| 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, mark_return_orders_as_picked_up, update_orders_as_PORaised
|
39 |
get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up, update_orders_as_PORaised,\
|
| - |
|
40 |
get_orders_not_met_expected_delivery_date
|
| 40 |
|
41 |
|
| 41 |
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
|
42 |
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
|
43 |
to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
|
| 43 |
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
|
44 |
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
|
| 44 |
LineItem, Order, TransactionServiceException
|
45 |
LineItem, Order, TransactionServiceException
|
| Line 506... |
Line 507... |
| 506 |
orders_not_delivered = update_non_delivery_reason(providerId, undeliveredOrders)
|
507 |
orders_not_delivered = update_non_delivery_reason(providerId, undeliveredOrders)
|
| 507 |
return [to_t_order(order) for order in orders_not_delivered]
|
508 |
return [to_t_order(order) for order in orders_not_delivered]
|
| 508 |
finally:
|
509 |
finally:
|
| 509 |
close_session()
|
510 |
close_session()
|
| 510 |
|
511 |
|
| - |
|
512 |
def getUndeliveredOrdersExpectedDeliveryDateNotMet(self):
|
| - |
|
513 |
"""
|
| - |
|
514 |
Returns the list of orders whose expected delivery date has passed but have not been
|
| - |
|
515 |
delivered yet.
|
| - |
|
516 |
Returns an empty list if no such orders exist.
|
| - |
|
517 |
"""
|
| - |
|
518 |
try:
|
| - |
|
519 |
orders_not_delivered = get_orders_not_met_expected_delivery_date()
|
| - |
|
520 |
return [to_t_order(order) for order in orders_not_delivered]
|
| - |
|
521 |
finally:
|
| - |
|
522 |
close_session()
|
| - |
|
523 |
|
| 511 |
def getUndeliveredOrders(self, providerId, warehouseId):
|
524 |
def getUndeliveredOrders(self, providerId, warehouseId):
|
| 512 |
"""
|
525 |
"""
|
| 513 |
Returns the list of orders whose delivery time has passed but have not been
|
526 |
Returns the list of orders whose delivery time has passed but have not been
|
| 514 |
delivered yet for the given provider and warehouse. To get a complete list of
|
527 |
delivered yet for the given provider and warehouse. To get a complete list of
|
| 515 |
undelivered orders, pass them as -1.
|
528 |
undelivered orders, pass them as -1.
|