| Line 627... |
Line 627... |
| 627 |
logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
|
627 |
logisticsCost = costingAndDeliveryEstimateObj.logisticsCost
|
| 628 |
logisticsCostInOrders = 0
|
628 |
logisticsCostInOrders = 0
|
| 629 |
current_time = datetime.datetime.now()
|
629 |
current_time = datetime.datetime.now()
|
| 630 |
#delivery_delay
|
630 |
#delivery_delay
|
| 631 |
for order in orders:
|
631 |
for order in orders:
|
| - |
|
632 |
deliveryTime = costingAndDeliveryEstimateObj.deliveryTime
|
| - |
|
633 |
shippingTime = costingAndDeliveryEstimateObj.shippingTime
|
| - |
|
634 |
delivery_delay = costingAndDeliveryEstimateObj.delivery_delay
|
| 632 |
expectedDelay = expectedDelayMap.get(order.lineitems[0].item_id)
|
635 |
expectedDelay = expectedDelayMap.get(order.lineitems[0].item_id)
|
| 633 |
shipping_delay = 24 * expectedDelay
|
636 |
shipping_delay = 24 * expectedDelay
|
| 634 |
if shipping_delay < 0:
|
637 |
if shipping_delay < 0:
|
| 635 |
shipping_delay = costingAndDeliveryEstimateObj.shippingTime
|
638 |
shipping_delay = shippingTime
|
| 636 |
else:
|
639 |
else:
|
| 637 |
shipping_delay = shipping_delay + 24 * costingAndDeliveryEstimateObj.shippingTime
|
640 |
shipping_delay = shipping_delay + 24 * shippingTime
|
| 638 |
shipping_delay = int(math.ceil(shipping_delay/24.0))
|
641 |
shipping_delay = int(math.ceil(shipping_delay/24.0))
|
| 639 |
costingAndDeliveryEstimateObj.deliveryTime = adjust_delivery_time(current_time, costingAndDeliveryEstimateObj.deliveryTime+shipping_delay)
|
642 |
deliveryTime = adjust_delivery_time(current_time, deliveryTime+shipping_delay)
|
| 640 |
costingAndDeliveryEstimateObj.shippingTime = adjust_delivery_time(current_time, shipping_delay)
|
643 |
shippingTime = adjust_delivery_time(current_time, shipping_delay)
|
| 641 |
costingAndDeliveryEstimateObj.delivery_delay = adjust_delivery_time(current_time, shipping_delay+costingAndDeliveryEstimateObj.delivery_delay)
|
644 |
delivery_delay = adjust_delivery_time(current_time, shipping_delay+delivery_delay)
|
| 642 |
order.otg = costingAndDeliveryEstimateObj.otgAvailable
|
645 |
order.otg = costingAndDeliveryEstimateObj.otgAvailable
|
| 643 |
|
646 |
|
| 644 |
order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
|
647 |
order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
|
| 645 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
648 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
| 646 |
#order.airwaybill_no = logistics_info.airway_billno
|
649 |
#order.airwaybill_no = logistics_info.airway_billno
|
| 647 |
#order.tracking_id = order.airwaybill_no
|
650 |
#order.tracking_id = order.airwaybill_no
|
| 648 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
651 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
| 649 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
652 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 650 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
653 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 651 |
order.promised_shipping_time = order.expected_shipping_time
|
654 |
order.promised_shipping_time = order.expected_shipping_time
|
| 652 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
655 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 653 |
order.promised_delivery_time = order.expected_delivery_time
|
656 |
order.promised_delivery_time = order.expected_delivery_time
|
| 654 |
itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 2)
|
657 |
itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 2)
|
| 655 |
logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
|
658 |
logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
|
| 656 |
order.lineitems[0].logisticsCost = itemLevelLogisticsCost
|
659 |
order.lineitems[0].logisticsCost = itemLevelLogisticsCost
|
| 657 |
order.lineitems[0].codCollectionCharges = 0
|
660 |
order.lineitems[0].codCollectionCharges = 0
|
| Line 833... |
Line 836... |
| 833 |
logisticsCostInOrders = 0
|
836 |
logisticsCostInOrders = 0
|
| 834 |
codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
|
837 |
codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
|
| 835 |
codCollectionChargesInOrders = 0
|
838 |
codCollectionChargesInOrders = 0
|
| 836 |
#delivery_delay
|
839 |
#delivery_delay
|
| 837 |
for order in orders:
|
840 |
for order in orders:
|
| - |
|
841 |
deliveryTime = costingAndDeliveryEstimateObj.deliveryTime
|
| - |
|
842 |
shippingTime = costingAndDeliveryEstimateObj.shippingTime
|
| - |
|
843 |
delivery_delay = costingAndDeliveryEstimateObj.delivery_delay
|
| 838 |
expectedDelay = expectedDelayMap.get(order.lineitems[0].item_id)
|
844 |
expectedDelay = expectedDelayMap.get(order.lineitems[0].item_id)
|
| 839 |
shipping_delay = 24 * expectedDelay
|
845 |
shipping_delay = 24 * expectedDelay
|
| 840 |
if shipping_delay < 0:
|
846 |
if shipping_delay < 0:
|
| 841 |
shipping_delay = costingAndDeliveryEstimateObj.shippingTime
|
847 |
shipping_delay = shippingTime
|
| 842 |
else:
|
848 |
else:
|
| 843 |
shipping_delay = shipping_delay + 24 * costingAndDeliveryEstimateObj.shippingTime
|
849 |
shipping_delay = shipping_delay + 24 * shippingTime
|
| 844 |
shipping_delay = int(math.ceil(shipping_delay/24.0))
|
850 |
shipping_delay = int(math.ceil(shipping_delay/24.0))
|
| 845 |
costingAndDeliveryEstimateObj.deliveryTime = adjust_delivery_time(current_time, costingAndDeliveryEstimateObj.deliveryTime+shipping_delay)
|
851 |
deliveryTime = adjust_delivery_time(current_time, deliveryTime+shipping_delay)
|
| 846 |
costingAndDeliveryEstimateObj.shippingTime = adjust_delivery_time(current_time, shipping_delay)
|
852 |
shippingTime = adjust_delivery_time(current_time, shipping_delay)
|
| 847 |
costingAndDeliveryEstimateObj.delivery_delay = adjust_delivery_time(current_time, shipping_delay+costingAndDeliveryEstimateObj.delivery_delay)
|
853 |
delivery_delay = adjust_delivery_time(current_time, shipping_delay+delivery_delay)
|
| 848 |
order.otg = costingAndDeliveryEstimateObj.otgAvailable
|
854 |
order.otg = costingAndDeliveryEstimateObj.otgAvailable
|
| 849 |
|
855 |
|
| 850 |
order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
|
856 |
order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
|
| 851 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
857 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
| 852 |
#order.airwaybill_no = logistics_info.airway_billno
|
858 |
#order.airwaybill_no = logistics_info.airway_billno
|
| 853 |
#order.tracking_id = order.airwaybill_no
|
859 |
#order.tracking_id = order.airwaybill_no
|
| 854 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
860 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
| 855 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
861 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 856 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
862 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 857 |
order.promised_shipping_time = order.expected_shipping_time
|
863 |
order.promised_shipping_time = order.expected_shipping_time
|
| 858 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
864 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 859 |
order.promised_delivery_time = order.expected_delivery_time
|
865 |
order.promised_delivery_time = order.expected_delivery_time
|
| 860 |
itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 2)
|
866 |
itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/transactionWeight, 2)
|
| 861 |
logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
|
867 |
logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
|
| 862 |
itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 2)
|
868 |
itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/transactionAmount, 2)
|
| 863 |
codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges
|
869 |
codCollectionChargesInOrders = codCollectionChargesInOrders + itemLevelCodCollectionCharges
|
| Line 9836... |
Line 9842... |
| 9836 |
logisticsCostInOrders = 0
|
9842 |
logisticsCostInOrders = 0
|
| 9837 |
codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
|
9843 |
codCollectionCharges = costingAndDeliveryEstimateObj.codCollectionCharges
|
| 9838 |
codCollectionChargesInOrders = 0
|
9844 |
codCollectionChargesInOrders = 0
|
| 9839 |
for order in ordersList:
|
9845 |
for order in ordersList:
|
| 9840 |
current_time = order.created_timestamp
|
9846 |
current_time = order.created_timestamp
|
| - |
|
9847 |
deliveryTime = costingAndDeliveryEstimateObj.deliveryTime
|
| 9841 |
shipping_delay = 24 * costingAndDeliveryEstimateObj.shippingTime
|
9848 |
shippingTime = costingAndDeliveryEstimateObj.shippingTime
|
| - |
|
9849 |
delivery_delay = costingAndDeliveryEstimateObj.delivery_delay
|
| - |
|
9850 |
shipping_delay = 24 * shippingTime
|
| 9842 |
shipping_delay = int(math.ceil(shipping_delay/24.0))
|
9851 |
shipping_delay = int(math.ceil(shipping_delay/24.0))
|
| 9843 |
costingAndDeliveryEstimateObj.deliveryTime = adjust_delivery_time(current_time, costingAndDeliveryEstimateObj.deliveryTime+shipping_delay)
|
9852 |
deliveryTime = adjust_delivery_time(current_time, deliveryTime+shipping_delay)
|
| 9844 |
costingAndDeliveryEstimateObj.shippingTime = adjust_delivery_time(current_time, shipping_delay)
|
9853 |
shippingTime = adjust_delivery_time(current_time, shipping_delay)
|
| 9845 |
costingAndDeliveryEstimateObj.delivery_delay = adjust_delivery_time(current_time, shipping_delay+costingAndDeliveryEstimateObj.delivery_delay)
|
9854 |
delivery_delay = adjust_delivery_time(current_time, shipping_delay+delivery_delay)
|
| 9846 |
order.otg = costingAndDeliveryEstimateObj.otgAvailable
|
9855 |
order.otg = costingAndDeliveryEstimateObj.otgAvailable
|
| 9847 |
|
9856 |
|
| 9848 |
order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
|
9857 |
order.logistics_provider_id = costingAndDeliveryEstimateObj.logistics_provider_id
|
| 9849 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
9858 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
| 9850 |
#order.airwaybill_no = logistics_info.airway_billno
|
9859 |
#order.airwaybill_no = logistics_info.airway_billno
|
| 9851 |
#order.tracking_id = order.airwaybill_no
|
9860 |
#order.tracking_id = order.airwaybill_no
|
| 9852 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
9861 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
| 9853 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
9862 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=delivery_delay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 9854 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
9863 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 9855 |
order.promised_shipping_time = order.expected_shipping_time
|
9864 |
order.promised_shipping_time = order.expected_shipping_time
|
| 9856 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=costingAndDeliveryEstimateObj.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
9865 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 9857 |
order.promised_delivery_time = order.expected_delivery_time
|
9866 |
order.promised_delivery_time = order.expected_delivery_time
|
| 9858 |
itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/shipmentWeight, 2)
|
9867 |
itemLevelLogisticsCost = round((order.total_weight *logisticsCost)/shipmentWeight, 2)
|
| 9859 |
logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
|
9868 |
logisticsCostInOrders = logisticsCostInOrders + itemLevelLogisticsCost
|
| 9860 |
if codCollectionCharges >0:
|
9869 |
if codCollectionCharges >0:
|
| 9861 |
itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/shipmentAmount, 2)
|
9870 |
itemLevelCodCollectionCharges = round((order.total_amount *codCollectionCharges)/shipmentAmount, 2)
|