Subversion Repositories SmartDukaan

Rev

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

Rev 19889 Rev 19912
Line 130... Line 130...
130
    validate_return_pickup, process_return_pickup, mark_return_transaction_complete, \
130
    validate_return_pickup, process_return_pickup, mark_return_transaction_complete, \
131
    refund_return_transaction_payment, get_eligible_orders_for_return, \
131
    refund_return_transaction_payment, get_eligible_orders_for_return, \
132
    get_eligible_return_orders_for_pickup, validate_return_transaction, \
132
    get_eligible_return_orders_for_pickup, validate_return_transaction, \
133
    get_return_pickup_request, mark_return_not_required_orders_as_processed, \
133
    get_return_pickup_request, mark_return_not_required_orders_as_processed, \
134
    get_all_return_orders_for_return_pickup_request, unaccept_order,\
134
    get_all_return_orders_for_return_pickup_request, unaccept_order,\
135
    get_outstanding_payments
135
    get_outstanding_payments, mark_payment_settled
136
from shop2020.model.v1.order.impl.DataService import DtrBatchCreditTracker
136
from shop2020.model.v1.order.impl.DataService import DtrBatchCreditTracker
137
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
137
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
138
from shop2020.model.v1.order.impl.model.DigitalTransaction import \
138
from shop2020.model.v1.order.impl.model.DigitalTransaction import \
139
    DigitalTransaction
139
    DigitalTransaction
140
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
140
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
Line 2803... Line 2803...
2803
            userCounterMap, outstandingResults = get_outstanding_payments(fetchType,userId,limit)
2803
            userCounterMap, outstandingResults = get_outstanding_payments(fetchType,userId,limit)
2804
            return [to_t_OutstandingPayments(outstandingResult,userCounterMap.get(outstandingResult.user_id)) for outstandingResult in outstandingResults]
2804
            return [to_t_OutstandingPayments(outstandingResult,userCounterMap.get(outstandingResult.user_id)) for outstandingResult in outstandingResults]
2805
        finally:
2805
        finally:
2806
            close_session()
2806
            close_session()
2807
            
2807
            
-
 
2808
    def markPaymentSettled(self,userId,paymentId,totalAmount,repaymentDate):
-
 
2809
        returnMap = {}
-
 
2810
        try:
-
 
2811
            flag, message = mark_payment_settled(userId,paymentId,totalAmount,repaymentDate)
-
 
2812
            returnMap[flag] = message
-
 
2813
            return returnMap
-
 
2814
        finally:
-
 
2815
            close_session()
-
 
2816
            
2808
    def getOrdersInBatchAsPromisedShipping(self, statuses, offset, limit, warehouse_id, source):
2817
    def getOrdersInBatchAsPromisedShipping(self, statuses, offset, limit, warehouse_id, source):
2809
        """
2818
        """
2810
        Returns at most 'limit' orders with the given statuses for the given warehouse starting from the given offset.
2819
        Returns at most 'limit' orders with the given statuses for the given warehouse starting from the given offset.
2811
        These orders should be in order of promised shipping time. 
2820
        These orders should be in order of promised shipping time. 
2812
        Pass the status as null and the limit as 0 to ignore them.
2821
        Pass the status as null and the limit as 0 to ignore them.