Subversion Repositories SmartDukaan

Rev

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

Rev 3427 Rev 3451
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):
 415 
def get_orders_by_shipping_date(from_shipping_date, to_shipping_date, provider_id, warehouse_id, cod):
416 
    query = Order.query
 416 
    query = Order.query.filter(Order.cod == cod)
417
417
418 
    if warehouse_id and warehouse_id != -1:
 418 
    if warehouse_id and warehouse_id != -1:
419 
        query = query.filter(Order.warehouse_id == warehouse_id)
 419 
        query = query.filter(Order.warehouse_id == warehouse_id)
420
420
421 
    if provider_id and provider_id != -1:
 421 
    if provider_id and provider_id != -1:
Line 1164... Line 1164...
1164 
 
 1164 
 
1165 
def create_purchase_order(warehouseId):
 1165 
def create_purchase_order(warehouseId):
1166 
    if not warehouseId:
 1166 
    if not warehouseId:
1167 
        raise TransactionServiceException(101, "bad warehouse id")
 1167 
        raise TransactionServiceException(101, "bad warehouse id")
1168
1168
1169 
    query = Order.query.filter_by(warehouse_id=warehouseId)
 1169 
    query = Order.query.with_lockmode("update").filter_by(warehouse_id=warehouseId)
1170 
    query = query.filter_by(status=OrderStatus.SUBMITTED_FOR_PROCESSING)
 1170 
    query = query.filter_by(status=OrderStatus.SUBMITTED_FOR_PROCESSING)
1171 
    query = query.filter_by(purchase_order_id=None)
 1171 
    query = query.filter_by(purchase_order_id=None)
1172 
    query = query.order_by(Order.created_timestamp)
 1172 
    query = query.order_by(Order.created_timestamp)
1173 
    pending_orders = query.all()
 1173 
    pending_orders = query.all()
1174
1174
Line 1206... Line 1206...
1206 
    for order in pending_orders:
 1206 
    for order in pending_orders:
1207 
        order.purchase_order_id = po_id
 1207 
        order.purchase_order_id = po_id
1208 
    session.commit()
 1208 
    session.commit()
1209 
    return po_id
 1209 
    return po_id
1210 
 
 1210 
 
- 
 
 1211 
def update_weight(order_id, weight):
- 
 
 1212 
    order = get_order(order_id)
- 
 
 1213 
    order.total_weight = weight
- 
 
 1214
- 
 
 1215 
    lineitems = order.lineitems
- 
 
 1216 
    for lineitem in lineitems:
- 
 
 1217 
        lineitem.total_weight = weight
- 
 
 1218
- 
 
 1219 
    session.commit()
- 
 
 1220 
    return order
- 
 
 1221
1211 
def close_session():
 1222 
def close_session():
1212 
    if session.is_active:
 1223 
    if session.is_active:
1213 
        print "session is active. closing it."
 1224 
        print "session is active. closing it."
1214 
        session.close()
 1225 
        session.close()
1215 
 
 1226