| Line 1484... |
Line 1484... |
| 1484 |
if to_date:
|
1484 |
if to_date:
|
| 1485 |
query = query.filter(or_(Order.created_timestamp < to_date, Order.refund_timestamp < to_date))
|
1485 |
query = query.filter(or_(Order.created_timestamp < to_date, Order.refund_timestamp < to_date))
|
| 1486 |
return query.all()
|
1486 |
return query.all()
|
| 1487 |
|
1487 |
|
| 1488 |
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):
|
| - |
|
1489 |
print "source ------------", source
|
| - |
|
1490 |
print "statuses ------------", statuses
|
| 1489 |
query = Order.query.options(joinedload('lineitems'))
|
1491 |
query = Order.query.options(joinedload('lineitems'))
|
| 1490 |
if warehouse_id:
|
1492 |
if warehouse_id:
|
| 1491 |
query = query.filter(Order.warehouse_id == warehouse_id)
|
1493 |
query = query.filter(Order.warehouse_id == warehouse_id)
|
| 1492 |
if source:
|
1494 |
if source:
|
| 1493 |
query = query.filter(Order.source == source)
|
1495 |
query = query.filter(Order.source == source)
|
| Line 1497... |
Line 1499... |
| 1497 |
if limit:
|
1499 |
if limit:
|
| 1498 |
query = query.limit(limit)
|
1500 |
query = query.limit(limit)
|
| 1499 |
return query.all()
|
1501 |
return query.all()
|
| 1500 |
|
1502 |
|
| 1501 |
def get_orders_in_batch_as_promised_shipping(statuses=[], offset=0, limit=0, warehouse_id=None, source=0):
|
1503 |
def get_orders_in_batch_as_promised_shipping(statuses=[], offset=0, limit=0, warehouse_id=None, source=0):
|
| - |
|
1504 |
print "source ------------", source
|
| - |
|
1505 |
print "statuses ------------", statuses
|
| 1502 |
query = Order.query.options(joinedload('lineitems'))
|
1506 |
query = Order.query.options(joinedload('lineitems'))
|
| 1503 |
if warehouse_id:
|
1507 |
if warehouse_id:
|
| 1504 |
query = query.filter(Order.warehouse_id == warehouse_id)
|
1508 |
query = query.filter(Order.warehouse_id == warehouse_id)
|
| 1505 |
if source:
|
1509 |
if source:
|
| 1506 |
query = query.filter(Order.source == source)
|
1510 |
query = query.filter(Order.source == source)
|
| Line 8313... |
Line 8317... |
| 8313 |
orderFulfillmentWarehouse = None
|
8317 |
orderFulfillmentWarehouse = None
|
| 8314 |
try:
|
8318 |
try:
|
| 8315 |
cursor = conn.cursor()
|
8319 |
cursor = conn.cursor()
|
| 8316 |
if wrongFulFillmentWh:
|
8320 |
if wrongFulFillmentWh:
|
| 8317 |
selectSql = "select id, displayName, vendor_id from warehouse where id = %d"%(newFulfillWh)
|
8321 |
selectSql = "select id, displayName, vendor_id from warehouse where id = %d"%(newFulfillWh)
|
| - |
|
8322 |
print "SelectSql", selectSql
|
| 8318 |
cursor.execute(selectSql)
|
8323 |
cursor.execute(selectSql)
|
| 8319 |
else:
|
8324 |
else:
|
| 8320 |
selectSql = "select id, displayName, vendor_id from warehouse where id = %d"%(order.fulfilmentWarehouseId)
|
8325 |
selectSql = "select id, displayName, vendor_id from warehouse where id = %d"%(order.fulfilmentWarehouseId)
|
| 8321 |
cursor.execute(selectSql)
|
8326 |
cursor.execute(selectSql)
|
| 8322 |
orderFulfillmentWarehouse = cursor.fetchone()
|
8327 |
orderFulfillmentWarehouse = cursor.fetchone()
|
| Line 10363... |
Line 10368... |
| 10363 |
def receive_return_pickup(returnOrdersMap, req_id):
|
10368 |
def receive_return_pickup(returnOrdersMap, req_id):
|
| 10364 |
#returnPickupReq = ReturnPickupRequest.get_by(id=req_id)
|
10369 |
#returnPickupReq = ReturnPickupRequest.get_by(id=req_id)
|
| 10365 |
#returnOrders = ReturnOrderInfo.query.filter(ReturnOrderInfo.logisticsRequestId==req_id).all()
|
10370 |
#returnOrders = ReturnOrderInfo.query.filter(ReturnOrderInfo.logisticsRequestId==req_id).all()
|
| 10366 |
#if len(returnOrders)!=len(returnOrdersMap.keys()):
|
10371 |
#if len(returnOrders)!=len(returnOrdersMap.keys()):
|
| 10367 |
# raise TransactionServiceException(101, "All Returns Orders Information Missing. Please Fill All Orders Info")
|
10372 |
# raise TransactionServiceException(101, "All Returns Orders Information Missing. Please Fill All Orders Info")
|
| 10368 |
|
10373 |
print "returnOrdersMap", returnOrdersMap
|
| 10369 |
for returnOrderId in returnOrdersMap.iterkeys():
|
10374 |
for returnOrderId in returnOrdersMap.iterkeys():
|
| 10370 |
returnOrder = ReturnOrderInfo.get_by(id=returnOrderId)
|
10375 |
returnOrder = ReturnOrderInfo.get_by(id=returnOrderId)
|
| 10371 |
if returnOrder is None:
|
10376 |
if returnOrder is None:
|
| 10372 |
raise TransactionServiceException(101, "Return order missing")
|
10377 |
raise TransactionServiceException(101, "Return order missing")
|
| 10373 |
returnOrderDetails = returnOrdersMap.get(returnOrder.id)
|
10378 |
returnOrderDetails = returnOrdersMap.get(returnOrder.id)
|