From f6f72c25e2431a7c38422cebd064ce3afc097591 Mon Sep 17 00:00:00 2001
From: Pushpendra Kumar <b20122@students.iitmandi.ac.in>
Date: Wed, 29 Mar 2023 17:12:31 +0530
Subject: [PATCH] fix: edit charge - tax group is mandatory by backend, but
 cannot be set on UI

now no empty tax-group request is sent to backend from edit charge

Fixes: #1722
---
 .../charges/edit-charge/edit-charge.component.html        | 8 ++++----
 .../products/charges/edit-charge/edit-charge.component.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/products/charges/edit-charge/edit-charge.component.html b/src/app/products/charges/edit-charge/edit-charge.component.html
index 6cb31a7cd..784024800 100644
--- a/src/app/products/charges/edit-charge/edit-charge.component.html
+++ b/src/app/products/charges/edit-charge/edit-charge.component.html
@@ -101,15 +101,15 @@
 
           <mat-form-field fxFlex="48%">
             <mat-label>Tax Group</mat-label>
-            <mat-select *ngIf="chargeData.taxGroup" required formControlName="taxGroupId">
+            <mat-select *ngIf="chargeData.taxGroup" formControlName="taxGroupId">
               <mat-option *ngFor="let taxGroup of chargeData.taxGroupOptions" [value]="taxGroup.id">
                 {{ taxGroup.name }}
               </mat-option>
             </mat-select>
 
-            <mat-select *ngIf="!chargeData.taxGroup" required formControlName="taxGroupId">
-              <mat-option value="?">
-                Select Option
+            <mat-select *ngIf="!chargeData.taxGroup" formControlName="taxGroupId">
+              <mat-option *ngFor="let taxGroup of chargeData.taxGroupOptions" [value]="taxGroup.id">
+                {{ taxGroup.name }}
               </mat-option>
             </mat-select>
           </mat-form-field>
diff --git a/src/app/products/charges/edit-charge/edit-charge.component.ts b/src/app/products/charges/edit-charge/edit-charge.component.ts
index 8cf5340d1..8ba42f7f8 100644
--- a/src/app/products/charges/edit-charge/edit-charge.component.ts
+++ b/src/app/products/charges/edit-charge/edit-charge.component.ts
@@ -125,7 +125,7 @@ export class EditChargeComponent implements OnInit {
     if (this.chargeData.taxGroup) {
       this.chargeForm.addControl('taxGroupId', this.formBuilder.control({ value: this.chargeData.taxGroup.id }, Validators.required));
     } else {
-      this.chargeForm.addControl('taxGroupId', this.formBuilder.control({ value: '' }));
+      delete this.chargeData.taxGroupId;
     }
   }