| Line 691... |
Line 691... |
| 691 |
session.commit()
|
691 |
session.commit()
|
| 692 |
return True
|
692 |
return True
|
| 693 |
|
693 |
|
| 694 |
def mark_orders_as_manifested(warehouse_id, provider_id, cod):
|
694 |
def mark_orders_as_manifested(warehouse_id, provider_id, cod):
|
| 695 |
try:
|
695 |
try:
|
| 696 |
current_timestamp = datetime.datetime.now()
|
- |
|
| 697 |
orders = Order.query.filter_by(warehouse_id = warehouse_id, logistics_provider_id = provider_id, status = OrderStatus.BILLED, cod = cod).all()
|
696 |
orders = Order.query.filter_by(warehouse_id = warehouse_id, logistics_provider_id = provider_id, status = OrderStatus.BILLED, cod = cod).all()
|
| 698 |
for order in orders:
|
697 |
for order in orders:
|
| - |
|
698 |
order.status = OrderStatus.MANIFESTED
|
| - |
|
699 |
order.statusDescription = "Order manifested"
|
| - |
|
700 |
session.commit()
|
| - |
|
701 |
return True
|
| - |
|
702 |
except:
|
| - |
|
703 |
return False
|
| - |
|
704 |
|
| - |
|
705 |
def mark_orders_as_shipped_from_warehouse(warehouse_id, provider_id, cod):
|
| - |
|
706 |
try:
|
| - |
|
707 |
current_timestamp = datetime.datetime.now()
|
| - |
|
708 |
orders = Order.query.filter_by(warehouse_id = warehouse_id, logistics_provider_id = provider_id, status = OrderStatus.MANIFESTED, cod = cod).all()
|
| - |
|
709 |
for order in orders:
|
| 699 |
order.status = OrderStatus.SHIPPED_FROM_WH
|
710 |
order.status = OrderStatus.SHIPPED_FROM_WH
|
| 700 |
order.statusDescription = "Order shipped from warehouse"
|
711 |
order.statusDescription = "Order shipped from warehouse"
|
| 701 |
order.shipping_timestamp = current_timestamp
|
712 |
order.shipping_timestamp = current_timestamp
|
| 702 |
session.commit()
|
713 |
session.commit()
|
| 703 |
return True
|
714 |
return True
|
| 704 |
except:
|
715 |
except:
|
| 705 |
return False
|
716 |
return False
|
| 706 |
|
717 |
|
| 707 |
def mark_orders_as_picked_up(provider_id, pickup_details):
|
718 |
def mark_orders_as_picked_up(provider_id, pickup_details):
|
| 708 |
for awb, pickup_timestamp in pickup_details.iteritems():
|
719 |
for awb, pickup_timestamp in pickup_details.iteritems():
|
| 709 |
order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
|
720 |
order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
|
| 710 |
if order == None or order.status != OrderStatus.SHIPPED_FROM_WH:
|
721 |
if order == None or order.status != OrderStatus.SHIPPED_FROM_WH:
|
| 711 |
#raise TransactionServiceException(102, "No order found for the awb: " + awb)
|
722 |
#raise TransactionServiceException(102, "No order found for the awb: " + awb)
|