Subversion Repositories SmartDukaan

Rev

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

Rev 21323 Rev 21324
Line 117... Line 117...
117 
                    subOrder = self._isSubOrderActive(merchantOrder,  item['orderItemId'])
 117 
                    subOrder = self._isSubOrderActive(merchantOrder,  item['orderItemId'])
118 
                    if subOrder:
 118 
                    if subOrder:
119 
                        subOrder.detailedStatus = item['desktopSubStatus']
 119 
                        subOrder.detailedStatus = item['desktopSubStatus']
120
120
121 
        self.populateDerivedFields(merchantOrder, update)
 121 
        self.populateDerivedFields(merchantOrder, update)
122 
        self._saveToOrder(todict(merchantOrder))
 122 
        self._updateToOrder(todict(merchantOrder))
123
123
124 
    def _getActiveOrders(self, searchMap={}, collectionMap={}):
 124 
    def _getActiveOrders(self, searchMap={}, collectionMap={}):
125 
        collection = self.db.merchantOrder
 125 
        collection = self.db.merchantOrder
126 
        searchMap = dict(searchMap.items()+ {"closed": False, "storeId" : self.store_id}.items())
126 
        searchMap = dict(searchMap.items()+ {"closed": False, "storeId" : self.store_id}.items())
127 
        #collectionMap =  dict(collectionMap.items() + {"orderSuccessUrl":1, "orderId":1,"subOrders":1, "placedOn":1, "orderTracking"}.items())
 127 
        #collectionMap =  dict(collectionMap.items() + {"orderSuccessUrl":1, "orderId":1,"subOrders":1, "placedOn":1, "orderTracking"}.items())