Subversion Repositories SmartDukaan

Rev

Rev 4602 | Rev 4647 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4602 Rev 4607
Line 32... Line 32...
32
    mark_orders_as_timeout, get_order_for_awb,\
32
    mark_orders_as_timeout, get_order_for_awb,\
33
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
33
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
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
38
 
39
 
39
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
40
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
40
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
41
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
41
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
42
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
42
    LineItem, Order, TransactionServiceException
43
    LineItem, Order, TransactionServiceException
Line 1169... Line 1170...
1169
        try:
1170
        try:
1170
            return [to_t_order(order) for order in get_billed_orders_for_vendor(vendorId, to_py_date(billingDateFrom), to_py_date(billingDateTo))]
1171
            return [to_t_order(order) for order in get_billed_orders_for_vendor(vendorId, to_py_date(billingDateFrom), to_py_date(billingDateTo))]
1171
        finally:
1172
        finally:
1172
            close_session()
1173
            close_session()
1173
    
1174
    
-
 
1175
    def getSlippedSippingDateOrders(self):
-
 
1176
        try:
-
 
1177
            return [to_t_order(order) for order in get_slipped_sipping_date_orders()]
-
 
1178
        finally:
-
 
1179
            close_session()
-
 
1180
            
1174
    def getEBSSettlementSummaries(self):
1181
    def getEBSSettlementSummaries(self):
1175
        try:
1182
        try:
1176
            return get_ebs_settlement_summaries()
1183
            return get_ebs_settlement_summaries()
1177
        finally:
1184
        finally:
1178
            close_session()
1185
            close_session()