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.

Sign up for GitHub

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

fix/FSF-28 #1026

Merged
merged 7 commits into from
Aug 16, 2024
Merged

fix/FSF-28 #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d30bc6
FBR-710
BrianMuhimbura Aug 8, 2024
ab89e0c
Merge branch 'fiter/fb/dev' of https://github.com/fiterlatam/fineract…
BrianMuhimbura Aug 13, 2024
c93b09b
Merge branch 'fiter/fb/dev' of https://github.com/fiterlatam/fineract…
BrianMuhimbura Aug 16, 2024
cd9546e
FSF-25
BrianMuhimbura Aug 16, 2024
e2300e1
Merge branch 'fiter/fb/dev' of https://github.com/fiterlatam/fineract…
BrianMuhimbura Aug 16, 2024
c251f32
FSF-28
BrianMuhimbura Aug 16, 2024
46b0652
CHARGE FIX
BrianMuhimbura Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,4 +1024,8 @@ public Integer getMeetingStart() {
public Integer getMeetingEnd() {
return meetingEnd;
}

public void updateOffice(Office office) {
this.office = office;
}
}
1 change: 1 addition & 0 deletions .../fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,7 @@ public CommandProcessingResult transferGroup(JsonCommand command) {
group.updateMeetingDay(newCenter.getMeetingDay());
group.updateMeetingStart(newCenter.getMeetingStart());
group.updateMeetingEnd(newCenter.getMeetingEnd());
group.updateOffice(newCenter.getOffice());
this.groupRepository.saveAndFlush(group);
return new CommandProcessingResultBuilder() //
.withCommandId(command.commandId()) //
Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,12 @@ private BigDecimal generateInstallmentFeeRate(Charge charge, JsonObject loanChar
if (charge.isInstallmentFeeCharge() && charge.isAddOnInstallmentFeeType() && loanApplicationTermsCharges != null) {
if (ChargeCalculationType.fromInt(charge.getChargeCalculation()).isPercentageBased()) {
// update rate
LocalDate repaymentStartFromDate = loanApplicationTermsCharges.getRepaymentStartFromDate()!=null?
loanApplicationTermsCharges.getRepaymentStartFromDate():
loanApplicationTermsCharges.getCalculatedRepaymentsStartingFromLocalDate();

Pair<Integer, BigDecimal> addOnDaysAndRate = charge.getAddOnDisbursementChargeRate(
loanApplicationTermsCharges.getExpectedDisbursementDate(), loanApplicationTermsCharges.getRepaymentStartFromDate());
loanApplicationTermsCharges.getExpectedDisbursementDate(), repaymentStartFromDate);
rate = addOnDaysAndRate.getRight();
loanChargeElement.add("amount", new JsonPrimitive(rate));
}
Expand Down
Loading