WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

 def change_transaction_status(transaction_id, new_status, description, pickUp, orderType, source):
     transaction = get_transaction(transaction_id)
     transaction.status = new_status
     transaction.status_message = description
+    expectedDelayMap = {}
+    billingWarehouseIdMap = {}
+    billingWarehouseTxnMap = {}
     ## Assign runner in case of delhi pincodes
     if transaction.orders[0].pickupStoreId:
         logistics_client = LogisticsClient().get_client()
         store = logistics_client.getPickupStore(transaction.orders[0].pickupStoreId)
         if delhi_pincodes.__contains__(store.pin):
     if new_status == TransactionStatus.FAILED:
         for order in transaction.orders:
             order.status = OrderStatus.PAYMENT_FAILED
             order.statusDescription = "Payment Failed"
     elif new_status == TransactionStatus.AUTHORIZED or new_status == TransactionStatus.FLAGGED:
+        expectedDelayMap = {}
+        billingWarehouseIdMap = {}
+        billingWarehouseTxnMap = {}
         for order in transaction.orders:
             if new_status == TransactionStatus.AUTHORIZED:
                 order.status = OrderStatus.SUBMITTED_FOR_PROCESSING
                 order.statusDescription = "Submitted to warehouse"
             elif new_status == TransactionStatus.FLAGGED:
             order.orderType = orderType
             #After we got payment success, we will set logistics info also
             logistics_client = LogisticsClient().get_client()
             #FIXME line item is only one now. If multiple will come, need to fix.
             item_id = order.lineitems[0].item_id
+            if pickUp == PickUpType.RUNNER or pickUp == PickUpType.SELF or order.source!=OrderSource.WEBSITE:
-            logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
+                logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
-            current_time = datetime.datetime.now()
+                current_time = datetime.datetime.now()
-            logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
+                logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
-            logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
+                logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
-            logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
+                logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
-            order.otg = logistics_info.otgAvailable
+                order.otg = logistics_info.otgAvailable
-            order.warehouse_id = logistics_info.warehouseId
+                order.warehouse_id = logistics_info.warehouseId
-            order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
+                order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
-            order.logistics_provider_id = logistics_info.providerId
+                order.logistics_provider_id = logistics_info.providerId
-            #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
+                #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
-            #order.airwaybill_no = logistics_info.airway_billno
+                #order.airwaybill_no = logistics_info.airway_billno
-            #order.tracking_id = order.airwaybill_no
+                #order.tracking_id = order.airwaybill_no
-            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
+                #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
-            if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:
+                if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:
-                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                    order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                    order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-                order.promised_shipping_time = order.expected_shipping_time
+                    order.promised_shipping_time = order.expected_shipping_time
-                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                    order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-                order.promised_delivery_time = order.expected_delivery_time
+                    order.promised_delivery_time = order.expected_delivery_time
+                inventory_client = InventoryClient().get_client()
+                fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
+                if OrderType.B2B == order.orderType:
+                    #get state
+                    stateMaster = fetchStateMaster()
+                    stateId = -1
+                    for k, v in stateMaster.iteritems():
+                        if v.stateName == order.customer_state:
+                            stateId = k
+                            break
+                    if stateId == -1:
+                        raise TransactionServiceException(108, "No such State")
+                    if not inventory_client.isAlive():
+                        inventory_client = InventoryClient().get_client()
+                    ffWarehouse = inventory_client.getWarehouse(order.fulfilmentWarehouseId)
+                    if stateId!= ffWarehouse.stateId:
+                        goodWhIds = inventory_client.getOursGoodWarehouseIdsForLocation(stateId)
+                        if goodWhIds is None or len(goodWhIds) == 0:
+                            raise TransactionServiceException(108, "No availability from this location")
+                        fulfilmentWarehouseId = goodWhIds[0]
+                        for goodWhId in goodWhIds:
+                            availability = inventory_client.getItemAvailibilityAtWarehouse(goodWhId, order.lineitems[0].item_id)
+                            if availability > 0:
+                                fulfilmentWarehouseId = goodWhId
+                                break
+                        order.fulfilmentWarehouseId = fulfilmentWarehouseId
+                        fulfillmentWh = inventory_client.getWarehouse(fulfilmentWarehouseId)
+                        order.warehouse_id = fulfillmentWh.billingWarehouseId
+                if order.pickupStoreId:
+                    order.otg = False
+                if order.productCondition != ProductCondition.BAD:
+                    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)
-            inventory_client = InventoryClient().get_client()
-            fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
-            if OrderType.B2B == order.orderType:
+            elif order.source == OrderSource.WEBSITE:
-                #get state
+                try:
-                stateMaster = fetchStateMaster()
-                stateId = -1
-                for k, v in stateMaster.iteritems():
-                    if v.stateName == order.customer_state:
-                        stateId = k
-                        break
-                if stateId == -1:
-                    raise TransactionServiceException(108, "No such State")
+                    #Get the id and location of actual warehouse that'll be used to fulfil this order.
-                if not inventory_client.isAlive():
                     inventory_client = InventoryClient().get_client()
-                ffWarehouse = inventory_client.getWarehouse(order.fulfilmentWarehouseId)
+                    fulfilmentWhId, expected_delay, billingWarehouseId, sellingPrice, totalAvailability, weight = inventory_client.getItemAvailabilityAtLocation(item_id, 1)
-                if stateId!= ffWarehouse.stateId:
+                except Exception as ex:
-                    goodWhIds = inventory_client.getOursGoodWarehouseIdsForLocation(stateId)
+                    raise TransactionServiceException(103, "Unable to fetch inventory information about this item.")
-                    if goodWhIds is None or len(goodWhIds) == 0:
+                expectedDelayMap[item_id] = expected_delay
-                        raise TransactionServiceException(108, "No availability from this location")
+                if billingWarehouseIdMap.has_key(billingWarehouseId):
-                    fulfilmentWarehouseId = goodWhIds[0]
+                    ordersList = billingWarehouseIdMap.get(billingWarehouseId)
-                    for goodWhId in goodWhIds:
+                    ordersList.append(order)
-                        availability = inventory_client.getItemAvailibilityAtWarehouse(goodWhId, order.lineitems[0].item_id)
+                    billingWarehouseIdMap[billingWarehouseId] = ordersList
-                        if availability > 0:
+                else:
-                            fulfilmentWarehouseId = goodWhId
+                    ordersList = []
-                            break
+                    ordersList.append(order)
+                    billingWarehouseIdMap[billingWarehouseId] = ordersList
-                    order.fulfilmentWarehouseId = fulfilmentWarehouseId
+                if billingWarehouseTxnMap.has_key(billingWarehouseId):
-                    fulfillmentWh = inventory_client.getWarehouse(fulfilmentWarehouseId)
+                    transactionAmount , transactionWeight = billingWarehouseTxnMap.get(billingWarehouseId)
-                    order.warehouse_id = fulfillmentWh.billingWarehouseId
+                    transactionAmount = transactionAmount+order.total_amount
+                    transactionWeight = transactionWeight+order.total_weight
+                    billingWarehouseTxnMap[billingWarehouseId] = transactionAmount , transactionWeight
+                else:
+                    billingWarehouseTxnMap[billingWarehouseId] = order.total_amount , order.total_weight
-            if order.pickupStoreId:
-                order.otg = False
+                order.fulfilmentWarehouseId = fulfilmentWhId
+                fulfilmentWarehouseId = fulfilmentWhId
+                if OrderType.B2B == order.orderType:
+                    #get state
+                    stateMaster = fetchStateMaster()
+                    stateId = -1
+                    for k, v in stateMaster.iteritems():
+                        if v.stateName == order.customer_state:
+                            stateId = k
+                            break
+                    if stateId == -1:
+                        raise TransactionServiceException(108, "No such State")
+                    if not inventory_client.isAlive():
+                        inventory_client = InventoryClient().get_client()
+                    ffWarehouse = inventory_client.getWarehouse(order.fulfilmentWarehouseId)
+                    if stateId!= ffWarehouse.stateId:
+                        goodWhIds = inventory_client.getOursGoodWarehouseIdsForLocation(stateId)
+                        if goodWhIds is None or len(goodWhIds) == 0:
+                            raise TransactionServiceException(108, "No availability from this location")
+                        fulfilmentWarehouseId = goodWhIds[0]
+                        for goodWhId in goodWhIds:
+                            availability = inventory_client.getItemAvailibilityAtWarehouse(goodWhId, order.lineitems[0].item_id)
+                            if availability > 0:
+                                fulfilmentWarehouseId = goodWhId
+                                break
+                        order.fulfilmentWarehouseId = fulfilmentWarehouseId
+                        fulfillmentWh = inventory_client.getWarehouse(fulfilmentWarehouseId)
+                        order.warehouse_id = fulfillmentWh.billingWarehouseId
+                if order.pickupStoreId:
+                    order.otg = False
-            if order.productCondition != ProductCondition.BAD:
+                if order.productCondition != ProductCondition.BAD:
-                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)
+                    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)
             try:
                 item_pricing = inventory_client.getItemPricing(item_id, -1)
                 order.lineitems[0].transfer_price = item_pricing.transferPrice
                 order.lineitems[0].nlc = item_pricing.nlc
             except:
             creditObj = __creditHistoryObj(singleOrder.customer_id, 1, transaction.id, total_amount, CreditTxnType.BLOCKED, str(transaction.id))
             creditTxns = []
             creditTxns.append(creditObj)
             process_credit_transaction(transaction.id, singleOrder.customer_id, 1, creditTxns)
+        for billingWarehouseId, orders in billingWarehouseIdMap.items():
+            logistics_client = LogisticsClient().get_client()
+            transactionAmount , transactionWeight = billingWarehouseTxnMap.get(billingWarehouseId)
+            costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(orders[0].customer_pincode, transactionAmount, False, transactionWeight, billingWarehouseId)
+            logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
+            logisticsCostInOrders = 0
+            current_time = datetime.datetime.now()
+            #delivery_delay
+            for order in orders:
+                expectedDelay = expectedDelayMap.get(order.lineitems[0].item_id)
+                shipping_delay = 24 * expectedDelay
+                if shipping_delay < 0:
+                    shipping_delay = costingAndDeliveryEstimateObj.shippingTime
+                else:
+                    shipping_delay = shipping_delay + 24 * costingAndDeliveryEstimateObj.shippingTime
+                    shipping_delay = int(math.ceil(shipping_delay/24.0))
+                costingAndDeliveryEstimateObj.deliveryTime = adjust_delivery_time(current_time, costingAndDeliveryEstimateObj.deliveryTime+shipping_delay)
+                costingAndDeliveryEstimateObj.shippingTime = adjust_delivery_time(current_time, shipping_delay)
+                costingAndDeliveryEstimateObj.delivery_delay = adjust_delivery_time(current_time, shipping_delay+costingAndDeliveryEstimateObj.delivery_delay)
+                order.otg = costingAndDeliveryEstimateObj.otgAvailable
+                order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
+                #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
+                #order.airwaybill_no = logistics_info.airway_billno
+                #order.tracking_id = order.airwaybill_no
+                #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
+                order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                order.promised_shipping_time = order.expected_shipping_time
+                order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                order.promised_delivery_time = order.expected_delivery_time
+                itemLevelLogisticsCost = round((order.total_amount *logisticsCost)/transactionAmount, 0)
+                logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
+                order.lineitems[0].logisticsCost = itemLevelLogisticsCost
+                order.lineitems[0].codCollectionCharges = 0
+            orders[0].lineitems[0].logisticsCost = orders[0].lineitems[0].logisticsCost + (logisticsCost-logisticsCostInOrders)
     elif new_status == TransactionStatus.COD_IN_PROCESS:
+        expectedDelayMap = {}
+        billingWarehouseIdMap = {}
+        billingWarehouseTxnMap = {}
         for order in transaction.orders:
             order.status = OrderStatus.COD_VERIFICATION_PENDING
             order.statusDescription = "Verification Pending"
             order.cod = True
             order.orderType = orderType
                 #logistics_info.airway_billno = prepaid_logistics_info.airway_billno
                 #logistics_info.providerId = prepaid_logistics_info.providerId
                 #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
                 # Will not provide OTG in pickup store
                 order.otg = False
+                current_time = datetime.datetime.now()
+                logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
+                logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
+                logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
+                order.warehouse_id = logistics_info.warehouseId
+                order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
+                order.logistics_provider_id = logistics_info.providerId
+                #Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
+                #order.airwaybill_no = logistics_info.airway_billno
+                #order.tracking_id = order.airwaybill_no
+                #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
+                if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:
+                    order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                    order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                    order.promised_shipping_time = order.expected_shipping_time
+                    order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                    order.promised_delivery_time = order.expected_delivery_time
+                inventory_client = InventoryClient().get_client()
+                fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
+                if OrderType.B2B == order.orderType:
+                    #get state
+                    stateMaster = fetchStateMaster()
+                    stateId = -1
+                    for k, v in stateMaster.iteritems():
+                        if v.stateName == order.customer_state:
+                            stateId = k
+                            break
+                    if stateId == -1:
+                        raise TransactionServiceException(108, "No such State")
+                    if not inventory_client.isAlive():
+                        inventory_client = InventoryClient().get_client()
+                    ffWarehouse = inventory_client.getWarehouse(order.fulfilmentWarehouseId)
+                    if stateId!= ffWarehouse.stateId:
+                        goodWhIds = inventory_client.getOursGoodWarehouseIdsForLocation(stateId)
+                        if goodWhIds is None or len(goodWhIds) == 0:
+                            raise TransactionServiceException(108, "No availability from this location")
+                        fulfilmentWarehouseId = goodWhIds[0]
+                        for goodWhId in goodWhIds:
+                            availability = inventory_client.getItemAvailibilityAtWarehouse(goodWhId, order.lineitems[0].item_id)
+                            if availability > 0:
+                                fulfilmentWarehouseId = goodWhId
+                                break
+                        order.fulfilmentWarehouseId = fulfilmentWarehouseId
+                        fulfillmentWh = inventory_client.getWarehouse(fulfilmentWarehouseId)
+                        order.warehouse_id = fulfillmentWh.billingWarehouseId
+                if order.productCondition != ProductCondition.BAD:
+                    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)
             else:
-                logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD, pickUp)
-                order.otg = logistics_info.otgAvailable
-            current_time = datetime.datetime.now()
-            logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
-            logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
-            logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
-            order.warehouse_id = logistics_info.warehouseId
-            order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
-            order.logistics_provider_id = logistics_info.providerId
-            #Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
-            #order.airwaybill_no = logistics_info.airway_billno
-            #order.tracking_id = order.airwaybill_no
-            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
-            if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:
-                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-                order.promised_shipping_time = order.expected_shipping_time
-                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-                order.promised_delivery_time = order.expected_delivery_time
-            inventory_client = InventoryClient().get_client()
-            fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
-            if OrderType.B2B == order.orderType:
-                #get state
+                try:
-                stateMaster = fetchStateMaster()
-                stateId = -1
-                for k, v in stateMaster.iteritems():
-                    if v.stateName == order.customer_state:
-                        stateId = k
-                        break
-                if stateId == -1:
-                    raise TransactionServiceException(108, "No such State")
+                    #Get the id and location of actual warehouse that'll be used to fulfil this order.
-                if not inventory_client.isAlive():
                     inventory_client = InventoryClient().get_client()
+                    fulfilmentWhId, expected_delay, billingWarehouseId, sellingPrice, totalAvailability, weight = inventory_client.getItemAvailabilityAtLocation(item_id, 1)
+                except Exception as ex:
+                    raise TransactionServiceException(103, "Unable to fetch inventory information about this item.")
+                expectedDelayMap[item_id] = expected_delay
+                if billingWarehouseIdMap.has_key(billingWarehouseId):
-                ffWarehouse = inventory_client.getWarehouse(order.fulfilmentWarehouseId)
+                    ordersList = billingWarehouseIdMap.get(billingWarehouseId)
+                    ordersList.append(order)
+                    billingWarehouseIdMap[billingWarehouseId] = ordersList
+                else:
+                    ordersList = []
-                if stateId!= ffWarehouse.stateId:
+                    ordersList.append(order)
-                    goodWhIds = inventory_client.getOursGoodWarehouseIdsForLocation(stateId)
+                    billingWarehouseIdMap[billingWarehouseId] = ordersList
-                    if goodWhIds is None or len(goodWhIds) == 0:
+                if billingWarehouseTxnMap.has_key(billingWarehouseId):
-                        raise TransactionServiceException(108, "No availability from this location")
+                    transactionAmount , transactionWeight = billingWarehouseTxnMap.get(billingWarehouseId)
+                    transactionAmount = transactionAmount+order.total_amount
+                    transactionWeight = transactionWeight+order.total_weight
+                    billingWarehouseTxnMap[billingWarehouseId] = transactionAmount , transactionWeight
+                else:
+                    billingWarehouseTxnMap[billingWarehouseId] = order.total_amount , order.total_weight
+                order.fulfilmentWarehouseId = fulfilmentWhId
-                    fulfilmentWarehouseId = goodWhIds[0]
+                fulfilmentWarehouseId = fulfilmentWhId
+                if OrderType.B2B == order.orderType:
+                    #get state
+                    stateMaster = fetchStateMaster()
-                    for goodWhId in goodWhIds:
+                    stateId = -1
-                        availability = inventory_client.getItemAvailibilityAtWarehouse(goodWhId, order.lineitems[0].item_id)
+                    for k, v in stateMaster.iteritems():
-                        if availability > 0:
+                        if v.stateName == order.customer_state:
-                            fulfilmentWarehouseId = goodWhId
+                            stateId = k
                             break
+                    if stateId == -1:
+                        raise TransactionServiceException(108, "No such State")
+                    if not inventory_client.isAlive():
+                        inventory_client = InventoryClient().get_client()
+                    ffWarehouse = inventory_client.getWarehouse(order.fulfilmentWarehouseId)
+                    if stateId!= ffWarehouse.stateId:
+                        goodWhIds = inventory_client.getOursGoodWarehouseIdsForLocation(stateId)
+                        if goodWhIds is None or len(goodWhIds) == 0:
+                            raise TransactionServiceException(108, "No availability from this location")
+                        fulfilmentWarehouseId = goodWhIds[0]
+                        for goodWhId in goodWhIds:
+                            availability = inventory_client.getItemAvailibilityAtWarehouse(goodWhId, order.lineitems[0].item_id)
+                            if availability > 0:
+                                fulfilmentWarehouseId = goodWhId
+                                break
+                        order.fulfilmentWarehouseId = fulfilmentWarehouseId
+                        fulfillmentWh = inventory_client.getWarehouse(fulfilmentWarehouseId)
+                        order.warehouse_id = fulfillmentWh.billingWarehouseId
+                if order.pickupStoreId:
+                    order.otg = False
-                    order.fulfilmentWarehouseId = fulfilmentWarehouseId
-                    fulfillmentWh = inventory_client.getWarehouse(fulfilmentWarehouseId)
-                    order.warehouse_id = fulfillmentWh.billingWarehouseId
-            if order.productCondition != ProductCondition.BAD:
+                if order.productCondition != ProductCondition.BAD:
-                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)
+                    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)
             try:
                 item_pricing = inventory_client.getItemPricing(item_id, -1)
                 order.lineitems[0].transfer_price = item_pricing.transferPrice
                 order.lineitems[0].nlc = item_pricing.nlc
             except:
             catalog_client = CatalogClient().get_client()
             voucherAmount = catalog_client.getVoucherAmount(item_id, VoucherType.SPICEDECK_MOBILE)
             if voucherAmount:
                 __create_recharge_voucher_tracker(order, voucherAmount, VoucherType.SPICEDECK_MOBILE)
+        for billingWarehouseId, orders in billingWarehouseIdMap.items():
+            logistics_client = LogisticsClient().get_client()
+            transactionAmount , transactionWeight = billingWarehouseTxnMap.get(billingWarehouseId)
+            costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(orders[0].customer_pincode, transactionAmount, True, transactionWeight, billingWarehouseId)
+            current_time = datetime.datetime.now()
+            logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
+            logisticsCostInOrders = 0
+            codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
+            codCollectionChargesInOrders = 0
+            #delivery_delay
+            for order in orders:
+                expectedDelay = expectedDelayMap.get(order.lineitems[0].item_id)
+                shipping_delay = 24 * expectedDelay
+                if shipping_delay < 0:
+                    shipping_delay = costingAndDeliveryEstimateObj.shippingTime
+                else:
+                    shipping_delay = shipping_delay + 24 * costingAndDeliveryEstimateObj.shippingTime
+                    shipping_delay = int(math.ceil(shipping_delay/24.0))
+                costingAndDeliveryEstimateObj.deliveryTime = adjust_delivery_time(current_time, costingAndDeliveryEstimateObj.deliveryTime+shipping_delay)
+                costingAndDeliveryEstimateObj.shippingTime = adjust_delivery_time(current_time, shipping_delay)
+                costingAndDeliveryEstimateObj.delivery_delay = adjust_delivery_time(current_time, shipping_delay+costingAndDeliveryEstimateObj.delivery_delay)
+                order.otg = costingAndDeliveryEstimateObj.otgAvailable
+                order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
+                #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
+                #order.airwaybill_no = logistics_info.airway_billno
+                #order.tracking_id = order.airwaybill_no
+                #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
+                order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                order.promised_shipping_time = order.expected_shipping_time
+                order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+                order.promised_delivery_time = order.expected_delivery_time
+                itemLevelLogisticsCost = round((order.total_amount *logisticsCost)/transactionAmount, 0)
+                logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
+                itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 0)
+                codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges
+                order.lineitems[0].logisticsCost = itemLevelLogisticsCost
+                order.lineitems[0].codCollectionCharges = itemLevelCodCollectionCharges
+            orders[0].lineitems[0].logisticsCost = orders[0].lineitems[0].logisticsCost + (logisticsCost-logisticsCostInOrders)
+            orders[0].lineitems[0].codCollectionCharges = orders[0].lineitems[0].codCollectionCharges + (codCollectionCharges-codCollectionChargesInOrders)
     session.commit()
     if new_status in (TransactionStatus.AUTHORIZED, TransactionStatus.FLAGGED, TransactionStatus.COD_IN_PROCESS):
         try:
             if order.source == OrderSource.WEBSITE:
         conn.close()
     conn.close()
     print 'Process completed'
+    '''
     deltype = DeliveryType.PREPAID
     if ordersList[0].cod:
         deltype = DeliveryType.COD
     if not logistics_client.isAlive():
         logistics_client = LogisticsClient().get_client()
     awbNumber = logistics_client.getNewEmptyAwb(provider.id, deltype, totalOrderQuantity)
+    '''
     txnSeqRequired = 0
     txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==ordersList[0].transaction_id).order_by(desc(TransactionShipmentSequence.id)).first()
     if txnShipSeq is None:
         txnShipSeq = TransactionShipmentSequence()
         txnShipSeqNew.createdTimestamp = datetime.datetime.now()
         txnShipSeqNew.sequence = txnShipSeq.sequence + 1
         txnSeqRequired = txnShipSeq.sequence + 1
     for order in ordersList:
-        update_order_AWB(order.id, awbNumber)
+        #update_order_AWB(order.id, awbNumber)
         order.logisticsTransactionId = str(order.transaction_id)+"-"+str(txnSeqRequired)
     session.commit()
     singleOrder = ordersList[0]
     creditObj.amount = amount
     creditObj.credit_type = credit_type
     creditObj.shipping_id = shipping_id
     return creditObj
+def set_order_attribute_for_master_order_id(logisticsTransactionId, attributes):
+    orders = get_group_orders_by_logistics_txn_id(logisticsTransactionId)
+    for order in orders:
+        for attribute in attributes :
+            existingAttribute = Attribute.query.filter(Attribute.orderId == order.id).filter(Attribute.name == attribute.name).first()
+            if existingAttribute:
+                existingAttribute.value = attribute.value
+            else :
+                attr = Attribute()
+                attr.orderId = order.id
+                attr.name = attribute.name
+                attr.value = attribute.value
+    session.commit()
+def update_master_order_awb(logisticsTransactionId, airwaybill_no):
+    orders = get_group_orders_by_logistics_txn_id(logisticsTransactionId)
+    for order in orders:
+        order.airwaybill_no = airwaybill_no
+        order.tracking_id = airwaybill_no
+    session.commit()
+    return True
 if __name__ == '__main__':
     print get_orders_by_mobile_number("9650889334")

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 19356 → 19421