Subversion Repositories SmartDukaan

Rev

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

Rev 4801 Rev 4875
Line 35... Line 35...
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
    get_orders_not_met_expected_delivery_date, get_orders_where_vendor_not_paid,\
-
 
41
    save_cod_payment_settlement
41
 
42
 
42
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
43
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
43
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
44
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
44
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
45
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
45
    LineItem, Order, TransactionServiceException
46
    LineItem, Order, TransactionServiceException
Line 1270... Line 1271...
1270
        try:
1271
        try:
1271
            save_payment_settlements(to_py_date(settlementDate), paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection)
1272
            save_payment_settlements(to_py_date(settlementDate), paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection)
1272
        finally:
1273
        finally:
1273
            close_session()
1274
            close_session()
1274
    
1275
    
-
 
1276
    def saveCODPaymentSettlement(self, orderId, settlementDate, collection):
-
 
1277
        try:
-
 
1278
            save_cod_payment_settlement(orderId, to_py_date(settlementDate), collection)
-
 
1279
        finally:
-
 
1280
            close_session()
-
 
1281
    
1275
    def markEBSSettlementUploaded(self, settlementId):
1282
    def markEBSSettlementUploaded(self, settlementId):
1276
        try:
1283
        try:
1277
            mark_ebs_settlement_uploaded(settlementId)
1284
            mark_ebs_settlement_uploaded(settlementId)
1278
        finally:
1285
        finally:
1279
            close_session()
1286
            close_session()
Line 1289... Line 1296...
1289
        try:
1296
        try:
1290
            return get_reshipped_order_ids(orderIds)
1297
            return get_reshipped_order_ids(orderIds)
1291
        finally:
1298
        finally:
1292
            close_session()
1299
            close_session()
1293
    
1300
    
-
 
1301
    def getOrdersWhereVendorNotPaid(self, vendorId):
-
 
1302
        try:
-
 
1303
            return [to_t_order(order) for order in get_orders_where_vendor_not_paid(vendorId)]
-
 
1304
        finally:
-
 
1305
            close_session()
-
 
1306
    
1294
    def closeSession(self, ):
1307
    def closeSession(self, ):
1295
        close_session()
1308
        close_session()
1296
 
1309
 
1297
    def isAlive(self, ):
1310
    def isAlive(self, ):
1298
        """
1311
        """