| Line 34... |
Line 34... |
| 34 |
mark_order_doa_request_received, mark_order_doa_request_authorized,\
|
34 |
mark_order_doa_request_received, mark_order_doa_request_authorized,\
|
| 35 |
mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
|
35 |
mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
|
| 36 |
validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
|
36 |
validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
|
| 37 |
save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId, \
|
37 |
save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId, \
|
| 38 |
get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
|
38 |
get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
|
| 39 |
get_cancelled_orders, mark_order_as_delivered
|
39 |
get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up
|
| 40 |
|
40 |
|
| 41 |
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
|
41 |
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
|
| 42 |
to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
|
42 |
to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
|
| 43 |
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
|
43 |
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
|
| 44 |
LineItem, Order, TransactionServiceException
|
44 |
LineItem, Order, TransactionServiceException
|
| Line 734... |
Line 734... |
| 734 |
orders_not_picked_up = mark_doas_as_picked_up(providerId, pickupDetails)
|
734 |
orders_not_picked_up = mark_doas_as_picked_up(providerId, pickupDetails)
|
| 735 |
return [to_t_order(order) for order in orders_not_picked_up]
|
735 |
return [to_t_order(order) for order in orders_not_picked_up]
|
| 736 |
finally:
|
736 |
finally:
|
| 737 |
close_session()
|
737 |
close_session()
|
| 738 |
|
738 |
|
| - |
|
739 |
def markReturnOrdersAsPickedUp(self, providerId, pickupDetails):
|
| - |
|
740 |
"""
|
| - |
|
741 |
Marks all RET_PICKUP_CONFIRMED orders of the previous day for a provider as RET_RETURN_IN_TRANSIT.
|
| - |
|
742 |
Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
|
| - |
|
743 |
|
| - |
|
744 |
Parameters:
|
| - |
|
745 |
- providerId
|
| - |
|
746 |
- pickupDetails
|
| - |
|
747 |
"""
|
| - |
|
748 |
try:
|
| - |
|
749 |
orders_not_picked_up = mark_return_orders_as_picked_up(providerId, pickupDetails)
|
| - |
|
750 |
return [to_t_order(order) for order in orders_not_picked_up]
|
| - |
|
751 |
finally:
|
| - |
|
752 |
close_session()
|
| - |
|
753 |
|
| 739 |
def receiveReturn(self, orderId, receiveCondition):
|
754 |
def receiveReturn(self, orderId, receiveCondition):
|
| 740 |
"""
|
755 |
"""
|
| 741 |
If the order status is DOA_PICKUP_CONFIRMED or DOA_RETURN_IN_TRANSIT, marks the order status as DOA_RECEIVED_PRESTINE and returns true.
|
756 |
If the order status is DOA_PICKUP_CONFIRMED or DOA_RETURN_IN_TRANSIT, marks the order status as DOA_RECEIVED_PRESTINE and returns true.
|
| 742 |
If the order is in any other state, it returns false.
|
757 |
If the order is in any other state, it returns false.
|
| 743 |
Throws an exception if the order with the given id couldn't be found.
|
758 |
Throws an exception if the order with the given id couldn't be found.
|