This is an automated email from the ASF dual-hosted git repository. adamsaghy pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit c2678e4a9a5ffed70577c7fa375db8c246f5d0e0 Merge: 9dfe8dfe5e 14faf5dad6 Author: Adam Saghy <[email protected]> AuthorDate: Tue Nov 17 10:55:50 2026 +0000 Merge pull request #6953 from adamsaghy/FINERACT-3229/charge-amortization-configuration FINERACT-3229: Add amortization configuration to the charge definition .../portfolio/charge/api/ChargesApiConstants.java | 4 + .../charge/api/ChargesApiResourceSwagger.java | 26 ++ .../fineract/portfolio/charge/domain/Charge.java | 129 ++++++++- .../portfolio/charge/request/ChargeRequest.java | 4 + ...geDefinitionCommandFromApiJsonDeserializer.java | 93 ++++++- .../ChargeAmortizationConfigurationTest.java | 307 +++++++++++++++++++++ .../fineract/portfolio/charge/data/ChargeData.java | 14 +- .../domain/ChargeAmortizationCalculationType.java | 21 +- .../domain/ChargeAmortizationIncomeType.java | 21 +- .../domain/ChargeAmortizationPeriodType.java | 25 +- .../portfolio/charge/domain/ChargeTimeType.java | 7 + .../stepdef/loan/ChargeAmortizationStepDef.java | 163 +++++++++++ .../ChargeAmortizationConfiguration.feature | 96 +++++++ .../service/ChargeReadPlatformServiceImpl.java | 27 +- ...hargeWritePlatformServiceJpaRepositoryImpl.java | 2 + .../db/changelog/tenant/changelog-tenant.xml | 1 + ...85_add_amortization_configuration_to_charge.xml | 41 +++ .../ChargeAmortizationConfigurationTest.java | 174 ++++++++++++ 18 files changed, 1124 insertions(+), 31 deletions(-)
