CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

Merge branch 'PR145' into develop

Browse Source
This commit is contained in:
Adi Narayana Raju
2016-06-17 10:35:44 +05:30
parent 94ef2b0684 65767869b0
commit a89a43a3f7
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+17 -10
View File
@@ -40,7 +40,6 @@ import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Embedded; import javax.persistence.Embedded;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
@@ -6018,15 +6017,13 @@ public class Loan extends AbstractPersistable<Long> {
final MonetaryCurrency currency = getCurrency(); final MonetaryCurrency currency = getCurrency();
Money interest = Money.zero(currency); Money interest = Money.zero(currency);
Money fee = Money.zero(currency); Money fee = Money.zero(currency);
Money penalty = Money.zero(currency); Money penalty = Money.zero(currency);
boolean isArrearsPresent = false;
for (final LoanRepaymentScheduleInstallment installment : this.repaymentScheduleInstallments) { for (final LoanRepaymentScheduleInstallment installment : this.repaymentScheduleInstallments) {
if (installment.isNotFullyPaidOff()) { if (installment.isNotFullyPaidOff()) {
if (!isArrearsPresent || !installment.getDueDate().isAfter(paymentDate)) { if (!installment.getDueDate().isAfter(paymentDate)) {
interest = interest.plus(installment.getInterestOutstanding(currency)); interest = interest.plus(installment.getInterestOutstanding(currency));
fee = fee.plus(installment.getFeeChargesOutstanding(currency)); fee = fee.plus(installment.getFeeChargesOutstanding(currency));
penalty = penalty.plus(installment.getPenaltyChargesOutstanding(currency)); penalty = penalty.plus(installment.getPenaltyChargesOutstanding(currency));
isArrearsPresent = true;
} else if (installment.getFromDate().isBefore(paymentDate)) { } else if (installment.getFromDate().isBefore(paymentDate)) {
Money[] balancesForCurrentPeroid = fetchInterestFeeAndPenalty(paymentDate, currency, installment); Money[] balancesForCurrentPeroid = fetchInterestFeeAndPenalty(paymentDate, currency, installment);
interest = interest.plus(balancesForCurrentPeroid[0]); interest = interest.plus(balancesForCurrentPeroid[0]);
@@ -6071,6 +6068,7 @@ public class Loan extends AbstractPersistable<Long> {
public Money[] retriveIncomeForOverlappingPeriod(final LocalDate paymentDate) { public Money[] retriveIncomeForOverlappingPeriod(final LocalDate paymentDate) {
Money[] balances = new Money[3]; Money[] balances = new Money[3];
final MonetaryCurrency currency = getCurrency(); final MonetaryCurrency currency = getCurrency();
balances[0] = balances[1] = balances[2] = Money.zero(currency);
for (final LoanRepaymentScheduleInstallment installment : this.repaymentScheduleInstallments) { for (final LoanRepaymentScheduleInstallment installment : this.repaymentScheduleInstallments) {
if (installment.getDueDate().isEqual(paymentDate)){ if (installment.getDueDate().isEqual(paymentDate)){
Money interest = installment.getInterestOutstanding(currency); Money interest = installment.getInterestOutstanding(currency);
@@ -6202,13 +6200,22 @@ public class Loan extends AbstractPersistable<Long> {
Money [] balances = retriveIncomeForOverlappingPeriod(transactionDate); Money [] balances = retriveIncomeForOverlappingPeriod(transactionDate);
for (final LoanRepaymentScheduleInstallment installment : this.repaymentScheduleInstallments) { for (final LoanRepaymentScheduleInstallment installment : this.repaymentScheduleInstallments) {
if (!installment.getDueDate().isBefore(transactionDate)) { if (!installment.getDueDate().isBefore(transactionDate)) {
totalPrincipal = totalPrincipal.plus(installment.getPrincipalOutstanding(currency)); if (!installment.isPartlyPaid() && !installment.isObligationsMet()) {
newInstallments.remove(installment); totalPrincipal = totalPrincipal.plus(installment.getPrincipalOutstanding(currency));
} newInstallments.remove(installment);
}
}
} }
LocalDate installmentStartDate = getDisbursementDate();
if (newInstallments.size() > 0) {
installmentStartDate = newInstallments.get((newInstallments.size() - 1)).getDueDate();
}
LoanRepaymentScheduleInstallment newInstallment = new LoanRepaymentScheduleInstallment(null, newInstallments.size() + 1, LoanRepaymentScheduleInstallment newInstallment = new LoanRepaymentScheduleInstallment(null, newInstallments.size() + 1,
newInstallments.get((newInstallments.size() - 1)).getDueDate(), transactionDate, totalPrincipal.getAmount(), installmentStartDate, transactionDate, totalPrincipal.getAmount(),
balances[0].getAmount(), balances[1].getAmount(), balances[2].getAmount(), true, null); balances[0].getAmount(), balances[1].getAmount(), balances[2].getAmount(), true, null);
newInstallment.updateInstallmentNumber(newInstallments.size() + 1); newInstallment.updateInstallmentNumber(newInstallments.size() + 1);
newInstallments.add(newInstallment); newInstallments.add(newInstallment);