feat: enhance sale invoice component with dynamic invoice ID handling and navigation improvements

- Updated column headers and labels in various components and constants to reflect the new terminology.
- Changed the titles and placeholders in forms and dialogs to use "مودی" and "PSP".
- Adjusted routing titles and menu items to align with the new naming conventions.
- Refactored related constants and configurations to ensure consistency throughout the application.

angular.json

@@ -51,6 +51,54 @@
                             "optimization": false,
                             "sourceMap": true
                         },
+                        "novin": {
+                            "assets": [
+                                {
+                                    "glob": "**/*",
+                                    "input": "public-novin"
+                                }
+                            ],
+                            "budgets": [
+                                {
+                                    "maximumError": "3MB",
+                                    "maximumWarning": "2MB",
+                                    "type": "initial"
+                                },
+                                {
+                                    "maximumError": "8kB",
+                                    "maximumWarning": "4kB",
+                                    "type": "anyComponentStyle"
+                                }
+                            ],
+                            "fileReplacements": [
+                                {
+                                    "replace": "src/config.ts",
+                                    "with": "src/tenants/novin/config.ts"
+                                },
+                                {
+                                    "replace": "src/assets/images/brandingAssets.ts",
+                                    "with": "src/tenants/novin/brandingAssets.ts"
+                                },
+                                {
+                                    "replace": "src/environments/environment.ts",
+                                    "with": "src/environments/environment.novin.ts"
+                                },
+                                {
+                                    "replace": "src/app.routes.ts",
+                                    "with": "src/tenants/novin/app.routes.ts"
+                                },
+                                {
+                                    "replace": "src/app/branding/branding.config.ts",
+                                    "with": "src/tenants/novin/branding.config.ts"
+                                }
+                            ],
+                            "outputHashing": "all",
+                            "outputPath": "dist/novin",
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ]
+                        },
                         "production": {
                             "budgets": [
                                 {
@@ -81,6 +129,54 @@
                             "outputHashing": "all",
                             "outputPath": "dist/production"
                         },
+                        "sepehr": {
+                            "assets": [
+                                {
+                                    "glob": "**/*",
+                                    "input": "public-sepehr"
+                                }
+                            ],
+                            "budgets": [
+                                {
+                                    "maximumError": "3MB",
+                                    "maximumWarning": "2MB",
+                                    "type": "initial"
+                                },
+                                {
+                                    "maximumError": "8kB",
+                                    "maximumWarning": "4kB",
+                                    "type": "anyComponentStyle"
+                                }
+                            ],
+                            "fileReplacements": [
+                                {
+                                    "replace": "src/config.ts",
+                                    "with": "src/tenants/sepehr/config.ts"
+                                },
+                                {
+                                    "replace": "src/assets/images/brandingAssets.ts",
+                                    "with": "src/tenants/sepehr/brandingAssets.ts"
+                                },
+                                {
+                                    "replace": "src/environments/environment.ts",
+                                    "with": "src/environments/environment.sepehr.ts"
+                                },
+                                {
+                                    "replace": "src/app.routes.ts",
+                                    "with": "src/tenants/sepehr/app.routes.ts"
+                                },
+                                {
+                                    "replace": "src/app/branding/branding.config.ts",
+                                    "with": "src/tenants/sepehr/branding.config.ts"
+                                }
+                            ],
+                            "outputHashing": "all",
+                            "outputPath": "dist/sepehr",
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ]
+                        },
                         "staging": {
                             "extractLicenses": true,
                             "fileReplacements": [
@@ -135,7 +231,11 @@
                                 }
                             ],
                             "outputHashing": "all",
-                            "outputPath": "dist/tis"
+                            "outputPath": "dist/tis",
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ]
                         },
                         "tis-development": {
                             "assets": [
@@ -182,7 +282,11 @@
                             "optimization": false,
                             "outputHashing": "all",
                             "outputPath": "dist/tis",
-                            "sourceMap": true
+                            "sourceMap": true,
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ]
                         }
                     },
                     "defaultConfiguration": "production",
@@ -222,9 +326,15 @@
                         "development": {
                             "buildTarget": "pos.client:build:development"
                         },
+                        "novin": {
+                            "buildTarget": "pos.client:build:novin"
+                        },
                         "production": {
                             "buildTarget": "pos.client:build:production"
                         },
+                        "sepehr": {
+                            "buildTarget": "pos.client:build:sepehr"
+                        },
                         "staging": {
                             "buildTarget": "pos.client:build:staging"
                         },

docker-compose.yml

@@ -13,6 +13,29 @@ services:
       - "8091:8090"
     restart: unless-stopped
 
+  app_novin:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        TENANT: novin
+        DIST_DIR: novin
+
+    ports:
+      - "8093:8090"
+    restart: unless-stopped
+  # app_sepehr:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile
+  #     args:
+  #       TENANT: sepehr
+  #       DIST_DIR: sepehr
+
+  #   ports:
+  #     - "8092:8090"
+  #   restart: unless-stopped
+
   app_default:
     build:
       context: .

package.json

@@ -56,10 +56,14 @@
     "private": true,
     "scripts": {
         "build": "ng build",
+        "build:novin": "ng build --configuration novin",
+        "build:sepehr": "ng build --configuration sepehr",
         "build:tis": "ng build --configuration tis",
         "ng": "ng",
         "prestart": "node aspnetcore-https",
         "start": "run-script-os",
+        "start:novin": " ng serve --configuration novin",
+        "start:sepehr": " ng serve --configuration sepehr",
         "start:tis": " ng serve --configuration tis",
         "test": "ng test",
         "watch": "ng build --watch --configuration development"

public-novin/favicon/site.webmanifest

@@ -0,0 +1,36 @@
+{
+  "background_color": "#ffffff",
+  "display": "standalone",
+  "icons": [
+    {
+      "purpose": "any",
+      "sizes": "192x192",
+      "src": "/favicon/web-app-manifest-192x192.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "maskable",
+      "sizes": "192x192",
+      "src": "/favicon/web-app-manifest-192x192.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "any",
+      "sizes": "512x512",
+      "src": "/favicon/web-app-manifest-512x512.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "maskable",
+      "sizes": "512x512",
+      "src": "/favicon/web-app-manifest-512x512.png",
+      "type": "image/png"
+    }
+  ],
+  "id": "/",
+  "name": "پرداخت نوین - مدیریت صورت‌حساب‌های مالیاتی",
+  "scope": "/",
+  "short_name": "پرداخت نوین",
+  "start_url": "/",
+  "theme_color": "#ffffff"
+}

public-sepehr/favicon/site copy.webmanifest

@@ -0,0 +1,21 @@
+{
+  "name": "پرداخت الکترونیک سپهر",
+  "short_name": "پرداخت الکترونیک سپهر",
+  "icons": [
+    {
+      "src": "/web-app-manifest-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "/web-app-manifest-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}

public-sepehr/favicon/site.webmanifest

@@ -0,0 +1,36 @@
+{
+  "background_color": "#ffffff",
+  "display": "standalone",
+  "icons": [
+    {
+      "purpose": "any",
+      "sizes": "192x192",
+      "src": "/favicon/web-app-manifest-192x192.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "maskable",
+      "sizes": "192x192",
+      "src": "/favicon/web-app-manifest-192x192.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "any",
+      "sizes": "512x512",
+      "src": "/favicon/web-app-manifest-512x512.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "maskable",
+      "sizes": "512x512",
+      "src": "/favicon/web-app-manifest-512x512.png",
+      "type": "image/png"
+    }
+  ],
+  "id": "/",
+  "name": "پرداخت الکترونیک سپهر",
+  "scope": "/",
+  "short_name": "سپهر",
+  "start_url": "/",
+  "theme_color": "#ffffff"
+}

public/favicon/site.webmanifest

@@ -28,9 +28,9 @@
     }
   ],
   "id": "/",
-  "name": "نرم افزار صورت‌حساب‌های مالیاتی پاژن",
+  "name": "نرم افزار صورت‌حساب‌های مالیاتی سپاس",
   "scope": "/",
-  "short_name": "پاژن",
+  "short_name": "سپاس",
   "start_url": "/",
   "theme_color": "#ffffff"
 }

src/app.component.ts

@@ -1,3 +1,4 @@
+import { NavigationService } from '@/core/services/navigation.service';
 import { PwaInstallService } from '@/core/services/pwa-install.service';
 import { ConfirmationDialogComponent } from '@/shared/components/confirmationDialog/confirmation-dialog.component';
 import { Component, HostListener } from '@angular/core';
@@ -18,7 +19,10 @@ import { brandingConfig } from './app/branding/branding.config';
 export class AppComponent {
   toastPosition: 'top-center' | 'bottom-right' = 'bottom-right';
 
-  constructor(private readonly pwaInstallService: PwaInstallService) {
+  constructor(
+    private readonly pwaInstallService: PwaInstallService,
+    private readonly navigationService: NavigationService
+  ) {
     this.updateToastPosition();
     if (brandingConfig.enableInstallPrompt) {
       this.pwaInstallService.init();

src/app/core/services/native-bridge.service.ts

@@ -73,14 +73,14 @@ export class NativeBridgeService {
   }
 
   pay(request: INativePayRequest): any {
-    if (request.amount <= 10_000) {
+    // if (request.amount <= 1_000) {
-      const errorMessage = 'برای مقادیر زیر ۱۰۰ هزار ریال، پرداخت ممکن نیست.';
+    //   const errorMessage = 'برای مقادیر زیر ۱۰ هزار ریال، پرداخت ممکن نیست.';
-      this.toastService.warn({ text: errorMessage, life: 3000 });
+    //   this.toastService.warn({ text: errorMessage, life: 3000 });
-      return {
+    //   return {
-        success: false,
+    //     success: false,
-        error: errorMessage,
+    //     error: errorMessage,
-      };
+    //   };
-    }
+    // }
     this.toastService.info({ text: 'در حال پردازش پرداخت...' });
     try {
       // @ts-ignore
@@ -135,6 +135,7 @@ export class NativeBridgeService {
       this.toastService.info({ text: 'در حال چاپ ...' });
       // @ts-ignore
       window.NativeBridge.print(JSON.stringify(payload));
+
       return { success: true };
     } catch (error) {
       this.toastService.warn({ text: 'متاسفانه ارتباط با چاپگر برقرار نیست.' });

src/app/core/services/navigation.service.ts

@@ -0,0 +1,51 @@
+import { Injectable } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
+import { filter } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NavigationService {
+  private readonly CURRENT_URL_KEY = 'currentUrl';
+  private readonly PREVIOUS_URL_KEY = 'previousUrl';
+
+  currentUrl: string | null;
+  previousUrl: string | null;
+
+  constructor(private router: Router) {
+    this.currentUrl = sessionStorage.getItem(this.CURRENT_URL_KEY);
+    this.previousUrl = sessionStorage.getItem(this.PREVIOUS_URL_KEY);
+
+    this.router.events
+      .pipe(filter((event): event is NavigationEnd => event instanceof NavigationEnd))
+      .subscribe((event) => {
+        const newUrl = event.urlAfterRedirects;
+
+        // Ignore duplicate events
+        if (newUrl === this.currentUrl) {
+          return;
+        }
+
+        this.previousUrl = this.currentUrl;
+        this.currentUrl = newUrl;
+
+        if (this.previousUrl) {
+          sessionStorage.setItem(this.PREVIOUS_URL_KEY, this.previousUrl);
+        }
+
+        sessionStorage.setItem(this.CURRENT_URL_KEY, this.currentUrl);
+      });
+  }
+
+  canGoBack(): boolean {
+    return !!this.previousUrl;
+  }
+
+  back(fallbackUrl = '/'): void {
+    if (this.canGoBack()) {
+      window.history.back();
+    } else {
+      this.router.navigateByUrl(fallbackUrl);
+    }
+  }
+}

src/app/core/state/global/global.store.ts

@@ -1,5 +1,6 @@
 import { inject, Injectable } from '@angular/core';
 import { Router } from '@angular/router';
+import config from 'src/config';
 import { AuthService } from '../../services/auth.service';
 import { BaseState, BaseStore } from '../base-store';
 
@@ -123,7 +124,7 @@ export class GlobalStore extends BaseStore<GlobalState> {
   readonly isOnline = this.computed((state) => state.isOnline);
   readonly notifications = this.computed((state) => state.notifications);
   readonly unreadNotifications = this.computed((state) =>
-    state.notifications.filter((n) => !n.read),
+    state.notifications.filter((n) => !n.read)
   );
   readonly breadcrumbs = this.computed((state) => state.breadcrumbs);
   readonly preferences = this.computed((state) => state.preferences);
@@ -144,7 +145,11 @@ export class GlobalStore extends BaseStore<GlobalState> {
     }
 
     // Load theme from localStorage
-    const savedTheme = localStorage.getItem('app_theme') as 'light' | 'dark';
+    const savedTheme = config.isPosApplication
+      ? 'light'
+      : (localStorage.getItem('app_theme') as 'light' | 'dark');
+    console.log('savedTheme', savedTheme);
+
     if (savedTheme) {
       this.patchState({ theme: savedTheme });
     }
@@ -250,7 +255,7 @@ export class GlobalStore extends BaseStore<GlobalState> {
    */
   markNotificationRead(id: string): void {
     const notifications = this._state().notifications.map((n) =>
-      n.id === id ? { ...n, read: true } : n,
+      n.id === id ? { ...n, read: true } : n
     );
     this.patchState({ notifications });
   }

src/app/domains/consumer/constants/components/pos/pos.ts

@@ -10,7 +10,7 @@ export const columns: IColumn[] = [
   { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } },
   {
     field: 'provider',
-    header: 'ارایه‌دهنده',
+    header: 'PSP',
     type: 'nested',
     nestedOption: { path: 'provider.name' },
   },

src/app/domains/consumer/constants/menuItems.const.ts

@@ -18,12 +18,12 @@ export const CONSUMER_MENU_ITEMS = [
         routerLink: ['/consumer/poses'],
       },
       {
-        label: 'صورت‌حساب‌ها',
+        label: 'صورت‌حساب‌',
         icon: 'pi pi-fw pi-receipt',
         routerLink: ['/consumer/sale_invoices'],
       },
       {
-        label: 'مشتری‌ها',
+        label: 'مشتری',
         icon: 'pi pi-fw pi-users',
         routerLink: ['/consumer/customers'],
       },

src/app/domains/consumer/modules/accounts/components/form.component.html

@@ -1,16 +1,14 @@
 <shared-dialog
-  header="ویرایش گذرواژه"
+  header="تغییر رمز عبور"
   [(visible)]="visible"
   [modal]="true"
   [style]="{ width: '500px' }"
   [closable]="true"
-  (onHide)="close()"
+  (onHide)="close()">
->
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
+      [confirmPasswordControl]="form.controls.confirmPassword" />
-    />
 
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
   </form>

src/app/domains/consumer/modules/accounts/components/permissions/list.component.html

@@ -1,15 +1,15 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="مدیریت سطح دسترسی">
     @if (isOwner()) {
-      <div class="py-20 flex items-center justify-center">
+      <div class="flex items-center justify-center py-20">
         کاربر با سطح Owner به تمامی سطوح دسترسی داشته و قابل ویرایش نمی‌باشد
       </div>
     } @else if (loading()) {
-      <div class="py-20 flex items-center justify-center">
+      <div class="flex items-center justify-center py-20">
         <p-progressSpinner />
       </div>
     } @else if (permissions()) {
-      <div class="flex flex-col gap-6">
+      <div class="flex flex-col gap-4">
         <p-message severity="secondary"> پیام مفهومی برای مشخص کردن نوع دسترسی دادن</p-message>
         @for (pos of permissions()?.poses; track $index) {
           <div class="flex items-center gap-4">

src/app/domains/consumer/modules/accounts/views/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات کاربری" [editable]="false" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">

src/app/domains/consumer/modules/businessActivities/components/poses/form.component.html

@@ -4,14 +4,13 @@
   [modal]="true"
   [style]="{ width: '500px' }"
   [closable]="true"
-  (onHide)="close()"
+  (onHide)="close()">
->
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <field-name [control]="form.controls.name" />
 
-    <field-pos-type [control]="form.controls.pos_type" />
+    <!-- <field-pos-type [control]="form.controls.pos_type" /> -->
 
-    @if (form.controls.pos_type.value === "PSP") {
+    @if (form.controls.pos_type.value === 'PSP') {
       <field-serial-number [control]="form.controls.serial_number" />
       <field-device-id [control]="form.controls.device_id" />
       <field-provider-id [control]="form.controls.provider_id" />
@@ -22,8 +21,7 @@
       <field-username [control]="form.controls.username" />
       <shared-password-input
         [passwordControl]="form.controls.password"
-        [confirmPasswordControl]="form.controls.confirmPassword"
+        [confirmPasswordControl]="form.controls.confirmPassword" />
-      />
     }
 
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />

src/app/domains/consumer/modules/businessActivities/components/poses/form.component.ts

@@ -4,7 +4,6 @@ import { AbstractFormDialog } from '@/shared/abstractClasses';
 import {
   DeviceIdComponent,
   NameComponent,
-  PosTypeComponent,
   ProviderIdComponent,
   SerialNumberComponent,
   SharedPasswordInputComponent,
@@ -29,7 +28,6 @@ import { ConsumerPosesService } from '../../services/poses.service';
     FormFooterActionsComponent,
     DeviceIdComponent,
     ProviderIdComponent,
-    PosTypeComponent,
     SerialNumberComponent,
     UsernameComponent,
     Divider,
@@ -46,7 +44,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
   initForm = () => {
     const form = this.fb.group({
       name: fieldControl.name(this.initialValues?.name || ''),
-      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || ''),
+      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || 'PSP'),
       serial_number: fieldControl.serial_number(this.initialValues?.serial_number || ''),
       device_id: fieldControl.device_id(this.initialValues?.device?.id || ''),
       provider_id: fieldControl.provider_id(this.initialValues?.provider?.id || ''),
@@ -96,7 +94,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
         this.fb.control<string>('', {
           nonNullable: true,
           validators: fieldControl.username('')[1],
-        }),
+        })
       );
       // @ts-ignore
       form.addControl(
@@ -104,7 +102,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
         this.fb.control<string>('', {
           nonNullable: true,
           validators: [Validators.required],
-        }),
+        })
       );
       // @ts-ignore
       form.addControl(
@@ -112,7 +110,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
         this.fb.control<string>('', {
           nonNullable: true,
           validators: [Validators.required],
-        }),
+        })
       );
       form.addValidators([MustMatch('password', 'confirmPassword')]);
     }

src/app/domains/consumer/modules/businessActivities/components/poses/list.component.html

@@ -1,5 +1,5 @@
 <app-page-data-list
-  pageTitle="لیست پایانه‌های فروش"
+  pageTitle="پایانه‌های فروش"
   [columns]="columns"
   [addNewCtaLabel]="'افزودن پایانه فروش'"
   emptyPlaceholderTitle="پایانه فروشی یافت نشد."
@@ -12,8 +12,7 @@
   (onAdd)="openAddForm()"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()">
->
 </app-page-data-list>
 <consumer-pos-form
   [(visible)]="visibleForm"
@@ -22,5 +21,4 @@
   [complexId]="complexId"
   [posId]="selectedItemForEdit()?.id || ''"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

src/app/domains/consumer/modules/businessActivities/components/poses/list.component.ts

@@ -7,7 +7,7 @@ import {
 } from '@/shared/components/pageDataList/page-data-list.component';
 import { Component, inject, Input } from '@angular/core';
 import { Router } from '@angular/router';
-import { consumerPosesNamedRoutes } from '../../constants/routes/poses';
+import { consumerComplexPosesNamedRoutes } from '../../constants/routes/poses';
 import { IPosResponse } from '../../models';
 import { ConsumerPosesService } from '../../services/poses.service';
 import { ConsumerPosFormComponent } from './form.component';
@@ -36,7 +36,7 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
 
   toSinglePage(item: IPosResponse) {
     this.router.navigateByUrl(
-      consumerPosesNamedRoutes.pos.meta.pagePath!(this.businessId, this.complexId, item.id),
+      consumerComplexPosesNamedRoutes.pos.meta.pagePath!(this.businessId, this.complexId, item.id)
     );
   }
 }

src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.html

@@ -1,8 +1,13 @@
 <app-page-data-list
-  pageTitle="لیست صورت‌حساب‌ها"
+  [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
-  emptyPlaceholderTitle="تا به حال صورت‌حسابی توسط این پایانه ایجاد نشده است."
+  emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
   [items]="items()"
   [loading]="loading()"
+  [showDetails]="true"
+  (onDetails)="toSinglePage($event)"
   (onRefresh)="refresh()">
+  <ng-template #status let-item>
+    <catalog-tax-provider-status-tag [status]="item.status.value" [translate]="item.status.translate" />
+  </ng-template>
 </app-page-data-list>

src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.ts

@@ -1,47 +1,52 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
-import { Component, inject, Input } from '@angular/core';
+import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
+import { Component, inject, Input, TemplateRef, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { consumerSaleInvoicesNamedRoutes } from '../../../saleInvoices/constants/routes';
 import { ISalesInvoicesResponse } from '../../models';
 import { ConsumerSalesInvoicesService } from '../../services/invoices.service';
 
 @Component({
   selector: 'consumer-salesInvoices-list',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent],
+  imports: [PageDataListComponent, CatalogTaxProviderStatusTagComponent],
 })
 export class ConsumerSalesInvoicesComponent extends AbstractList<ISalesInvoicesResponse> {
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;
+
   @Input({ required: true }) complexId!: string;
   @Input({ required: true }) posId!: string;
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
+  @Input() header: IColumn[] = saleInvoiceListConfig.columns;
-    // { field: 'id', header: 'شناسه', type: 'id' },
-    { field: 'code', header: 'کد رهگیری' },
-    { field: 'total_amount', header: 'مبلغ کل', type: 'price' },
-    {
-      field: 'items_count',
-      header: 'تعداد کالاها',
-      customDataModel(item) {
-        return `${item.items.length} عدد`;
-      },
-    },
-    {
-      field: 'invoice_date',
-      header: 'تاریخ',
-      type: 'date',
-    },
-  ];
 
   private readonly service = inject(ConsumerSalesInvoicesService);
+  private readonly router = inject(Router);
 
   override setColumns(): void {
-    this.columns = this.header;
+    this.columns = this.header
+      .map((header) => {
+        if (header.field === 'status') {
+          return {
+            ...header,
+            customDataModel: this.status,
+          };
+        }
+        return header;
+      })
+      .filter((header) => header.field !== 'pos');
   }
 
   override getDataRequest() {
     return this.service.getAll(this.complexId, this.posId);
   }
+
+  toSinglePage(item: ISalesInvoicesResponse) {
+    this.router.navigateByUrl(consumerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(item.id));
+  }
 }

src/app/domains/consumer/modules/businessActivities/constants/routes/poses.ts

@@ -6,7 +6,7 @@ export type TPosesRouteNames = 'poses' | 'pos';
 const baseUrl = (businessId: string, complexId: string) =>
   `/consumer/business_activities/${businessId}/complexes/${complexId}/poses`;
 
-export const consumerPosesNamedRoutes: NamedRoutes<TPosesRouteNames> = {
+export const consumerComplexPosesNamedRoutes: NamedRoutes<TPosesRouteNames> = {
   poses: {
     path: 'poses',
     loadComponent: () =>
@@ -31,17 +31,17 @@ export const consumerPosesNamedRoutes: NamedRoutes<TPosesRouteNames> = {
 };
 
 export const CONSUMER_POSES_ROUTES: Routes = [
-  consumerPosesNamedRoutes.poses,
+  consumerComplexPosesNamedRoutes.poses,
   {
-    path: consumerPosesNamedRoutes.pos.path,
+    path: consumerComplexPosesNamedRoutes.pos.path,
     loadComponent: () =>
       import('../../components/poses/layout.component').then(
-        (m) => m.SuperAdminConsumerPosLayoutComponent,
+        (m) => m.SuperAdminConsumerPosLayoutComponent
       ),
     children: [
       {
         path: '',
-        loadComponent: consumerPosesNamedRoutes.pos.loadComponent,
+        loadComponent: consumerComplexPosesNamedRoutes.pos.loadComponent,
       },
     ],
   },

src/app/domains/consumer/modules/businessActivities/models/salesInvoices_io.d.ts

@@ -1,11 +1,15 @@
 import ISummary from '@/core/models/summary';
 import { TCustomerInfo, TPosOrderGoodPayload } from '@/domains/pos/modules/shop/models';
+import { TspProviderResponseStatus } from '@/shared/catalog';
+import { IEnumTranslate } from '@/shared/models';
 
 export interface ISalesInvoicesRawResponse {
   id: string;
+  invoice_number: string;
   code: string;
   invoice_date: string;
   total_amount: string;
+  status: IEnumTranslate<TspProviderResponseStatus>;
   items: Item[];
   payments: Payment[];
   customer?: TCustomerInfo;

src/app/domains/consumer/modules/businessActivities/store/businessActivity.store.ts

@@ -54,7 +54,7 @@ export class BusinessActivityStore extends EntityStore<
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });

src/app/domains/consumer/modules/businessActivities/store/pos.store.ts

@@ -2,7 +2,7 @@ import { defaultBaseStateData, EntityState, EntityStore } from '@/core/state';
 import { computed, inject, Injectable } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { catchError, finalize } from 'rxjs';
-import { consumerPosesNamedRoutes } from '../constants/routes/poses';
+import { consumerComplexPosesNamedRoutes } from '../constants/routes/poses';
 import { IPosResponse } from '../models';
 import { ConsumerPosesService } from '../services/poses.service';
 
@@ -28,12 +28,16 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
     this.patchState({
       breadcrumbItems: [
         {
-          ...consumerPosesNamedRoutes.poses.meta,
+          ...consumerComplexPosesNamedRoutes.poses.meta,
-          routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(businessId, complexId),
+          routerLink: consumerComplexPosesNamedRoutes.poses.meta.pagePath!(businessId, complexId),
         },
         {
           title: this.entity()?.name,
-          routerLink: consumerPosesNamedRoutes.pos.meta.pagePath!(businessId, complexId, posId),
+          routerLink: consumerComplexPosesNamedRoutes.pos.meta.pagePath!(
+            businessId,
+            complexId,
+            posId
+          ),
         },
       ],
     });
@@ -50,7 +54,7 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });

src/app/domains/consumer/modules/businessActivities/views/complexes/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات شعبه" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -17,6 +17,5 @@
     [businessActivityId]="businessId()"
     [complexId]="complexId()"
     [initialValues]="complex() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/consumer/modules/businessActivities/views/poses/list.component.ts

@@ -4,7 +4,7 @@ import pageParamsUtils from '@/utils/page-params.utils';
 import { Component, computed, inject, signal } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ConsumerPosesComponent } from '../../components/poses/list.component';
-import { consumerPosesNamedRoutes } from '../../constants/routes/poses';
+import { consumerComplexPosesNamedRoutes } from '../../constants/routes/poses';
 import { BusinessActivityStore } from '../../store/businessActivity.store';
 import { ConsumerComplexStore } from '../../store/complex.store';
 
@@ -32,10 +32,10 @@ export class ConsumerPosListPageComponent {
       ...this.businessStore.breadcrumbItems(),
       ...this.complexStore.breadcrumbItems(),
       {
-        title: consumerPosesNamedRoutes.poses.meta.title,
+        title: consumerComplexPosesNamedRoutes.poses.meta.title,
-        routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(
+        routerLink: consumerComplexPosesNamedRoutes.poses.meta.pagePath!(
           this.businessId(),
-          this.complexId(),
+          this.complexId()
         ),
       },
     ]);

src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html

@@ -1,5 +1,5 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
-  <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
+  <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [backRoute]="backRoute()" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <p-button type="button" variant="outlined" size="small" (onClick)="toPosLanding()"> ورود به پایانه </p-button>
     </ng-template>
@@ -10,7 +10,7 @@
         <app-key-value label="شماره سریال" [value]="pos()?.serial_number" />
         <app-key-value label="نوع دستگاه" [value]="pos()?.device?.name" />
         <app-key-value label="مدل دستگاه" [value]="pos()?.model" />
-        <app-key-value label="ارایه‌دهنده" [value]="pos()?.provider?.name" />
+        <app-key-value label="PSP" [value]="pos()?.provider?.name" />
       </div>
     </div>
   </app-card-data>
@@ -24,6 +24,5 @@
     [complexId]="complexId()"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/consumer/modules/businessActivities/views/poses/single.component.ts

@@ -8,6 +8,7 @@ import { Button } from 'primeng/button';
 import { COOKIE_KEYS } from 'src/assets/constants';
 import { ConsumerPosFormComponent } from '../../components/poses/form.component';
 import { ConsumerSalesInvoicesComponent } from '../../components/salesInvoices/list.component';
+import { consumerComplexPosesNamedRoutes } from '../../constants/routes/poses';
 import { BusinessActivityStore } from '../../store/businessActivity.store';
 import { ConsumerComplexStore } from '../../store/complex.store';
 import { PosStore } from '../../store/pos.store';
@@ -38,6 +39,11 @@ export class ConsumerComplexPosPageComponent {
   readonly posId = signal<string>(this.pageParams()['posId']!);
   editMode = signal<boolean>(false);
 
+  backRoute = computed(
+    () =>
+      `${consumerComplexPosesNamedRoutes.poses.meta.pagePath!(this.businessId(), this.complexId())}`
+  );
+
   constructor() {
     effect(() => {
       if (this.pos()?.id) {
@@ -59,7 +65,7 @@ export class ConsumerComplexPosPageComponent {
       sameSite: 'Lax', // or 'Strict' for same-site requests only
       secure: false,
       path: '/',
-      domain: 'localhost',
+      domain: window.location.hostname,
     });
     window.open('/pos', '_blank');
   }

src/app/domains/consumer/modules/businessActivities/views/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <a routerLink pButton [routerLink]="goodsPageRoute()" outlined size="small">مدیریت کالاها</a>
@@ -25,6 +25,5 @@
     [editMode]="true"
     [businessId]="businessId()"
     [initialValues]="business() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/consumer/modules/customers/components/list.component.html

@@ -1,5 +1,5 @@
 <app-page-data-list
-  [pageTitle]="'لیست مشتری'"
+  [pageTitle]="'مشتری‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="مشتری یافت نشد"
   [items]="items()"
@@ -8,8 +8,7 @@
   [showDetails]="true"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()" />
-/>
 
 @if (selectedItemForEdit()) {
   <consumer-customer-form-dialog [(visible)]="visibleForm" [customer]="selectedItemForEdit()!" (onSubmit)="refresh()" />

src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.html

@@ -1,9 +1,13 @@
 <app-page-data-list
-  [pageTitle]="'لیست صورت‌حساب‌'"
+  [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()" />
+  (onRefresh)="refresh()">
+  <ng-template #status let-item>
+    <catalog-tax-provider-status-tag [status]="item.status.value" [translate]="item.status.translate" />
+  </ng-template>
+</app-page-data-list>

src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.ts

@@ -1,10 +1,12 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
-import { Component, inject, Input } from '@angular/core';
+import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
+import { Component, inject, Input, TemplateRef, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { consumerCustomerSaleInvoicesNamedRoutes } from '../../constants/routes/saleInvoices';
 import { ICustomerSaleInvoicesResponse } from '../../models/saleInvoices.io';
@@ -13,48 +15,27 @@ import { CustomerSaleInvoicesService } from '../../services/saleInvoices.service
 @Component({
   selector: 'consumer-customer-saleInvoice-list',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent],
+  imports: [PageDataListComponent, CatalogTaxProviderStatusTagComponent],
 })
 export class ConsumerCustomerSaleInvoiceListComponent extends AbstractList<ICustomerSaleInvoicesResponse> {
   @Input({ required: true }) customerId!: string;
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
+  @Input() header: IColumn[] = saleInvoiceListConfig.columns;
-    { field: 'code', header: 'کد رهگیری' },
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;
-    {
-      field: 'total_amount',
-      header: 'قیمت نهایی',
-      type: 'price',
-    },
-    {
-      field: 'pos',
-      header: 'پایانه',
-      customDataModel(item: ICustomerSaleInvoicesResponse) {
-        return `${item.pos.complex.business_activity.name}، شعبه ${item.pos.complex.name}، پایانه فروش ${item.pos.name}`;
-      },
-    },
-    {
-      field: 'account',
-      header: 'ایجاد شده توسط',
-      type: 'nested',
-      nestedOption: { path: 'account.account.username' },
-    },
-    {
-      field: 'invoice_date',
-      header: 'تاریخ صورت‌حساب‌',
-      type: 'date',
-    },
-    {
-      field: 'created_at',
-      header: 'تاریخ ایجاد',
-      type: 'date',
-    },
-  ];
 
   private readonly service = inject(CustomerSaleInvoicesService);
   private readonly router = inject(Router);
 
   override setColumns(): void {
-    this.columns = this.header;
+    this.columns = this.header.map((header) => {
+      if (header.field === 'status') {
+        return {
+          ...header,
+          customDataModel: this.status,
+        };
+      }
+      return header;
+    });
   }
 
   override getDataRequest() {

src/app/domains/consumer/modules/customers/constants/routes/saleInvoices.ts

@@ -12,8 +12,8 @@ export const consumerCustomerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerCusto
           (m) => m.ConsumerCustomerSaleInvoicesComponent
         ),
       meta: {
-        title: 'صورت‌حساب‌های صادر شده',
+        title: 'صورت‌حساب‌ها',
-        pagePath: (customerId: string) => `consumer/customers/${customerId}`,
+        pagePath: (customerId: string) => `consumer/customers/${customerId}/saleInvoices`,
       },
     },
     saleInvoice: {
@@ -23,7 +23,7 @@ export const consumerCustomerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerCusto
           (m) => m.ConsumerCustomerSaleInvoiceComponent
         ),
       meta: {
-        title: 'صورت‌حساب‌ صادر شده',
+        title: 'صورت‌حساب‌',
         pagePath: (customerId: string, saleInvoiceId: string) =>
           `consumer/customers/${customerId}/saleInvoices/${saleInvoiceId}`,
       },

src/app/domains/consumer/modules/customers/store/saleInvoice.store.ts

@@ -36,10 +36,10 @@ export class ConsumerCustomerSaleInvoiceStore extends EntityStore<
             consumerCustomerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!(customerId),
         },
         {
-          title: this.entity()?.code,
+          title: `صورت‌حساب ${this.entity()?.invoice_number}`,
           routerLink: consumerCustomerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(
             customerId,
-            invoiceId,
+            invoiceId
           ),
         },
       ],
@@ -57,7 +57,7 @@ export class ConsumerCustomerSaleInvoiceStore extends EntityStore<
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });

src/app/domains/consumer/modules/customers/views/saleInvoices/list.component.ts

@@ -1,7 +1,11 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
-import { Component, inject, signal } from '@angular/core';
+import { BreadcrumbService } from '@/core/services';
+import pageParamsUtils from '@/utils/page-params.utils';
+import { Component, computed, inject, signal } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ConsumerCustomerSaleInvoiceListComponent } from '../../components/saleInvoices/list.component';
+import { consumerCustomerSaleInvoicesNamedRoutes } from '../../constants/routes/saleInvoices';
+import { ConsumerCustomerStore } from '../../store/customer.store';
 
 @Component({
   selector: 'consumer-customer-saleInvoices',
@@ -10,6 +14,25 @@ import { ConsumerCustomerSaleInvoiceListComponent } from '../../components/saleI
 })
 export class ConsumerCustomerSaleInvoicesComponent {
   private readonly route = inject(ActivatedRoute);
+  private readonly breadcrumbService = inject(BreadcrumbService);
+  private readonly store = inject(ConsumerCustomerStore);
 
-  readonly customerId = signal<string>(this.route.snapshot.paramMap.get('customerId')!);
+  pageParams = computed(() => pageParamsUtils(this.route));
+  customerId = signal<string>(this.pageParams()['customerId']);
+
+  ngAfterViewInit() {
+    this.setBreadcrumb();
+  }
+
+  setBreadcrumb() {
+    this.breadcrumbService.setItems([
+      ...this.store.breadcrumbItems(),
+      {
+        title: consumerCustomerSaleInvoicesNamedRoutes.saleInvoices.meta.title,
+        routerLink: consumerCustomerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!(
+          this.customerId()
+        ),
+      },
+    ]);
+  }
 }

src/app/domains/consumer/modules/customers/views/single.component.html

@@ -1,18 +1,17 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data
     [cardTitle]="`اطلاعات مشتری (${customer() ? (customer()?.type === 'LEGAL' ? 'حقوقی' : 'حقیقی') : ''})`"
     [editable]="true"
-    [(editMode)]="editMode"
+    [(editMode)]="editMode">
-  >
     <div class="flex flex-col gap-4">
-      @if (customer()?.type === "LEGAL") {
+      @if (customer()?.type === 'LEGAL') {
         <div class="listKeyValue">
           <app-key-value label="عنوان" [value]="customer()?.legal?.company_name" />
           <app-key-value label="کد اقتصادی" [value]="customer()?.legal?.economic_code" />
           <app-key-value label="شماره ثبت" [value]="customer()?.legal?.registration_number" />
           <app-key-value label="کد پستی" [value]="customer()?.legal?.postal_code" />
         </div>
-      } @else if (customer()?.type === "INDIVIDUAL") {
+      } @else if (customer()?.type === 'INDIVIDUAL') {
         <div class="listKeyValue">
           <app-key-value label="نام" [value]="customer()?.individual?.first_name" />
           <app-key-value label="نام خانوادگی" [value]="customer()?.individual?.last_name" />

src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.html

@@ -1,7 +1,7 @@
 <app-page-data-list
-  pageTitle="آخرین صورت‌حساب‌های صادر شده امروز"
+  pageTitle="صورت‌حساب‌های امروز"
   [columns]="columns"
-  emptyPlaceholderTitle="تا به این لحظه صورت‌حساب‌ی صادر نشده است."
+  emptyPlaceholderTitle="تا به این لحظه صورت‌حسابی صادر نشده است."
   [items]="items()"
   [showDetails]="true"
   [loading]="loading()"

src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.ts

@@ -2,6 +2,7 @@ import { consumerSaleInvoicesNamedRoutes } from '@/domains/consumer/modules/sale
 import { AbstractList } from '@/shared/abstractClasses';
 import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
+import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
 import { Component, inject, TemplateRef, ViewChild } from '@angular/core';
 import { Router, RouterLink } from '@angular/router';
 import { ButtonDirective } from 'primeng/button';
@@ -27,29 +28,17 @@ export class ConsumerStatisticsLatestInvoicesComponent extends AbstractList<ISta
   readonly invoicesPageRoute = consumerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!();
 
   override setColumns(): void {
-    this.columns = [
+    this.columns = saleInvoiceListConfig.columns
-      { field: 'code', header: 'کد پیگیری' },
+      .filter((column) => column.field !== 'created_at')
-      { field: 'total_amount', header: 'قیمت نهایی', type: 'price' },
+      .map((header) => {
-      {
+        if (header.field === 'status') {
-        field: 'pos',
+          return {
-        header: 'پایانه',
+            ...header,
-        customDataModel(item) {
+            customDataModel: this.status,
-          return `${item.pos.name} - ${item.pos.complex.name} - ${item.pos.complex.business_activity.name}`;
+          };
-        },
+        }
-      },
+        return header;
-      {
+      });
-        field: 'consumer_account',
-        header: 'ایجاد شده توسط',
-        type: 'nested',
-        nestedOption: { path: 'consumer_account.account.username' },
-      },
-      {
-        field: 'invoice_date',
-        header: 'تاریخ صورت‌حساب‌',
-        type: 'dateTime',
-      },
-      { field: 'status', header: 'وضعیت صدور', customDataModel: this.status },
-    ];
   }
 
   override getDataRequest() {

src/app/domains/consumer/modules/poses/components/list.component.html

@@ -1,5 +1,5 @@
 <app-page-data-list
-  pageTitle="لیست پایانه‌های فروش"
+  pageTitle="پایانه‌های فروش"
   [columns]="columns"
   emptyPlaceholderTitle="پایانه فروشی یافت نشد."
   [items]="items()"
@@ -8,8 +8,7 @@
   [showEdit]="true"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()">
->
   <ng-template #toPosLandingAction let-item>
     <p-button type="button" variant="outlined" (onClick)="toPosLanding(item.id)"> ورود به پایانه </p-button>
   </ng-template>
@@ -19,5 +18,4 @@
   [editMode]="editMode()"
   [posId]="selectedItemForEdit()?.id || ''"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

src/app/domains/consumer/modules/poses/views/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <p-button type="button" variant="outlined" size="small" (onClick)="toPosLanding()"> ورود به پایانه </p-button>
@@ -10,7 +10,7 @@
         <app-key-value label="شماره سریال" [value]="pos()?.serial_number" />
         <app-key-value label="نوع دستگاه" [value]="pos()?.device?.name" />
         <app-key-value label="مدل دستگاه" [value]="pos()?.model" />
-        <app-key-value label="ارایه‌دهنده" [value]="pos()?.provider?.name" />
+        <app-key-value label="PSP" [value]="pos()?.provider?.name" />
       </div>
     </div>
   </app-card-data>
@@ -20,6 +20,5 @@
     [editMode]="true"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/consumer/modules/poses/views/single.component.ts

@@ -44,12 +44,17 @@ export class ConsumerPosPageComponent {
 
   toPosLanding() {
     this.cookieService.set(COOKIE_KEYS.POS_ID, '', new Date());
+
+    console.log('COOKIE_KEYS.POS_ID', COOKIE_KEYS.POS_ID);
+
     this.cookieService.set(COOKIE_KEYS.POS_ID, this.posId(), {
       sameSite: 'Lax', // or 'Strict' for same-site requests only
       secure: false,
       path: '/',
-      domain: 'localhost',
+      domain: window.location.hostname,
     });
+    console.log('this.posId', this.posId());
+
     window.open('/pos', '_blank');
   }
 }

src/app/domains/consumer/modules/profile/components/reset-password-card.component.html

@@ -1,11 +1,10 @@
-<app-card-data cardTitle="تغییر گذرواژه" [editable]="false">
+<app-card-data cardTitle="تغییر رمز عبور" [editable]="false">
-  <form [formGroup]="form" (submit)="submit()" class="max-w-lg mx-auto">
+  <form [formGroup]="form" (submit)="submit()" class="mx-auto max-w-lg">
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
+      [confirmPasswordControl]="form.controls.confirmPassword" />
-    />
+    <button type="submit" pButton [disabled]="form.invalid || loading()" class="mx-auto w-full max-w-xs">
-    <button type="submit" pButton [disabled]="form.invalid || loading()" class="w-full max-w-xs mx-auto">
+      تغییر رمز عبور
-      تغییر گذرواژه
     </button>
   </form>
 </app-card-data>

src/app/domains/consumer/modules/profile/components/reset-password-card.component.ts

@@ -25,7 +25,7 @@ export class ConsumerResetPasswordCardComponent {
       password: fieldControl.password(),
       confirmPassword: fieldControl.confirmPassword(),
     },
-    { validators: [MustMatch('password', 'confirmPassword')] },
+    { validators: [MustMatch('password', 'confirmPassword')] }
   );
 
   submit() {
@@ -40,7 +40,7 @@ export class ConsumerResetPasswordCardComponent {
       .pipe(finalize(() => this.loading.set(false)))
       .subscribe(() => {
         this.form.reset();
-        this.toastService.success({ text: 'گذرواژه با موفقیت به‌روز شد.' });
+        this.toastService.success({ text: 'رمز عبور با موفقیت به‌روز شد.' });
       });
   }
 }

src/app/domains/consumer/modules/saleInvoices/components/list.component.html

@@ -1,7 +1,7 @@
 <app-page-data-list
-  [pageTitle]="'لیست صورت‌حساب‌ها'"
+  [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
-  emptyPlaceholderTitle="صورت‌حساب‌ی یافت نشد"
+  emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
   [items]="items()"
   [loading]="loading()"
   [perPage]="responseMetaData()?.perPage"
@@ -10,4 +10,8 @@
   [showDetails]="true"
   (onDetails)="toSinglePage($event)"
   (onRefresh)="refresh()"
-  (onChangePage)="changePage($event)" />
+  (onChangePage)="changePage($event)">
+  <ng-template #status let-item>
+    <catalog-tax-provider-status-tag [status]="item.status.value" [translate]="item.status.translate" />
+  </ng-template>
+</app-page-data-list>

src/app/domains/consumer/modules/saleInvoices/components/list.component.ts

@@ -1,13 +1,14 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { Maybe } from '@/core';
+import { IPaginatedQuery } from '@/core/models/service.model';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
-import { IPaginatedQuery } from '@/core/models/service.model';
 import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
-import { Component, inject, Input } from '@angular/core';
+import { Component, inject, Input, TemplateRef, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { consumerSaleInvoicesNamedRoutes } from '../constants/routes';
 import { IConsumerSaleInvoicesResponse } from '../models';
@@ -16,7 +17,7 @@ import { ConsumerSaleInvoicesService } from '../services/main.service';
 @Component({
   selector: 'consumer-saleInvoice-list',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent],
+  imports: [PageDataListComponent, CatalogTaxProviderStatusTagComponent],
 })
 export class ConsumerSaleInvoiceListComponent extends AbstractList<
   IConsumerSaleInvoicesResponse,
@@ -24,12 +25,21 @@ export class ConsumerSaleInvoiceListComponent extends AbstractList<
 > {
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = saleInvoiceListConfig.columns;
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;
 
   private readonly service = inject(ConsumerSaleInvoicesService);
   private readonly router = inject(Router);
 
   override setColumns(): void {
-    this.columns = this.header;
+    this.columns = this.header.map((header) => {
+      if (header.field === 'status') {
+        return {
+          ...header,
+          customDataModel: this.status,
+        };
+      }
+      return header;
+    });
   }
 
   override getDataRequest(payload: Maybe<IPaginatedQuery>) {

src/app/domains/consumer/modules/saleInvoices/constants/routes/index.ts

@@ -9,7 +9,7 @@ export const consumerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerSaleInvoicesR
     loadComponent: () =>
       import('../../views/list.component').then((m) => m.ConsumerSaleInvoicesComponent),
     meta: {
-      title: 'صورت‌حساب‌های صادر شده',
+      title: 'صورت‌حساب‌ها',
       pagePath: () => `/consumer/sale_invoices`,
     },
   },
@@ -18,7 +18,7 @@ export const consumerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerSaleInvoicesR
     loadComponent: () =>
       import('../../views/single.component').then((m) => m.ConsumerSaleInvoiceComponent),
     meta: {
-      title: 'صورت‌حساب‌ صادر شده',
+      title: 'صورت‌حساب‌',
       pagePath: (saleInvoiceId: string) => `/consumer/sale_invoices/${saleInvoiceId}`,
     },
   },

src/app/domains/consumer/modules/saleInvoices/store/main.store.ts

@@ -35,7 +35,7 @@ export class ConsumerSaleInvoiceStore extends EntityStore<
           routerLink: consumerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!(),
         },
         {
-          title: this.entity()?.code,
+          title: `صورت‌حساب ${this.entity()?.invoice_number}`,
           routerLink: consumerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(invoiceId),
         },
       ],
@@ -53,7 +53,7 @@ export class ConsumerSaleInvoiceStore extends EntityStore<
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });

src/app/domains/partner/constants/menuItems.const.ts

@@ -8,20 +8,21 @@ export const PARTNER_MENU_ITEMS = [
         routerLink: ['/partner'],
       },
       {
-        label: 'حساب‌های کاربری',
+        label: 'مودی',
-        icon: 'pi pi-fw pi-user',
-        routerLink: ['/partner/accounts'],
-      },
-      {
-        label: 'مشتری‌ها',
         icon: 'pi pi-fw pi-users',
         routerLink: ['/partner/consumers'],
       },
       {
-        label: 'لایسنس‌ها',
+        label: 'لایسنس',
         icon: 'pi pi-fw pi-key',
         routerLink: ['/partner/licenses'],
       },
+
+      {
+        label: 'حساب‌های کاربری',
+        icon: 'pi pi-fw pi-user',
+        routerLink: ['/partner/accounts'],
+      },
     ],
   },
 ] as MenuItem[];

src/app/domains/partner/modules/accounts/components/form.component.html

@@ -1,16 +1,14 @@
 <shared-dialog
-  header="ویرایش گذرواژه"
+  header="تغییر رمز عبور"
   [(visible)]="visible"
   [modal]="true"
   [style]="{ width: '500px' }"
   [closable]="true"
-  (onHide)="close()"
+  (onHide)="close()">
->
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
+      [confirmPasswordControl]="form.controls.confirmPassword" />
-    />
 
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
   </form>

src/app/domains/partner/modules/accounts/views/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات کاربری" [editable]="false" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">

src/app/domains/partner/modules/consumers/components/createConsumerWrapper/create-consumer-wrapper.component.html

@@ -1,11 +1,10 @@
 <shared-dialog
-  header="افزودن مشتری"
+  header="افزودن مودی"
   [(visible)]="visible"
   [modal]="true"
   [style]="{ width: '640px' }"
   [closable]="true"
-  (onHide)="close()"
+  (onHide)="close()">
->
   <p-stepper [value]="activeStep()" [linear]="true">
     <p-step-list>
       <p-step [value]="1">اطلاعات اولیه</p-step>
@@ -24,16 +23,14 @@
         <partner-consumer-businessActivities-form-content
           [consumerId]="consumer()?.id || ''"
           (onSubmit)="onBusinessActivitySubmit($event)"
-          (onClose)="close()"
+          (onClose)="close()" />
-        />
       }
       @case (3) {
         <partner-consumer-complex-form-content
           [consumerId]="consumer()?.id || ''"
           [businessActivityId]="businessActivity()?.id || ''"
           (onSubmit)="onComplexSubmit($event)"
-          (onClose)="close()"
+          (onClose)="close()" />
-        />
       }
       @case (4) {
         <partner-consumer-pos-form-content
@@ -41,8 +38,7 @@
           [businessActivityId]="businessActivity()?.id || ''"
           [complexId]="complex()?.id || ''"
           (onSubmit)="onPosSubmit($event)"
-          (onClose)="close()"
+          (onClose)="close()" />
-        />
       }
     }
   </div>

src/app/domains/partner/modules/consumers/components/form-dialog.component.ts

@@ -17,7 +17,7 @@ export class ConsumerUserFormDialogComponent extends AbstractDialog {
   @Input() consumerId?: string;
 
   get preparedTitle() {
-    return `${this.editMode ? 'ویرایش' : 'افزودن'} مشتری`;
+    return `${this.editMode ? 'ویرایش' : 'افزودن'} مودی`;
   }
 
   onFormSubmit(response: IPartnerConsumerResponse) {

src/app/domains/partner/modules/consumers/components/poses/form.component.html

@@ -1,8 +1,8 @@
 <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
   <field-name [control]="form.controls.name" />
-  <field-pos-type [control]="form.controls.pos_type" />
+  <!-- <field-pos-type [control]="form.controls.pos_type" /> -->
 
-  @if (form.controls.pos_type.value === "PSP") {
+  @if (form.controls.pos_type.value === 'PSP') {
     <field-serial-number [control]="form.controls.serial_number" />
     <field-device-id [control]="form.controls.device_id" />
     <field-provider-id [control]="form.controls.provider_id" />
@@ -13,8 +13,7 @@
     <field-username [control]="form.controls.username" />
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
+      [confirmPasswordControl]="form.controls.confirmPassword" />
-    />
   }
 
   <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />

src/app/domains/partner/modules/consumers/components/poses/form.component.ts

@@ -4,7 +4,6 @@ import { AbstractForm } from '@/shared/abstractClasses';
 import {
   DeviceIdComponent,
   NameComponent,
-  PosTypeComponent,
   ProviderIdComponent,
   SerialNumberComponent,
   SharedPasswordInputComponent,
@@ -27,7 +26,6 @@ import { PartnerPosesService } from '../../services/poses.service';
     FormFooterActionsComponent,
     DeviceIdComponent,
     ProviderIdComponent,
-    PosTypeComponent,
     SerialNumberComponent,
     UsernameComponent,
     Divider,
@@ -45,7 +43,7 @@ export class ConsumerPosFormContentComponent extends AbstractForm<IPosRequest, I
   initForm = () => {
     const form = this.fb.group({
       name: fieldControl.name(this.initialValues?.name || ''),
-      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || ''),
+      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || 'PSP'),
       serial_number: fieldControl.serial_number(this.initialValues?.serial_number || ''),
       device_id: fieldControl.device_id(this.initialValues?.device?.id || ''),
       provider_id: fieldControl.provider_id(this.initialValues?.provider?.id || ''),

src/app/domains/partner/modules/consumers/constants/routes/index.ts

@@ -10,7 +10,7 @@ export const partnerConsumersNamedRoutes: NamedRoutes<TConsumersRouteNames> = {
     path: 'consumers',
     loadComponent: () => import('../../views/list.component').then((m) => m.ConsumersComponent),
     meta: {
-      title: 'مشتری‌ها',
+      title: 'مودیان',
       pagePath: () => '/partner/consumers',
     },
   },
@@ -18,7 +18,7 @@ export const partnerConsumersNamedRoutes: NamedRoutes<TConsumersRouteNames> = {
     path: 'consumers/:consumerId',
     loadComponent: () => import('../../views/single.component').then((m) => m.ConsumerComponent),
     meta: {
-      title: 'مشتری',
+      title: 'مودی',
       pagePath: (guildId: string) => `/partner/consumers/${guildId}`,
     },
   },

src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <button pButton outlined size="small" (click)="showAccountsChargeDialog()">شارژ کاربر</button>
@@ -22,13 +22,11 @@
     [consumerId]="consumerId()"
     [businessActivityId]="businessId()"
     [initialValues]="businessActivity() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
   <partner-charge-account-form-dialog
     [(visible)]="visibleAccountsChargeForm"
     [consumerId]="consumerId()"
     [businessId]="businessId()"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()">
-  >
   </partner-charge-account-form-dialog>
 </div>

src/app/domains/partner/modules/consumers/views/complexes/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات شعبه" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -18,6 +18,5 @@
     [businessActivityId]="businessId()"
     [complexId]="complexId()"
     [initialValues]="complex() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/partner/modules/consumers/views/list.component.html

@@ -1,10 +1,10 @@
 <app-page-data-list
-  pageTitle="لیست مشتری"
+  pageTitle="مودیان"
-  [addNewCtaLabel]="'افزودن مشتری'"
+  [addNewCtaLabel]="'افزودن مودی'"
   [columns]="columns"
   [showAdd]="true"
-  emptyPlaceholderTitle="مشتری یافت نشد"
+  emptyPlaceholderTitle="مودی یافت نشد"
-  emptyPlaceholderDescription="برای افزودن مشتری، روی دکمهٔ بالا کلیک کنید."
+  emptyPlaceholderDescription="برای افزودن مودی، روی دکمهٔ بالا کلیک کنید."
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"
@@ -13,8 +13,7 @@
   (onAdd)="openAddForm()"
   (onDetails)="toSinglePage($event)"
   (onEdit)="onEditClick($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()" />
-/>
 <partner-create-consumer-wrapper [(visible)]="visibleCreateForm" (onSubmit)="refresh()" />
 
 <partner-consumer-form
@@ -22,5 +21,4 @@
   [editMode]="true"
   [consumerId]="selectedItemForEdit()?.id"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

src/app/domains/partner/modules/consumers/views/poses/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -15,6 +15,5 @@
     [complexId]="complexId()"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/partner/modules/consumers/views/single.component.html

@@ -1,11 +1,11 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
-  <app-card-data cardTitle="اطلاعات مشتری" [editable]="true" [(editMode)]="editMode">
+  <app-card-data cardTitle="اطلاعات مودی" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions> </ng-template>
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
-        <app-key-value label="نام مشتری" [value]="consumer()?.name" />
+        <app-key-value label="نام" [value]="consumer()?.name" />
-        <app-key-value label="نوع مشتری" [value]="consumer()?.type?.translate" />
+        <app-key-value label="نوع" [value]="consumer()?.type?.translate" />
-        @if (consumer()?.type?.value === "LEGAL") {
+        @if (consumer()?.type?.value === 'LEGAL') {
           <app-key-value label="شناسه ملی" [value]="consumer()?.legal?.registration_code" />
         } @else {
           <app-key-value label="شماره موبایل" [value]="consumer()?.individual?.mobile_number" />
@@ -28,6 +28,5 @@
     [editMode]="true"
     [consumerId]="consumerId()"
     [initialValues]="consumer() || undefined"
-    (onSubmit)="getData()"
+    (onSubmit)="getData()" />
-  />
 </div>

src/app/domains/partner/modules/customers/components/list.component.html

@@ -1,5 +1,5 @@
 <app-page-data-list
-  [pageTitle]="'لیست مشتری'"
+  [pageTitle]="'مشتری‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="مشتری یافت نشد"
   [items]="items()"
@@ -8,5 +8,4 @@
   [showDetails]="true"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()" />
-/>

src/app/domains/partner/modules/customers/views/single.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات مشتری" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">

src/app/domains/partner/modules/licenses/components/filter-form.component.html

@@ -1,7 +1,7 @@
-<div class="flex flex-col gap-4 w-full">
+<div class="flex w-full flex-col gap-4">
-  <uikit-field label="بر اساس نام مشتری" name="search" class="w-full">
+  <uikit-field label="بر اساس نام مودی" name="search" class="w-full">
     <p-inputgroup class="w-full">
-      <input pInputText [(ngModel)]="search" placeholder="جستجوی نام مشتری" (ngModelChange)="onFilterChange($event)" />
+      <input pInputText [(ngModel)]="search" placeholder="جستجوی نام مودی" (ngModelChange)="onFilterChange($event)" />
       <p-inputgroup-addon>
         <p-button icon="pi pi-times" severity="secondary" (onClick)="clearSearch()"></p-button>
       </p-inputgroup-addon>

src/app/domains/partner/modules/licenses/components/list.component.ts

@@ -18,7 +18,7 @@ export class PartnerLicenseListComponent extends AbstractList<ILicenseResponse>
       // { field: 'id', header: 'شناسه', type: 'id' },
       {
         field: 'business_activity',
-        header: 'عنوان مشتری',
+        header: 'مودی',
         type: 'nested',
         nestedOption: {
           path: 'business_activity.consumer.name',

src/app/domains/partner/modules/profile/components/reset-password-card.component.html

@@ -1,11 +0,0 @@
-<app-card-data cardTitle="تغییر گذرواژه" [editable]="false">
-  <form [formGroup]="form" (submit)="submit()" class="max-w-lg mx-auto">
-    <shared-password-input
-      [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
-    />
-    <button type="submit" pButton [disabled]="form.invalid || loading()" class="w-full max-w-xs mx-auto">
-      تغییر گذرواژه
-    </button>
-  </form>
-</app-card-data>

src/app/domains/partner/modules/profile/components/reset-password-card.component.ts

@@ -1,46 +0,0 @@
-import { ToastService } from '@/core/services/toast.service';
-import { MustMatch } from '@/core/validators';
-import { AppCardComponent, SharedPasswordInputComponent } from '@/shared/components';
-import { fieldControl } from '@/shared/constants';
-import { Component, inject, signal } from '@angular/core';
-import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { ButtonDirective } from 'primeng/button';
-import { finalize } from 'rxjs';
-import { ProfileService } from '../services/main.service';
-
-@Component({
-  selector: 'partner-reset-password-card',
-  templateUrl: './reset-password-card.component.html',
-  imports: [ReactiveFormsModule, AppCardComponent, SharedPasswordInputComponent, ButtonDirective],
-})
-export class PartnerResetPasswordCardComponent {
-  private readonly service = inject(ProfileService);
-  private readonly fb = inject(FormBuilder);
-  private readonly toastService = inject(ToastService);
-
-  readonly loading = signal(false);
-
-  form = this.fb.group(
-    {
-      password: fieldControl.password(),
-      confirmPassword: fieldControl.confirmPassword(),
-    },
-    { validators: [MustMatch('password', 'confirmPassword')] },
-  );
-
-  submit() {
-    if (this.form.invalid) {
-      this.form.markAllAsTouched();
-      return;
-    }
-
-    this.loading.set(true);
-    this.service
-      .resetPassword({ password: this.form.value.password as string })
-      .pipe(finalize(() => this.loading.set(false)))
-      .subscribe(() => {
-        this.form.reset();
-        this.toastService.success({ text: 'گذرواژه با موفقیت به‌روز شد.' });
-      });
-  }
-}

src/app/domains/partner/modules/profile/models/io.d.ts

@@ -12,5 +12,6 @@ export interface IProfileRequestPayload {
 }
 
 export interface IResetPasswordRequest {
+  currentPassword: string;
   password: string;
 }

src/app/domains/partner/modules/profile/views/single.component.html

@@ -1,5 +1,10 @@
 <div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات پروفایل" [editable]="true" [(editMode)]="editing">
+    <ng-template #moreActions>
+      <p-button type="button" variant="outlined" size="small" (onClick)="openResetPasswordDialog()">
+        تغییر گذرواژه
+      </p-button>
+    </ng-template>
     <div class="listKeyValue">
       <app-key-value label="تصویر" [value]="profile()?.logo_url" type="thumbnail" />
       <app-key-value label="عنوان" [value]="profile()?.name" />
@@ -7,9 +12,13 @@
     </div>
   </app-card-data>
 
-  <partner-reset-password-card />
-
   @if (editing()) {
     <partner-profile-form [(visible)]="editing" [initialValues]="profile()!" (onSubmit)="onEditSuccess()" />
   }
 </div>
+
+<shared-change-password-form-dialog
+  [(visible)]="resetPasswordDialog"
+  [showCurrentPasswordField]="true"
+  [loading]="resetPasswordLoading()"
+  (onSubmit)="resetPassword($event)" />

src/app/domains/partner/modules/profile/views/single.component.ts

@@ -1,8 +1,16 @@
+import { ToastService } from '@/core/services/toast.service';
 import { PartnerStore } from '@/domains/partner/store/main.store';
-import { AppCardComponent, KeyValueComponent } from '@/shared/components';
+import {
+  AppCardComponent,
+  ChangePasswordFormDialogComponent,
+  KeyValueComponent,
+} from '@/shared/components';
 import { Component, computed, inject, signal } from '@angular/core';
+import { Button } from 'primeng/button';
+import { finalize } from 'rxjs';
 import { PartnerProfileFormComponent } from '../components/form.component';
-import { PartnerResetPasswordCardComponent } from '../components/reset-password-card.component';
+import { IResetPasswordRequest } from '../models';
+import { ProfileService } from '../services/main.service';
 
 @Component({
   selector: 'partner-profile',
@@ -10,17 +18,22 @@ import { PartnerResetPasswordCardComponent } from '../components/reset-password-
   imports: [
     AppCardComponent,
     KeyValueComponent,
-    PartnerResetPasswordCardComponent,
     PartnerProfileFormComponent,
+    Button,
+    ChangePasswordFormDialogComponent,
   ],
 })
 export class PartnerProfileComponent {
   private readonly store = inject(PartnerStore);
+  private readonly service = inject(ProfileService);
+  private readonly toastService = inject(ToastService);
+
+  readonly resetPasswordLoading = signal(false);
+  editing = signal(false);
+  resetPasswordDialog = signal(false);
 
   readonly profile = computed(() => this.store.entity());
 
-  editing = signal(false);
-
   edit() {
     this.editing.set(true);
   }
@@ -28,4 +41,21 @@ export class PartnerProfileComponent {
   onEditSuccess() {
     this.store.getData();
   }
+  openResetPasswordDialog() {
+    this.resetPasswordDialog.set(true);
+  }
+
+  resetPassword(payload: IResetPasswordRequest) {
+    this.resetPasswordLoading.set(true);
+
+    this.service
+      .resetPassword(payload)
+      .pipe(finalize(() => this.resetPasswordLoading.set(false)))
+      .subscribe(() => {
+        this.toastService.success({
+          text: 'تغییر رمز عبور با موفقیت انجام شد.',
+        });
+        this.resetPasswordDialog.set(false);
+      });
+  }
 }

src/app/domains/pos/components/change-password.component.html

@@ -0,0 +1,5 @@
+<shared-change-password-form-dialog
+  [(visible)]="visible"
+  [showCurrentPasswordField]="true"
+  [loading]="submitLoading()"
+  (onSubmit)="submit($event)" />

src/app/domains/pos/components/change-password.component.ts

@@ -0,0 +1,36 @@
+import { ToastService } from '@/core/services/toast.service';
+import { AbstractDialog } from '@/shared/abstractClasses/abstract-dialog';
+import {
+  ChangePasswordFormDialogComponent,
+  IChangePasswordSubmitPayload,
+} from '@/shared/components';
+import { Component, inject, signal } from '@angular/core';
+import { finalize } from 'rxjs';
+import { PosChangePasswordService } from '../services/password';
+
+@Component({
+  selector: 'pos-change-password',
+  templateUrl: 'change-password.component.html',
+  imports: [ChangePasswordFormDialogComponent],
+})
+export class PosChangePasswordComponent extends AbstractDialog {
+  private readonly service = inject(PosChangePasswordService);
+  private readonly toastService = inject(ToastService);
+
+  submitLoading = signal(false);
+
+  submit(payload: IChangePasswordSubmitPayload) {
+    this.submitLoading.set(true);
+
+    this.service
+      .changePassword(payload)
+      .pipe(finalize(() => this.submitLoading.set(false)))
+      .subscribe(() => {
+        this.toastService.success({
+          text: 'تغییر رمز عبور با موفقیت انجام شد.',
+        });
+        this.submitLoading.set(false);
+        this.close();
+      });
+  }
+}

src/app/domains/pos/layouts/pagesLayout/layout.component.html

@@ -5,7 +5,7 @@
 <ng-template #topbarCenter>
   @if (posInfo()) {
     <a [routerLink]="homeRouteLink" class="flex flex-col items-center justify-center gap-2">
-      <div class="h-8 w-8">
+      <div class="h-8 max-w-20">
         <img
           [src]="posInfo()?.partner?.logo_url ?? placeholderLogo"
           alt="Logo"
@@ -25,52 +25,27 @@
 
 @if (loading()) {
   <shared-page-loading />
-} @else {
+} @else if (error()) {
-  <!-- <div class="w-svw h-svh bg-surface-ground flex flex-col gap-4 p-4"> -->
+  @switch (error()?.status) {
-  <!-- <div class="w-full flex items-center gap-4 shrink-0 justify-between">
+    @case (412) {
-      <div class="flex gap-2 items-center">
+      <pos-choose-cards class="h-full" (onChoose)="onChoosePos()" />
-        @if (posInfo()) {
+    }
-          <div class="w-10 h-10">
+    @default {
-            <img [src]="placeholderLogo" alt="Logo" class="w-full h-full object-cover rounded-md bg-surface-card" />
+      <div class="flex h-full w-full items-center justify-center">
-          </div>
+        <p-card class="border-surface-border border">
-          <span class="text-lg font-bold">
+          <div class="flex shrink-0 flex-col items-center justify-between gap-2">
-            {{ posInfo()?.name }} ({{ posInfo()?.complex!.name }} - {{ posInfo()?.businessActivity!.name }})
+            <i class="pi pi-exclamation-triangle text-error mb-3 text-6xl!" aria-hidden="true"></i>
-          </span>
+            <span class="text-error mb-2 block text-xl font-semibold"> عدم دسترسی </span>
-        }
+            <p class="inline-block text-base">متاسفانه امکان دسترسی برای کاربر شما فراهم نیست</p>
-      </div>
+            <button pButton outlined severity="danger" class="mt-5 w-32" (click)="logout()">خروج</button>
-      <div class="flex gap-2 items-center">
+          </div>
-        <div class="bg-surface-card px-3 rounded-md shadow-sm h-9 flex items-center">
+        </p-card>
-          <span [jalaliDate]="now" jalaliFormat="dddd YYYY/MM/DD" class="text-base"></span>
+      </div>
-        </div>
-        <div class="">
-          <p-menu #menu [model]="profileMenuItems" [popup]="true" />
-          <button pButton (click)="menu.toggle($event)" icon="pi pi-user" severity="contrast">
-            {{ posProfile()?.account?.username }}
-          </button>
-        </div>
-      </div>
-    </div> -->
-  @if (error()) {
-    @switch (error()?.status) {
-      @case (412) {
-        <pos-choose-cards class="h-full" (onChoose)="onChoosePos()" />
-      }
-      @default {
-        <div class="flex h-full w-full items-center justify-center">
-          <p-card class="border-surface-border border">
-            <div class="flex shrink-0 flex-col items-center justify-between gap-2">
-              <i class="pi pi-exclamation-triangle text-error mb-3 text-6xl!" aria-hidden="true"></i>
-              <span class="text-error mb-2 block text-xl font-semibold"> عدم دسترسی </span>
-              <p class="inline-block text-base">متاسفانه امکان دسترسی برای کاربر شما فراهم نیست</p>
-              <button pButton outlined severity="danger" class="mt-5 w-32" (click)="logout()">خروج</button>
-            </div>
-          </p-card>
-        </div>
-      }
     }
-  } @else {
-    <pos-main-menu-sidebar [(visible)]="mainMenuVisible" />
-    <router-outlet></router-outlet>
   }
-  <!-- </div> -->
+} @else {
+  <pos-main-menu-sidebar [(visible)]="mainMenuVisible" />
+  <pos-change-password [(visible)]="changePasswordVisible" />
+  <router-outlet></router-outlet>
 }
+<!-- </div> -->

src/app/domains/pos/layouts/pagesLayout/layout.component.ts

@@ -11,6 +11,7 @@ import { Menu } from 'primeng/menu';
 import { finalize } from 'rxjs';
 import images from 'src/assets/images';
 import config from 'src/config';
+import { PosChangePasswordComponent } from '../../components/change-password.component';
 import { PosInfoStore, PosProfileStore } from '../../store';
 import { DeviceInfoStore } from '../../store/device.store';
 import { PosMainMenuSidebarComponent } from '../mainMenuSidebar/main-menu-sidebar.component';
@@ -30,6 +31,7 @@ import { PosChooseCardsComponent } from './choose-pos.component';
     CommonModule,
     RouterLinkWithHref,
     RouterOutlet,
+    PosChangePasswordComponent,
   ],
 })
 export class PosPagesLayoutComponent {
@@ -49,6 +51,7 @@ export class PosPagesLayoutComponent {
   private readonly layoutService = inject(LayoutService);
 
   mainMenuVisible = signal(false);
+  changePasswordVisible = signal(false);
 
   readonly posProfileLoading = computed(() => this.posProfileStore.loading());
   readonly posProfile = computed(() => this.posProfileStore.entity());
@@ -67,12 +70,21 @@ export class PosPagesLayoutComponent {
     this.authService.logout();
   };
 
+  showChangePasswordDialog = () => {
+    this.changePasswordVisible.set(true);
+  };
+
   profileMenuItems: MenuItem[] = [
     {
       label: 'راهنمای سامانه',
       icon: 'pi pi-question-circle',
       disabled: true,
     },
+    {
+      label: 'تغییر رمز عبور',
+      icon: 'pi pi-key',
+      command: this.showChangePasswordDialog,
+    },
     {
       label: 'خروج',
       icon: 'pi pi-sign-out',
@@ -97,7 +109,7 @@ export class PosPagesLayoutComponent {
             .pipe(
               finalize(() => {
                 this.layoutService.changeFullPageLoading(false);
-              }),
+              })
             )
             .subscribe();
         },

src/app/domains/pos/modules/configs/components/changePassword/form.component.html

@@ -1,11 +0,0 @@
-<app-card-data cardTitle="تغییر گذرواژه" class="w-full">
-  <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
-    <shared-password-input
-      [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword" />
-
-    <div class="flex w-full justify-end">
-      <button pButton label="ذخیره گذرواژه" [loading]="submitLoading()" class="w-full max-w-40"></button>
-    </div>
-  </form>
-</app-card-data>

src/app/domains/pos/modules/configs/components/changePassword/form.component.ts

@@ -1,51 +0,0 @@
-import { MustMatch } from '@/core/validators';
-import { AbstractForm } from '@/shared/abstractClasses';
-import { AppCardComponent } from '@/shared/components';
-import { SharedPasswordInputComponent } from '@/shared/components/passwordInput/password-input.component';
-import { fieldControl } from '@/shared/constants';
-import { CommonModule } from '@angular/common';
-import { Component, inject } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
-import { ButtonDirective } from 'primeng/button';
-import { tap } from 'rxjs';
-import { IChangePasswordSubmitPayload } from './model';
-import { PosChangePasswordService } from './services/main.service';
-
-@Component({
-  selector: 'pos-change-password-form',
-  templateUrl: './form.component.html',
-  imports: [
-    ReactiveFormsModule,
-    SharedPasswordInputComponent,
-    CommonModule,
-    ButtonDirective,
-    AppCardComponent,
-  ],
-})
-export class PosChangePasswordFormDialogComponent extends AbstractForm<
-  IChangePasswordSubmitPayload,
-  any
-> {
-  private readonly changePasswordService = inject(PosChangePasswordService);
-
-  form = this.fb.group(
-    {
-      password: fieldControl.password(),
-      confirmPassword: fieldControl.confirmPassword(),
-    },
-    {
-      validators: [MustMatch('password', 'confirmPassword')],
-    }
-  );
-
-  override submitForm() {
-    const payload = this.form.getRawValue().password!;
-    return this.changePasswordService.changePassword({ password: payload }).pipe(
-      tap({
-        next: (res) => {
-          this.form.reset();
-        },
-      })
-    );
-  }
-}