| Line 396... |
Line 396... |
| 396 |
order.logistics_provider_id = logistics_info.providerId
|
396 |
order.logistics_provider_id = logistics_info.providerId
|
| 397 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
397 |
#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
|
| 398 |
#order.airwaybill_no = logistics_info.airway_billno
|
398 |
#order.airwaybill_no = logistics_info.airway_billno
|
| 399 |
#order.tracking_id = order.airwaybill_no
|
399 |
#order.tracking_id = order.airwaybill_no
|
| 400 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
400 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
| 401 |
|
401 |
if order.source not in (OrderSource.AMAZON):
|
| 402 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
402 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 403 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
403 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 404 |
order.promised_shipping_time = order.expected_shipping_time
|
404 |
order.promised_shipping_time = order.expected_shipping_time
|
| 405 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
405 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 406 |
order.promised_delivery_time = order.expected_delivery_time
|
406 |
order.promised_delivery_time = order.expected_delivery_time
|
| 407 |
|
407 |
|
| 408 |
if order.pickupStoreId:
|
408 |
if order.pickupStoreId:
|
| 409 |
order.otg = False
|
409 |
order.otg = False
|
| 410 |
|
410 |
|
| 411 |
inventory_client = InventoryClient().get_client()
|
411 |
inventory_client = InventoryClient().get_client()
|
| Line 458... |
Line 458... |
| 458 |
order.logistics_provider_id = logistics_info.providerId
|
458 |
order.logistics_provider_id = logistics_info.providerId
|
| 459 |
#Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
459 |
#Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
| 460 |
#order.airwaybill_no = logistics_info.airway_billno
|
460 |
#order.airwaybill_no = logistics_info.airway_billno
|
| 461 |
#order.tracking_id = order.airwaybill_no
|
461 |
#order.tracking_id = order.airwaybill_no
|
| 462 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
462 |
#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
|
| - |
|
463 |
if order.source not in (OrderSource.AMAZON):
|
| 463 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
464 |
order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 464 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
465 |
order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 465 |
order.promised_shipping_time = order.expected_shipping_time
|
466 |
order.promised_shipping_time = order.expected_shipping_time
|
| 466 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
467 |
order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
|
| 467 |
order.promised_delivery_time = order.expected_delivery_time
|
468 |
order.promised_delivery_time = order.expected_delivery_time
|
| 468 |
|
469 |
|
| 469 |
inventory_client = InventoryClient().get_client()
|
470 |
inventory_client = InventoryClient().get_client()
|
| 470 |
if order.productCondition != ProductCondition.BAD:
|
471 |
if order.productCondition != ProductCondition.BAD:
|
| 471 |
inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
|
472 |
inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
|
| 472 |
|
473 |
|
| Line 6851... |
Line 6852... |
| 6851 |
helper_client = HelperClient().get_client()
|
6852 |
helper_client = HelperClient().get_client()
|
| 6852 |
helper_client.saveUserEmailForSending(store.approvalEmail.split(';'), "", "Price approval requested for " + str(order.lineitems[0]) + " order Id " + str(order.id) + " in store " + store.hotspotId , content, str(transaction_id), "PriceApproval", [], [], order.source)
|
6853 |
helper_client.saveUserEmailForSending(store.approvalEmail.split(';'), "", "Price approval requested for " + str(order.lineitems[0]) + " order Id " + str(order.id) + " in store " + store.hotspotId , content, str(transaction_id), "PriceApproval", [], [], order.source)
|
| 6853 |
session.commit()
|
6854 |
session.commit()
|
| 6854 |
else:
|
6855 |
else:
|
| 6855 |
order.otg = False
|
6856 |
order.otg = False
|
| - |
|
6857 |
session.commit()
|
| 6856 |
except Exception as e:
|
6858 |
except Exception as e:
|
| 6857 |
print "Error inserting transaction Id: " + str(transaction_id) + " due to " + str(e)
|
6859 |
print "Error inserting transaction Id: " + str(transaction_id) + " due to " + str(e)
|
| 6858 |
|
6860 |
|
| 6859 |
return True
|
6861 |
return True
|
| 6860 |
|
6862 |
|
| 6861 |
def update_amazon_fba_order_returns(fbaOrderReturns):
|
6863 |
def update_amazon_fba_order_returns(fbaOrderReturns):
|
| 6862 |
for order_return in fbaOrderReturns:
|
6864 |
for order_return in fbaOrderReturns:
|
| 6863 |
orderReturn = AmazonFbaOrderReturns.query.filter(AmazonFbaOrderReturns.amazonOrderId==order_return.amazonOrderId).filter(AmazonFbaOrderReturns.insertionTimestamp == to_py_date(order_return.insertionTimestamp)).filter(AmazonFbaOrderReturns.sku==order_return.sku).first()
|
6865 |
orderReturn = AmazonFbaOrderReturns.query.filter(AmazonFbaOrderReturns.amazonOrderId==order_return.amazonOrderId).filter(AmazonFbaOrderReturns.insertionTimestamp == to_py_date(order_return.insertionTimestamp)).filter(AmazonFbaOrderReturns.sku==order_return.sku).first()
|