From 10fcf28ea72995745b9794671fdb522f7315dabc Mon Sep 17 00:00:00 2001
From: Adam Saghy <adamsaghy@gmail.com>
Date: Wed, 12 Feb 2025 15:36:51 +0100
Subject: [PATCH] interestChargedFromDisbursementDate flag only for cumulative
 loans

---
 .../loans-account-terms-step.component.html           | 11 +++++------
 .../loans-account-terms-step.component.ts             |  8 +++++++-
 .../account-details/account-details.component.html    |  4 +---
 .../loan-product-summary.component.html               |  6 ++----
 .../loan-product-terms-step.component.html            |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

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 @@
       <p>{{ 'labels.inputs.Calculate interest for exact days in partial period' | translate }}</p>
     </mat-checkbox>
 
-    <mat-checkbox
-      fxFlex="48%"
-      formControlName="interestRecognitionOnDisbursementDate"
-    >
-      <p>{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}</p>
-    </mat-checkbox>
+    <ng-container *ngIf="isProgressive">
+      <mat-checkbox formControlName="interestRecognitionOnDisbursementDate" fxFlex="48%">
+        <p>{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}</p>
+      </mat-checkbox>
+    </ng-container>
 
     <mat-form-field fxFlex="48%">
       <mat-label>{{ 'labels.inputs.Arrears tolerance' | translate }} </mat-label>
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 @@
     </div>
 
     <div fxFlexFill>
-      <span fxFlex="50%"
-        >{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:</span
-      >
+      <span fxFlex="50%">{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:</span>
       <span fxFlex="50%">{{ loanDetails.interestRecognitionOnDisbursementDate | yesNo }}</span>
     </div>
 
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 @@
   </div>
 
   <div fxFlexFill>
-    <span fxFlex="47%"
-      >{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:</span
-    >
+    <span fxFlex="47%">{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:</span>
     <span fxFlex="53%">{{ loanProduct.interestRecognitionOnDisbursementDate | yesNo }}</span>
   </div>
-  
+
   <h3 class="mat-h3" fxFlexFill>{{ 'labels.inputs.Loan Schedule' | translate }}</h3>
 
   <mat-divider [inset]="true"></mat-divider>
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 }}
     </mat-checkbox>
-    
+
     <mat-checkbox
       fxFlex="32%"
       labelPosition="before"