From 1d3e1fd60b0c2a9bbbd33b3bbf4dedc93e06e3db Mon Sep 17 00:00:00 2001 From: andrew-dzak Date: Mon, 21 Jul 2014 17:52:29 +0300 Subject: [PATCH] MIFOSX-1453 done --- .../mifosplatform/portfolio/loanaccount/domain/Loan.java | 3 +++ .../service/LoanWritePlatformServiceJpaRepositoryImpl.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java index a3cc27768..bbe6d62ff 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java @@ -3851,4 +3851,7 @@ public class Loan extends AbstractPersistable { return this.approvedPrincipal; } + public BigDecimal getTotalOverpaid() { + return this.totalOverpaid; + } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 3366c5fca..6d4106a3f 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -1407,7 +1407,11 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf final LoanTransaction newTransferAcceptanceTransaction = LoanTransaction.approveTransfer(acceptedInOffice, loan, transferDate); loan.getLoanTransactions().add(newTransferAcceptanceTransaction); - loan.setLoanStatus(LoanStatus.ACTIVE.getValue()); + if(loan.getTotalOverpaid() !=null){ + loan.setLoanStatus(LoanStatus.OVERPAID.getValue()); + }else{ + loan.setLoanStatus(LoanStatus.ACTIVE.getValue()); + } if (loanOfficer != null) { loan.reassignLoanOfficer(loanOfficer, transferDate); }