Subversion Repositories SmartDukaan

Rev

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

Rev 10017 Rev 10136
Line 2401... Line 2401...
2401
    current_time = datetime.datetime.now()
2401
    current_time = datetime.datetime.now()
2402
    to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
2402
    to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
2403
    orders_not_picked_up = Order.query.filter_by(doa_logistics_provider_id = provider_id).filter_by(status=OrderStatus.RET_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
2403
    orders_not_picked_up = Order.query.filter_by(doa_logistics_provider_id = provider_id).filter_by(status=OrderStatus.RET_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
2404
    return orders_not_picked_up
2404
    return orders_not_picked_up
2405
 
2405
 
2406
def receive_return(order_id, receiveCondition):
2406
def receive_return(order_id, receiveCondition, receiveFreebie):
2407
    order = get_order(order_id)
2407
    order = get_order(order_id)
2408
    scanFreebie = False
2408
    scanFreebie = False
2409
 
2409
 
2410
    if order.status in [OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.DOA_RETURN_IN_TRANSIT]:
2410
    if order.status in [OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.DOA_RETURN_IN_TRANSIT]:
2411
        if receiveCondition == 0:
2411
        if receiveCondition == 0: