From 452a1adc176d92e556a082c0272a3291677db070 Mon Sep 17 00:00:00 2001 From: Pushpendra Kumar Date: Thu, 30 Mar 2023 15:38:28 +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 and when empty tax-group charge is filled with some tax-group ,it is sending back the request to backend Fixes: #1722 --- .../products/charges/edit-charge/edit-charge.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 8ba42f7f8..426c615f8 100644 --- a/src/app/products/charges/edit-charge/edit-charge.component.ts +++ b/src/app/products/charges/edit-charge/edit-charge.component.ts @@ -123,9 +123,9 @@ export class EditChargeComponent implements OnInit { } } if (this.chargeData.taxGroup) { - this.chargeForm.addControl('taxGroupId', this.formBuilder.control({ value: this.chargeData.taxGroup.id }, Validators.required)); + this.chargeForm.addControl('taxGroupId', this.formBuilder.control({ value: this.chargeData.taxGroup.id, disabled: true })); } else { - delete this.chargeData.taxGroupId; + this.chargeForm.addControl('taxGroupId', this.formBuilder.control({ value: '' })); } } @@ -150,6 +150,9 @@ export class EditChargeComponent implements OnInit { const charges = this.chargeForm.getRawValue(); charges.locale = this.settingsService.language.code; charges.chargePaymentMode = this.chargeData.chargePaymentMode.id; + if(charges.taxGroupId.value===''){ + delete charges.taxGroupId; + } this.productsService.updateCharge(this.chargeData.id.toString(), charges) .subscribe((response: any) => { this.router.navigate(['../'], { relativeTo: this.route });