You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "adamsaghy (via GitHub)" <gi...@apache.org> on 2023/09/19 18:54:42 UTC
[GitHub] [fineract] adamsaghy opened a new pull request, #3461: FINERACT-1958: Rework down-payment calculation
adamsaghy opened a new pull request, #3461:
URL: https://github.com/apache/fineract/pull/3461
## Description
Describe the changes made and why they were made.
Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).
## Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests
- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
- [ ] Create/update unit or integration tests for verifying the changes made.
- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)
FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on pull request #3461: FINERACT-1958: Rework down-payment calculation
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on PR #3461:
URL: https://github.com/apache/fineract/pull/3461#issuecomment-1730982665
> 1.Not clear how we are handling overlapping downpayment installments during generate flow. 2.Not clear how we are handling Number of Repayments check during schedule generation.
1. It does not. Please have a follow up PR to handle them properly
2. The number of repayments does not contain the down-payment installment anymore. We need to only set how many regular installments we want.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] ruchiD commented on a diff in pull request #3461: FINERACT-1958: Rework down-payment calculation
Posted by "ruchiD (via GitHub)" <gi...@apache.org>.
ruchiD commented on code in PR #3461:
URL: https://github.com/apache/fineract/pull/3461#discussion_r1331072969
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java:
##########
@@ -137,18 +137,27 @@ private LoanScheduleModel generate(final MathContext mc, final LoanApplicationTe
loanApplicationTerms.getLoanCalendar(), loanApplicationTerms.getHolidayDetailDTO(), loanApplicationTerms);
if (!scheduleParams.isPartialUpdate()) {
- Long notDownPaymentPeriodNumber = periods.stream().filter(period -> !period.isDownPaymentPeriod()).count();
+ BigDecimal downPaymentAmount = BigDecimal.ZERO;
+ if (loanApplicationTerms.isDownPaymentEnabled()) {
+ downPaymentAmount = MathUtil.percentageOf(scheduleParams.getOutstandingBalance().getAmount(),
+ loanApplicationTerms.getDisbursedAmountPercentageForDownPayment(), 19);
+ }
+ Money calculatedAmortizableAmount = loanApplicationTerms.getPrincipal().minus(downPaymentAmount);
+ scheduleParams.setOutstandingBalance(calculatedAmortizableAmount);
// Set Fixed Principal Amount
- updateAmortization(mc, loanApplicationTerms, notDownPaymentPeriodNumber.intValue(), scheduleParams.getOutstandingBalance());
+ updateAmortization(mc, loanApplicationTerms, scheduleParams.getPeriodNumber(), calculatedAmortizableAmount);
if (loanApplicationTerms.isMultiDisburseLoan()) {
/* fetches the first tranche amount and also updates other tranche details to map */
- BigDecimal disburseAmt = getDisbursementAmount(loanApplicationTerms, scheduleParams.getPeriodStartDate(), periods,
- chargesDueAtTimeOfDisbursement, scheduleParams.getDisburseDetailMap(), scheduleParams.applyInterestRecalculation(),
- scheduleParams);
- scheduleParams.setPrincipalToBeScheduled(Money.of(currency, disburseAmt));
- loanApplicationTerms.setPrincipal(loanApplicationTerms.getPrincipal().zero().plus(disburseAmt));
- scheduleParams.setOutstandingBalanceAsPerRest(Money.of(currency, disburseAmt));
+ BigDecimal disburseAmt = getDisbursementAmount(loanApplicationTerms, scheduleParams.getPeriodStartDate(),
+ scheduleParams.getDisburseDetailMap(), scheduleParams.applyInterestRecalculation());
+ BigDecimal downPaymentAmt = MathUtil.percentageOf(disburseAmt,
Review Comment:
Check for downpayment enable is needed here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy merged pull request #3461: FINERACT-1958: Rework down-payment calculation
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy merged PR #3461:
URL: https://github.com/apache/fineract/pull/3461
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org