| Line 3494... |
Line 3494... |
| 3494 |
|
3494 |
|
| 3495 |
actual_shipping_delay = adjust_delivery_time(order.expected_shipping_time, further_delay)
|
3495 |
actual_shipping_delay = adjust_delivery_time(order.expected_shipping_time, further_delay)
|
| 3496 |
order.expected_shipping_time = order.expected_shipping_time + datetime.timedelta(days=actual_shipping_delay)
|
3496 |
order.expected_shipping_time = order.expected_shipping_time + datetime.timedelta(days=actual_shipping_delay)
|
| 3497 |
if order.courier_delivery_time:
|
3497 |
if order.courier_delivery_time:
|
| 3498 |
order.courier_delivery_time = order.courier_delivery_time + datetime.timedelta(days=adjust_delivery_time(order.courier_delivery_time, further_delay))
|
3498 |
order.courier_delivery_time = order.courier_delivery_time + datetime.timedelta(days=adjust_delivery_time(order.courier_delivery_time, further_delay))
|
| 3499 |
else
|
3499 |
else:
|
| 3500 |
order.courier_delivery_time = order.expected_delivery_time + datetime.timedelta(days=adjust_delivery_time(order.expected_delivery_time, further_delay))
|
3500 |
order.courier_delivery_time = order.expected_delivery_time + datetime.timedelta(days=adjust_delivery_time(order.expected_delivery_time, further_delay))
|
| 3501 |
session.commit()
|
3501 |
session.commit()
|
| 3502 |
|
3502 |
|
| 3503 |
try:
|
3503 |
try:
|
| 3504 |
transaction_requiring_extra_processing = TransactionRequiringExtraProcessing()
|
3504 |
transaction_requiring_extra_processing = TransactionRequiringExtraProcessing()
|
| Line 6675... |
Line 6675... |
| 6675 |
#After we got payment success, we will set logistics info also
|
6675 |
#After we got payment success, we will set logistics info also
|
| 6676 |
logistics_client = LogisticsClient().get_client()
|
6676 |
logistics_client = LogisticsClient().get_client()
|
| 6677 |
#FIXME line item is only one now. If multiple will come, need to fix.
|
6677 |
#FIXME line item is only one now. If multiple will come, need to fix.
|
| 6678 |
item_id = order.lineitems[0].item_id
|
6678 |
item_id = order.lineitems[0].item_id
|
| 6679 |
logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
|
6679 |
logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
|
| 6680 |
'''
|
- |
|
| 6681 |
current_time = datetime.datetime.now()
|
- |
|
| 6682 |
|
6680 |
|
| - |
|
6681 |
#current_time = datetime.datetime.now()
|
| - |
|
6682 |
|
| 6683 |
logistics_info.deliveryTime = adjust_delivery_time(to_py_date(deliveryTimeStamp), 0)
|
6683 |
#logistics_info.deliveryTime = adjust_delivery_time(to_py_date(deliveryTimeStamp), 0)
|
| 6684 |
logistics_info.shippingTime = adjust_delivery_time(to_py_date(shipTimestamp), 0)
|
6684 |
#logistics_info.shippingTime = adjust_delivery_time(to_py_date(shipTimestamp), 0)
|
| 6685 |
logistics_info.deliveryDelay = 0
|
6685 |
#logistics_info.deliveryDelay = 0
|
| 6686 |
'''
|
6686 |
|
| 6687 |
|
6687 |
|
| 6688 |
order.otg = logistics_info.otgAvailable
|
6688 |
order.otg = logistics_info.otgAvailable
|
| 6689 |
order.warehouse_id = logistics_info.warehouseId
|
6689 |
order.warehouse_id = logistics_info.warehouseId
|
| 6690 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
6690 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
| 6691 |
order.logistics_provider_id = 45
|
6691 |
order.logistics_provider_id = 45
|
| Line 6746... |
Line 6746... |
| 6746 |
order.otg = False
|
6746 |
order.otg = False
|
| 6747 |
else:
|
6747 |
else:
|
| 6748 |
logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD, pickUp)
|
6748 |
logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD, pickUp)
|
| 6749 |
order.otg = logistics_info.otgAvailable
|
6749 |
order.otg = logistics_info.otgAvailable
|
| 6750 |
|
6750 |
|
| 6751 |
'''
|
6751 |
|
| 6752 |
current_time = datetime.datetime.now()
|
6752 |
#current_time = datetime.datetime.now()
|
| 6753 |
logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
|
6753 |
#logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
|
| 6754 |
logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
|
6754 |
#logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
|
| 6755 |
logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
|
6755 |
#logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
|
| 6756 |
'''
|
6756 |
|
| 6757 |
|
6757 |
|
| 6758 |
order.warehouse_id = logistics_info.warehouseId
|
6758 |
order.warehouse_id = logistics_info.warehouseId
|
| 6759 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
6759 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
| 6760 |
order.logistics_provider_id = 45
|
6760 |
order.logistics_provider_id = 45
|
| 6761 |
#Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
6761 |
#Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|