| Line 531... |
Line 531... |
| 531 |
elif new_status == TransactionStatus.AUTHORIZED or new_status == TransactionStatus.FLAGGED:
|
531 |
elif new_status == TransactionStatus.AUTHORIZED or new_status == TransactionStatus.FLAGGED:
|
| 532 |
user_client = UserClient().get_client()
|
532 |
user_client = UserClient().get_client()
|
| 533 |
catalog_client = CatalogClient().get_client()
|
533 |
catalog_client = CatalogClient().get_client()
|
| 534 |
|
534 |
|
| 535 |
pdu = user_client.getPrivateDealUser(transaction.orders[0].customer_id)
|
535 |
pdu = user_client.getPrivateDealUser(transaction.orders[0].customer_id)
|
| 536 |
print "pdu.isFofo----", pdu.isFofo
|
536 |
print "pdu.isFofo----", pdu.isFofo
|
| - |
|
537 |
fofoWarehousesMap = {}
|
| 537 |
if pdu.isFofo:
|
538 |
if pdu.isFofo:
|
| 538 |
fofoDealMap = catalog_client.getAllFofoDeals([order.lineitems[0].item_id], [4,7])
|
539 |
fofoDealMap = catalog_client.getAllFofoDeals([order.lineitems[0].item_id], [4,7])
|
| 539 |
if fofoDealMap:
|
540 |
if fofoDealMap:
|
| 540 |
itemIds = []
|
541 |
itemIds = []
|
| 541 |
for order in transaction.orders:
|
542 |
for order in transaction.orders:
|
| Line 564... |
Line 565... |
| 564 |
#After we got payment success, we will set logistics info also
|
565 |
#After we got payment success, we will set logistics info also
|
| 565 |
logistics_client = LogisticsClient().get_client()
|
566 |
logistics_client = LogisticsClient().get_client()
|
| 566 |
#FIXME line item is only one now. If multiple will come, need to fix.
|
567 |
#FIXME line item is only one now. If multiple will come, need to fix.
|
| 567 |
item_id = order.lineitems[0].item_id
|
568 |
item_id = order.lineitems[0].item_id
|
| 568 |
if pickUp == PickUpType.RUNNER or pickUp == PickUpType.SELF:
|
569 |
if pickUp == PickUpType.RUNNER or pickUp == PickUpType.SELF:
|
| 569 |
print 'fofoWarehousesMap', fofoWarehousesMap
|
- |
|
| 570 |
current_time = datetime.datetime.now()
|
570 |
current_time = datetime.datetime.now()
|
| 571 |
logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
|
571 |
logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
|
| 572 |
order.logistics_provider_id = logistics_info.providerId
|
572 |
order.logistics_provider_id = logistics_info.providerId
|
| 573 |
if fofoWarehousesMap:
|
573 |
if pdu.isFofo and fofoWarehousesMap:
|
| 574 |
order.fulfilmentWarehouseId = fofoWarehousesMap.get(item_id).id
|
574 |
order.fulfilmentWarehouseId = fofoWarehousesMap.get(item_id).id
|
| 575 |
order.warehouse_id = fofoWarehousesMap.get(item_id).billingWarehouseId
|
575 |
order.warehouse_id = fofoWarehousesMap.get(item_id).billingWarehouseId
|
| 576 |
else:
|
576 |
else:
|
| 577 |
logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
|
- |
|
| 578 |
logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
|
- |
|
| 579 |
logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
|
- |
|
| 580 |
|
- |
|
| 581 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
- |
|
| 582 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
- |
|
| 583 |
order.promised_shipping_time = order.expected_shipping_time
|
- |
|
| 584 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
- |
|
| 585 |
order.promised_delivery_time = order.expected_delivery_time
|
- |
|
| 586 |
|
- |
|
| 587 |
order.warehouse_id = logistics_info.warehouseId
|
577 |
order.warehouse_id = logistics_info.warehouseId
|
| 588 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
578 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
| - |
|
579 |
|
| - |
|
580 |
logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
|
| - |
|
581 |
logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
|
| - |
|
582 |
logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
|
| - |
|
583 |
|
| - |
|
584 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| - |
|
585 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| - |
|
586 |
order.promised_shipping_time = order.expected_shipping_time
|
| - |
|
587 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| - |
|
588 |
order.promised_delivery_time = order.expected_delivery_time
|
| 589 |
order.otg = False
|
589 |
order.otg = False
|
| 590 |
|
590 |
|
| 591 |
|
591 |
|
| 592 |
inventory_client = InventoryClient().get_client()
|
592 |
inventory_client = InventoryClient().get_client()
|
| 593 |
|
593 |
|