| Line 787... |
Line 787... |
| 787 |
order.statusDescription = "Order delivered"
|
787 |
order.statusDescription = "Order delivered"
|
| 788 |
order.delivery_timestamp, order.receiver = detail.split('|')
|
788 |
order.delivery_timestamp, order.receiver = detail.split('|')
|
| 789 |
update_trust_level(order)
|
789 |
update_trust_level(order)
|
| 790 |
session.commit()
|
790 |
session.commit()
|
| 791 |
|
791 |
|
| - |
|
792 |
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
|
| - |
|
793 |
order = Order.get_by(id=orderId)
|
| - |
|
794 |
if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.DOA_PICKUP_CONFIRMED]:
|
| - |
|
795 |
raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
|
| - |
|
796 |
|
| - |
|
797 |
if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
|
| - |
|
798 |
order.delivery_timestamp = deliveryTimestamp
|
| - |
|
799 |
order.receiver = receiver
|
| - |
|
800 |
order.status = OrderStatus.DELIVERY_SUCCESS
|
| - |
|
801 |
order.statusDescription = "Order delivered"
|
| - |
|
802 |
update_trust_level(order)
|
| - |
|
803 |
session.commit()
|
| - |
|
804 |
|
| 792 |
def mark_orders_as_failed(provider_id, returned_orders):
|
805 |
def mark_orders_as_failed(provider_id, returned_orders):
|
| 793 |
for awb, detail in returned_orders.iteritems():
|
806 |
for awb, detail in returned_orders.iteritems():
|
| 794 |
order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
|
807 |
order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
|
| 795 |
if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
|
808 |
if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
|
| 796 |
continue
|
809 |
continue
|