Subversion Repositories SmartDukaan

Rev

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

Rev 987 Rev 995
Line 182... Line 182...
182 
        query = query.filter(Order.created_timestamp >from_date)
 182 
        query = query.filter(Order.created_timestamp >from_date)
183 
    if to_date:
 183 
    if to_date:
184 
        query = query.filter(Order.created_timestamp < to_date)
 184 
        query = query.filter(Order.created_timestamp < to_date)
185 
    return query.all()
 185 
    return query.all()
186 
 
 186 
 
- 
 
 187 
def get_orders_by_billing_date(status, start_billing_date, end_billing_date, warehouse_id):
- 
 
 188 
    if not warehouse_id:
- 
 
 189 
        raise TransactionServiceException(101, "bad warehouse id")
- 
 
 190 
 
- 
 
 191 
    query = Order.query.filter(Order.warehouse_id == warehouse_id)
- 
 
 192
- 
 
 193 
    if status:
- 
 
 194 
        query = query.filter(Order.status == status)
- 
 
 195
- 
 
 196 
    if start_billing_date:
- 
 
 197 
        query = query.filter(Order.billing_timestamp >= start_billing_date)
- 
 
 198
- 
 
 199 
    if end_billing_date:
- 
 
 200 
        query = query.filter(Order.billing_timestamp <= end_billing_date)
- 
 
 201
- 
 
 202 
    return query.all()
- 
 
 203 
 
187 
def change_order_status(self, orderId, status, description):
 204 
def change_order_status(self, orderId, status, description):
188 
    order = get_order(orderId)
 205 
    order = get_order(orderId)
189 
    order.status = status
 206 
    order.status = status
190 
    order.statusDescription = description
 207 
    order.statusDescription = description
191 
    session.commit()
 208 
    session.commit()