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

     RechargeTransaction, HotspotStore, WalletForCompany, WalletHistoryForCompany, \
     FRC, OperatorSeries, SourceDetail, Company, EbayOrder, AmazonFbaSalesSnapshot, \
     AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, \
     HotspotServiceMatrix, SnapdealOrder, FlipkartOrder, DataInsuranceDetailForOrder, \
     AmazonFbaOrderReturns, FlipkartAdvantageOrder, InvoiceCounterGenerator, \
-    TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, LoanHistory
+    TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, LoanHistory, \
+    ShipmentLogisticsCostDetail
 from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
 from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
 from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
     MobileRechargeOrder
 from shop2020.model.v1.order.impl.model.RechargeDenomination import \
     TransactionStatus, OrderStatus, DelayReason, ExtraTransactionProcessingType, \
     HotspotAction, TimeoutSummary, OrderStatusGroups, OrderType, RechargeOrderStatus, \
     RechargeType, RechargeStatistics, DeviceNumberInfo, EmiChargeType, PayMethod, \
     OrderSource, StorePaymentStatus, ProductCondition, TaxType, \
     AmazonFCWarehouseLocation, RechargeMode, CreditTxnType, CreditHistory as TCreditHistory, \
-    LoanHistory as TLoanHistory
+    LoanHistory as TLoanHistory, ShipmentLogisticsCostDetail as TShipmentLogisticsCostDetail
 from shop2020.thriftpy.model.v1.user.ttypes import VoucherType, CouponCategory, \
     User, Sex
 from shop2020.thriftpy.payments.ttypes import PaymentException
 from shop2020.thriftpy.utils.ttypes import UserSmsInfo, SmsType
 from shop2020.thriftpy.warehouse.ttypes import ScanType, \
             order.status = OrderStatus.PAYMENT_FAILED
             order.statusDescription = "Payment Failed"
     elif new_status == TransactionStatus.AUTHORIZED or new_status == TransactionStatus.FLAGGED:
         expectedDelayMap = {}
         billingWarehouseIdMap = {}
         billingWarehouseTxnMap = {}
+        subOrderAmountsMap = {}
         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:
                     transactionWeight = transactionWeight+order.total_weight
                     billingWarehouseTxnMap[billingWarehouseId] = transactionAmount , transactionWeight
                 else:
                     billingWarehouseTxnMap[billingWarehouseId] = order.total_amount , order.total_weight
+                subOrderAmountsMap[long(order.lineitems[0].unit_price)] = order
                 order.fulfilmentWarehouseId = fulfilmentWhId
                 fulfilmentWarehouseId = fulfilmentWhId
                 if OrderType.B2B == order.orderType:
                     #get state
             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)
+            costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(orders[0].customer_pincode, transactionAmount, False, transactionWeight, billingWarehouseId, False)
+            if costingAndDeliveryEstimateObj is None:
+                subOrderAmountsList = sorted(subOrderAmountsMap.keys())
+                maxUnitPriceOrder = subOrderAmountsMap.get(subOrderAmountsList[len(subOrderAmountsList)-1])
+                costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(orders[0].customer_pincode, maxUnitPriceOrder.lineitems[0].unit_price, False, maxUnitPriceOrder.lineitems[0].unit_weight, billingWarehouseId, False)
+            if costingAndDeliveryEstimateObj is None:
+                raise TransactionServiceException(108, "No Logistics Provider Assigned")
             logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
             logisticsCostInOrders = 0
             current_time = datetime.datetime.now()
             #delivery_delay
             for order in orders:
                 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_weight *logisticsCost)/transactionWeight, 0)
+                itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 2)
                 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)
+            orders[0].lineitems[0].logisticsCost = orders[0].lineitems[0].logisticsCost + (round(logisticsCost,2)-logisticsCostInOrders)
     elif new_status == TransactionStatus.COD_IN_PROCESS:
         expectedDelayMap = {}
         billingWarehouseIdMap = {}
         billingWarehouseTxnMap = {}
+        subOrderAmountsMap = {}
         for order in transaction.orders:
             order.status = OrderStatus.COD_VERIFICATION_PENDING
             order.statusDescription = "Verification Pending"
             order.cod = True
             order.orderType = orderType
                     transactionWeight = transactionWeight+order.total_weight
                     billingWarehouseTxnMap[billingWarehouseId] = transactionAmount , transactionWeight
                 else:
                     billingWarehouseTxnMap[billingWarehouseId] = order.total_amount , order.total_weight
+                subOrderAmountsMap[long(order.lineitems[0].unit_price)] = order
                 order.fulfilmentWarehouseId = fulfilmentWhId
                 fulfilmentWarehouseId = fulfilmentWhId
                 if OrderType.B2B == order.orderType:
                     #get state
                 __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)
+            costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(orders[0].customer_pincode, transactionAmount, True, transactionWeight, billingWarehouseId, False)
+            if costingAndDeliveryEstimateObj is None:
+                subOrderAmountsList = sorted(subOrderAmountsMap.keys())
+                maxUnitPriceOrder = subOrderAmountsMap.get(subOrderAmountsList[len(subOrderAmountsList)-1])
+                costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(orders[0].customer_pincode, maxUnitPriceOrder.lineitems[0].unit_price, True, maxUnitPriceOrder.lineitems[0].unit_weight, billingWarehouseId, False)
+            if costingAndDeliveryEstimateObj is None:
+                raise TransactionServiceException(108, "No Logistics Provider Assigned")
             current_time = datetime.datetime.now()
             logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
             logisticsCostInOrders = 0
             codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
             codCollectionChargesInOrders = 0
                 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_weight *logisticsCost)/transactionWeight, 0)
+                itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 2)
                 logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
-                itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 0)
+                itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 2)
                 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].logisticsCost = orders[0].lineitems[0].logisticsCost + (round(logisticsCost,2)-logisticsCostInOrders)
-            orders[0].lineitems[0].codCollectionCharges = orders[0].lineitems[0].codCollectionCharges + (codCollectionCharges-codCollectionChargesInOrders)
+            orders[0].lineitems[0].codCollectionCharges = orders[0].lineitems[0].codCollectionCharges + (round(codCollectionCharges,2)-codCollectionChargesInOrders)
     session.commit()
     if new_status in (TransactionStatus.AUTHORIZED, TransactionStatus.FLAGGED, TransactionStatus.COD_IN_PROCESS):
         try:
             if order.source == OrderSource.WEBSITE:
 def accept_order(orderId):
     logging.info("Accepting order no: " + str(orderId))
     order = get_order(orderId)
+    ordersList = []
+    ordersList.append(order)
+    updatedOrders = logisticsProviderFinalCheck(ordersList)
+    order = updatedOrders[0]
     logistics_client = LogisticsClient().get_client()
     provider = logistics_client.getProvider(order.logistics_provider_id)
     providerLimits = logistics_client.getProviderLimitDetailsForPincode(provider.id, order.customer_pincode)
     if order.total_weight is None or order.total_weight == 0:
     order = Order.get_by(id = orderId)
     order.airwaybill_no=airwayBillNo
     order.tracking_id=airwayBillNo
     #order.logisticsTransactionId = str(order.transaction_id)+airwayBillNo
     session.commit()
+    shipmentLogisticsCostObj = TShipmentLogisticsCostDetail()
+    shipmentLogisticsCostObj.airwayBillNo = airwayBillNo
+    shipmentLogisticsCostObj.logisticsTransactionId = order.logisticsTransactionId
+    shipmentLogisticsCostObj.shipmentAmount = order.total_amount
+    shipmentLogisticsCostObj.shipmentCodCollectionCharges = order.lineitems[0].codCollectionCharges
+    shipmentLogisticsCostObj.shipmentLogsiticsCost = order.lineitems[0].logisticsCost
+    shipmentLogisticsCostObj.shipmentWeight = order.total_weight
+    shipmentLogisticsCostDetails = []
+    shipmentLogisticsCostDetails.append(shipmentLogisticsCostObj)
+    add_or_update_shipment_logistics_cost_details(shipmentLogisticsCostObj)
     return order
 #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
 def get_hotspot_service_matrices():
     hotspotServiceMatrices = HotspotServiceMatrix.query.all()
         orderObj = Order.get_by(id=orderId)
         totalOrderQuantity = totalOrderQuantity + long(orderObj.lineitems[0].quantity)
         ordersList.append(orderObj)
     print orders
+    updatedOrders = logisticsProviderFinalCheck(ordersList)
     user_client = UserClient().get_client()
-    isPrivateDealUser = user_client.isPrivateDealUser(ordersList[0].customer_id)
+    isPrivateDealUser = user_client.isPrivateDealUser(updatedOrders[0].customer_id)
     privateDealUser = None
     if isPrivateDealUser:
-        privateDealUser = user_client.getPrivateDealUser(ordersList[0].customer_id)
+        privateDealUser = user_client.getPrivateDealUser(updatedOrders[0].customer_id)
     logistics_client = LogisticsClient().get_client()
-    provider = logistics_client.getProvider(ordersList[0].logistics_provider_id)
+    provider = logistics_client.getProvider(updatedOrders[0].logistics_provider_id)
-    providerLimits = logistics_client.getProviderLimitDetailsForPincode(provider.id, ordersList[0].customer_pincode)
+    providerLimits = logistics_client.getProviderLimitDetailsForPincode(provider.id, updatedOrders[0].customer_pincode)
     print 'Accpet Order Process Started'
     '''
     Check For Pre Conditions
     '''
-    for order in ordersList:
+    for order in updatedOrders:
         if order.total_weight is None or order.total_weight ==0:
             raise TransactionServiceException(208, "Weight Value Not Defined for order:- "+ str(order.id)+". Contact Category Team.")
         totalWeight = totalWeight + order.total_weight
         #if order.cod:
         totalOrdersAmount = totalOrdersAmount + order.total_amount
             if not order.cod:
                 if totalOrdersAmount > providerPrepaidLimit:
                     raise TransactionServiceException(212, "Logistics Partner "+provider.name+ " Max Prepaid Amount Limit Violated Rs." +str(providerPrepaidLimit))
-    for order in ordersList:
+    for order in updatedOrders:
         if order.status in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.CAPTURE_IN_PROCESS]:
             if not order.cod:
                 if order.transaction.status == TransactionStatus.AUTHORIZED and order.transaction.payment_option != capitalFloatPayMethod:
                     __capture_txn(order)
         break
     except:
         raise TransactionServiceException(212, "Unable to connect to Inventory System")
     #conn = getDbConnection("localhost","root","shop2020","inventory")
     print 'Connected to Inventory DB'
-    for order in ordersList:
+    for order in updatedOrders:
         if order.status in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.CAPTURE_IN_PROCESS]:
             order.status = OrderStatus.ACCEPTED
             order.statusDescription = "Order Accepted"
             order.accepted_timestamp = datetime.datetime.now()
             if order.source == 6 or order.source == 7 or order.source == 8:
         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()
+    txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==updatedOrders[0].transaction_id).order_by(desc(TransactionShipmentSequence.id)).first()
     if txnShipSeq is None:
         txnShipSeq = TransactionShipmentSequence()
-        txnShipSeq.transactionId = ordersList[0].transaction_id
+        txnShipSeq.transactionId = updatedOrders[0].transaction_id
         txnShipSeq.createdTimestamp = datetime.datetime.now()
         txnShipSeq.sequence = 1
         txnSeqRequired = 1
     else:
         txnShipSeqNew = TransactionShipmentSequence()
         txnShipSeqNew.transactionId = txnShipSeq.transactionId
         txnShipSeqNew.createdTimestamp = datetime.datetime.now()
         txnShipSeqNew.sequence = txnShipSeq.sequence + 1
         txnSeqRequired = txnShipSeq.sequence + 1
-    for order in ordersList:
+    for order in updatedOrders:
         #update_order_AWB(order.id, awbNumber)
         order.logisticsTransactionId = str(order.transaction_id)+"-"+str(txnSeqRequired)
     session.commit()
-    singleOrder = ordersList[0]
+    singleOrder = updatedOrders[0]
     if singleOrder.orderType == OrderType.B2B:
         user_client = UserClient().get_client()
         if user_client.isPrivateDealUser(singleOrder.customer_id):
             billing_address = user_client.getBillingAddressForUser(singleOrder.customer_id)
             if billing_address is not None:
                 attr.value = attribute.value
     session.commit()
 def update_master_order_awb(logisticsTransactionId, airwaybill_no):
     orders = get_group_orders_by_logistics_txn_id(logisticsTransactionId)
+    shipmentAmount = 0
+    shipmentWeight = 0
+    shipmentLogisticsCost = 0
+    shipmentCodCollectionCharges = 0
     for order in orders:
         order.airwaybill_no = airwaybill_no
         order.tracking_id = airwaybill_no
+        shipmentAmount = shipmentAmount + order.total_amount
+        shipmentWeight = shipmentWeight + order.total_weight
+        shipmentLogisticsCost = shipmentLogisticsCost + order.lineitems[0].logisticsCost
+        shipmentCodCollectionCharges = shipmentCodCollectionCharges + order.lineitems[0].codCollectionCharges
+    session.commit()
+    shipmentLogisticsCostObj = TShipmentLogisticsCostDetail()
+    shipmentLogisticsCostObj.airwayBillNo = airwaybill_no
+    shipmentLogisticsCostObj.logisticsTransactionId = logisticsTransactionId
+    shipmentLogisticsCostObj.shipmentAmount = shipmentAmount
+    shipmentLogisticsCostObj.shipmentCodCollectionCharges = shipmentCodCollectionCharges
+    shipmentLogisticsCostObj.shipmentLogsiticsCost = shipmentLogisticsCost
+    shipmentLogisticsCostObj.shipmentWeight = shipmentWeight
+    shipmentLogisticsCostDetails = []
+    shipmentLogisticsCostDetails.append(shipmentLogisticsCostObj)
+    add_or_update_shipment_logistics_cost_details(shipmentLogisticsCostObj)
+    return True
+def add_or_update_shipment_logistics_cost_details(shipmentLogisticsCostDetails):
+    currentTime = datetime.datetime.now()
+    for shipmentLogisticsCostDetail in shipmentLogisticsCostDetails:
+        shipment_logisticsCostDetail = ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=shipmentLogisticsCostDetail.logisticsTransactionId, airwayBillNo = shipmentLogisticsCostDetail.airwayBillNo)
+        if shipment_logisticsCostDetail:
+            shipment_logisticsCostDetail.shipmentAmount = shipmentLogisticsCostDetail.shipmentAmount
+            shipment_logisticsCostDetail.shipmentWeight = shipmentLogisticsCostDetail.shipmentWeight
+            shipment_logisticsCostDetail.shipmentLogsiticsCost = shipmentLogisticsCostDetail.shipmentLogsiticsCost
+            shipment_logisticsCostDetail.shipmentCodCollectionCharges = shipmentLogisticsCostDetail.shipmentCodCollectionCharges
+            shipment_logisticsCostDetail.updatedAt = currentTime
+        else:
+            shipment_logisticsCostDetail = ShipmentLogisticsCostDetail()
+            shipment_logisticsCostDetail.logisticsTransactionId = shipmentLogisticsCostDetail.logisticsTransactionId
+            shipment_logisticsCostDetail.airwayBillNo = shipmentLogisticsCostDetail.airwayBillNo
+            shipment_logisticsCostDetail.shipmentAmount = shipmentLogisticsCostDetail.shipmentAmount
+            shipment_logisticsCostDetail.shipmentWeight = shipmentLogisticsCostDetail.shipmentWeight
+            shipment_logisticsCostDetail.shipmentLogsiticsCost = shipmentLogisticsCostDetail.shipmentLogsiticsCost
+            shipment_logisticsCostDetail.shipmentCodCollectionCharges = shipmentLogisticsCostDetail.shipmentCodCollectionCharges
+            shipment_logisticsCostDetail.updatedAt = currentTime
+    session.commit()
+    return True
+def logisticsProviderFinalCheck(ordersList):
+    shipmentAmount = 0
+    shipmentWeight = 0
+    isCod = False
+    if ordersList[0].cod:
+        isCod = True
+    for order in ordersList:
+        shipmentAmount = shipmentAmount + order.total_amount
+        shipmentWeight = shipmentWeight + order.total_weight
+    logistics_client = LogisticsClient().get_client()
+    costingAndDeliveryEstimateObj = logistics_client.getCostingAndDeliveryEstimateForPincode(ordersList[0].customer_pincode, shipmentAmount, isCod, shipmentWeight, ordersList[0].warehouse_id, False)
+    if costingAndDeliveryEstimateObj is None:
+        raise TransactionServiceException(227, "No Provider Assigned for these orders. Please select less orders.")
+    logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
+    logisticsCostInOrders = 0
+    codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
+    codCollectionChargesInOrders = 0
+    for order in ordersList:
+        current_time = order.created_timestamp
+        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_weight *logisticsCost)/shipmentWeight, 2)
+        logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
+        if codCollectionCharges >0:
+            itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/shipmentAmount, 2)
+            codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges
+            order.lineitems[0].codCollectionCharges = itemLevelCodCollectionCharges
+        order.lineitems[0].logisticsCost = itemLevelLogisticsCost
+    ordersList[0].lineitems[0].logisticsCost = ordersList[0].lineitems[0].logisticsCost + (round(logisticsCost,2)-logisticsCostInOrders)
+    if codCollectionCharges>0:
+        ordersList[0].lineitems[0].codCollectionCharges = ordersList[0].lineitems[0].codCollectionCharges + (round(codCollectionCharges,2)-codCollectionChargesInOrders)
     session.commit()
-    return True
+    return ordersList
 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 19438 → 19474