From 9a1bfa32394ca662c7cbd07aca3e2d373ff4797e Mon Sep 17 00:00:00 2001
From: Jayesh Savaliya <123955234+jayesh9747@users.noreply.github.com>
Date: Fri, 28 Mar 2025 13:22:49 +0530
Subject: [PATCH] resolved bug in Creating Tax Components (#2367)

---
 .../create-tax-component.component.html              |  2 +-
 .../create-tax-component.component.ts                | 10 +++++-----
 .../edit-tax-component.component.html                |  4 ++--
 .../edit-tax-component.component.ts                  | 12 ++++++++----
 .../manage-tax-components.component.html             |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.html b/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.html
index 6a576177b..9c17cf2e8 100644
--- a/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.html
+++ b/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.html
@@ -44,7 +44,7 @@
             [inputFormControl]="taxComponentForm.controls.debitAcountId"
             [glAccountList]="debitAccountData"
             [required]="false"
-            [inputLabel]="'Credit Account'"
+            [inputLabel]="'Debit Account'"
           >
           </mifosx-gl-account-selector>
 
diff --git a/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.ts b/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.ts
index 5dbced148..5839a85df 100644
--- a/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.ts
+++ b/src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.ts
@@ -113,15 +113,15 @@ export class CreateTaxComponentComponent implements OnInit {
   getAccountsData(accountTypeId: number) {
     switch (accountTypeId) {
       case 1:
-        return this.taxComponentTemplateData.glAccountOptions.assetAccountOptions;
+        return this.taxComponentTemplateData.glAccountOptions.assetAccountOptions || [];
       case 2:
-        return this.taxComponentTemplateData.glAccountOptions.liabilityAccountOptions;
+        return this.taxComponentTemplateData.glAccountOptions.liabilityAccountOptions || [];
       case 3:
-        return this.taxComponentTemplateData.glAccountOptions.equityAccountOptions;
+        return this.taxComponentTemplateData.glAccountOptions.equityAccountOptions || [];
       case 4:
-        return this.taxComponentTemplateData.glAccountOptions.incomeAccountOptions;
+        return this.taxComponentTemplateData.glAccountOptions.incomeAccountOptions || [];
       case 5:
-        return this.taxComponentTemplateData.glAccountOptions.expenseAccountOptions;
+        return this.taxComponentTemplateData.glAccountOptions.expenseAccountOptions || [];
     }
   }
 
diff --git a/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.html b/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.html
index 0bf70751e..9b021b55d 100644
--- a/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.html
+++ b/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.html
@@ -21,12 +21,12 @@
             </mat-error>
           </mat-form-field>
 
-          <mat-form-field *ngIf="taxComponentData.creditAccountType.value">
+          <mat-form-field *ngIf="taxComponentData?.creditAccountType?.value">
             <mat-label>{{ 'labels.inputs.Credit Account Type' | translate }}</mat-label>
             <input matInput formControlName="creditAccountType" />
           </mat-form-field>
 
-          <mat-form-field *ngIf="taxComponentData.creditAccount.name">
+          <mat-form-field *ngIf="taxComponentData?.creditAccount?.name">
             <mat-label>{{ 'labels.inputs.Credit Account' | translate }}</mat-label>
             <input matInput formControlName="creditAccount" />
           </mat-form-field>
diff --git a/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.ts b/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.ts
index 05fd73d5c..245f2b1d7 100644
--- a/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.ts
+++ b/src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.ts
@@ -63,6 +63,12 @@ export class EditTaxComponentComponent implements OnInit {
    * Edit tax component form.
    */
   editTaxComponent() {
+    const creditAccountTypeValue = this.taxComponentData?.creditAccountType?.value
+      ? this.translateService.instant(`labels.inputs.accounting.${this.taxComponentData.creditAccountType.value}`)
+      : null;
+
+    const creditAccountName = this.taxComponentData?.creditAccount?.name ?? null;
+
     this.taxComponentForm = this.formBuilder.group({
       name: [
         this.taxComponentData.name,
@@ -78,13 +84,11 @@ export class EditTaxComponentComponent implements OnInit {
       startDate: [this.taxComponentData.startDate && new Date(this.taxComponentData.startDate)],
       creditAccountType: [
         {
-          value: this.translateService.instant(
-            'labels.inputs.accounting.' + this.taxComponentData.creditAccountType.value
-          ),
+          value: creditAccountTypeValue,
           disabled: true
         }
       ],
-      creditAccount: [{ value: this.taxComponentData.creditAccount.name, disabled: true }]
+      creditAccount: [{ value: creditAccountName, disabled: true }]
     });
   }
 
diff --git a/src/app/products/manage-tax-components/manage-tax-components.component.html b/src/app/products/manage-tax-components/manage-tax-components.component.html
index df9e008b6..8c7e5d2ba 100644
--- a/src/app/products/manage-tax-components/manage-tax-components.component.html
+++ b/src/app/products/manage-tax-components/manage-tax-components.component.html
@@ -33,7 +33,7 @@
       <ng-container matColumnDef="glAccount">
         <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Account' | translate }}</th>
         <td mat-cell *matCellDef="let taxComponent">
-          ({{ taxComponent.creditAccount.glCode }}) {{ taxComponent.creditAccount.name }}
+          ({{ taxComponent.creditAccount?.glCode || '' }}) {{ taxComponent.creditAccount?.name || '' }}
         </td>
       </ng-container>