Subversion Repositories SmartDukaan

Rev

Rev 20687 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 20687 Rev 20699
Line 64... Line 64...
64 
                    merchantOrderId = doc("#orders-list>div>span>b").html()
 64 
                    merchantOrderId = doc("#orders-list>div>span>b").html()
65 
                    if not merchantOrderId:
 65 
                    if not merchantOrderId:
66 
                        merchantOrderId = urlparse.parse_qs(urlparse.urlsplit(orderSuccessUrl).query)
 66 
                        merchantOrderId = urlparse.parse_qs(urlparse.urlsplit(orderSuccessUrl).query)
67 
                    else:
 67 
                    else:
68 
                        raise
 68 
                        raise
- 
 
 69 
                if not merchantOrderId  or re.match("\d+-\d+\d+", merchantOrderId):
- 
 
 70 
                    raise
69 
                order = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, True)
 71 
                order = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, True)
70 
                order.orderTrackingUrl = ORDER_REDIRECT_URL % (merchantOrderId)
 72 
                order.orderTrackingUrl = ORDER_REDIRECT_URL % (merchantOrderId)
71 
                order.orderSuccessUrl = orderSuccessUrl
 73 
                order.orderSuccessUrl = orderSuccessUrl
72 
                order.merchantOrderId = merchantOrderId
 74 
                order.merchantOrderId = merchantOrderId
73 
                order.requireDetail = True
 75 
                order.requireDetail = True