| 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, \
|
35 |
mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, \
|
| 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_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
|
38 |
get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
|
| 39 |
get_cancelled_orders
|
39 |
get_cancelled_orders, mark_order_as_delivered
|
| 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 465... |
Line 465... |
| 465 |
try:
|
465 |
try:
|
| 466 |
mark_orders_as_delivered(providerId, deliveredOrders)
|
466 |
mark_orders_as_delivered(providerId, deliveredOrders)
|
| 467 |
finally:
|
467 |
finally:
|
| 468 |
close_session()
|
468 |
close_session()
|
| 469 |
|
469 |
|
| - |
|
470 |
def markOrderAsDelivered(self, orderId, deliveryTimestamp, receiver):
|
| - |
|
471 |
"""
|
| - |
|
472 |
Attributes:
|
| - |
|
473 |
- orderId
|
| - |
|
474 |
- deliveryTimestamp
|
| - |
|
475 |
- receiver
|
| - |
|
476 |
"""
|
| - |
|
477 |
try:
|
| - |
|
478 |
mark_order_as_delivered(orderId, to_py_date(deliveryTimestamp), receiver)
|
| - |
|
479 |
finally:
|
| - |
|
480 |
close_session()
|
| - |
|
481 |
|
| - |
|
482 |
|
| 470 |
def markOrdersAsFailed(self, providerId, returnedOrders):
|
483 |
def markOrdersAsFailed(self, providerId, returnedOrders):
|
| 471 |
"""
|
484 |
"""
|
| 472 |
Mark all orders with AWBs in the given map as failed. Also sets the delivery timestamp.
|
485 |
Mark all orders with AWBs in the given map as failed. Also sets the delivery timestamp.
|
| 473 |
Raises an exception if we encounter report for an AWB number that we did not ship.
|
486 |
Raises an exception if we encounter report for an AWB number that we did not ship.
|
| 474 |
|
487 |
|