Subversion Repositories SmartDukaan

Rev

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

Rev 14698 Rev 14699
Line 51... Line 51...
51 
                try:
 51 
                try:
52 
                    orderUrl = soup.find('div', {"id":"thank-you-box-wrapper"}).div.findAll('div', recursive=False)[1].a['href']
 52 
                    orderUrl = soup.find('div', {"id":"thank-you-box-wrapper"}).div.findAll('div', recursive=False)[1].a['href']
53 
                    merchantOrderId = re.findall(r'.*&oid=(.*)&?.*?', orderUrl)[0]
 53 
                    merchantOrderId = re.findall(r'.*&oid=(.*)&?.*?', orderUrl)[0]
54 
                except:
 54 
                except:
55 
                    merchantOrderId = soup.find(id="orders-list").div.span.b.text
 55 
                    merchantOrderId = soup.find(id="orders-list").div.span.b.text
56 
                order = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, False)
 56 
                order = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, True)
57 
                order.orderSuccessUrl = ORDER_REDIRECT_URL % (merchantOrderId)
 57 
                order.orderSuccessUrl = ORDER_REDIRECT_URL % (merchantOrderId)
58 
                order.merchantOrderId = merchantOrderId
 58 
                order.merchantOrderId = merchantOrderId
59 
                order.requireDetail = True
 59 
                order.requireDetail = True
60 
                order.status = 'html_required'
 60 
                order.status = 'html_required'
61 
                order.closed = None
 61 
                order.closed = None
Line 72... Line 72...
72 
                resp["result"] = 'ORDER_NOT_CREATED'
 72 
                resp["result"] = 'ORDER_NOT_CREATED'
73 
                return resp
 73 
                return resp
74
74
75 
        else:
 75 
        else:
76 
            try:
 76 
            try:
77 
                merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)
 77 
                merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, False)
78 
                soup = BeautifulSoup(rawHtml)
 78 
                soup = BeautifulSoup(rawHtml)
79 
                try:
 79 
                try:
80 
                    self.parseOldStlye(merchantOrder, soup)
 80 
                    self.parseOldStlye(merchantOrder, soup)
81 
                except:
 81 
                except:
82 
                    try:
 82 
                    try: