From c197614af6ce8c92f66078c5d229b69371f5153a Mon Sep 17 00:00:00 2001 From: Lionel Raymundi - Poincenot Date: Fri, 24 Feb 2017 18:49:02 -0300 Subject: [PATCH] FINERACT-406 allow disbursal of topup loan on same date of transaction of previous loan --- ...nApplicationWritePlatformServiceJpaRepositoryImpl.java | 8 ++++---- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java index f46c8e191..92660a0fd 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java @@ -301,7 +301,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa "loanIdToClose is invalid, Currency code is different."); } final LocalDate lastUserTransactionOnLoanToClose = loanToClose.getLastUserTransactionDate(); - if(!newLoanApplication.getDisbursementDate().isAfter(lastUserTransactionOnLoanToClose)){ + if(newLoanApplication.getDisbursementDate().isBefore(lastUserTransactionOnLoanToClose)){ throw new GeneralPlatformDomainRuleException( "error.msg.loan.disbursal.date.should.be.after.last.transaction.date.of.loan.to.be.closed", "Disbursal date of this loan application "+newLoanApplication.getDisbursementDate() @@ -710,7 +710,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa "loanIdToClose is invalid, Currency code is different."); } final LocalDate lastUserTransactionOnLoanToClose = loanToClose.getLastUserTransactionDate(); - if(!existingLoanApplication.getDisbursementDate().isAfter(lastUserTransactionOnLoanToClose)){ + if(existingLoanApplication.getDisbursementDate().isBefore(lastUserTransactionOnLoanToClose)){ throw new GeneralPlatformDomainRuleException( "error.msg.loan.disbursal.date.should.be.after.last.transaction.date.of.loan.to.be.closed", "Disbursal date of this loan application "+existingLoanApplication.getDisbursementDate() @@ -1123,7 +1123,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa } final LocalDate lastUserTransactionOnLoanToClose = loanToClose.getLastUserTransactionDate(); - if(!loan.getDisbursementDate().isAfter(lastUserTransactionOnLoanToClose)){ + if(loan.getDisbursementDate().isBefore(lastUserTransactionOnLoanToClose)){ throw new GeneralPlatformDomainRuleException( "error.msg.loan.disbursal.date.should.be.after.last.transaction.date.of.loan.to.be.closed", "Disbursal date of this loan application "+loan.getDisbursementDate() @@ -1376,4 +1376,4 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa } } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 37d13259c..4f02d2e3e 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -317,7 +317,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf "Loan to be closed with this topup is not active."); } final LocalDate lastUserTransactionOnLoanToClose = loanToClose.getLastUserTransactionDate(); - if(!loan.getDisbursementDate().isAfter(lastUserTransactionOnLoanToClose)){ + if(loan.getDisbursementDate().isBefore(lastUserTransactionOnLoanToClose)){ throw new GeneralPlatformDomainRuleException( "error.msg.loan.disbursal.date.should.be.after.last.transaction.date.of.loan.to.be.closed", "Disbursal date of this loan application "+loan.getDisbursementDate()