You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/03/07 07:33:28 UTC

[1/2] incubator-fineract git commit: FINERACT-406 allow disbursal of topup loan on same date of transaction of previous loan

Repository: incubator-fineract
Updated Branches:
  refs/heads/develop cdbcf7501 -> 8c080fc75


FINERACT-406 allow disbursal of topup loan on same date of transaction of previous loan


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/c197614a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/c197614a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/c197614a

Branch: refs/heads/develop
Commit: c197614af6ce8c92f66078c5d229b69371f5153a
Parents: c1af6d6
Author: Lionel Raymundi - Poincenot <li...@poincenot.com>
Authored: Fri Feb 24 18:49:02 2017 -0300
Committer: Lionel Raymundi - Poincenot <li...@poincenot.com>
Committed: Fri Feb 24 18:49:02 2017 -0300

----------------------------------------------------------------------
 ...LoanApplicationWritePlatformServiceJpaRepositoryImpl.java | 8 ++++----
 .../service/LoanWritePlatformServiceJpaRepositoryImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/c197614a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
----------------------------------------------------------------------
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 f46c8e1..92660a0 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
+}

http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/c197614a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
----------------------------------------------------------------------
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 37d1325..4f02d2e 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()


[2/2] incubator-fineract git commit: Merge branch 'FINERACT-406' into develop

Posted by na...@apache.org.
Merge branch 'FINERACT-406' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/8c080fc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/8c080fc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/8c080fc7

Branch: refs/heads/develop
Commit: 8c080fc75d29c9f8e81184e40436f8f3d26c7440
Parents: cdbcf75 c197614
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Tue Mar 7 13:03:05 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Tue Mar 7 13:03:05 2017 +0530

----------------------------------------------------------------------
 ...LoanApplicationWritePlatformServiceJpaRepositoryImpl.java | 8 ++++----
 .../service/LoanWritePlatformServiceJpaRepositoryImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------