| Line 789... |
Line 789... |
| 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):
|
792 |
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
|
| 793 |
order = Order.get_by(id=orderId)
|
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]:
|
794 |
if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.DOA_PICKUP_REQUEST_RAISED, OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_RECEIVED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RTO_IN_TRANSIT]:
|
| 795 |
raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
|
795 |
raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
|
| 796 |
|
796 |
|
| 797 |
if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
|
797 |
if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
|
| 798 |
order.delivery_timestamp = deliveryTimestamp
|
798 |
order.delivery_timestamp = deliveryTimestamp
|
| 799 |
order.receiver = receiver
|
799 |
order.receiver = receiver
|