Subversion Repositories SmartDukaan

Rev

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

Rev 19817 Rev 19818
Line 9841... Line 9841...
9841
        if loanTxn.credit_type in [CreditTxnType.PAID]:
9841
        if loanTxn.credit_type in [CreditTxnType.PAID]:
9842
            loanHistoryRecords = LoanHistory.query.filter(LoanHistory.loan_id==loanTxn.loan_id).filter(LoanHistory.payment_id==paymentId).all()
9842
            loanHistoryRecords = LoanHistory.query.filter(LoanHistory.loan_id==loanTxn.loan_id).filter(LoanHistory.payment_id==paymentId).all()
9843
            loanTotalHistory = 0
9843
            loanTotalHistory = 0
9844
            for loanHistoryRec in loanHistoryRecords:
9844
            for loanHistoryRec in loanHistoryRecords:
9845
                loanTotalHistory = loanTotalHistory + loanHistoryRec.amount
9845
                loanTotalHistory = loanTotalHistory + loanHistoryRec.amount
9846
            if loanTotalHistory < 0:
9846
            if loanTotalHistory <= 0:
9847
                logging.info("Error: Loan Already Paid or Closed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9847
                logging.info("Error: Loan Already Paid or Closed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9848
                raise TransactionServiceException(227, "Error: Loan Already Paid or Closed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9848
                raise TransactionServiceException(227, "Error: Loan Already Paid or Closed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9849
            else:
9849
            else:
9850
                loanHistoryRec = LoanHistory()
9850
                loanHistoryRec = LoanHistory()
9851
                loanHistoryRec.user_id = userId
9851
                loanHistoryRec.user_id = userId
Line 9855... Line 9855...
9855
                loanHistoryRec.credit_type = CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type]
9855
                loanHistoryRec.credit_type = CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type]
9856
                loanHistoryRec.loan_id = loanTxn.loan_id
9856
                loanHistoryRec.loan_id = loanTxn.loan_id
9857
                loanHistoryRec.invoiceNumber = loanTxn.invoiceNumber
9857
                loanHistoryRec.invoiceNumber = loanTxn.invoiceNumber
9858
                if loanTxn.value_date:
9858
                if loanTxn.value_date:
9859
                    loanHistoryRec.value_date = to_py_date(loanTxn.value_date)
9859
                    loanHistoryRec.value_date = to_py_date(loanTxn.value_date)
9860
                loanRec = LoanHistory.get_by(payment_id=paymentId,loan_id=loanTxn.loan_id, credit_type='LOAN')
-
 
9861
                userSanction.loan = userSanction.loan + (loanTxn.amount * loanTxnMultplierMap.get(loanTxn.credit_type))
9860
                userSanction.loan = userSanction.loan + (loanTxn.amount * loanTxnMultplierMap.get(loanTxn.credit_type))
9862
        else:
9861
        else:
9863
            loanHistoryRec = LoanHistory.get_by(payment_id=paymentId,loan_id=loanTxn.loan_id, credit_type=CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9862
            loanHistoryRec = LoanHistory.get_by(payment_id=paymentId,loan_id=loanTxn.loan_id, credit_type=CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9864
            if loanHistoryRec is None:
9863
            if loanHistoryRec is None:
9865
                loanHistoryRec = LoanHistory()
9864
                loanHistoryRec = LoanHistory()
Line 9879... Line 9878...
9879
                    else:
9878
                    else:
9880
                        fetchCreditorDueDateMap()
9879
                        fetchCreditorDueDateMap()
9881
                        due_days = creditorDueDateMap.get(creditorId)
9880
                        due_days = creditorDueDateMap.get(creditorId)
9882
                        loanHistoryRec.due_date = datetime.datetime.now()+timedelta(days=due_days)
9881
                        loanHistoryRec.due_date = datetime.datetime.now()+timedelta(days=due_days)
9883
                if loanTxn.credit_type in [CreditTxnType.CORRECTION]:
9882
                if loanTxn.credit_type in [CreditTxnType.CORRECTION]:
9884
                    loanRec = LoanHistory.get_by(payment_id=paymentId,loan_id=loanTxn.loan_id, credit_type='LOAN')
-
 
9885
                    userSanction.loan = userSanction.loan + (loanTxn.amount * loanTxnMultplierMap.get(loanTxn.credit_type))
9883
                    userSanction.loan = userSanction.loan + (loanTxn.amount * loanTxnMultplierMap.get(loanTxn.credit_type))
9886
            else:
9884
            else:
9887
                logging.info("Error: Entry already existed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9885
                logging.info("Error: Entry already existed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9888
                raise TransactionServiceException(227, "Error: Entry already existed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9886
                raise TransactionServiceException(227, "Error: Entry already existed for "+str(paymentId) + " Loan Id:- "+str(loanTxn.loan_id) +" Loan Txn Type:- "+CreditTxnType._VALUES_TO_NAMES[loanTxn.credit_type])
9889
    session.commit()   
9887
    session.commit()   
9890
    return True
9888
    return True
9891
    
9889
    
-
 
9890
#paymentId is transaction id
9892
def __loanHistoryObj(user_id, creditor_id, paymentId, amount, credit_type, loan_id, value_date=None, invoiceNumber=None):
9891
def __loanHistoryObj(user_id, creditor_id, paymentId, amount, credit_type, loan_id, value_date=None, invoiceNumber=None):
9893
    loanobj = TLoanHistory()
9892
    loanobj = TLoanHistory()
9894
    loanobj.user_id = user_id
9893
    loanobj.user_id = user_id
9895
    loanobj.creditor_id = creditor_id    
9894
    loanobj.creditor_id = creditor_id    
9896
    loanobj.payment_id = paymentId
9895
    loanobj.payment_id = paymentId
Line 10780... Line 10779...
10780
    
10779
    
10781
    ordersMap = {}
10780
    ordersMap = {}
10782
    for order in eligibleOrders:
10781
    for order in eligibleOrders:
10783
        ordersMap[order.id] = order.lineitems[0].quantity - order.lineitems[0].returnQty
10782
        ordersMap[order.id] = order.lineitems[0].quantity - order.lineitems[0].returnQty
10784
    
10783
    
10785
    print ordersMap
-
 
10786
    
-
 
10787
    print "++++++++++++"
-
 
10788
    
-
 
10789
    print returnOrdersMap
-
 
10790
    
-
 
10791
    for orderId, returnOrderQty in returnOrdersMap.items():
10784
    for orderId, returnOrderQty in returnOrdersMap.items():
10792
        if returnOrderQty > ordersMap.get(orderId):
10785
        if returnOrderQty > ordersMap.get(orderId):
10793
            print "ret false*********";
-
 
10794
            return False
10786
            return False
10795
    return True
10787
    return True
10796
 
10788
 
10797
def get_return_pickup_request(returnPickupId):
10789
def get_return_pickup_request(returnPickupId):
10798
    return ReturnPickupRequest.query.filter(ReturnPickupRequest.id==returnPickupId).first()
10790
    return ReturnPickupRequest.query.filter(ReturnPickupRequest.id==returnPickupId).first()