Subversion Repositories SmartDukaan

Rev

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

Rev 22705 Rev 22717
Line 563... Line 563...
563
                order.promised_shipping_time = order.expected_shipping_time
563
                order.promised_shipping_time = order.expected_shipping_time
564
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
564
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
565
                order.promised_delivery_time = order.expected_delivery_time
565
                order.promised_delivery_time = order.expected_delivery_time
566
                    
566
                    
567
                inventory_client = InventoryClient().get_client()
567
                inventory_client = InventoryClient().get_client()
568
                fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
-
 
569
#                if OrderType.B2B == order.orderType:
568
#                if OrderType.B2B == order.orderType:
570
#                    #get state
569
#                    #get state
571
#                    stateMaster = fetchStateMaster()
570
#                    stateMaster = fetchStateMaster()
572
#                    stateId = -1
571
#                    stateId = -1
573
#                    for k, v in stateMaster.iteritems():
572
#                    for k, v in stateMaster.iteritems():
Line 596... Line 595...
596
                                
595
                                
597
                if order.pickupStoreId:
596
                if order.pickupStoreId:
598
                    order.otg = False
597
                    order.otg = False
599
                    
598
                    
600
                if order.productCondition != ProductCondition.BAD:
599
                if order.productCondition != ProductCondition.BAD:
601
                    inventory_client.reserveItemInWarehouse(item_id, fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
600
                    inventory_client.reserveItemInWarehouse(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
602
 
601
 
603
            elif order.source == OrderSource.WEBSITE:
602
            elif order.source == OrderSource.WEBSITE:
604
                try:
603
                try:
605
                    #Get the id and location of actual warehouse that'll be used to fulfil this order.
604
                    #Get the id and location of actual warehouse that'll be used to fulfil this order.
606
                    inventory_client = InventoryClient().get_client()
605
                    inventory_client = InventoryClient().get_client()