CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: edit charge - tax group is mandatory by backend, but cannot be set on UI

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

Fixes: #1722
This commit is contained in:
Pushpendra Kumar
2023-03-29 14:05:53 +02:00
committed by Adam Saghy
parent 6af25660d9
commit f6f72c25e2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/products/charges/edit-charge/edit-charge.component.html
+4 -4
View File
@@ -101,15 +101,15 @@
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Tax Group</mat-label> <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"> <mat-option *ngFor="let taxGroup of chargeData.taxGroupOptions" [value]="taxGroup.id">
{{ taxGroup.name }} {{ taxGroup.name }}
</mat-option> </mat-option>
</mat-select> </mat-select>
<mat-select *ngIf="!chargeData.taxGroup" required formControlName="taxGroupId"> <mat-select *ngIf="!chargeData.taxGroup" formControlName="taxGroupId">
<mat-option value="?"> <mat-option *ngFor="let taxGroup of chargeData.taxGroupOptions" [value]="taxGroup.id">
Select Option {{ taxGroup.name }}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
src/app/products/charges/edit-charge/edit-charge.component.ts
+1 -1
View File
@@ -125,7 +125,7 @@ export class EditChargeComponent implements OnInit {
if (this.chargeData.taxGroup) { 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 }, Validators.required));
} else { } else {
this.chargeForm.addControl('taxGroupId', this.formBuilder.control({ value: '' })); delete this.chargeData.taxGroupId;
} }
} }