diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
index 4217cfcda..c1480924d 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
@@ -326,12 +326,11 @@
{{ 'labels.inputs.Calculate interest for exact days in partial period' | translate }}
-
- {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}
-
+
+
+ {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}
+
+
{{ 'labels.inputs.Arrears tolerance' | translate }}
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
index c09ceb4a0..923d6e736 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
@@ -100,6 +100,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
currency: Currency;
productEnableDownPayment = false;
+ isProgressive = false;
/**
* Create Loans Account Terms Form
@@ -127,7 +128,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
this.loansAccountTermsData = this.loansAccountTemplate;
}
this.productEnableDownPayment = this.loansAccountTermsData.product.enableDownPayment;
-
+ this.isProgressive =
+ this.loansAccountTermsData.loanScheduleType.code == LoanProducts.LOAN_SCHEDULE_TYPE_PROGRESSIVE;
if (this.loansAccountTermsData.product) {
this.loanProduct = this.loansAccountTermsData.product;
}
@@ -164,6 +166,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
this.setAdvancedPaymentStrategyControls();
+ if (this.loansAccountTermsData.loanScheduleType.code == LoanProducts.LOAN_SCHEDULE_TYPE_CUMULATIVE) {
+ this.loansAccountTermsForm.removeControl('interestRecognitionOnDisbursementDate');
+ }
+
if (this.loansAccountTermsData.isLoanProductLinkedToFloatingRate) {
this.loansAccountTermsForm.removeControl('interestRatePerPeriod');
}
diff --git a/src/app/loans/loans-view/account-details/account-details.component.html b/src/app/loans/loans-view/account-details/account-details.component.html
index c60d3ef36..51d7c74d8 100644
--- a/src/app/loans/loans-view/account-details/account-details.component.html
+++ b/src/app/loans/loans-view/account-details/account-details.component.html
@@ -123,9 +123,7 @@
- {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:
+ {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:
{{ loanDetails.interestRecognitionOnDisbursementDate | yesNo }}
diff --git a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
index a75bc31a0..053770e4b 100644
--- a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
+++ b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
@@ -363,12 +363,10 @@
- {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:
+ {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:
{{ loanProduct.interestRecognitionOnDisbursementDate | yesNo }}
-
+
{{ 'labels.inputs.Loan Schedule' | translate }}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
index b696fb5cc..3a3e8ce15 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
@@ -133,7 +133,7 @@
>
{{ 'labels.inputs.Is Zero Interest Rate?' | translate }}
-
+