Subversion Repositories SmartDukaan

Rev

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

Rev 14267 Rev 14269
Line 200... Line 200...
200 
                response = json.loads(response)['response']
 200 
                response = json.loads(response)['response']
201 
                items = response['itemsMap']
 201 
                items = response['itemsMap']
202 
                orders = response['orders']
 202 
                orders = response['orders']
203 
                closed = True
 203 
                closed = True
204 
                for order in orders:
 204 
                for order in orders:
- 
 
 205 
                    orderId = str(order['id'])
205 
                    subOrder = self._isSubOrderActive(tr, order['id'])
 206 
                    subOrder = self._isSubOrderActive(tr, orderId)
206 
                    if subOrder:
 207 
                    if subOrder:
207 
                        if subOrder['closed']:
 208 
                        if subOrder['closed']:
208 
                            continue
 209 
                            continue
209 
                        else:
 210 
                        else:
210 
                            findMap = {"orderId": order['orderId'], "subOrders.merchantSubOrderId": order['id']}
 211 
                            findMap = {"orderId": order['orderId'], "subOrders.merchantSubOrderId": orderId}
211 
                            updateMap = {}
 212 
                            updateMap = {}
212 
                            updateMap["subOrders.$.detailedStatus"] = order['statusDescription']
 213 
                            updateMap["subOrders.$.detailedStatus"] = order['statusDescription']
213 
                            status = self._getStatusFromDetailedStatus(ORDERSTATUS[order['status']])
214 
                            status = self._getStatusFromDetailedStatus(ORDERSTATUS[order['status']])
214 
                            closedStatus = status in [Store.ORDER_DELIVERED, Store.ORDER_CANCELLED]
 215 
                            closedStatus = status in [Store.ORDER_DELIVERED, Store.ORDER_CANCELLED]
215 
                            updateMap["subOrders.$.status"] = status
 216 
                            updateMap["subOrders.$.status"] = status
Line 229... Line 230...
229 
                                updateMap["subOrders.$.estimatedDeliveryDate"] = expectedDelivery
 230 
                                updateMap["subOrders.$.estimatedDeliveryDate"] = expectedDelivery
230 
                                closed = False
 231 
                                closed = False
231 
                            bulk.find(findMap).update({'$set' : updateMap})
 232 
                            bulk.find(findMap).update({'$set' : updateMap})
232 
                    else:
 233 
                    else:
233 
                        subOrder = self.parseSubOrder(order, items)
 234 
                        subOrder = self.parseSubOrder(order, items)
234 
                        self.db.merchantOrder.update({"orderId":order['orderId']},{'$push':{"subOrders":todict(subOrder)}})
 235 
                        self.db.merchantOrder.update({"orderId":tr['orderId']},{'$push':{"subOrders":todict(subOrder)}})
235 
                        print "Added new suborder with subOrder Id:", subOrder.merchantSubOrderId
 236 
                        print "Added new suborder with subOrder Id:", subOrder.merchantSubOrderId
236 
                        closed = False
 237 
                        closed = False
237 
                bulk.find({"order":order['id']}).update({'$set' : {'closed':closed}})
 238 
                bulk.find({"order":tr['orderId']}).update({'$set' : {'closed':closed}})
238 
            except:
 239 
            except:
239 
                pass
 240 
                pass
240 
            try:
 241 
            try:
241 
                bulk.execute()
 242 
                bulk.execute()
242 
            except:
 243 
            except: