Subversion Repositories SmartDukaan

Rev

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

Rev 20396 Rev 20397
Line 141... Line 141...
141 
                            break
 141 
                            break
142 
                        findMap = {"orderId": order['orderId'], "subOrders.merchantSubOrderId": merchantSubOrderId}
 142 
                        findMap = {"orderId": order['orderId'], "subOrders.merchantSubOrderId": merchantSubOrderId}
143 
                        divs = orderItem.findAll('div', recursive=False)
 143 
                        divs = orderItem.findAll('div', recursive=False)
144 
                        orderTracking = divs[2]
 144 
                        orderTracking = divs[2]
145 
                        orderTrackingDetDiv = divs[3].find('div',{'class':'c-tabs-content m-top active'})
 145 
                        orderTrackingDetDiv = divs[3].find('div',{'class':'c-tabs-content m-top active'})
146 
                        orderTrackingDet = orderTrackingDetDiv.find('div',{'class':re.compile('tracking-remark')}).text
 146 
                        orderTrackingDet = str(orderTrackingDetDiv.findAll("div", "tracking-remark", recursive=True)[-1].text)
147 
                        updateMap["subOrders.$.detailedStatus"] = orderTrackingDet
 147 
                        updateMap["subOrders.$.detailedStatus"] = orderTrackingDet
148 
                        status = self._getStatusFromDetailedStatus(orderTrackingDet)
 148 
                        status = self._getStatusFromDetailedStatus(orderTrackingDet)
149 
                        tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
 149 
                        tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
150
150
151 
                        cashbackStatus = subOrder.get("cashBackStatus")
151 
                        cashbackStatus = subOrder.get("cashBackStatus")