+ class="bg-primary text-primary-contrast -mt-20 inline-flex h-24 w-24 items-center justify-center rounded-full">
-
{{ message.header }}
+
{{ message.header }}
{{ message.message }}
-
}
diff --git a/src/app/shared/components/confirmationDialog/confirmation-dialog.component.ts b/src/app/shared/components/confirmationDialog/confirmation-dialog.component.ts
index 4b69d67..27a8bd5 100644
--- a/src/app/shared/components/confirmationDialog/confirmation-dialog.component.ts
+++ b/src/app/shared/components/confirmationDialog/confirmation-dialog.component.ts
@@ -1,48 +1,11 @@
-import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
-import { ConfirmationService } from 'primeng/api';
+import { Component } from '@angular/core';
import { Button } from 'primeng/button';
import { ConfirmDialog } from 'primeng/confirmdialog';
@Component({
selector: 'app-shared-confirmation-dialog',
templateUrl: './confirmation-dialog.component.html',
- providers: [ConfirmationService],
+ standalone: true,
imports: [ConfirmDialog, Button],
})
-export class ConfirmationDialogComponent implements OnDestroy {
- @Input() message!: string;
- @Input() header: string = 'تأیید عملیات';
- @Input() acceptLabel: string = 'بله';
- @Input() rejectLabel: string = 'خیر';
- @Output() onAccept = new EventEmitter
();
- @Output() onReject = new EventEmitter();
-
- constructor(private confirmationService: ConfirmationService) {}
-
- show() {
- this.confirmationService.confirm({
- header: this.header,
- message: this.message,
- acceptLabel: this.acceptLabel,
- rejectLabel: this.rejectLabel,
- accept: () => {
- this.accept();
- },
- reject: () => {
- this.reject();
- },
- });
- }
-
- accept() {
- this.onAccept.emit();
- }
-
- reject() {
- this.onReject.emit();
- }
-
- ngOnDestroy() {
- // Cleanup if needed
- }
-}
+export class ConfirmationDialogComponent {}
diff --git a/src/app/shared/components/confirmationDialog/confirmation-dialog.service.ts b/src/app/shared/components/confirmationDialog/confirmation-dialog.service.ts
index 1c33315..1b21d74 100644
--- a/src/app/shared/components/confirmationDialog/confirmation-dialog.service.ts
+++ b/src/app/shared/components/confirmationDialog/confirmation-dialog.service.ts
@@ -1,78 +1,32 @@
-import {
- ApplicationRef,
- ComponentFactoryResolver,
- ComponentRef,
- Injectable,
- Injector,
-} from '@angular/core';
-import { ConfirmationDialogComponent } from './confirmation-dialog.component';
+import { Injectable, inject } from '@angular/core';
+import { Confirmation, ConfirmationService } from 'primeng/api';
+
+export interface AppConfirmOptions {
+ header: string;
+ message: string;
+ acceptLabel?: string;
+ rejectLabel?: string;
+ accept?: () => void;
+ reject?: () => void;
+}
@Injectable({
providedIn: 'root',
})
-export class ConfirmationDialogService {
- private componentRef: ComponentRef | null = null;
+export class AppConfirmationService {
+ private confirmationService = inject(ConfirmationService);
- constructor(
- private componentFactoryResolver: ComponentFactoryResolver,
- private appRef: ApplicationRef,
- private injector: Injector,
- ) {}
-
- confirm(options: {
- message: string;
- header?: string;
- acceptLabel?: string;
- rejectLabel?: string;
- accept?: () => void;
- reject?: () => void;
- }) {
- // Create the component dynamically
- const factory = this.componentFactoryResolver.resolveComponentFactory(
- ConfirmationDialogComponent,
- );
- this.componentRef = factory.create(this.injector);
-
- // Set inputs
- this.componentRef.instance.message = options.message;
- if (options.header) this.componentRef.instance.header = options.header;
- if (options.acceptLabel) this.componentRef.instance.acceptLabel = options.acceptLabel;
- if (options.rejectLabel) this.componentRef.instance.rejectLabel = options.rejectLabel;
-
- // Subscribe to outputs and close after
- if (options.accept) {
- this.componentRef.instance.onAccept.subscribe(() => {
- options.accept!();
- this.close();
+ ask(options: Confirmation): Promise {
+ return new Promise((resolve) => {
+ this.confirmationService.confirm({
+ position: 'bottom',
+ acceptLabel: 'تایید',
+ rejectLabel: 'لغو',
+ ...options,
+ closeOnEscape: true,
+ accept: () => options.accept?.() || resolve(true),
+ reject: () => resolve(false),
});
- } else {
- this.componentRef.instance.onAccept.subscribe(() => this.close());
- }
- if (options.reject) {
- this.componentRef.instance.onReject.subscribe(() => {
- options.reject!();
- this.close();
- });
- } else {
- this.componentRef.instance.onReject.subscribe(() => this.close());
- }
-
- // Attach to the app
- this.appRef.attachView(this.componentRef.hostView);
-
- // Append to body
- document.body.appendChild(this.componentRef.location.nativeElement);
-
- // Trigger change detection and show
- this.componentRef.changeDetectorRef.detectChanges();
- this.componentRef.instance.show();
- }
-
- close() {
- if (this.componentRef) {
- this.appRef.detachView(this.componentRef.hostView);
- this.componentRef.destroy();
- this.componentRef = null;
- }
+ });
}
}
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 ecb1fbf..6af21d2 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
@@ -6,14 +6,10 @@
-
+
@@ -35,6 +31,7 @@
+
@for (payment of invoice.payments; track $index) {
;
@@ -67,6 +74,88 @@ export class SharedSaleInvoiceSingleViewComponent {
@ViewChild('totalAmount', { static: false }) totalAmount!: TemplateRef;
+ moreActionMenuItems = signal([]);
+
+ constructor() {
+ this.showErrors = this.showErrors.bind(this);
+ this.showRevokeConfirmation = this.showRevokeConfirmation.bind(this);
+ this.showCorrection = this.showCorrection.bind(this);
+ this.showBackFromSale = this.showBackFromSale.bind(this);
+ this.printInvoice = this.printInvoice.bind(this);
+ }
+
+ showErrors() {}
+ showRevokeConfirmation() {
+ console.log('this.confirmationService', this.confirmationService);
+
+ this.confirmationService.ask({
+ header: `ابطال فاکتور شماره ${this.invoice!.invoice_number}`,
+ message: `در صورت تایید ابطال فاکتور شماره ${this.invoice!.invoice_number} بر روی دکمهی ابطال کلیک کنید.`,
+ acceptLabel: 'ابطال',
+ acceptButtonProps: {
+ severity: 'dangerdock',
+ },
+
+ accept: () => {
+ console.log('here');
+ // this.deferredInstallPrompt.prompt();
+ // this.deferredInstallPrompt.userChoice.finally(() => {
+ // this.deferredInstallPrompt = null;
+ // this.canInstall.set(false);
+ // window.location.reload();
+ // });
+ // },
+ },
+ });
+ }
+ showCorrection() {}
+ showBackFromSale() {}
+
+ ngOnChanges(changes: SimpleChanges) {
+ if (changes['invoice'] && this.invoice) {
+ const invoiceStatus = this.invoice.status.value;
+ const actions: MenuItem[] = [
+ {
+ label: 'دلایل خطا',
+ icon: 'pi pi-question',
+ neededStatus: 'FAILURE',
+ command: this.showErrors,
+ },
+ {
+ label: 'ابطال',
+ icon: 'pi pi-eraser',
+ neededStatus: 'SUCCESS',
+ command: this.showRevokeConfirmation,
+ },
+ {
+ label: 'اصلاح',
+ icon: 'pi pi-file-edit',
+ neededStatus: 'SUCCESS',
+ command: this.showCorrection,
+ },
+ {
+ label: 'برگشت از فروش',
+ icon: 'pi pi-cart-minus',
+ neededStatus: 'SUCCESS',
+ command: this.showBackFromSale,
+ },
+ {
+ label: 'چاپ',
+ icon: 'pi pi-print',
+ neededStatus: '',
+ command: this.printInvoice,
+ },
+ ];
+
+ this.moreActionMenuItems.set(
+ actions.filter(
+ // @ts-ignore
+ (action) => !action.neededStatus || action.neededStatus === invoiceStatus
+ )
+ );
+ }
+ }
+
readonly posName = computed(() => {
if (this.posInfoStore.entity()) {
const { name, businessActivity, complex } = this.posInfoStore.entity()!;
@@ -280,7 +369,7 @@ export class SharedSaleInvoiceSingleViewComponent {
nestedOption: {
path: 'payload.commission',
type: 'price',
- }
+ },
},
{
field: 'wages',
@@ -289,7 +378,7 @@ export class SharedSaleInvoiceSingleViewComponent {
nestedOption: {
path: 'payload.wages',
type: 'price',
- }
+ },
},
{
field: 'profit',
@@ -298,7 +387,7 @@ export class SharedSaleInvoiceSingleViewComponent {
nestedOption: {
path: 'payload.profit',
type: 'price',
- }
+ },
},
{
field: 'discount_amount',
@@ -315,7 +404,6 @@ export class SharedSaleInvoiceSingleViewComponent {
header: 'مبلغ قابل پرداخت',
type: 'price',
},
-
];
refresh() {
diff --git a/src/app/shared/components/pageDataList/page-data-list.component.html b/src/app/shared/components/pageDataList/page-data-list.component.html
index 9fbea5a..39f691b 100644
--- a/src/app/shared/components/pageDataList/page-data-list.component.html
+++ b/src/app/shared/components/pageDataList/page-data-list.component.html
@@ -59,7 +59,7 @@
diff --git a/src/app/shared/components/pageDataList/page-data-list.component.ts b/src/app/shared/components/pageDataList/page-data-list.component.ts
index 9901268..3201fe5 100644
--- a/src/app/shared/components/pageDataList/page-data-list.component.ts
+++ b/src/app/shared/components/pageDataList/page-data-list.component.ts
@@ -104,7 +104,7 @@ export class PageDataListComponent {
@Input() emptyPlaceholderTitle: string = 'موردی برای نمایش وجود ندارد';
@Input() emptyPlaceholderDescription?: string = '';
@Input() emptyPlaceholderCtaLabel?: string;
- @Input() totalRecords!: number;
+ @Input() totalPages?: number = 1;
@Input() perPage?: number = 10;
@Input() currentPage?: number = 1;
@Input() showEdit: boolean = false;
@@ -191,7 +191,7 @@ export class PageDataListComponent {
};
get showPaginator() {
- return !!(this.totalRecords && this.perPage && this.totalRecords > this.perPage);
+ return !!(this.totalPages && this.perPage && this.totalPages > this.perPage);
}
getPreviewClasses(item: Record, column: IColumn): any {
diff --git a/src/app/uikit/paginator.component.html b/src/app/uikit/paginator.component.html
index 1540f85..104be61 100644
--- a/src/app/uikit/paginator.component.html
+++ b/src/app/uikit/paginator.component.html
@@ -1,19 +1,29 @@
-
-
- صفحه {{ currentPage }} از {{ totalPages() }}
-
-
+@if (totalPages > 1) {
+
+
+ @for (page of pagesToShow(); track page) {
+
+ }
+
+