From 0f75e8e6c995fd2bd121f72d811618f9f6bd23e6 Mon Sep 17 00:00:00 2001
From: Jose Alberto Hernandez <alberto@black-box.local>
Date: Mon, 3 Feb 2025 20:12:21 -0500
Subject: [PATCH] Introduce interestChargedFromDisbursementDate to control when
 interest charging should start

---
 .../loans-account-terms-step.component.html              | 7 +++++++
 .../loans-account-terms-step.component.ts                | 9 ++++++---
 .../account-details/account-details.component.html       | 7 +++++++
 .../loan-product-summary.component.html                  | 9 ++++++++-
 .../loan-product-terms-step.component.html               | 6 +++++-
 .../loan-product-terms-step.component.ts                 | 6 ++++--
 src/assets/translations/cs-CS.json                       | 1 +
 src/assets/translations/de-DE.json                       | 1 +
 src/assets/translations/en-US.json                       | 1 +
 src/assets/translations/es-MX.json                       | 1 +
 src/assets/translations/fr-FR.json                       | 1 +
 src/assets/translations/it-IT.json                       | 1 +
 src/assets/translations/ko-KO.json                       | 1 +
 src/assets/translations/lt-LT.json                       | 1 +
 src/assets/translations/lv-LV.json                       | 1 +
 src/assets/translations/ne-NE.json                       | 1 +
 src/assets/translations/pt-PT.json                       | 1 +
 src/assets/translations/sw-SW.json                       | 1 +
 18 files changed, 49 insertions(+), 7 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 0bd34d388e..6fec03f5d1 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,6 +326,13 @@ <h4 fxFlex="98%" class="mat-h4">{{ 'labels.heading.Interest Calculations' | tran
       <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>
+
     <mat-form-field fxFlex="48%">
       <mat-label>{{ 'labels.inputs.Arrears tolerance' | translate }} </mat-label>
       <input
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 c73b2d64cd..9ccbb35cf3 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
@@ -158,7 +158,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         interestRateDifferential: this.loansAccountTermsData.interestRateDifferential,
         multiDisburseLoan: this.loansAccountTermsData.multiDisburseLoan,
         interestRateFrequencyType: this.loansAccountTermsData.interestRateFrequencyType.id,
-        balloonRepaymentAmount: this.loansAccountTermsData.balloonRepaymentAmount
+        balloonRepaymentAmount: this.loansAccountTermsData.balloonRepaymentAmount,
+        interestRecognitionOnDisbursementDate: this.loansAccountTermsData.interestRecognitionOnDisbursementDate || false
       });
 
       this.setAdvancedPaymentStrategyControls();
@@ -263,7 +264,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         interestRateDifferential: this.loansAccountTermsData.interestRateDifferential,
         multiDisburseLoan: this.loansAccountTermsData.multiDisburseLoan,
         interestRateFrequencyType: this.loansAccountTermsData.interestRateFrequencyType.id,
-        balloonRepaymentAmount: this.loansAccountTermsData.balloonRepaymentAmount
+        balloonRepaymentAmount: this.loansAccountTermsData.balloonRepaymentAmount,
+        interestRecognitionOnDisbursementDate: this.loansAccountTermsData.interestRecognitionOnDisbursementDate || false
       });
     }
     this.createloansAccountTermsForm();
@@ -413,7 +415,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       ],
       multiDisburseLoan: [false],
       interestRateFrequencyType: [''],
-      balloonRepaymentAmount: ['']
+      balloonRepaymentAmount: [''],
+      interestRecognitionOnDisbursementDate: [false]
     });
   }
 
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 d3d95a5b5b..f9705e86f6 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
@@ -122,6 +122,13 @@ <h3>{{ 'labels.heading.Loan Details' | translate }}</h3>
       <span fxFlex="50%"> {{ loanDetails.allowPartialPeriodInterestCalcualtion | yesNo }} </span>
     </div>
 
+    <div fxFlexFill>
+      <span fxFlex="50%"
+        >{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}:</span
+      >
+      <span fxFlex="50%">{{ loanDetails.interestRecognitionOnDisbursementDate | yesNo }}</span>
+    </div>
+
     <div fxFlexFill>
       <span fxFlex="50%"> {{ 'labels.inputs.Submitted on' | translate }}</span>
       <span fxFlex="50%"> {{ loanDetails.timeline.submittedOnDate | dateFormat }} </span>
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 bca902b21b..a75bc31a0d 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
@@ -355,13 +355,20 @@ <h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Settings' | translate }}</h3>
     <span fxFlex="53%">{{ loanProduct.interestCalculationPeriodType?.value | translateKey: 'catalogs' }}</span>
   </div>
 
-  <div fxFlexFill *ngIf="loanProduct.allowPartialPeriodInterestCalculation">
+  <div fxFlexFill>
     <span fxFlex="47%"
       >{{ 'labels.inputs.Allow Partial Interest Calculation with same as repayment' | translate }}:</span
     >
     <span fxFlex="53%">{{ loanProduct.allowPartialPeriodInterestCalculation | yesNo }}</span>
   </div>
 
+  <div fxFlexFill>
+    <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 8ad1a87c53..b696fb5ccc 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
@@ -119,6 +119,10 @@ <h4 fxFlex="98%" class="mat-h4">
 
     <mat-divider fxFlex="98%"></mat-divider>
 
+    <mat-checkbox fxFlex="96%" labelPosition="before" formControlName="interestRecognitionOnDisbursementDate">
+      {{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}
+    </mat-checkbox>
+
     <h3 fxFlex="23%" class="mat-h3">{{ 'labels.inputs.Interest Rates' | translate }}</h3>
 
     <mat-checkbox
@@ -129,7 +133,7 @@ <h3 fxFlex="23%" class="mat-h3">{{ 'labels.inputs.Interest Rates' | translate }}
     >
       {{ 'labels.inputs.Is Zero Interest Rate?' | translate }}
     </mat-checkbox>
-
+    
     <mat-checkbox
       fxFlex="32%"
       labelPosition="before"
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts
index 64e4b32de8..c891e430b5 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts
@@ -86,7 +86,8 @@ export class LoanProductTermsStepComponent implements OnInit, OnChanges {
       repaymentFrequencyType: this.loanProductsTemplate.repaymentFrequencyType.id,
       minimumDaysBetweenDisbursalAndFirstRepayment:
         this.loanProductsTemplate.minimumDaysBetweenDisbursalAndFirstRepayment,
-      repaymentStartDateType: this.loanProductsTemplate.repaymentStartDateType.id || 1
+      repaymentStartDateType: this.loanProductsTemplate.repaymentStartDateType.id || 1,
+      interestRecognitionOnDisbursementDate: this.loanProductsTemplate.interestRecognitionOnDisbursementDate || false
     });
 
     if (this.loanProductsTemplate.allowApprovedDisbursedAmountsOverApplied) {
@@ -173,7 +174,8 @@ export class LoanProductTermsStepComponent implements OnInit, OnChanges {
       ],
       minimumDaysBetweenDisbursalAndFirstRepayment: [''],
       repaymentStartDateType: [1],
-      fixedLength: [null]
+      fixedLength: [null],
+      interestRecognitionOnDisbursementDate: [false]
     });
   }
 
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index 1482d3c294..7f89052ca3 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "Je pohyblivá sazba",
       "Is Floating calculation allowed?": "Je povolen plovoucí výpočet?",
       "Is Interest Posting required on closure date": "Je požadováno zveřejnění zájmu v den uzávěrky",
+      "Is interest recognition on disbursement date?": "Je úrok uznán k datu výplaty?",
       "Is Linked to floating interest rates?": "Je spojeno s pohyblivými úrokovými sazbami?",
       "Is Loan Officer": "Je úvěrový úředník",
       "Is Mandatory Deposit": "Je povinná záloha",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index 4ae9a70a74..7b9741838a 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "Ist ein variabler Zinssatz",
       "Is Floating calculation allowed?": "Ist eine gleitende Berechnung zulässig?",
       "Is Interest Posting required on closure date": "Ist eine Zinsbuchung am Abschlussdatum erforderlich?",
+      "Is interest recognition on disbursement date?": "Erfolgt die Anerkennung der Zinsen am Auszahlungstag?",
       "Is Linked to floating interest rates?": "Ist es mit variablen Zinssätzen verbunden?",
       "Is Loan Officer": "Ist Kreditsachbearbeiter",
       "Is Mandatory Deposit": "Ist eine obligatorische Anzahlung",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index b4960d0d2a..9fa0154a08 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -1762,6 +1762,7 @@
       "Is Floating Rate": "Is Floating Rate",
       "Is Floating calculation allowed?": "Is Floating calculation allowed?",
       "Is Interest Posting required on closure date": "Is Interest Posting required on closure date",
+      "Is interest recognition on disbursement date?": "Is interest recognition on disbursement date?",
       "Is Linked to floating interest rates?": "Is Linked to floating interest rates?",
       "Is Loan Officer": "Is Loan Officer",
       "Is Mandatory Deposit": "Is Mandatory Deposit",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index 44776054d0..ebd62b20d6 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -1760,6 +1760,7 @@
       "Is Floating Rate": "¿Es tasa variable",
       "Is Floating calculation allowed?": "¿Se permite el cálculo flotante?",
       "Is Interest Posting required on closure date": "¿Se requiere la publicación de intereses en la fecha de cierre?",
+      "Is interest recognition on disbursement date?": "¿El reconocimiento de intereses se realiza en la fecha de desembolso?",
       "Is Linked to floating interest rates?": "¿Está vinculado a tasas de interés flotantes?",
       "Is Loan Officer": "Es oficial de Créditos",
       "Is Mandatory Deposit": "Es depósito obligatorio",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index cb7983fa1e..2b3de65808 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "Le taux est flottant",
       "Is Floating calculation allowed?": "Le calcul flottant est-il autorisé ?",
       "Is Interest Posting required on closure date": "La publication des intérêts est-elle requise à la date de clôture",
+      "Is interest recognition on disbursement date?": "Les intérêts sont-ils reconnus à la date de décaissement ?",
       "Is Linked to floating interest rates?": "Est-ce lié à des taux d’intérêt flottants ?",
       "Is Loan Officer": "est agent de crédit",
       "Is Mandatory Deposit": "Le dépôt est-il obligatoire",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index c518b26aa3..63754656ae 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -1760,6 +1760,7 @@
       "Is Floating Rate": "È il tasso variabile",
       "Is Floating calculation allowed?": "È consentito il calcolo flottante?",
       "Is Interest Posting required on closure date": "È richiesta la registrazione degli interessi alla data di chiusura",
+      "Is interest recognition on disbursement date?": "Il riconoscimento degli interessi avviene alla data di erogazione?",
       "Is Linked to floating interest rates?": "È legato a tassi di interesse variabili?",
       "Is Loan Officer": "È l'ufficiale di prestito",
       "Is Mandatory Deposit": "È un deposito obbligatorio",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 46cc92206a..e82e557cbd 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -1762,6 +1762,7 @@
       "Is Floating Rate": "변동금리인가",
       "Is Floating calculation allowed?": "부동 계산이 허용됩니까?",
       "Is Interest Posting required on closure date": "마감일에 관심 게시가 필요합니까?",
+      "Is interest recognition on disbursement date?": "지급일에 이자가 인식되나요?",
       "Is Linked to floating interest rates?": "변동금리와 연동되나요?",
       "Is Loan Officer": "대출담당자인가",
       "Is Mandatory Deposit": "필수 예금인가요?",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index 632805fdbf..5fb640caf0 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "Ar kintama norma",
       "Is Floating calculation allowed?": "Ar leidžiamas plaukiojantis skaičiavimas?",
       "Is Interest Posting required on closure date": "Ar uždarymo dieną būtina paskelbti palūkanas",
+      "Is interest recognition on disbursement date?": "Ar palūkanų pripažinimas išmokėjimo dieną?",
       "Is Linked to floating interest rates?": "Ar susieta su kintamomis palūkanų normomis?",
       "Is Loan Officer": "Yra paskolos pareigūnas",
       "Is Mandatory Deposit": "Yra privalomas depozitas",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 10aa43fd6f..96d8caaf5d 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "Ir mainīgā likme",
       "Is Floating calculation allowed?": "Vai ir atļauts peldošs aprēķins?",
       "Is Interest Posting required on closure date": "Vai slēgšanas datumā ir nepieciešams publicēt procentus",
+      "Is interest recognition on disbursement date?": "Vai procentu atzīšana izmaksas datumā?",
       "Is Linked to floating interest rates?": "Vai ir saistīts ar mainīgajām procentu likmēm?",
       "Is Loan Officer": "Ir aizdevuma amatpersona",
       "Is Mandatory Deposit": "Ir obligāts depozīts",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index 203ad50a5c..85843f9a39 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "फ्लोटिंग रेट हो",
       "Is Floating calculation allowed?": "फ्लोटिंग गणना गर्न अनुमति छ?",
       "Is Interest Posting required on closure date": "समापन मितिमा रुचि पोस्टिंग आवश्यक छ",
+      "Is interest recognition on disbursement date?": "के वितरण मितिमा ब्याज मान्यता छ?",
       "Is Linked to floating interest rates?": "फ्लोटिंग ब्याज दर संग जोडिएको छ?",
       "Is Loan Officer": "ऋण अधिकारी हुनुहुन्छ",
       "Is Mandatory Deposit": "अनिवार्य निक्षेप छ",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index ecd7d19dbd..c234857c9f 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "É taxa flutuante",
       "Is Floating calculation allowed?": "O cálculo flutuante é permitido?",
       "Is Interest Posting required on closure date": "O lançamento de juros é obrigatório na data de fechamento",
+      "Is interest recognition on disbursement date?": "O reconhecimento dos juros ocorre na data do desembolso?",
       "Is Linked to floating interest rates?": "Está vinculado a taxas de juros flutuantes?",
       "Is Loan Officer": "É oficial de empréstimo",
       "Is Mandatory Deposit": "É Depósito Obrigatório",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index 7df57038a5..410d55679a 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -1761,6 +1761,7 @@
       "Is Floating Rate": "Ni Kiwango cha Kuelea",
       "Is Floating calculation allowed?": "Je, hesabu ya kuelea inaruhusiwa?",
       "Is Interest Posting required on closure date": "Je! Uchapishaji wa Maslahi unahitajika katika tarehe ya kufungwa",
+      "Is interest recognition on disbursement date?": "Je, ni utambuzi wa riba katika tarehe ya malipo?",
       "Is Linked to floating interest rates?": "Je, Inahusishwa na viwango vya riba vinavyoelea?",
       "Is Loan Officer": "Ni Afisa Mikopo",
       "Is Mandatory Deposit": "Ni Amana ya Lazima",