debug
This commit is contained in:
@@ -33,11 +33,11 @@
|
||||
|
||||
<app-amount-percentage-input
|
||||
[percentageControl]="form.controls.discount_percentage"
|
||||
[amountControl]="form.controls.discount"
|
||||
[amountControl]="form.controls.discount_amount"
|
||||
[baseAmount]="baseAmountForDiscountCalculation()"
|
||||
[minAmount]="0"
|
||||
[maxAmount]="baseAmountForDiscountCalculation()"
|
||||
name="discount"
|
||||
name="discount_amount"
|
||||
label="تخفیف">
|
||||
<ng-template #labelSuffix>
|
||||
<p-selectButton
|
||||
@@ -55,7 +55,7 @@
|
||||
<pos-form-dialog-amount-card-template
|
||||
[totalAmount]="totalAmount()"
|
||||
[baseTotalAmount]="baseTotalAmount()"
|
||||
[discountAmount]="form.controls.discount.value || 0"
|
||||
[discountAmount]="form.controls.discount_amount.value || 0"
|
||||
[taxAmount]="taxAmount()" />
|
||||
<button pButton class="w-full sm:w-auto" (click)="submit()">{{ preparedCTAText() }}</button>
|
||||
</div>
|
||||
|
||||
@@ -88,7 +88,7 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
|
||||
[Validators.required, greaterThanValidator(0)],
|
||||
],
|
||||
quantity: [this.initialValues?.quantity || 0, [Validators.required, greaterThanValidator(0)]],
|
||||
discount: [this.initialValues?.discount_amount || 0],
|
||||
discount_amount: [this.initialValues?.discount_amount || 0],
|
||||
discount_percentage: [0, [Validators.max(100), Validators.min(0)]],
|
||||
payload: this.fb.group({
|
||||
commission: [this.initialValues?.payload?.commission || 0, [Validators.required]],
|
||||
@@ -107,13 +107,13 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
|
||||
|
||||
form.controls.payload.controls.profit.valueChanges.pipe(takeUntilDestroyed()).subscribe(() => {
|
||||
// if ((form.controls.discount_amount.value || 0) > (value || 0)) {
|
||||
form.controls.discount.setValue(0, { emitEvent: false });
|
||||
form.controls.discount_amount.setValue(0, { emitEvent: false });
|
||||
// }
|
||||
});
|
||||
form.controls.payload.controls.profit_percentage.valueChanges
|
||||
.pipe(takeUntilDestroyed())
|
||||
.subscribe(() => {
|
||||
form.controls.discount.setValue(0, { emitEvent: false });
|
||||
form.controls.discount_amount.setValue(0, { emitEvent: false });
|
||||
});
|
||||
|
||||
return form;
|
||||
@@ -127,7 +127,7 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
|
||||
total_amount: this.totalAmount(),
|
||||
base_total_amount: this.baseTotalAmount(),
|
||||
tax_amount: this.taxAmount(),
|
||||
discount_amount: this.form.value.discount || 0,
|
||||
discount_amount: this.form.value.discount_amount || 0,
|
||||
payload: {
|
||||
commission: this.form.controls.payload.controls.commission.value || 0,
|
||||
karat: this.form.controls.payload.controls.karat.value as TGoldKarat,
|
||||
|
||||
Reference in New Issue
Block a user