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

Merge branch 'Fineract-361' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-01-02 17:57:52 +05:30
parent f55a16755f 5fe0e529e7
commit 7b0fcc5674
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
+14 -3
View File
@@ -633,7 +633,7 @@ public final class LoanApplicationTerms {
// with periodic interest for default month and year for // with periodic interest for default month and year for
// equal installment // equal installment
final BigDecimal periodicInterestRateForRepaymentPeriod = periodicInterestRate(calculator, mc, DaysInMonthType.DAYS_30, final BigDecimal periodicInterestRateForRepaymentPeriod = periodicInterestRate(calculator, mc, DaysInMonthType.DAYS_30,
DaysInYearType.DAYS_365, periodStartDate, periodEndDate); DaysInYearType.DAYS_365, periodStartDate, periodEndDate, true);
Money totalPmtForThisInstallment = calculateTotalDueForEqualInstallmentRepaymentPeriod(periodicInterestRateForRepaymentPeriod, Money totalPmtForThisInstallment = calculateTotalDueForEqualInstallmentRepaymentPeriod(periodicInterestRateForRepaymentPeriod,
outstandingBalance, periodsElapsed); outstandingBalance, periodsElapsed);
return totalPmtForThisInstallment; return totalPmtForThisInstallment;
@@ -966,7 +966,13 @@ public final class LoanApplicationTerms {
} }
private BigDecimal periodicInterestRate(final PaymentPeriodsInOneYearCalculator calculator, final MathContext mc, private BigDecimal periodicInterestRate(final PaymentPeriodsInOneYearCalculator calculator, final MathContext mc,
final DaysInMonthType daysInMonthType, final DaysInYearType daysInYearType, LocalDate periodStartDate, LocalDate periodEndDate) { final DaysInMonthType daysInMonthType, final DaysInYearType daysInYearType, LocalDate periodStartDate,
LocalDate periodEndDate) {
return periodicInterestRate(calculator, mc, daysInMonthType, daysInYearType, periodStartDate, periodEndDate, false);
}
private BigDecimal periodicInterestRate(final PaymentPeriodsInOneYearCalculator calculator, final MathContext mc, final DaysInMonthType daysInMonthType,
final DaysInYearType daysInYearType, LocalDate periodStartDate, LocalDate periodEndDate, boolean isForPMT) {
final long loanTermPeriodsInOneYear = calculatePeriodsInOneYear(calculator); final long loanTermPeriodsInOneYear = calculatePeriodsInOneYear(calculator);
@@ -974,7 +980,12 @@ public final class LoanApplicationTerms {
final BigDecimal loanTermPeriodsInYearBigDecimal = BigDecimal.valueOf(loanTermPeriodsInOneYear); final BigDecimal loanTermPeriodsInYearBigDecimal = BigDecimal.valueOf(loanTermPeriodsInOneYear);
BigDecimal periodicInterestRate = BigDecimal.ZERO; BigDecimal periodicInterestRate = BigDecimal.ZERO;
BigDecimal loanTermFrequencyBigDecimal = calculateLoanTermFrequency(periodStartDate, periodEndDate); BigDecimal loanTermFrequencyBigDecimal = BigDecimal.ONE;
if(isForPMT){
loanTermFrequencyBigDecimal = BigDecimal.valueOf(this.repaymentEvery);
} else {
loanTermFrequencyBigDecimal = calculateLoanTermFrequency(periodStartDate, periodEndDate);
}
switch (this.interestCalculationPeriodMethod) { switch (this.interestCalculationPeriodMethod) {
case INVALID: case INVALID:
break; break;