@if (contentRendered) {
{
- private readonly store = inject(PosLandingStore);
- private readonly posInfo = inject(PosInfoStore);
+export class PosPaymentFormDialogComponent extends AbstractFormDialog {
+ @Input() totalAmount = 0;
+ @Input() submitOrderLoading = false;
+ @Input() isGoldGuild = false;
+ @Input() isUnknownCustomer = false;
+ @Output() onSubmitPayment = new EventEmitter<{
+ payment: IPayment;
+ settlementType: 'CASH' | 'CREDIT' | 'MIXED';
+ }>();
+
private readonly paymentBridge = inject(PosPaymentBridgeAbstract);
private readonly nativeBridgeService = inject(NativeBridgeService);
private readonly toastServices = inject(ToastService);
@@ -67,18 +79,11 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog('CASH');
-
- readonly totalAmount = computed(() => this.store.orderPricingInfo().totalAmount);
-
- readonly remainedAmount = signal(this.totalAmount());
+ readonly remainedAmount = signal(0);
setOffMax = signal(this.remainedAmount());
cashMax = signal(this.remainedAmount());
terminalsMax = signal([this.remainedAmount()]);
- readonly submitOrderLoading = computed(() => this.store.submitOrderLoading());
- readonly isGoldGuild = computed(() => this.posInfo.entity()?.guild.code.toLowerCase() === 'gold');
- readonly isUnknownCustomer = computed(() => this.store.customer().type === 'UNKNOWN');
-
payByTerminalSteps = signal(
Array.from({ length: 10 }, (_, i) => ({
value: i + 1,
@@ -95,35 +100,51 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog {
if (payload.status === 'SUCCESS') {
- const paidStepId = Number(payload.id || 0);
- this.payByTerminalSteps.update((prev) =>
- prev.map((step, index) => {
- if (step.value === paidStepId) {
- return {
- ...step,
- payed: true,
- amount: this.terminalControls[step.value - 1]?.value || 0,
- info: {
- customer_card_no: payload.data?.customerCardNO || '',
- description: payload.message || '',
- rrn: payload.data?.rrn || '',
- stan: payload.data?.stan || '',
- terminal_id: payload.data?.terminalId || '',
- transaction_date_time: new Date(payload.data?.transactionDateTime || ''),
- },
- };
- }
- return step;
- })
- );
- const terminalControl = this.terminalControls[paidStepId - 1];
+ const paidStepId = this.resolvePaidStepId(payload);
+ const terminalId = payload.data?.terminalId || '';
+ const stan = payload.data?.stan || '';
+ const rrn = payload.data?.rrn || '';
+ const customerCardNo = payload.data?.customerCardNO || '';
+ const transactionDateTime = payload.data?.transactionDateTime;
+
+ const targetIndex = Math.max(0, paidStepId - 1);
+ const prevSteps = this.payByTerminalSteps();
+ const steps = [...prevSteps];
+ const currentStep = steps[targetIndex];
+ if (!currentStep) return;
+
+ steps[targetIndex] = {
+ ...currentStep,
+ payed: true,
+ amount: Number(this.terminalControls[targetIndex]?.value || currentStep.amount || 0),
+ info: {
+ customer_card_no: customerCardNo,
+ description: payload.message || '',
+ rrn,
+ stan,
+ terminal_id: terminalId,
+ transaction_date_time: transactionDateTime ? new Date(transactionDateTime) : new Date(),
+ },
+ };
+
+ this.payByTerminalSteps.set(steps);
+
+ const terminalControl = this.terminalControls[targetIndex];
if (terminalControl) {
terminalControl.disable({ onlySelf: true, emitEvent: false });
}
const amount = Number(
terminalControl?.value || this.extractAmountFromPaymentResult(payload) || 0
);
- this.toastServices.success({ text: `پرداخت با موفقیت انجام شد. مبلغ: ${amount}` });
+ let successMessage = '';
+ if (this.payByTerminalSteps()?.length > 1) {
+ successMessage = `پرداخت مرحله ${paidStepId} به مبلغ ${formatWithCurrency(amount)} با موفقیت انجام شد.`;
+ } else {
+ successMessage = `پرداخت به مبلغ ${formatWithCurrency(amount)} با موفقیت انجام شد.`;
+ }
+ this.toastServices.success({
+ text: successMessage,
+ });
} else {
this.toastServices.error({ text: payload.message || 'پرداخت با دستگاه انجام نشد.' });
}
@@ -147,7 +168,7 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog (acc || 0) + (curr || 0), 0) || 0;
const totalValue = (value.cash || 0) + (value.set_off || 0) + terminalTotal;
- const remainedAmount = this.totalAmount() - totalValue;
+ const remainedAmount = this.totalAmount - totalValue;
const setOffMax = remainedAmount + (value.set_off || 0);
const cashMax = remainedAmount + (value.cash || 0);
@@ -280,6 +301,26 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog amount));
+ }
+
+ override ngOnInit(): void {
+ super.ngOnInit();
+ this.resetLimits();
+ }
+
+ override ngOnChanges(changes: SimpleChanges): void {
+ super.ngOnChanges(changes);
+ if (changes['totalAmount']) {
+ this.resetLimits();
+ }
+ }
+
ngOnDestroy() {
this.restorePaymentCallback?.();
}
@@ -293,8 +334,6 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog {
- return throwError(() => err);
- })
- )
- .subscribe((res) => {
- this.close();
- this.onSubmit.emit(res);
- });
+ this.onSubmitPayment.emit({
+ payment,
+ settlementType: this.selectedSettlementType(),
+ });
}
}
private checkTerminalPayments(): boolean {
const pendingTerminalPayments = this.getPendingTerminalPayments();
if (pendingTerminalPayments.length) {
- if (this.nativeBridgeService.isEnabled()) {
- const nextPending = pendingTerminalPayments[0];
- this.payByTerminal(nextPending.stepId, nextPending.amount);
- this.toastServices.info({
- text: 'پس از تایید پرداخت هر مرحله، برای مرحله بعد دوباره روی ثبت پرداخت بزنید.',
- life: 3500,
- });
- } else {
- this.toastServices.error({
- text: 'امکان ارتباط با دستگاه پرداخت میسر نیست.',
- });
- return false;
- }
+ // if (this.nativeBridgeService.isEnabled()) {
+ const nextPending = pendingTerminalPayments[0];
+ this.payByTerminal(nextPending.stepId, nextPending.amount);
+ this.toastServices.info({
+ text: 'پس از تایید پرداخت هر مرحله، برای مرحله بعد دوباره روی ثبت پرداخت بزنید.',
+ life: 3500,
+ });
+ // } else {
+ // this.toastServices.error({
+ // text: 'امکان ارتباط با دستگاه پرداخت میسر نیست.',
+ // });
+ // return false;
+ // }
return false;
}
@@ -362,16 +390,22 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog amount > 0 && !this.isTerminalStepPaid(stepId));
}
- override onSuccess(response: IPosOrderResponse): void {}
-
private extractAmountFromPaymentResult(payload: unknown): number | null {
if (!payload || typeof payload !== 'object') return null;
const amount = (payload as { amount?: unknown }).amount;
@@ -405,4 +437,14 @@ export class PosPaymentFormDialogComponent extends AbstractFormDialog 0 && this.payByTerminalSteps().some((step) => step.value === rawId)) return rawId;
+
+ const pendingStep = this.terminalControls.findIndex(
+ (control, index) => Number(control.value || 0) > 0 && !this.isTerminalStepPaid(index + 1)
+ );
+ return pendingStep >= 0 ? pendingStep + 1 : 1;
+ }
}
diff --git a/src/app/shared/components/invoices/payment/index.ts b/src/app/shared/components/invoices/payment/index.ts
new file mode 100644
index 0000000..6092a37
--- /dev/null
+++ b/src/app/shared/components/invoices/payment/index.ts
@@ -0,0 +1 @@
+export * from './form-dialog.component';
diff --git a/src/app/shared/components/invoices/returnForm/form.component.html b/src/app/shared/components/invoices/returnForm/form.component.html
index 10a9409..c8a8b89 100644
--- a/src/app/shared/components/invoices/returnForm/form.component.html
+++ b/src/app/shared/components/invoices/returnForm/form.component.html
@@ -13,9 +13,14 @@
}
+ >(null);
+ totalPriceInfo = {
+ totalBaseAmount: 0,
+ discountAmount: 0,
+ taxAmount: 0,
+ totalAmount: 0,
+ };
init() {
this.initForm();
this.prepareCalculation();
+ this.recalculateTotalPriceInfo();
}
prepareCalculation() {
@@ -85,6 +109,38 @@ export class SharedReturnFormComponent extends AbstractForm<
})
);
});
+
+ this.items.valueChanges.subscribe(() => {
+ this.recalculateTotalPriceInfo();
+ });
+ }
+
+ private recalculateTotalPriceInfo() {
+ const initialMap = new Map((this.initialValues || []).map((item) => [String(item.id), item]));
+ const currentItems = this.items.getRawValue();
+
+ this.totalPriceInfo = currentItems.reduce(
+ (acc, current) => {
+ const source = initialMap.get(String(current.id || ''));
+ if (!source) return acc;
+
+ const maxQuantity = Number(current.maxQuantity || 0);
+ const quantity = Number(current.quantity || 0);
+ const ratio = maxQuantity > 0 ? quantity / maxQuantity : 0;
+
+ acc.totalBaseAmount += Number(source.unit_price || 0) * quantity;
+ acc.discountAmount += Number(source.discount_amount || 0) * ratio;
+ acc.taxAmount += Number(source.tax_amount || 0) * ratio;
+ acc.totalAmount += Number(source.total_amount || 0) * ratio;
+ return acc;
+ },
+ {
+ totalBaseAmount: 0,
+ discountAmount: 0,
+ taxAmount: 0,
+ totalAmount: 0,
+ }
+ );
}
override ngOnInit(): void {
@@ -98,15 +154,17 @@ export class SharedReturnFormComponent extends AbstractForm<
}
override submitForm() {
- const payload = this.items.getRawValue().map((item) => ({
+ const rawItems = this.items.getRawValue();
+ const payload = rawItems.map((item) => ({
id: item.id || '',
quantity: Number(item.quantity || 0),
maxQuantity: Number(item.maxQuantity || 0),
}));
- const hasChanges = payload.some(
- (item, index) => item.quantity !== Number(this.initialValues?.[index]?.quantity || 0)
+ const initialMap = new Map(
+ (this.initialValues || []).map((item) => [String(item.id), Number(item.quantity || 0)])
);
+ const hasChanges = payload.some((item) => item.quantity !== Number(initialMap.get(item.id) || 0));
if (!hasChanges) {
this.toastService.warn({
diff --git a/src/app/shared/components/invoices/returnForm/item-form.component.html b/src/app/shared/components/invoices/returnForm/item-form.component.html
index add84dd..4f4de26 100644
--- a/src/app/shared/components/invoices/returnForm/item-form.component.html
+++ b/src/app/shared/components/invoices/returnForm/item-form.component.html
@@ -1,13 +1,34 @@
-
-
+ ((resolve) => {
@@ -306,17 +304,10 @@ export class SharedSaleInvoiceSingleViewComponent {
return (await this.beforeCorrectionSubmit?.(mapped)) ?? true;
}
- onCorrectionPaymentAmountChange(event: Event) {
- const value = Number((event.target as HTMLInputElement)?.value || 0);
- this.correctionPaymentAmount.set(Number.isFinite(value) ? value : 0);
- }
-
- confirmCorrectionPayment() {
- if (this.correctionPaymentAmount() < this.correctionRequiredPayment()) {
- this.toastService.warn({ text: 'مبلغ پرداختی باید حداقل برابر با افزایش مبلغ باشد.' });
- return;
- }
-
+ confirmCorrectionPayment(_event: {
+ payment: IPayment;
+ settlementType: 'CASH' | 'CREDIT' | 'MIXED';
+ }) {
this.showCorrectionPaymentDialog.set(false);
this.pendingCorrectionSubmitResolver?.(true);
this.pendingCorrectionSubmitResolver = null;
- @if (!isUnknownCustomer()) {
+ @if (!isUnknownCustomer) {
نوع تسویهحساب
- @if (isGoldGuild()) {
+ @if (isGoldGuild) {
diff --git a/src/app/domains/pos/modules/shop/components/payment/form-dialog.component.ts b/src/app/shared/components/invoices/payment/form-dialog.component.ts
similarity index 70%
rename from src/app/domains/pos/modules/shop/components/payment/form-dialog.component.ts
rename to src/app/shared/components/invoices/payment/form-dialog.component.ts
index 12f0fdf..9b08388 100644
--- a/src/app/domains/pos/modules/shop/components/payment/form-dialog.component.ts
+++ b/src/app/shared/components/invoices/payment/form-dialog.component.ts
@@ -1,33 +1,38 @@
import { Maybe } from '@/core';
import { NativeBridgeService } from '@/core/services';
import { ToastService } from '@/core/services/toast.service';
-import { PosInfoStore } from '@/domains/pos/store';
+import {
+ IPayment,
+ PosPaymentResult,
+ TerminalSuccessPaymentPayload,
+ TOrderPaymentTypes,
+} from '@/domains/pos/modules/shop/models';
+import { PosPaymentBridgeAbstract } from '@/domains/pos/modules/shop/services/payment-bridge.abstract';
+import { PosPaymentBridgeService } from '@/domains/pos/modules/shop/services/payment-bridge.service';
import { AbstractFormDialog } from '@/shared/abstractClasses';
import { KeyValueComponent } from '@/shared/components';
import { SharedLightBottomsheetComponent } from '@/shared/components/dialog/light-bottomsheet.component';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { PriceInputComponent } from '@/shared/components/input/price-input.component';
import { UikitFieldComponent, UikitLabelComponent } from '@/uikit';
-import { Component, computed, inject, signal } from '@angular/core';
+import { formatWithCurrency } from '@/utils';
+import {
+ Component,
+ EventEmitter,
+ inject,
+ Input,
+ Output,
+ signal,
+ SimpleChanges,
+} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormControl, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
import { ButtonDirective } from 'primeng/button';
import { Select } from 'primeng/select';
import { SelectButton } from 'primeng/selectbutton';
-import { catchError, throwError } from 'rxjs';
-import {
- IPayment,
- IPosOrderResponse,
- PosPaymentResult,
- TerminalSuccessPaymentPayload,
- TOrderPaymentTypes,
-} from '../../models';
-import { PosPaymentBridgeAbstract } from '../../services/payment-bridge.abstract';
-import { PosPaymentBridgeService } from '../../services/payment-bridge.service';
-import { PosLandingStore } from '../../store/main.store';
@Component({
- selector: 'pos-payment-form-dialog',
+ selector: 'shared-invoice-payment-form-dialog',
templateUrl: './form-dialog.component.html',
imports: [
FormsModule,
@@ -44,9 +49,16 @@ import { PosLandingStore } from '../../store/main.store';
],
providers: [{ provide: PosPaymentBridgeAbstract, useExisting: PosPaymentBridgeService }],
})
-export class PosPaymentFormDialogComponent extends AbstractFormDialog
-
- {{ index + 1 }}- {{ good.name }}
-
- ;
@Input({ required: true }) good!: Goodsnapshot;
@Input({ required: true }) index!: number;
+ @Input() canRemove = true;
+ @Input() maxQuantity: number | null = null;
+ @Output() onRemove = new EventEmitter();
preparedCalculation = signal>(null);
@@ -42,4 +45,8 @@ export class SharedReturnFormItemComponent {
this.prepareCalculation();
}
}
+
+ remove() {
+ this.onRemove.emit();
+ }
}
diff --git a/src/app/shared/components/invoices/sale-invoice-single-view.component.html b/src/app/shared/components/invoices/sale-invoice-single-view.component.html
index 5268448..b9d68b2 100644
--- a/src/app/shared/components/invoices/sale-invoice-single-view.component.html
+++ b/src/app/shared/components/invoices/sale-invoice-single-view.component.html
@@ -60,26 +60,12 @@
-
+
diff --git a/src/app/shared/components/invoices/returnForm/item-form.component.ts b/src/app/shared/components/invoices/returnForm/item-form.component.ts
index d834079..47607a4 100644
--- a/src/app/shared/components/invoices/returnForm/item-form.component.ts
+++ b/src/app/shared/components/invoices/returnForm/item-form.component.ts
@@ -1,7 +1,7 @@
import { Maybe } from '@/core';
-import { Component, Input, signal, SimpleChanges } from '@angular/core';
+import { Component, EventEmitter, Input, Output, signal, SimpleChanges } from '@angular/core';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { Divider } from 'primeng/divider';
+import { ButtonDirective } from 'primeng/button';
import { InputComponent } from '../../input/input.component';
import { Goodsnapshot } from '../sale-invoice-full-response.model';
@@ -20,12 +20,15 @@ type BackFromSaleFormValue = {
@Component({
selector: 'shared-return-form-item',
templateUrl: './item-form.component.html',
- imports: [InputComponent, ReactiveFormsModule, Divider],
+ imports: [InputComponent, ReactiveFormsModule, ButtonDirective],
})
export class SharedReturnFormItemComponent {
@Input({ required: true }) control!: FormControl
+ ![]()
+
+
+
+
+ {{ good.name }}
+
+
+
+ مقدار: {{ maxQuantity || 0 }} {{ good.measure_unit.name }}
+
-
- مبلغ اصلاحی افزایش یافته است. لطفاً مبلغ پرداختی را ثبت کنید.
-
-
- حداقل مبلغ موردنیاز
-
-
-
-
-
-
-
-
-
-