Subversion Repositories SmartDukaan

Rev

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

Rev 5713 Rev 5720
Line 1066... Line 1066...
1066
 
1066
 
1067
def get_orders_collection_at_store(storeId, fromDate, toDate, onlyCod):
1067
def get_orders_collection_at_store(storeId, fromDate, toDate, onlyCod):
1068
    query = Order.query.filter(Order.status == OrderStatus.DELIVERY_SUCCESS)
1068
    query = Order.query.filter(Order.status == OrderStatus.DELIVERY_SUCCESS)
1069
    if storeId:
1069
    if storeId:
1070
        query = query.filter_by(pickupStoreId = storeId)
1070
        query = query.filter_by(pickupStoreId = storeId)
-
 
1071
    else:
-
 
1072
        query = query.filter(Order.pickupStoreId != 0)
1071
    if onlyCod:
1073
    if onlyCod:
1072
        query = query.filter_by(cod = onlyCod)
1074
        query = query.filter_by(cod = onlyCod)
1073
    if fromDate:
1075
    if fromDate:
1074
        query = query.filter(Order.delivery_timestamp >= fromDate)
1076
        query = query.filter(Order.delivery_timestamp >= fromDate)
1075
    if toDate:
1077
    if toDate: