| Line 1410... |
Line 1410... |
| 1410 |
order.jacket_number = jacketNumber
|
1410 |
order.jacket_number = jacketNumber
|
| 1411 |
if order.source == 6:
|
1411 |
if order.source == 6:
|
| 1412 |
order.jacket_number = "600"+str(orderId)
|
1412 |
order.jacket_number = "600"+str(orderId)
|
| 1413 |
if order.source == 7:
|
1413 |
if order.source == 7:
|
| 1414 |
order.jacket_number = "700"+str(orderId)
|
1414 |
order.jacket_number = "700"+str(orderId)
|
| - |
|
1415 |
if order.source == 8:
|
| - |
|
1416 |
order.jacket_number = "800"+str(orderId)
|
| 1415 |
if itemNumbers:
|
1417 |
if itemNumbers:
|
| 1416 |
lineitem.item_number = itemNumbers[0]
|
1418 |
lineitem.item_number = itemNumbers[0]
|
| 1417 |
if serialNumbers:
|
1419 |
if serialNumbers:
|
| 1418 |
lineitem.serial_number = serialNumbers[0]
|
1420 |
lineitem.serial_number = serialNumbers[0]
|
| 1419 |
|
1421 |
|
| Line 2634... |
Line 2636... |
| 2634 |
#if this order is from store and a new order for it has already been reshipped then
|
2636 |
#if this order is from store and a new order for it has already been reshipped then
|
| 2635 |
#this order cannot be refunded.
|
2637 |
#this order cannot be refunded.
|
| 2636 |
if order.source == 2 and order.new_order_id:
|
2638 |
if order.source == 2 and order.new_order_id:
|
| 2637 |
raise TransactionServiceException(112, "This order should be marked reship")
|
2639 |
raise TransactionServiceException(112, "This order should be marked reship")
|
| 2638 |
if order.source == 6 or order.source ==7:
|
2640 |
if order.source == 6 or order.source ==7:
|
| - |
|
2641 |
#Add more order statuses
|
| 2639 |
if order.status == OrderStatus.RTO_RECEIVED_PRESTINE:
|
2642 |
if order.status == OrderStatus.RTO_RECEIVED_PRESTINE:
|
| 2640 |
order.statusDescription = "RTO Refunded"
|
2643 |
order.statusDescription = "RTO Refunded"
|
| 2641 |
order.status = OrderStatus.RTO_REFUNDED
|
2644 |
order.status = OrderStatus.RTO_REFUNDED
|
| 2642 |
order.refund_timestamp = datetime.datetime.now()
|
2645 |
order.refund_timestamp = datetime.datetime.now()
|
| 2643 |
order.refunded_by = refunded_by
|
2646 |
order.refunded_by = refunded_by
|
| Line 6089... |
Line 6092... |
| 6089 |
query = Order.query.filter(Order.status.in_(statuses))
|
6092 |
query = Order.query.filter(Order.status.in_(statuses))
|
| 6090 |
query = query.filter(Order.warehouse_id.in_(warehouse_ids))
|
6093 |
query = query.filter(Order.warehouse_id.in_(warehouse_ids))
|
| 6091 |
#raise TransactionServiceException(101, "bad warehouse id")
|
6094 |
#raise TransactionServiceException(101, "bad warehouse id")
|
| 6092 |
return query.all()
|
6095 |
return query.all()
|
| 6093 |
|
6096 |
|
| - |
|
6097 |
def __update_tax_type(order):
|
| - |
|
6098 |
print "updating tax type"
|
| - |
|
6099 |
|
| 6094 |
def create_ebay_order(ebay_order):
|
6100 |
def create_ebay_order(ebay_order):
|
| 6095 |
ebayOrder = EbayOrder()
|
6101 |
ebayOrder = EbayOrder()
|
| 6096 |
ebayOrder.orderId = ebay_order.orderId
|
6102 |
ebayOrder.orderId = ebay_order.orderId
|
| 6097 |
ebayOrder.paisaPayId = ebay_order.paisaPayId
|
6103 |
ebayOrder.paisaPayId = ebay_order.paisaPayId
|
| 6098 |
ebayOrder.salesRecordNumber = ebay_order.salesRecordNumber
|
6104 |
ebayOrder.salesRecordNumber = ebay_order.salesRecordNumber
|
| Line 6308... |
Line 6314... |
| 6308 |
if not flipkartorder:
|
6314 |
if not flipkartorder:
|
| 6309 |
print "No found order for orderid " + str(orderid)
|
6315 |
print "No found order for orderid " + str(orderid)
|
| 6310 |
raise TransactionServiceException(108, "no such order")
|
6316 |
raise TransactionServiceException(108, "no such order")
|
| 6311 |
return flipkartorder
|
6317 |
return flipkartorder
|
| 6312 |
|
6318 |
|
| - |
|
6319 |
def get_flipkart_order_by_subOrderId(flipkartOrderItemId):
|
| - |
|
6320 |
flipkartorder = FlipkartOrder.query.filter_by(flipkartSubOrderId=flipkartOrderItemId).first()
|
| - |
|
6321 |
if not flipkartorder:
|
| - |
|
6322 |
raise TransactionServiceException(108, "no such flipkart order " + str(flipkartOrderItemId))
|
| - |
|
6323 |
return flipkartorder
|
| - |
|
6324 |
|
| 6313 |
def update_flipkart_order_dates_and_awb(orderid,suborderid,date,awb):
|
6325 |
def update_flipkart_order_dates_and_awb(orderid,suborderid,date,awb):
|
| 6314 |
flipkartorder = FlipkartOrder.query.filter_by(flipkartOrderId=orderid,flipkartSubOrderId=suborderid).first()
|
6326 |
flipkartorder = FlipkartOrder.query.filter_by(flipkartOrderId=orderid,flipkartSubOrderId=suborderid).first()
|
| 6315 |
print flipkartorder
|
6327 |
print flipkartorder
|
| 6316 |
order = get_order(flipkartorder.orderId)
|
6328 |
order = get_order(flipkartorder.orderId)
|
| 6317 |
if not order:
|
6329 |
if not order:
|