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



                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)
                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)

                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)
                logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
                itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 0)
                codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges
                order.lineitems[0].logisticsCost = itemLevelLogisticsCost
                order.lineitems[0].codCollectionCharges = itemLevelCodCollectionCharges

Subversion Repositories SmartDukaan

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

Rev 19421		Rev 19438
Line 634...		Line 634...
634	`order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	634	`order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
635	`order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	635	`order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
636	`order.promised_shipping_time = order.expected_shipping_time`	636	`order.promised_shipping_time = order.expected_shipping_time`
637	`order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	637	`order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
638	`order.promised_delivery_time = order.expected_delivery_time`	638	`order.promised_delivery_time = order.expected_delivery_time`
639	`itemLevelLogisticsCost = round((order.total_amount *logisticsCost)/transactionAmount, 0)`	639	`itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 0)`
640	`logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost`	640	`logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost`
641	`order.lineitems[0].logisticsCost = itemLevelLogisticsCost`	641	`order.lineitems[0].logisticsCost = itemLevelLogisticsCost`
642	`order.lineitems[0].codCollectionCharges = 0`	642	`order.lineitems[0].codCollectionCharges = 0`
643		643
644	`orders[0].lineitems[0].logisticsCost = orders[0].lineitems[0].logisticsCost + (logisticsCost-logisticsCostInOrders)`	644	`orders[0].lineitems[0].logisticsCost = orders[0].lineitems[0].logisticsCost + (logisticsCost-logisticsCostInOrders)`
Line 826...		Line 826...
826	`order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	826	`order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
827	`order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	827	`order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
828	`order.promised_shipping_time = order.expected_shipping_time`	828	`order.promised_shipping_time = order.expected_shipping_time`
829	`order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	829	`order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
830	`order.promised_delivery_time = order.expected_delivery_time`	830	`order.promised_delivery_time = order.expected_delivery_time`
831	`itemLevelLogisticsCost = round((order.total_amount *logisticsCost)/transactionAmount, 0)`	831	`itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 0)`
832	`logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost`	832	`logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost`
833	`itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 0)`	833	`itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 0)`
834	`codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges`	834	`codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges`
835	`order.lineitems[0].logisticsCost = itemLevelLogisticsCost`	835	`order.lineitems[0].logisticsCost = itemLevelLogisticsCost`
836	`order.lineitems[0].codCollectionCharges = itemLevelCodCollectionCharges`	836	`order.lineitems[0].codCollectionCharges = itemLevelCodCollectionCharges`