Subversion Repositories SmartDukaan

Rev

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

Rev 13445 Rev 13449
Line 1339... Line 1339...
1339 
                alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
 1339 
                alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
1340 
            except Exception as e:
 1340 
            except Exception as e:
1341 
                print "Exception in ending alert in MarkOrderAsRTO method"
 1341 
                print "Exception in ending alert in MarkOrderAsRTO method"
1342 
                print e
 1342 
                print e
1343 
    else:
 1343 
    else:
1344 
        if selectedOrder == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
 1344 
        if selectedOrder == None or selectedOrder.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
1345 
            return False
 1345 
            return False
1346 
        selectedOrder.status = OrderStatus.RTO_IN_TRANSIT
 1346 
        selectedOrder.status = OrderStatus.RTO_IN_TRANSIT
1347 
        selectedOrder.delivery_timestamp = datetime.datetime.now()
 1347 
        selectedOrder.delivery_timestamp = datetime.datetime.now()
1348 
        selectedOrder.statusDescription = "Order Returned to Origin"
 1348 
        selectedOrder.statusDescription = "Order Returned to Origin"
1349 
        update_trust_level(selectedOrder)
 1349 
        update_trust_level(selectedOrder)