Subversion Repositories SmartDukaan

Rev

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

Rev 3986 Rev 4008
Line 18... Line 18...
18
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
18
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
19
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
19
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
20
    process_return, get_return_order, mark_doas_as_picked_up,\
20
    process_return, get_return_order, mark_doas_as_picked_up,\
21
    create_purchase_order, verify_order, is_alive, get_orders_by_shipping_date,\
21
    create_purchase_order, verify_order, is_alive, get_orders_by_shipping_date,\
22
    update_weight, change_warehouse, change_product, add_delay_reason,\
22
    update_weight, change_warehouse, change_product, add_delay_reason,\
-
 
23
    reconcile_cod_collection, get_transactions_requiring_extra_processing,\
23
    reconcile_cod_collection
24
    mark_transaction_as_processed
24
 
25
 
25
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
26
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
26
    to_t_alert, to_t_order, to_t_lineitem
27
    to_t_alert, to_t_order, to_t_lineitem
27
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
28
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
28
    LineItem, Order, TransactionServiceException
29
    LineItem, Order, TransactionServiceException
Line 828... Line 829...
828
        """
829
        """
829
        try:
830
        try:
830
            return reconcile_cod_collection(collectedAmountMap, xferBy, xferTxnId, xferDate)
831
            return reconcile_cod_collection(collectedAmountMap, xferBy, xferTxnId, xferDate)
831
        finally:
832
        finally:
832
            close_session()
833
            close_session()
-
 
834
 
-
 
835
    def getTransactionsRequiringExtraProcessing(self, category):
-
 
836
        """
-
 
837
        Returns the list of transactions that require some extra processing and
-
 
838
        which belong to a particular category. This is currently used by CRM
-
 
839
        application.
-
 
840
        """
-
 
841
        try:
-
 
842
            return get_transactions_requiring_extra_processing(category)
-
 
843
        finally:
-
 
844
            close_session()
-
 
845
 
-
 
846
    def markTransactionAsProcessed(self, transactionId, category):
-
 
847
        """
-
 
848
        Marks a particular transaction as processed for a particular category.
-
 
849
        It essentially deletes the transaction if it is processed for a particular
-
 
850
        category. This is currently used by CRM application.
-
 
851
        """
-
 
852
        try:
-
 
853
            return mark_transaction_as_processed(transactionId, category)
-
 
854
        finally:
-
 
855
            close_session()
833
    
856
    
834
    def closeSession(self, ):
857
    def closeSession(self, ):
835
        close_session()
858
        close_session()
836
 
859
 
837
    def isAlive(self, ):
860
    def isAlive(self, ):