Subversion Repositories SmartDukaan

Rev

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

Rev 4712 Rev 4715
Line 30... Line 30...
30
    mark_orders_as_po_raised, mark_orders_as_reversal_initiated,\
30
    mark_orders_as_po_raised, mark_orders_as_reversal_initiated,\
31
    mark_orders_as_not_available, update_shipment_address,\
31
    mark_orders_as_not_available, update_shipment_address,\
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, 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_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
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,\
Line 1246... Line 1246...
1246
        try:
1246
        try:
1247
            mark_ebs_settlement_uploaded(settlementId)
1247
            mark_ebs_settlement_uploaded(settlementId)
1248
        finally:
1248
        finally:
1249
            close_session()
1249
            close_session()
1250
    
1250
    
-
 
1251
    def getSettlementsByDate(self, settlementDateFrom, settlementDateTo, isRefund):
-
 
1252
        try:
-
 
1253
            settlements = get_settlements_by_date(to_py_date(settlementDateFrom), to_py_date(settlementDateTo), isRefund)
-
 
1254
            return [to_t_payment_settlement(settlement) for settlement in settlements]
-
 
1255
        finally:
-
 
1256
            close_session()
-
 
1257
    
-
 
1258
    def getReshippedOrderIds(self, orderIds):
-
 
1259
        try:
-
 
1260
            return get_reshipped_order_ids(orderIds)
-
 
1261
        finally:
-
 
1262
            close_session()
-
 
1263
    
1251
    def closeSession(self, ):
1264
    def closeSession(self, ):
1252
        close_session()
1265
        close_session()
1253
 
1266
 
1254
    def isAlive(self, ):
1267
    def isAlive(self, ):
1255
        """
1268
        """