From 897322facce373dcb7213afa942fe4ca823d1950 Mon Sep 17 00:00:00 2001 From: Manoj <56669674+fynmanoj@users.noreply.github.com> Date: Thu, 11 Nov 2021 15:51:12 +0530 Subject: [PATCH] FINERACT-1348-fixed-principal-percentage (#3381) --- app/global-translations/locale-en.json | 4 ++++ .../loanAccount/EditLoanAccAppController.js | 1 + .../loanAccount/NewLoanAccAppController.js | 1 + .../product/CreateLoanProductController.js | 4 ++++ .../product/EditLoanProductController.js | 5 +++++ app/views/loans/editloanaccount.html | 12 ++++++++++++ app/views/loans/newloanaccount.html | 14 ++++++++++++++ app/views/products/createloanproduct.html | 14 ++++++++++++++ app/views/products/editloanproduct.html | 10 ++++++++++ app/views/products/viewloanproduct.html | 4 ++++ 10 files changed, 69 insertions(+) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index bcf8388f..a3b42ff7 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -4288,5 +4288,9 @@ "label.selectrate" : "Select Rate", "label.input.street":"Street", + "label.input.fixed.pricipal.percentage.per.installment" : "Fixed Principal % per instalment", + "label.heading.fixed.pricipal.percentage.per.installment" : "Fixed Principal % per instalment", + "label.tooltip.fixed.pricipal.percentage.per.installment" : "Principal portion of the instalments except the last installment will be fixed to this value.", + "----End---": "--End of file--- " } diff --git a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js index ea7afc6f..3470e09d 100755 --- a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js +++ b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js @@ -132,6 +132,7 @@ scope.formData.interestRatePerPeriod = scope.loanaccountinfo.interestRatePerPeriod; scope.formData.interestRateFrequencyType = scope.loanaccountinfo.interestRateFrequencyType.id; scope.formData.amortizationType = scope.loanaccountinfo.amortizationType.id; + scope.formData.fixedPrincipalPercentagePerInstallment = scope.loanaccountinfo.fixedPrincipalPercentagePerInstallment; scope.formData.interestType = scope.loanaccountinfo.interestType.id; scope.formData.isEqualAmortization = scope.loanaccountinfo.isEqualAmortization; scope.formData.interestCalculationPeriodType = scope.loanaccountinfo.interestCalculationPeriodType.id; diff --git a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js index b9c78799..c0386a98 100755 --- a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js +++ b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js @@ -154,6 +154,7 @@ scope.loandetails.repaymentFrequencyValue = scope.loanaccountinfo.repaymentFrequencyType.value; scope.formData.interestRatePerPeriod = scope.loanaccountinfo.interestRatePerPeriod; scope.formData.amortizationType = scope.loanaccountinfo.amortizationType.id; + scope.formData.fixedPrincipalPercentagePerInstallment = scope.loanaccountinfo.fixedPrincipalPercentagePerInstallment; scope.formData.isEqualAmortization = scope.loanaccountinfo.isEqualAmortization; scope.loandetails.amortizationValue = scope.loanaccountinfo.amortizationType.value; scope.formData.interestType = scope.loanaccountinfo.interestType.id; diff --git a/app/scripts/controllers/product/CreateLoanProductController.js b/app/scripts/controllers/product/CreateLoanProductController.js index 46041ad1..2171dd9a 100755 --- a/app/scripts/controllers/product/CreateLoanProductController.js +++ b/app/scripts/controllers/product/CreateLoanProductController.js @@ -415,6 +415,10 @@ this.formData.allowPartialPeriodInterestCalcualtion = false; } + if(this.formData.amortizationType != 0){ + this.formData.fixedPrincipalPercentagePerInstallment = null; + } + if (this.formData.recalculationCompoundingFrequencyType == 4) { if(this.formData.recalculationCompoundingFrequencyNthDayType == -2) { delete this.formData.recalculationCompoundingFrequencyNthDayType; diff --git a/app/scripts/controllers/product/EditLoanProductController.js b/app/scripts/controllers/product/EditLoanProductController.js index 84308f8d..6d8e7a28 100755 --- a/app/scripts/controllers/product/EditLoanProductController.js +++ b/app/scripts/controllers/product/EditLoanProductController.js @@ -72,6 +72,7 @@ maxInterestRatePerPeriod: scope.product.maxInterestRatePerPeriod, interestRateFrequencyType: scope.product.interestRateFrequencyType.id, amortizationType: scope.product.amortizationType.id, + fixedPrincipalPercentagePerInstallment: scope.product.fixedPrincipalPercentagePerInstallment, interestType: scope.product.interestType.id, interestCalculationPeriodType: scope.product.interestCalculationPeriodType.id, allowPartialPeriodInterestCalcualtion:scope.product.allowPartialPeriodInterestCalcualtion, @@ -566,6 +567,10 @@ this.formData.allowPartialPeriodInterestCalcualtion = false; } + if(this.formData.amortizationType != 0){ + this.formData.fixedPrincipalPercentagePerInstallment = null; + } + if (this.formData.recalculationCompoundingFrequencyType == 4) { if(this.formData.recalculationCompoundingFrequencyNthDayType == -2) { delete this.formData.recalculationCompoundingFrequencyNthDayType; diff --git a/app/views/loans/editloanaccount.html b/app/views/loans/editloanaccount.html index 4af1c78e..d7f28e5b 100755 --- a/app/views/loans/editloanaccount.html +++ b/app/views/loans/editloanaccount.html @@ -238,6 +238,18 @@ + + + + + + + + diff --git a/app/views/loans/newloanaccount.html b/app/views/loans/newloanaccount.html index 4d99d4d9..af11194b 100755 --- a/app/views/loans/newloanaccount.html +++ b/app/views/loans/newloanaccount.html @@ -319,6 +319,16 @@ ng-options="amortizationType.id as amortizationType.value for amortizationType in loanaccountinfo.amortizationTypeOptions" value="{{amortizationType.id}}" ng-disabled="!loanaccountinfo.product.allowAttributeOverrides.amortizationType"> + + + + + + @@ -981,6 +991,10 @@ {{ 'label.input.amortization' | translate }}  {{loandetails.amortizationValue}} + + {{ 'label.input.fixed.pricipal.percentage.per.installment' | translate }}  + {{formData.fixedPrincipalPercentagePerInstallment}} + {{ 'label.input.interestcalculationperiod' | translate }}  {{loandetails.interestCalculationPeriodValue}} diff --git a/app/views/products/createloanproduct.html b/app/views/products/createloanproduct.html index c80e6dfe..0c86d612 100755 --- a/app/views/products/createloanproduct.html +++ b/app/views/products/createloanproduct.html @@ -645,6 +645,20 @@ ng-false-value="false"> +
+ +
+ +
+
+ +
+
+
+
+ +
+ +
+