| Line 30... |
Line 30... |
| 30 |
mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
|
30 |
mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
|
| 31 |
validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
|
31 |
validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
|
| 32 |
save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_Prepaid, \
|
32 |
save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_Prepaid, \
|
| 33 |
get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
|
33 |
get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
|
| 34 |
get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up, update_orders_as_PORaised,\
|
34 |
get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up, update_orders_as_PORaised,\
|
| 35 |
get_order_distribution_by_status, get_orders_not_met_expected_delivery_date, get_orders_where_vendor_not_paid,\
|
35 |
get_order_distribution_by_status, get_orders_not_met_expected_delivery_date,\
|
| 36 |
mark_orders_as_local_connected, mark_orders_as_destinationCityReached,\
|
36 |
mark_orders_as_local_connected, mark_orders_as_destinationCityReached,\
|
| 37 |
mark_orders_as_firstDeliveryAttempted, get_non_delivered_orders_by_courier, get_orders_not_local_connected,\
|
37 |
mark_orders_as_firstDeliveryAttempted, get_non_delivered_orders_by_courier, get_orders_not_local_connected,\
|
| 38 |
get_doas_not_picked_up, get_return_orders_not_picked_up, get_orders_not_picked_up, get_rto_orders, get_order_list,\
|
38 |
get_doas_not_picked_up, get_return_orders_not_picked_up, get_orders_not_picked_up, get_rto_orders, get_order_list,\
|
| 39 |
get_order_ids_for_status, update_orders_as_paid_to_vendor, update_COD_agent,\
|
39 |
get_order_ids_for_status, update_orders_as_paid_to_vendor, update_COD_agent,\
|
| 40 |
get_refunded_orders_marked_paid, get_settlement_for_Cod, get_order_list_for_vendor, update_order_only_as_paid_to_vendor,\
|
40 |
get_refunded_orders_marked_paid, get_settlement_for_Cod, get_order_list_for_vendor, update_order_only_as_paid_to_vendor,\
|
| 41 |
get_all_verification_agents
|
41 |
get_all_verification_agents, get_billed_orders, get_all_return_orders
|
| 42 |
|
42 |
|
| 43 |
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
|
43 |
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
|
| 44 |
to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement, to_t_verification_agent
|
44 |
to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement, to_t_verification_agent
|
| 45 |
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
|
45 |
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
|
| 46 |
LineItem, Order, TransactionServiceException
|
46 |
LineItem, Order, TransactionServiceException
|
| Line 995... |
Line 995... |
| 995 |
from_date, to_date = get_fdate_tdate(fromDate, toDate)
|
995 |
from_date, to_date = get_fdate_tdate(fromDate, toDate)
|
| 996 |
return get_return_orders(warehouseId, from_date, to_date)
|
996 |
return get_return_orders(warehouseId, from_date, to_date)
|
| 997 |
finally:
|
997 |
finally:
|
| 998 |
close_session()
|
998 |
close_session()
|
| 999 |
|
999 |
|
| - |
|
1000 |
def getAllReturnOrders(self, onlyNotProcessed, fromDate, toDate):
|
| - |
|
1001 |
"""
|
| - |
|
1002 |
Get all return orders created between the from and to dates for the given warehouse.
|
| - |
|
1003 |
Ignores the warehouse if it is passed as -1.
|
| - |
|
1004 |
|
| - |
|
1005 |
Parameters:
|
| - |
|
1006 |
- warehouseId
|
| - |
|
1007 |
- fromDate
|
| - |
|
1008 |
- toDate
|
| - |
|
1009 |
"""
|
| - |
|
1010 |
try:
|
| - |
|
1011 |
from_date, to_date = get_fdate_tdate(fromDate, toDate)
|
| - |
|
1012 |
return get_all_return_orders(onlyNotProcessed, from_date, to_date)
|
| - |
|
1013 |
finally:
|
| - |
|
1014 |
close_session()
|
| - |
|
1015 |
|
| 1000 |
def getReturnOrder(self, id):
|
1016 |
def getReturnOrder(self, id):
|
| 1001 |
"""
|
1017 |
"""
|
| 1002 |
Returns the ReturnOrder corresponding to the given id.
|
1018 |
Returns the ReturnOrder corresponding to the given id.
|
| 1003 |
Throws an exception if the return order with the given id couldn't be found.
|
1019 |
Throws an exception if the return order with the given id couldn't be found.
|
| 1004 |
|
1020 |
|
| Line 1421... |
Line 1437... |
| 1421 |
try:
|
1437 |
try:
|
| 1422 |
return get_reshipped_order_ids(orderIds)
|
1438 |
return get_reshipped_order_ids(orderIds)
|
| 1423 |
finally:
|
1439 |
finally:
|
| 1424 |
close_session()
|
1440 |
close_session()
|
| 1425 |
|
1441 |
|
| 1426 |
def getOrdersWhereVendorNotPaid(self, vendorId):
|
1442 |
def getBilledOrders(self, vendorId, onlyVendorNotPaid, billingDateFrom, billingDateTo):
|
| 1427 |
try:
|
1443 |
try:
|
| - |
|
1444 |
from_date, to_date = get_fdate_tdate(billingDateFrom, billingDateTo)
|
| 1428 |
return [to_t_order(order) for order in get_orders_where_vendor_not_paid(vendorId)]
|
1445 |
return [to_t_order(order) for order in get_billed_orders(vendorId, onlyVendorNotPaid, from_date, to_date)]
|
| 1429 |
finally:
|
1446 |
finally:
|
| 1430 |
close_session()
|
1447 |
close_session()
|
| 1431 |
|
1448 |
|
| 1432 |
def getStatusDistributionOfOrders(self, startDate, endDate):
|
1449 |
def getStatusDistributionOfOrders(self, startDate, endDate):
|
| 1433 |
try:
|
1450 |
try:
|