Subversion Repositories SmartDukaan

Rev

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

Rev 16283 Rev 16370
Line 44... Line 44...
44
    '''
44
    '''
45
    OrderStatusMap = {
45
    OrderStatusMap = {
46
                      MStore.ORDER_PLACED : ['payment successful', 'new order - cod confirmation pending', 'processing', 'quality check','on schedule', 'processing - pickup initiated', 'processing - ready to dispatch','processing - procurement delay from merchant','processing - slight procurment delay from merchant','cod order confirmed by customer'],
46
                      MStore.ORDER_PLACED : ['payment successful', 'new order - cod confirmation pending', 'processing', 'quality check','on schedule', 'processing - pickup initiated', 'processing - ready to dispatch','processing - procurement delay from merchant','processing - slight procurment delay from merchant','cod order confirmed by customer'],
47
                      MStore.ORDER_DELIVERED : ['delivered', 'complete'],
47
                      MStore.ORDER_DELIVERED : ['delivered', 'complete'],
48
                      MStore.ORDER_SHIPPED : ['in transit', 'dispatched','shipped','order handed to courier','order handed over to courier'],
48
                      MStore.ORDER_SHIPPED : ['in transit', 'dispatched','shipped','order handed to courier','order handed over to courier'],
49
                      MStore.ORDER_CANCELLED : ['payment failed', 'canceled', 'payment declined', 'order on hold - cancellation requested by customer', 'courier returned', 'canceled on customer request', 'canceled by customer','order canceled by customer','canceled - address not shippable']
49
                      MStore.ORDER_CANCELLED : ['payment failed', 'canceled', 'payment declined', 'order on hold - cancellation requested by customer', 'courier returned', 'canceled on customer request', 'canceled by customer','order canceled by customer','canceled - address not shippable','return complete','undelivered - returning to origin']
50
                      }
50
                      }
51
    OrderStatusConfirmationMap= {
51
    OrderStatusConfirmationMap= {
52
                                 "P" : "Payment Successful",
52
                                 "P" : "Payment Successful",
53
                                 "D" : "Order Declined",
53
                                 "D" : "Order Declined",
54
                                 "O" : "New Order - COD confirmation Pending"
54
                                 "O" : "New Order - COD confirmation Pending"
Line 418... Line 418...
418
                if header[0] == 'Content-Type' and 'json' in header[1]:
418
                if header[0] == 'Content-Type' and 'json' in header[1]:
419
                    jsonResponse = json.loads(page)
419
                    jsonResponse = json.loads(page)
420
            if jsonResponse is not None:
420
            if jsonResponse is not None:
421
                page = jsonResponse['text']
421
                page = jsonResponse['text']
422
            
422
            
423
            merchantOrder = self._parseOrders(orderId, merchantOrderId, subTagId, userId, page, orderSuccessUrl, orderObj)
423
            merchantOrder = self._parseOrders(orderId, merchantOrderId, subTagId, userId, page, orderSuccessUrl, orderObj) 
424
            
424
            
425
            merchantOrder.orderTrackingUrl = ORDER_TRACK_URL_DB + 'order_id=' +str(merchantOrderId)+'&email_id='+ emailId
425
            merchantOrder.orderTrackingUrl = ORDER_TRACK_URL_DB + 'order_id=' +str(merchantOrderId)+'&email_id='+ emailId
426
               
426
               
427
            if self._saveToOrder(todict(merchantOrder)):
427
            if self._saveToOrder(todict(merchantOrder)):
428
                resp['result'] = 'ORDER_CREATED'
428
                resp['result'] = 'ORDER_CREATED'