Subversion Repositories SmartDukaan

Rev

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

Rev 3415 Rev 3427
Line 410... Line 410...
410 
    if end_billing_date:
 410 
    if end_billing_date:
411 
        query = query.filter(Order.billing_timestamp <= end_billing_date)
 411 
        query = query.filter(Order.billing_timestamp <= end_billing_date)
412
412
413 
    return query.all()
 413 
    return query.all()
414 
 
 414 
 
- 
 
 415 
def get_orders_by_shipping_date(from_shipping_date, to_shipping_date, provider_id, warehouse_id):
- 
 
 416 
    query = Order.query
- 
 
 417
- 
 
 418 
    if warehouse_id and warehouse_id != -1:
- 
 
 419 
        query = query.filter(Order.warehouse_id == warehouse_id)
- 
 
 420
- 
 
 421 
    if provider_id and provider_id != -1:
- 
 
 422 
        query = query.filter(Order.logistics_provider_id == provider_id)
- 
 
 423
- 
 
 424 
    if from_shipping_date:
- 
 
 425 
        query = query.filter(Order.shipping_timestamp >= from_shipping_date)
- 
 
 426
- 
 
 427 
    if to_shipping_date:
- 
 
 428 
        query = query.filter(Order.shipping_timestamp <= to_shipping_date)
- 
 
 429
- 
 
 430 
    query = query.order_by(Order.airwaybill_no)
- 
 
 431
- 
 
 432 
    return query.all()
- 
 
 433 
 
415 
def get_orders_for_transaction(transaction_id, customer_id):
 434 
def get_orders_for_transaction(transaction_id, customer_id):
416 
    orders = Order.query.filter_by(transaction_id=transaction_id, customer_id=customer_id).all()
 435 
    orders = Order.query.filter_by(transaction_id=transaction_id, customer_id=customer_id).all()
417
436
418 
    if not orders:
 437 
    if not orders:
419 
        raise TransactionServiceException(101, "No order for the transaction")
 438 
        raise TransactionServiceException(101, "No order for the transaction")