Subversion Repositories SmartDukaan

Rev

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

Rev 4781 Rev 4783
Line 839... Line 839...
839
    today_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
839
    today_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
840
    upto_datetime = today_datetime - datetime.timedelta(4)
840
    upto_datetime = today_datetime - datetime.timedelta(4)
841
    orders_not_delivered = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST))).filter(or_(Order.shipping_timestamp <= upto_datetime, Order.pickup_timestamp <= upto_datetime)).all()
841
    orders_not_delivered = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST))).filter(or_(Order.shipping_timestamp <= upto_datetime, Order.pickup_timestamp <= upto_datetime)).all()
842
    return orders_not_delivered
842
    return orders_not_delivered
843
 
843
 
-
 
844
def get_orders_not_met_expected_delivery_date():
-
 
845
    current_time = datetime.datetime.now()
-
 
846
    today_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
-
 
847
    orders_not_delivered = Order.query.filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST))).filter(Order.expected_delivery_time <= today_datetime).all()
-
 
848
    return orders_not_delivered
-
 
849
 
844
def get_alerts(type, warehouseId, status, timestamp):
850
def get_alerts(type, warehouseId, status, timestamp):
845
    query = Alert.query.filter(Alert.warehouseId == warehouseId)
851
    query = Alert.query.filter(Alert.warehouseId == warehouseId)
846
    if type != -1 :
852
    if type != -1 :
847
        query = query.filter(Alert.type == type)
853
        query = query.filter(Alert.type == type)
848
    if status != -1 :
854
    if status != -1 :