Subversion Repositories SmartDukaan

Rev

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

Rev 26000 Rev 26409
Line 1471... Line 1471...
1471
        query = query.filter(Order.status.in_(statuses))
1471
        query = query.filter(Order.status.in_(statuses))
1472
    if warehouse_id:
1472
    if warehouse_id:
1473
        query = query.filter(Order.warehouse_id == warehouse_id)
1473
        query = query.filter(Order.warehouse_id == warehouse_id)
1474
        #raise TransactionServiceException(101, "bad warehouse id")
1474
        #raise TransactionServiceException(101, "bad warehouse id")
1475
    if from_date:
1475
    if from_date:
-
 
1476
        if to_date:
-
 
1477
            query = query.filter(or_(
-
 
1478
                and_(Order.created_timestamp >from_date, Order.created_timestamp < to_date),
-
 
1479
                and_(Order.refund_timestamp >from_date, Order.refund_timestamp < to_date)  
-
 
1480
            ))
-
 
1481
        else:
1476
        query = query.filter(Order.created_timestamp >from_date)
1482
            query = query.filter(Order.created_timestamp >from_date)) 
-
 
1483
    else:
1477
    if to_date:
1484
        if to_date:
1478
        query = query.filter(Order.created_timestamp < to_date)
1485
            query = query.filter(or_(Order.created_timestamp < to_date, Order.refund_timestamp < to_date))
1479
    return query.all()
1486
    return query.all()
1480
 
1487
 
1481
def get_orders_in_batch(statuses=[], offset=0, limit=0, warehouse_id=None, source=0):
1488
def get_orders_in_batch(statuses=[], offset=0, limit=0, warehouse_id=None, source=0):
1482
    query = Order.query.options(joinedload('lineitems'))
1489
    query = Order.query.options(joinedload('lineitems'))
1483
    if warehouse_id:
1490
    if warehouse_id: