Subversion Repositories SmartDukaan

Rev

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

Rev 5361 Rev 5368
Line 2304... Line 2304...
2304 
    else:
 2304 
    else:
2305 
        query = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_(order_status_list))
 2305 
        query = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_(order_status_list))
2306 
    return query.all()
 2306 
    return query.all()
2307 
 
 2307 
 
2308 
def get_billed_orders_for_vendor(vendor_id, billing_date_from, billing_date_to):
 2308 
def get_billed_orders_for_vendor(vendor_id, billing_date_from, billing_date_to):
2309 
    query = Order.query.filter_by(vendorId = vendor_id)
 2309 
    query = Order.query.filter(Order.status != OrderStatus.PAYMENT_PENDING)
- 
 
 2310 
 
- 
 
 2311 
    if vendor_id:
2310 
    query = query.filter(Order.status != OrderStatus.PAYMENT_PENDING)
 2312 
        query = query.filter_by(vendorId = vendor_id)
- 
 
 2313 
 
2311 
    if billing_date_from:
 2314 
    if billing_date_from:
2312 
        query = query.filter(Order.billing_timestamp >= billing_date_from)
 2315 
        query = query.filter(Order.billing_timestamp >= billing_date_from)
2313
2316 
 
2314 
    if billing_date_to:
 2317 
    if billing_date_to:
2315 
        query = query.filter(Order.billing_timestamp <= billing_date_to)
 2318 
        query = query.filter(Order.billing_timestamp <= billing_date_to)
2316
2319 
 
2317 
    return query.all()
 2320 
    return query.all()
2318 
 
 2321 
 
2319 
def get_orders_where_vendor_not_paid(vendor_id):
 2322 
def get_orders_where_vendor_not_paid(vendor_id):
2320 
    query = Order.query.filter_by(vendorId = vendor_id)
 2323 
    query = Order.query.filter_by(vendorId = vendor_id)
2321 
    query = query.filter(Order.billing_timestamp != None)
 2324 
    query = query.filter(Order.billing_timestamp != None)