Subversion Repositories SmartDukaan

Rev

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

Rev 6744 Rev 6745
Line 1477... Line 1477...
1477 
                print e
 1477 
                print e
1478 
        else:
 1478 
        else:
1479 
            order.status = OrderStatus.DELIVERY_SUCCESS
 1479 
            order.status = OrderStatus.DELIVERY_SUCCESS
1480 
            order.statusDescription = "Order delivered"
 1480 
            order.statusDescription = "Order delivered"
1481 
            update_trust_level(order)
 1481 
            update_trust_level(order)
1482 
            enqueue_delivery_success_mail(order)
 1482 
            if enqueue_delivery_success_mail(order) :
- 
 
 1483 
                session.commit()
- 
 
 1484 
            else :
- 
 
 1485 
                session.rollback()
1483 
            try:
 1486 
            try:
1484 
                alert_client = AlertClient().get_client()
 1487 
                alert_client = AlertClient().get_client()
1485 
                alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
 1488 
                alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
1486 
            except Exception as e:
 1489 
            except Exception as e:
1487 
                print "Exception in scheduling alert in ShippedFromWarehouse method"
 1490 
                print "Exception in scheduling alert in ShippedFromWarehouse method"
1488 
                print e
 1491 
                print e
1489 
 
 1492 
 
1490 
    session.commit()
 1493
1491 
 
 1494 
 
1492 
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
 1495 
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
1493 
    order = Order.get_by(id=orderId)
 1496 
    order = Order.get_by(id=orderId)
1494 
    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]:
 1497 
    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]:
1495 
        raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
 1498 
        raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))