Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FINERACT-1724: Fee's are not included in total balance amount, when we have multiple disbursements on first day #3150

Merged

Conversation

adamsaghy
Copy link
Contributor

Description

Describe the changes made and why they were made.

Ignore if these details are present on the associated Apache Fineract JIRA ticket.

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.

if (installmentNumber == null && charge.isDueForCollectionFromAndUpToAndIncluding(startDate, installment.getDueDate())) {

boolean isDue = installment.isFirstPeriod()
? charge.isDueForCollectionFromIncludingAndUpToAndIncluding(startDate, installment.getDueDate())
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably yes.

Copy link
Member

@mohitsinha mohitsinha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left comments regarding 2 cases, where we just check if loanCharge is due or not.
The startDate in both these cases is disbursementDate and endDate is installment.getDueDate(), so only installment.dueDate parameter is sufficient.

Can there be 1 IT for this flow?

@adamsaghy
Copy link
Contributor Author

Left comments regarding 2 cases, where we just check if loanCharge is due or not. The startDate in both these cases is disbursementDate and endDate is installment.getDueDate(), so only installment.dueDate parameter is sufficient.

Can there be 1 IT for this flow?

Thank you for your review!

I have replied to your comments and i am working on the IT test case.

@adamsaghy adamsaghy force-pushed the FINERACT-1724/enhance_charge_handling branch 2 times, most recently from f3aadf7 to aba2cc4 Compare May 2, 2023 20:40
@adamsaghy adamsaghy force-pushed the FINERACT-1724/enhance_charge_handling branch from aba2cc4 to 62b2faf Compare May 2, 2023 21:09
Copy link
Contributor

@taskain7 taskain7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adamsaghy adamsaghy merged commit 629d2da into apache:develop May 3, 2023
6 checks passed
@adamsaghy adamsaghy deleted the FINERACT-1724/enhance_charge_handling branch June 7, 2023 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants