Subversion Repositories SmartDukaan

Rev

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

Rev 20395 Rev 20396
Line 378... Line 378...
378
                    if cashbackAmount <= 0:
378
                    if cashbackAmount <= 0:
379
                        cashbackStatus = Store.CB_NA
379
                        cashbackStatus = Store.CB_NA
380
                    merchantsubOrder.cashBackAmount = cashbackAmount
380
                    merchantsubOrder.cashBackAmount = cashbackAmount
381
                    merchantsubOrder.cashBackStatus = cashbackStatus      
381
                    merchantsubOrder.cashBackStatus = cashbackStatus      
382
                    merchantsubOrder.cashBackPercentage = cashbackPercent
382
                    merchantsubOrder.cashBackPercentage = cashbackPercent
383
                    merchantsubOrder.detailedStatus = str(orderItem.find("div", "tracking-remark", recursive=True).text)   
383
                    merchantsubOrder.detailedStatus = str(orderItem.findAll("div", "tracking-remark", recursive=True)[-1].text)   
384
                    
384
                    
385
                    subOrders.append(merchantsubOrder)
-
 
386
                    #To track shipping details         
385
                    #To track shipping details         
387
                    status=ORDER_PLACED    
386
                    status=ORDER_PLACED    
388
                    tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
387
                    tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
389
                    if "approveDetails-complete" in str(tr):
388
                    if "approveDetails-complete" in str(tr):
390
                        if "processingDetails-complete" in str(tr):
389
                        if "processingDetails-complete" in str(tr):
Line 401... Line 400...
401
                    elif "approveDetails-ongoing" in str(tr):
400
                    elif "approveDetails-ongoing" in str(tr):
402
                        status=MStore.ORDER_PLACED             
401
                        status=MStore.ORDER_PLACED             
403
                    if "dead" in str(tr) or "shippingDetails-returnOngoing" in str(tr) or "shippingDetails-return" in str(tr):
402
                    if "dead" in str(tr) or "shippingDetails-returnOngoing" in str(tr) or "shippingDetails-return" in str(tr):
404
                        status = MStore.ORDER_CANCELLED    
403
                        status = MStore.ORDER_CANCELLED    
405
                    print "Sub Order Status " + str(status)
404
                    print "Sub Order Status " + str(status)
406
                    subOrder.status=status
405
                    merchantsubOrder.status=status
-
 
406
                    subOrders.append(merchantsubOrder)
407
 
407
 
408
            if self._saveToOrder(todict(merchantOrder)):
408
            if self._saveToOrder(todict(merchantOrder)):
409
                resp['result'] = 'ORDER_CREATED'
409
                resp['result'] = 'ORDER_CREATED'
410
            else:
410
            else:
411
                resp['result'] = 'ORDER_ALREADY_CREATED_IGNORED'
411
                resp['result'] = 'ORDER_ALREADY_CREATED_IGNORED'