update RD prodcut code

src/app/deposits/recurring-deposits/create-recurring-deposits-account/create-recurring-deposits-account.component.html

@@ -70,6 +70,7 @@
       <mifosx-recurring-deposits-account-interest-rate-chart-step
         [recurringDepositsAccountTemplate]="recurringDepositsAccountTemplate"
         [recurringDepositsAccountProductTemplate]="recurringDepositsAccountProductTemplate"
+        [rdInterestRates]="rdInterestRates"
       >
       </mifosx-recurring-deposits-account-interest-rate-chart-step>
     </mat-step>

src/app/deposits/recurring-deposits/create-recurring-deposits-account/create-recurring-deposits-account.component.ts

@@ -13,6 +13,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 /** Custom Services */
 import { RecurringDepositsService } from '../recurring-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
+import { ProductsService } from 'app/products/products.service';
 
 /** Step Components */
 import { RecurringDepositsAccountDetailsStepComponent } from '../recurring-deposits-account-stepper/recurring-deposits-account-details-step/recurring-deposits-account-details-step.component';
@@ -54,6 +55,7 @@ export class CreateRecurringDepositsAccountComponent {
   private dateUtils = inject(Dates);
   private recurringDepositsService = inject(RecurringDepositsService);
   private settingsService = inject(SettingsService);
+  private productsService = inject(ProductsService);
 
   /** Imports all the step component */
   @ViewChild(RecurringDepositsAccountDetailsStepComponent, { static: true })
@@ -69,6 +71,8 @@ export class CreateRecurringDepositsAccountComponent {
   recurringDepositsAccountTemplate: any;
   /** Recurring Deposit Account Product Template */
   recurringDepositsAccountProductTemplate: any;
+  /** Active CBS base interest rate chart */
+  rdInterestRates: any[] = [];
 
   constructor() {
     this.route.data.subscribe((data: { recurringDepositsAccountTemplate: any }) => {
@@ -78,10 +82,19 @@ export class CreateRecurringDepositsAccountComponent {
 
   /**
    * Sets recurring deposits account product template.
-   * @param {any} $event API response
+   * Also fetches the active CBS base interest rate chart.
+   * @param {any} $event API response (includes productId)
    */
   setTemplate($event: any) {
     this.recurringDepositsAccountProductTemplate = $event;
+    this.productsService.getRdBaseInterestRates().subscribe({
+      next: (rates: any[]) => {
+        this.rdInterestRates = rates || [];
+      },
+      error: () => {
+        this.rdInterestRates = [];
+      }
+    });
   }
 
   /** Get Recurring Deposit Account Details Form Data */

src/app/deposits/recurring-deposits/edit-recurring-deposit-account/edit-recurring-deposit-account.component.html

@@ -71,6 +71,7 @@
       <mifosx-recurring-deposits-account-interest-rate-chart-step
         [recurringDepositsAccountTemplate]="recurringDepositsAccountAndTemplate"
         [recurringDepositsAccountProductTemplate]="recurringDepositsAccountProductTemplate"
+        [rdInterestRates]="rdInterestRates"
       >
       </mifosx-recurring-deposits-account-interest-rate-chart-step>
     </mat-step>

src/app/deposits/recurring-deposits/edit-recurring-deposit-account/edit-recurring-deposit-account.component.ts

@@ -13,6 +13,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 /** Custom Services */
 import { RecurringDepositsService } from '../recurring-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
+import { ProductsService } from 'app/products/products.service';
 
 /** Step Components */
 import { RecurringDepositsAccountDetailsStepComponent } from '../recurring-deposits-account-stepper/recurring-deposits-account-details-step/recurring-deposits-account-details-step.component';
@@ -54,6 +55,7 @@ export class EditRecurringDepositAccountComponent {
   private dateUtils = inject(Dates);
   private recurringDepositsService = inject(RecurringDepositsService);
   private settingsService = inject(SettingsService);
+  private productsService = inject(ProductsService);
 
   /** Imports all the step component */
   @ViewChild(RecurringDepositsAccountDetailsStepComponent, { static: true })
@@ -69,6 +71,8 @@ export class EditRecurringDepositAccountComponent {
   recurringDepositsAccountAndTemplate: any;
   /** Recurring Deposit Account Product Template */
   recurringDepositsAccountProductTemplate: any;
+  /** Active CBS base interest rate chart */
+  rdInterestRates: any[] = [];
 
   constructor() {
     this.route.data.subscribe((data: { recurringDepositsAccountAndTemplate: any }) => {
@@ -82,6 +86,14 @@ export class EditRecurringDepositAccountComponent {
    */
   setTemplate($event: any) {
     this.recurringDepositsAccountProductTemplate = $event;
+    this.productsService.getRdBaseInterestRates().subscribe({
+      next: (rates: any[]) => {
+        this.rdInterestRates = rates || [];
+      },
+      error: () => {
+        this.rdInterestRates = [];
+      }
+    });
   }
 
   /** Get Recurring Deposit Account Details Form Data */

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-interest-rate-chart-step/recurring-deposits-account-interest-rate-chart-step.component.html

@@ -7,34 +7,84 @@
 -->
 
 <div class="layout-column gap-2px">
-  <div class="flex-fill" *ngIf="recurringDepositsAccountProductTemplate?.accountChart.name">
-    <span class="flex-40">{{ 'labels.inputs.name' | translate }}:</span>
-    <span class="flex-60">{{ recurringDepositsAccountProductTemplate.accountChart.name }}</span>
-  </div>
+  <!-- ── Custom RD Interest Rate Chart (from m_rd_interest_rate_slab_history) ── -->
+  @if (_activeRdVersion) {
+    <div class="rd-rate-header">
+      <strong>{{ _activeRdVersion.versionLabel }}</strong>
+      <span class="rd-rate-active-badge">Active</span>
+      <span class="rd-rate-from">Effective from: {{ _activeRdVersion.effectiveFromDate }}</span>
+    </div>
 
-  <div class="flex-fill">
-    <span class="flex-40">{{ 'labels.inputs.Valid from Date' | translate }}:</span>
-    <span class="flex-60">{{ recurringDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }}</span>
-  </div>
+    <table class="mat-elevation-z1 rd-rate-table" mat-table [dataSource]="_activeRdVersion.slabs">
+      <ng-container matColumnDef="srNo">
+        <th mat-header-cell *matHeaderCellDef>Sr.</th>
+        <td mat-cell *matCellDef="let slab">{{ slab.srNo }}</td>
+      </ng-container>
+      <ng-container matColumnDef="description">
+        <th mat-header-cell *matHeaderCellDef>Particular</th>
+        <td mat-cell *matCellDef="let slab">{{ slab.description }}</td>
+      </ng-container>
+      <ng-container matColumnDef="fromPeriod">
+        <th mat-header-cell *matHeaderCellDef>From</th>
+        <td mat-cell *matCellDef="let slab">{{ slab.fromPeriod }}</td>
+      </ng-container>
+      <ng-container matColumnDef="toPeriod">
+        <th mat-header-cell *matHeaderCellDef>To</th>
+        <td mat-cell *matCellDef="let slab">{{ slab.toPeriod ?? '—' }}</td>
+      </ng-container>
+      <ng-container matColumnDef="periodTypeLabel">
+        <th mat-header-cell *matHeaderCellDef>Period Type</th>
+        <td mat-cell *matCellDef="let slab">{{ slab.periodTypeLabel }}</td>
+      </ng-container>
+      <ng-container matColumnDef="annualInterestRate">
+        <th mat-header-cell *matHeaderCellDef>Annual Rate (%)</th>
+        <td mat-cell *matCellDef="let slab">
+          <strong>{{ slab.annualInterestRate | number: '1.2-2' }}</strong>
+        </td>
+      </ng-container>
+      <tr mat-header-row *matHeaderRowDef="rdSlabColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: rdSlabColumns"></tr>
+    </table>
+  }
 
-  <div class="flex-fill" *ngIf="recurringDepositsAccountProductTemplate?.accountChart.endDate">
-    <span class="flex-40">{{ 'labels.inputs.End Date' | translate }}:</span>
-    <span class="flex-60">{{ recurringDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }}</span>
-  </div>
+  <!-- ── Legacy chart (shown only when no custom rate chart available) ── -->
+  @if (!_activeRdVersion) {
+    <div class="flex-fill" *ngIf="recurringDepositsAccountProductTemplate?.accountChart.name">
+      <span class="flex-40">{{ 'labels.inputs.name' | translate }}:</span>
+      <span class="flex-60">{{ recurringDepositsAccountProductTemplate.accountChart.name }}</span>
+    </div>
 
-  <div class="flex-fill" *ngIf="recurringDepositsAccountProductTemplate?.accountChart.description">
-    <span class="flex-40">{{ 'labels.inputs.Description' | translate }}:</span>
-    <span class="flex-60">{{ recurringDepositsAccountProductTemplate?.accountChart.description }}</span>
-  </div>
+    <div class="flex-fill">
+      <span class="flex-40">{{ 'labels.inputs.Valid from Date' | translate }}:</span>
+      <span class="flex-60">{{ recurringDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }}</span>
+    </div>
 
-  <div class="flex-fill">
-    <span class="flex-40">{{ 'labels.inputs.Primary Grouping by Amount' | translate }}:</span>
-    <span class="flex-60">{{
-      recurringDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount | yesNo
-    }}</span>
-  </div>
+    <div class="flex-fill" *ngIf="recurringDepositsAccountProductTemplate?.accountChart.endDate">
+      <span class="flex-40">{{ 'labels.inputs.End Date' | translate }}:</span>
+      <span class="flex-60">{{ recurringDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }}</span>
+    </div>
 
-  <table class="mat-elevation-z1" mat-table [dataSource]="interestRateChartData" #chartsTable multiTemplateDataRows>
+    <div class="flex-fill" *ngIf="recurringDepositsAccountProductTemplate?.accountChart.description">
+      <span class="flex-40">{{ 'labels.inputs.Description' | translate }}:</span>
+      <span class="flex-60">{{ recurringDepositsAccountProductTemplate?.accountChart.description }}</span>
+    </div>
+
+    <div class="flex-fill">
+      <span class="flex-40">{{ 'labels.inputs.Primary Grouping by Amount' | translate }}:</span>
+      <span class="flex-60">{{
+        recurringDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount | yesNo
+      }}</span>
+    </div>
+  }
+
+  <table
+    class="mat-elevation-z1"
+    [class.hidden]="_activeRdVersion"
+    mat-table
+    [dataSource]="interestRateChartData"
+    #chartsTable
+    multiTemplateDataRows
+  >
     <ng-container matColumnDef="period">
       <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Period' | translate }}</th>
       <td mat-cell *matCellDef="let chartSlab">

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-interest-rate-chart-step/recurring-deposits-account-interest-rate-chart-step.component.ts

@@ -21,7 +21,7 @@ import {
   MatRow
 } from '@angular/material/table';
 import { trigger, state, style, transition, animate } from '@angular/animations';
-import { NgIf, NgSwitch, TitleCasePipe } from '@angular/common';
+import { NgIf, NgSwitch, TitleCasePipe, DecimalPipe } from '@angular/common';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatStepperPrevious, MatStepperNext } from '@angular/material/stepper';
 import { DateFormatPipe } from '../../../../pipes/date-format.pipe';
@@ -69,7 +69,28 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
   @Input() recurringDepositsAccountTemplate: any;
   @Input() recurringDepositsAccountProductTemplate: any;
 
-  /** Interest Rate Chart Data */
+  /**
+   * CBS base rate chart loaded from the active base-interest-rate service.
+   * When set, this table is shown instead of the legacy accountChart.chartSlabs.
+   */
+  @Input() set rdInterestRates(rates: any[]) {
+    this._rdInterestRates = rates || [];
+    this._activeRdVersion = this._rdInterestRates.find((v: any) => v.isActive) ?? this._rdInterestRates[0] ?? null;
+  }
+
+  _rdInterestRates: any[] = [];
+  _activeRdVersion: any = null;
+
+  readonly rdSlabColumns = [
+    'srNo',
+    'description',
+    'fromPeriod',
+    'toPeriod',
+    'periodTypeLabel',
+    'annualInterestRate'
+  ];
+
+  /** Interest Rate Chart Data (legacy – used when no custom rate chart is available) */
   interestRateChartData: any = [];
   /** Columns to be displayed in interest rate chart table. */
   chartSlabsDisplayedColumns: any[] = [
@@ -88,7 +109,7 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
     'incentiveType',
     'amount'
   ];
-  /** Additional Column to disblac incentives table  */
+  /** Additional Column to display incentives table  */
   chartSlabsIncentivesDisplayedColumns: string[] = ['incentives'];
   /** Expand Chart Slab Index used in the view */
   expandChartSlabIndex: number;