| Line 801... |
Line 801... |
| 801 |
update_trust_level(order)
|
801 |
update_trust_level(order)
|
| 802 |
session.commit()
|
802 |
session.commit()
|
| 803 |
|
803 |
|
| 804 |
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
|
804 |
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
|
| 805 |
order = Order.get_by(id=orderId)
|
805 |
order = Order.get_by(id=orderId)
|
| 806 |
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]:
|
806 |
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_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RTO_IN_TRANSIT]:
|
| 807 |
raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
|
807 |
raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
|
| 808 |
|
808 |
|
| 809 |
if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.RTO_IN_TRANSIT]:
|
809 |
if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.RTO_IN_TRANSIT]:
|
| 810 |
order.delivery_timestamp = deliveryTimestamp
|
810 |
order.delivery_timestamp = deliveryTimestamp
|
| 811 |
order.receiver = receiver
|
811 |
order.receiver = receiver
|