Subversion Repositories SmartDukaan

Rev

Rev 4767 | Rev 4770 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4767 Rev 4769
Line 803... Line 803...
803
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
803
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
804
    order = Order.get_by(id=orderId)
804
    order = Order.get_by(id=orderId)
805
    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]:
805
    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
        raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
806
        raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
807
    
807
    
808
    if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
808
    if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.RTO_IN_TRANSIT]:
809
        order.delivery_timestamp = deliveryTimestamp
809
        order.delivery_timestamp = deliveryTimestamp
810
        order.receiver = receiver
810
        order.receiver = receiver
811
    order.status = OrderStatus.DELIVERY_SUCCESS
811
    order.status = OrderStatus.DELIVERY_SUCCESS
812
    order.statusDescription = "Order delivered"
812
    order.statusDescription = "Order delivered"
813
    update_trust_level(order)
813
    update_trust_level(order)