Subversion Repositories SmartDukaan

Rev

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

Rev 1404 Rev 1405
Line 310... Line 310...
310 
    orders = Order.query.filter_by(transaction_id=transaction_id).all()
 310 
    orders = Order.query.filter_by(transaction_id=transaction_id).all()
311 
    if not orders:
 311 
    if not orders:
312 
        raise TransactionServiceException(101, "No order for the transaction")
 312 
        raise TransactionServiceException(101, "No order for the transaction")
313 
    return orders
 313 
    return orders
314 
 
 314 
 
- 
 
 315 
def get_undelivered_orders(provider_id, warehouse_id):
- 
 
 316 
    query = Order.query
- 
 
 317 
    if provider_id != -1:
- 
 
 318 
        query = query.filter_by(Order.logistics_provider_id == provider_id)
- 
 
 319 
    if warehouse_id != -1:
- 
 
 320 
        query = query.filter(Order.warehouse_id == warehouse_id)
- 
 
 321 
    query = query.filter(and_(Order.status != OrderStatus.DELIVERY_SUCCESS, Order.status != OrderStatus.FAILED, \
- 
 
 322 
                              Order.status > OrderStatus.SHIPPED_FROM_WH))
- 
 
 323 
    query = query.filter(Order.expected_delivery_time < datetime.datetime.now())
- 
 
 324 
    orders = query.all()
- 
 
 325 
    return orders
- 
 
 326 
 
315 
def get_line_items_for_order(order_id):
 327 
def get_line_items_for_order(order_id):
316 
    query = LineItem.query.filter(LineItem.order_id == order_id)
 328 
    query = LineItem.query.filter(LineItem.order_id == order_id)
317 
    return query.all()
 329 
    return query.all()
318 
 
 330 
 
319 
def change_order_status(self, orderId, status, description):
 331 
def change_order_status(self, orderId, status, description):