Subversion Repositories SmartDukaan

Rev

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

Rev 7741 Rev 7746
Line 1733... Line 1733...
1733 
    doc.document = pdfFile
 1733 
    doc.document = pdfFile
1734 
 
 1734 
 
1735 
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
 1735 
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
1736 
    order = Order.get_by(id=orderId)
 1736 
    order = Order.get_by(id=orderId)
1737 
    if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DOA_PICKUP_REQUEST_RAISED, OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_RECEIVED, OrderStatus.RET_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RET_PICKUP_REQUEST_RAISED, OrderStatus.RTO_IN_TRANSIT, OrderStatus.BILLED, OrderStatus.RECEIVED_AT_STORE]:
 1737 
    if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DOA_PICKUP_REQUEST_RAISED, OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_RECEIVED, OrderStatus.RET_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RET_PICKUP_REQUEST_RAISED, OrderStatus.RTO_IN_TRANSIT, OrderStatus.BILLED, OrderStatus.RECEIVED_AT_STORE]:
1738 
        raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
 1738 
        raise TransactionServiceException(101, "Either wrong order id or invalid state " + str(orderId))
1739
1739
1740 
    # Provider is 4 is for self pickup and hardcoded. We should figure out a way to not to hard code.
1740 
    # Provider is 4 is for self pickup and hardcoded. We should figure out a way to not to hard code.
1741 
    if order.status == OrderStatus.BILLED and order.logistics_provider_id != 4:
 1741 
    if order.status == OrderStatus.BILLED and order.logistics_provider_id != 4:
1742 
        raise TransactionServiceException(101, "Order is not marked for self pickup: " + str(orderId))
 1742 
        raise TransactionServiceException(101, "Order is not marked for self pickup: " + str(orderId))
1743
1743