Subversion Repositories SmartDukaan

Rev

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

Rev 14211 Rev 14246
Line 139... Line 139...
139 
        missingOrderUrls = []
 139 
        missingOrderUrls = []
140 
        missingOrders = self._getMissingOrders({'userId':userId})
 140 
        missingOrders = self._getMissingOrders({'userId':userId})
141 
        for missingOrder in missingOrders:
 141 
        for missingOrder in missingOrders:
142 
            missingOrderUrls.append(ORDER_REDIRECT_URL%(missingOrder['merchantOrderId']))
 142 
            missingOrderUrls.append(ORDER_REDIRECT_URL%(missingOrder['merchantOrderId']))
143 
        orders = self._getActiveOrders({'userId':userId})
 143 
        orders = self._getActiveOrders({'userId':userId})
144 
        print "orders", orders
 - 
 
145 
        count = len(orders)
 144 
        count = len(orders)
146 
        print "count", count
 145 
        print "count", count
147 
        if count > 0:
 146 
        if count > 0:
148 
            return missingOrderUrls + ['https://www.amazon.in/gp/css/order-history', 'https://www.amazon.in/gp/css/order-history/?orderFilter=cancelled']
 147 
            return missingOrderUrls + ['https://www.amazon.in/gp/css/order-history', 'https://www.amazon.in/gp/css/order-history/?orderFilter=cancelled']
149 
        else:
148 
        else:
Line 206... Line 205...
206 
                                            updateMap = {}
 205 
                                            updateMap = {}
207 
                                            closedStatus = False
 206 
                                            closedStatus = False
208 
                                            updateMap['subOrders.$.imgUrl'] = imgUrl
 207 
                                            updateMap['subOrders.$.imgUrl'] = imgUrl
209 
                                            updateMap['subOrders.$.lastTracked'] = timestamp
 208 
                                            updateMap['subOrders.$.lastTracked'] = timestamp
210 
                                            updateMap['subOrders.$.detailedStatus'] = orderStatus
 209 
                                            updateMap['subOrders.$.detailedStatus'] = orderStatus
- 
 
 210 
                                            updateMap['subOrders.$.deliveredOn'] = deliveredOn
211 
                                            cashbackStatus = subOrder.get("cashBackStatus")
 211 
                                            cashbackStatus = subOrder.get("cashBackStatus")
212 
                                            updateMap['subOrders.$.status'] = status
212 
                                            updateMap['subOrders.$.status'] = status
213
213
214 
                                            if status==MStore.ORDER_DELIVERED:
214 
                                            if status==MStore.ORDER_DELIVERED:
215 
                                                closedStatus = True
 215 
                                                closedStatus = True