Subversion Repositories SmartDukaan

Rev

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

Rev 20419 Rev 20420
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
                        if orderTrackingDetDiv is not None:
146
                        orderTrackingDet = str(orderTrackingDetDiv.find("div", "tracking-remark").text)
147
                            orderTrackingDet = str(orderTrackingDetDiv.find("div", "tracking-remark").text)
147
                        updateMap["subOrders.$.detailedStatus"] = orderTrackingDet
148
                            updateMap["subOrders.$.detailedStatus"] = orderTrackingDet
148
                        '''status = self._getStatusFromDetailedStatus(orderTrackingDet)'''
149
                            '''status = self._getStatusFromDetailedStatus(orderTrackingDet)'''
149
                        tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
150
                            tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
150
                        cashbackStatus = subOrder.get("cashBackStatus")
151
                            cashbackStatus = subOrder.get("cashBackStatus")
151
                        
152
                            
152
                        tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
153
                            tr = orderTracking.findAll("div",{"class":"tap-bullet-area c-tab-trigger"})
153
 
154
    
154
                        if "approveDetails-ongoing" in str(tr) or "processingDetails-ongoing" in str(tr):
155
                            if "approveDetails-ongoing" in str(tr) or "processingDetails-ongoing" in str(tr):
155
                            status=MStore.ORDER_PLACED
156
                                status=MStore.ORDER_PLACED
156
                        elif "shippingDetails-ongoing" in str(tr):
157
                            elif "shippingDetails-ongoing" in str(tr):
157
                            status = MStore.ORDER_SHIPPED
158
                                status = MStore.ORDER_SHIPPED
158
                        elif "delivery-complete" in str(tr):
159
                            elif "delivery-complete" in str(tr):
159
                            status = MStore.ORDER_DELIVERED
160
                                status = MStore.ORDER_DELIVERED
160
                            if cashbackStatus == Store.CB_PENDING:
161
                                if cashbackStatus == Store.CB_PENDING:
161
                                cashbackStatus = Store.CB_APPROVED
162
                                    cashbackStatus = Store.CB_APPROVED
162
                            closedStatus = True
163
                                closedStatus = True
163
                        if "dead" in str(tr) or "shippingDetails-returnOngoing" in str(tr) or "shippingDetails-return" in str(tr):
164
                            if "dead" in str(tr) or "shippingDetails-returnOngoing" in str(tr) or "shippingDetails-return" in str(tr):
-
 
165
                                status = MStore.ORDER_CANCELLED
-
 
166
                                closedStatus = True
-
 
167
                                if cashbackStatus == Store.CB_PENDING:
-
 
168
                                    cashbackStatus = Store.CB_CANCELLED
-
 
169
                        else:
-
 
170
                            updateMap["subOrders.$.detailedStatus"] = "Refunded"
164
                            status = MStore.ORDER_CANCELLED
171
                            status = MStore.ORDER_CANCELLED
165
                            closedStatus = True
172
                            closedStatus = True
166
                            if cashbackStatus == Store.CB_PENDING:
173
                            if cashbackStatus == Store.CB_PENDING:
167
                                cashbackStatus = Store.CB_CANCELLED
174
                                cashbackStatus = Store.CB_CANCELLED
168
                        print "Sub Order Status " + str(status)
175
                        print "Sub Order Status " + str(status)