| Line 771... |
Line 771... |
| 771 |
order.pickup_timestamp = pickup_timestamp
|
771 |
order.pickup_timestamp = pickup_timestamp
|
| 772 |
session.commit()
|
772 |
session.commit()
|
| 773 |
|
773 |
|
| 774 |
current_time = datetime.datetime.now()
|
774 |
current_time = datetime.datetime.now()
|
| 775 |
to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
|
775 |
to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
|
| 776 |
from_datetime = to_datetime - datetime.timedelta(2)
|
- |
|
| 777 |
orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.SHIPPED_FROM_WH).filter(Order.shipping_timestamp >= from_datetime).filter(Order.shipping_timestamp <= to_datetime).all()
|
776 |
orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.SHIPPED_FROM_WH).filter(Order.shipping_timestamp <= to_datetime).all()
|
| 778 |
return orders_not_picked_up
|
777 |
return orders_not_picked_up
|
| 779 |
|
778 |
|
| 780 |
def mark_orders_as_delivered(provider_id, delivered_orders):
|
779 |
def mark_orders_as_delivered(provider_id, delivered_orders):
|
| 781 |
for awb, detail in delivered_orders.iteritems():
|
780 |
for awb, detail in delivered_orders.iteritems():
|
| 782 |
order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
|
781 |
order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
|
| Line 1097... |
Line 1096... |
| 1097 |
order.doa_pickup_timestamp = doa_pickup_timestamp
|
1096 |
order.doa_pickup_timestamp = doa_pickup_timestamp
|
| 1098 |
session.commit()
|
1097 |
session.commit()
|
| 1099 |
|
1098 |
|
| 1100 |
current_time = datetime.datetime.now()
|
1099 |
current_time = datetime.datetime.now()
|
| 1101 |
to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
|
1100 |
to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
|
| - |
|
1101 |
orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.DOA_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
|
| - |
|
1102 |
return orders_not_picked_up
|
| - |
|
1103 |
|
| - |
|
1104 |
def mark_return_orders_as_picked_up(provider_id, pickup_details):
|
| - |
|
1105 |
for pickupNo, return_order_pickup_timestamp in pickup_details.iteritems():
|
| - |
|
1106 |
order = Order.query.filter_by(pickupRequestNo=pickupNo, logistics_provider_id = provider_id).first()
|
| - |
|
1107 |
if order == None or order.status != OrderStatus.RET_PICKUP_CONFIRMED:
|
| - |
|
1108 |
#raise TransactionServiceException(102, "No order found for the awb: " + awb)
|
| - |
|
1109 |
continue
|
| - |
|
1110 |
order.status = OrderStatus.RET_RETURN_IN_TRANSIT
|
| - |
|
1111 |
order.statusDescription = "Return order picked up by Courier Company"
|
| - |
|
1112 |
order.doa_pickup_timestamp = return_order_pickup_timestamp
|
| - |
|
1113 |
session.commit()
|
| - |
|
1114 |
|
| 1102 |
from_datetime = to_datetime - datetime.timedelta(2)
|
1115 |
current_time = datetime.datetime.now()
|
| - |
|
1116 |
to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
|
| 1103 |
orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.DOA_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp >= from_datetime).filter(Order.doa_auth_timestamp <= to_datetime).all()
|
1117 |
orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.RET_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
|
| 1104 |
return orders_not_picked_up
|
1118 |
return orders_not_picked_up
|
| 1105 |
|
1119 |
|
| 1106 |
def receive_return(order_id, receiveCondition):
|
1120 |
def receive_return(order_id, receiveCondition):
|
| 1107 |
order = get_order(order_id)
|
1121 |
order = get_order(order_id)
|
| 1108 |
|
1122 |
|