From dd1245c9974a9907f81d8a3ef58a00b078ebe459 Mon Sep 17 00:00:00 2001
From: Jose Alberto Hernandez <alberto@black-box.local>
Date: Sun, 25 Feb 2024 23:31:42 -0600
Subject: [PATCH] Fix: Recurring Deposit product edition using IRC ids

---
 ...it-product-interest-rate-chart-step.component.ts | 13 ++++++++++++-
 .../recurring-deposit-general-tab.component.html    |  6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.ts b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.ts
index 53b6ea933..617b94589 100644
--- a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.ts
+++ b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.ts
@@ -111,6 +111,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
       this.chartsDetail[i].chartSlabs.forEach((chartSlabDetail: any, j: number) => {
 
         const chartSlabInfo = this.formBuilder.group({
+          id: [chartSlabDetail.id],
           amountRangeFrom: [chartSlabDetail.amountRangeFrom],
           amountRangeTo: [chartSlabDetail.amountRangeTo],
           annualInterestRate: [chartSlabDetail.annualInterestRate, Validators.required],
@@ -154,6 +155,9 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
         name: chartData.name,
         chartSlabs: this.getChartSlabsData(chartData)
       };
+      if (chartData.id) {
+        chart['id'] = chartData.id;
+      }
       this.chartsDetail.push(chart);
     });
     this.recurringDepositProductInterestRateChartForm.patchValue({
@@ -182,6 +186,9 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
         toPeriod: eachChartSlabData.toPeriod,
         incentives: this.getIncentivesData(chartSlabData)
       };
+      if (eachChartSlabData.id) {
+        chartSlab['id'] = eachChartSlabData.id;
+      }
       chartSlabs.push(chartSlab);
     });
     return chartSlabs;
@@ -224,6 +231,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
 
   createChartForm(): UntypedFormGroup {
     return this.formBuilder.group({
+      'id': [null],
       'name': [''],
       'description': [''],
       'fromDate': ['', Validators.required],
@@ -376,7 +384,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     for (const chart of recurringDepositProductInterestRateChart.charts) {
       chart.dateFormat = dateFormat;
       chart.locale = locale;
-      chart.fromDate = this.dateUtils.formatDate(chart.fromDate, dateFormat) || '';
+      chart.fromDate = this.dateUtils.formatDate(chart.fromDate, dateFormat);
       chart.endDate = this.dateUtils.formatDate(chart.endDate, dateFormat) || '';
       if (chart.endDate === '') {
         delete chart.endDate;
@@ -384,6 +392,9 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
       if (chart.description === '') {
         delete chart.description;
       }
+      if (chart.id === null) {
+        delete chart.id;
+      }
     }
     return recurringDepositProductInterestRateChart;
   }
diff --git a/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html b/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html
index b28031696..55e8993a3 100644
--- a/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html
+++ b/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html
@@ -380,8 +380,10 @@
           <div fxFlexFill fxLayout="row wrap" fxLayout.lt-md="column">
             <span fxFlex="40%">Interest on savings:</span>
             <span fxFlex="60%">{{ recurringDepositProduct.accountingMappings.interestOnSavingsAccount.name }}</span>
-            <span fxFlex="40%">Write-off:</span>
-            <span fxFlex="60%">{{ recurringDepositProduct.accountingMappings.writeOffAccount.name }}</span>
+            <span *ngIf="recurringDepositProduct.accountingMappings.writeOffAccount">
+              <span fxFlex="40%">Write-off:</span>
+              <span fxFlex="60%">{{ recurringDepositProduct.accountingMappings.writeOffAccount.name }}</span>  
+            </span>
           </div>
 
           <h4 fxFlexFill class="mat-h4">Income</h4>