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

feat: enhance invoice handling with success messages and payment data integration
set loading in correction and return form
2026-06-17 14:57:44 +03:30 · 2026-06-17 10:03:06 +03:30 · 2026-06-17 09:21:20 +03:30 · 2026-06-17 08:48:34 +03:30 · 2026-06-16 15:47:23 +03:30 · 2026-06-16 00:03:02 +03:30
392 changed files with 6299 additions and 16673 deletions
@@ -0,0 +1,34 @@
+name: Manual Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      target:
+        description: "Target service"
+        required: true
+        default: "app_default"
+        type: choice
+        options:
+          - app_default
+          - app_tis
+          - both
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Deploy locally (manual trigger only)
+        run: |
+          if [ "${{ inputs.target }}" = "app_default" ]; then
+            docker compose build app_default
+            docker compose up -d app_default
+          elif [ "${{ inputs.target }}" = "app_tis" ]; then
+            docker compose build app_tis
+            docker compose up -d app_tis
+          else
+            docker compose build app_default app_tis
+            docker compose up -d app_default app_tis
+          fi
@@ -0,0 +1,44 @@
+name: Production CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+
+jobs:
+  validate-and-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: TypeScript check
+        run: pnpm -s exec tsc -p tsconfig.app.json --noEmit
+
+      - name: Build default tenant
+        run: pnpm build
+
+      - name: Build tis tenant
+        run: pnpm build:tis
+
+      - name: Docker build default
+        run: docker compose build app_default
+
+      - name: Docker build tis
+        run: docker compose build app_tis
@@ -43,3 +43,4 @@ testem.log
 Thumbs.db

 .env.*
+.env
@@ -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",
@@ -190,8 +294,7 @@
                        "allowedCommonJsDependencies": [
                            "dayjs",
                            "dayjs/locale/fa",
-                            "dayjs/plugin/relativeTime",
-                            "flatpickr-wrap/dist/l10n/fa.js"
+                            "dayjs/plugin/relativeTime"
                        ],
                        "assets": [
                            {
@@ -209,8 +312,6 @@
                            ".webp": "file"
                        },
                        "styles": [
-                            "node_modules/flatpickr-wrap/dist/flatpickr.css",
-                            "node_modules/flatpickr-wrap/dist/themes/confetti.css",
                            "src/assets/styles.scss"
                        ],
                        "tsConfig": "tsconfig.app.json"
@@ -225,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"
                        },
@@ -252,8 +359,6 @@
                        "inlineStyleLanguage": "scss",
                        "karmaConfig": "karma.conf.js",
                        "styles": [
-                            "node_modules/flatpickr-wrap/dist/flatpickr.css",
-                            "node_modules/flatpickr-wrap/dist/themes/confetti.css",
                            "src/assets/styles.scss"
                        ],
                        "tsConfig": "tsconfig.spec.json"
@@ -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: .
@@ -12,12 +12,9 @@
        "@primeng/themes": "^20.4.0",
        "@primeuix/themes": "^1.2.5",
        "@tailwindcss/postcss": "^4.2.3",
-        "@zoomit/dayjs-jalali-plugin": "^0.1.11",
        "angularx-qrcode": "20.0.0",
        "chart.js": "4.4.2",
        "dayjs": "^1.11.20",
-        "flatpickr": "^4.6.13",
-        "flatpickr-wrap": "^1.0.0",
        "jalaliday": "^3.1.1",
        "jest-editor-support": "32.0.0-beta.1",
        "ngx-cookie-service": "^21.3.1",
@@ -59,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"
@@ -44,9 +44,6 @@ importers:
      '@tailwindcss/postcss':
        specifier: ^4.2.3
        version: 4.2.3
-      '@zoomit/dayjs-jalali-plugin':
-        specifier: ^0.1.11
-        version: 0.1.11
      angularx-qrcode:
        specifier: 20.0.0
        version: 20.0.0(@angular/core@20.3.19(@angular/compiler@20.3.19)(rxjs@7.8.2))
@@ -56,12 +53,6 @@ importers:
      dayjs:
        specifier: ^1.11.20
        version: 1.11.20
-      flatpickr:
-        specifier: ^4.6.13
-        version: 4.6.13
-      flatpickr-wrap:
-        specifier: ^1.0.0
-        version: 1.0.0
      jalaliday:
        specifier: ^3.1.1
        version: 3.1.1(dayjs@1.11.20)
@@ -2817,9 +2808,6 @@ packages:
  '@yarnpkg/lockfile@1.1.0':
    resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==}

-  '@zoomit/dayjs-jalali-plugin@0.1.11':
-    resolution: {integrity: sha512-xqbrBPRoBhbaAWeLbqq9QERZwj+h2KuJMehpOQrlT4y980oA+rdiF/YzXlzVaIvc845UYDrsTp8IDwttWyV/xg==}
-
  abbrev@4.0.0:
    resolution: {integrity: sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==}
    engines: {node: ^20.17.0 || >=22.9.0}
@@ -3956,12 +3944,6 @@ packages:
    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
    hasBin: true

-  flatpickr-wrap@1.0.0:
-    resolution: {integrity: sha512-ctthNBZyDJe1P2fpLF7N7ivwDQGkWAAr7R5BLZ2BSlz9O+w4NEc68M7FNvK/UPUPNj3FQ2pGV8UNZV/9WBU9/Q==}
-
-  flatpickr@4.6.13:
-    resolution: {integrity: sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==}
-
  flatted@3.4.2:
    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}

@@ -4229,7 +4211,7 @@ packages:
    engines: {node: '>=0.10.0'}

  iconv-lite@0.7.2:
-    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==, tarball: https://hub.megan.ir/repository/npm/iconv-lite/-/iconv-lite-0.7.2.tgz}
    engines: {node: '>=0.10.0'}

  icss-utils@5.1.0:
@@ -5085,9 +5067,6 @@ packages:
    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
    hasBin: true

-  native-date-adapter@1.0.3:
-    resolution: {integrity: sha512-WXA6496dHy79BS35CWbeBha1A1QV5LjezaTA5bFWV3LXrwiRT9YXE5LJc+SSEgbN7QHz++xJnjhMHZAXMKIqAg==}
-
  natural-compare@1.4.0:
    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}

@@ -9450,8 +9429,6 @@ snapshots:

  '@yarnpkg/lockfile@1.1.0': {}

-  '@zoomit/dayjs-jalali-plugin@0.1.11': {}
-
  abbrev@4.0.0: {}

  abort-controller@3.0.0:
@@ -10884,12 +10861,6 @@ snapshots:

  flat@5.0.2: {}

-  flatpickr-wrap@1.0.0:
-    dependencies:
-      native-date-adapter: 1.0.3
-
-  flatpickr@4.6.13: {}
-
  flatted@3.4.2: {}

  follow-redirects@1.16.0(debug@4.4.3):
@@ -12106,8 +12077,6 @@ snapshots:

  nanoid@3.3.11: {}

-  native-date-adapter@1.0.3: {}
-
  natural-compare@1.4.0: {}

  needle@3.5.0:
@@ -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"
+}
@@ -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"
+}
@@ -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"
+}
@@ -28,9 +28,9 @@
    }
  ],
  "id": "/",
-  "name": "نرم افزار صورت‌حساب‌های مالیاتی پاژن",
+  "name": "نرم افزار صورت‌حساب‌های مالیاتی سپاس",
  "scope": "/",
-  "short_name": "پاژن",
+  "short_name": "سپاس",
  "start_url": "/",
  "theme_color": "#ffffff"
 }
@@ -1,24 +1,28 @@
+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';
 import { RouterModule } from '@angular/router';
-import { ConfirmDialog } from 'primeng/confirmdialog';
 import { ToastModule } from 'primeng/toast';
 import { brandingConfig } from './app/branding/branding.config';

@Component({
  selector: 'app-root',
  standalone: true,
-  imports: [RouterModule, ToastModule, ConfirmDialog],
+  imports: [RouterModule, ToastModule, ConfirmationDialogComponent],
  template: `
    <p-toast [position]="toastPosition" [baseZIndex]="3000" />
-    <p-confirmDialog />
+    <app-shared-confirmation-dialog />
    <router-outlet />
  `,
 })
 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();
@@ -12,7 +12,7 @@ import {
  withInterceptors,
  withInterceptorsFromDi,
 } from '@angular/common/http';
-import { ApplicationConfig, isDevMode, provideZonelessChangeDetection } from '@angular/core';
+import { ApplicationConfig, provideZonelessChangeDetection } from '@angular/core';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import {
  provideRouter,
@@ -34,7 +34,7 @@ export const appConfig: ApplicationConfig = {
        anchorScrolling: 'enabled',
        scrollPositionRestoration: 'enabled',
      }),
-      withEnabledBlockingInitialNavigation(),
+      withEnabledBlockingInitialNavigation()
    ),
    provideZonelessChangeDetection(),
    // configure HttpClient once: enable fetch and register both functional
@@ -42,6 +42,12 @@ export const appConfig: ApplicationConfig = {
    provideAnimationsAsync(),
    // ensure PrimeNG uses our preset (applies css variables at app initialization)
    providePrimeNG({
+      zIndex: {
+        tooltip: 2100,
+        menu: 2000,
+        overlay: 2000,
+        modal: 1100,
+      },
      theme: {
        preset: MyPreset,
        options: { darkModeSelector: '.app-dark' },
@@ -72,7 +78,7 @@ export const appConfig: ApplicationConfig = {
    provideHttpClient(
      withFetch(),
      withInterceptors([loggingInterceptor, authInterceptor, errorInterceptor, dedupInterceptor]),
-      withInterceptorsFromDi(),
+      withInterceptorsFromDi()
    ),
    // provideServiceWorker('ngsw-worker.js', {
    //   enabled: !isDevMode(),
@@ -68,6 +68,13 @@ export class FormErrorsService {
      const info = errors['invalidUsername'];
      out.push({ key: 'invalidUsername', message: info.message ?? `${label} معتبر نیست.` });
    }
+    if (errors['equalLength']) {
+      const info = errors['equalLength'];
+      out.push({
+        key: 'equalLength',
+        message: `تعداد کاراکترهای ${label} باید برابر با ${info.length} باشد.`,
+      });
+    }

    if (errors['invalidFiscalId']) {
      const info = errors['invalidFiscalId'];
@@ -73,21 +73,21 @@ export class NativeBridgeService {
  }

  pay(request: INativePayRequest): any {
-    if (request.amount <= 10_000) {
-      const errorMessage = 'برای مقادیر زیر ۱۰۰ هزار ریال، پرداخت ممکن نیست.';
-      this.toastService.warn({ text: errorMessage, life: 3000 });
-      return {
-        success: false,
-        error: errorMessage,
-      };
-    }
+    // if (request.amount <= 1_000) {
+    //   const errorMessage = 'برای مقادیر زیر ۱۰ هزار ریال، پرداخت ممکن نیست.';
+    //   this.toastService.warn({ text: errorMessage, life: 3000 });
+    //   return {
+    //     success: false,
+    //     error: errorMessage,
+    //   };
+    // }
    this.toastService.info({ text: 'در حال پردازش پرداخت...' });
    try {
      // @ts-ignore
      window.NativeBridge.pay(request.amount, request.id || '');
      return { success: true };
    } catch (error) {
-      this.toastService.info({ text: (error as Error).message });
+      // this.toastService.info({ text: (error as Error).message });
      return { success: false, error: (error as Error).message };
    }
    // const fn = window.NativeBridge.pay(123, 'test');
@@ -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: 'متاسفانه ارتباط با چاپگر برقرار نیست.' });
@@ -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);
+    }
+  }
+}
@@ -10,10 +10,18 @@ interface IToast extends Pick<ToastMessageOptions, 'sticky' | 'life'> {
  providedIn: 'root',
 })
 export class ToastService {
+  private readonly dedupeWindowMs = 2000;
+  private readonly recentMessages = new Map<string, number>();
+
  constructor(private messageService: MessageService) {}

  add(message: ToastMessageOptions) {
    if (!message.detail) return;
+    const dedupeKey = `${message.severity ?? ''}|${message.summary ?? ''}|${message.detail}`;
+    const now = Date.now();
+    const lastShownAt = this.recentMessages.get(dedupeKey);
+    if (lastShownAt && now - lastShownAt < this.dedupeWindowMs) return;
+    this.recentMessages.set(dedupeKey, now);
    this.messageService.add(message);
  }

@@ -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 });
  }
@@ -0,0 +1,19 @@
+import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+
+export function equalLengthValidator(length: number): ValidatorFn {
+  return (control: AbstractControl): ValidationErrors | null => {
+    const v = control.value;
+    if (v === null || v === undefined || v === '') {
+      return null;
+    }
+    const normalized = String(v);
+
+    return normalized.length !== length
+      ? {
+          equalLength: {
+            length,
+          },
+        }
+      : null;
+  };
+}
@@ -1,3 +1,4 @@
+export * from './equalLength.validator';
 export * from './fiscal-id.validator';
 export * from './greater.validator';
 export * from './iban.validator';
@@ -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' },
  },
@@ -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'],
      },
@@ -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>
@@ -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">
@@ -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">
@@ -4,11 +4,10 @@
  [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-economic-code [control]="form.controls.economic_code" />
+    <field-individual-economic-code [control]="form.controls.economic_code" />
    <field-fiscal-id [control]="form.controls.fiscal_id" />
    <field-partner-token [control]="form.controls.partner_token" />
    <field-invoice-number-sequence [control]="form.controls.invoice_number_sequence" [min]="1" />
@@ -1,7 +1,7 @@
 import { AbstractFormDialog } from '@/shared/abstractClasses';
 import {
-  EconomicCodeComponent,
  FiscalIdComponent,
+  IndividualEconomicCodeComponent,
  NameComponent,
  PartnerTokenComponent,
 } from '@/shared/components';
@@ -22,7 +22,7 @@ import { BusinessActivitiesService } from '../services/main.service';
    SharedDialogComponent,
    FormFooterActionsComponent,
    NameComponent,
-    EconomicCodeComponent,
+    IndividualEconomicCodeComponent,
    PartnerTokenComponent,
    InvoiceNumberSequenceComponent,
    FiscalIdComponent,
@@ -37,11 +37,11 @@ export class ConsumerBusinessActivityFormComponent extends AbstractFormDialog<

  form = this.fb.group({
    name: fieldControl.name(this.initialValues?.name || ''),
-    economic_code: fieldControl.economic_code(this.initialValues?.economic_code || ''),
+    economic_code: fieldControl.individual_economic_code(this.initialValues?.economic_code || ''),
    fiscal_id: fieldControl.fiscal_id(this.initialValues?.fiscal_id || ''),
    partner_token: fieldControl.partner_token(this.initialValues?.partner_token || ''),
    invoice_number_sequence: fieldControl.invoice_number_sequence(
-      this.initialValues?.invoice_number_sequence || 1,
+      this.initialValues?.invoice_number_sequence || 1
    ),
  });

@@ -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()" />
@@ -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')]);
    }
@@ -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()" />
@@ -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)
    );
  }
 }
@@ -1,9 +1,13 @@
 <app-page-data-list
-  pageTitle="لیست فاکتور‌ها"
+  [pageTitle]="'صورت‌حساب‌ها'"
  [columns]="columns"
-  emptyPlaceholderTitle="تا به حال فاکتور فروشی توسط این پایانه ایجاد نشده است."
+  emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
  [items]="items()"
  [loading]="loading()"
-  (onRefresh)="refresh()"
->
+  [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>
@@ -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[] = [
-    // { 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',
-    },
-  ];
+  @Input() header: IColumn[] = saleInvoiceListConfig.columns;

  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));
+  }
 }
@@ -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,
      },
    ],
  },
@@ -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;
@@ -54,7 +54,7 @@ export class BusinessActivityStore extends EntityStore<
        catchError((error) => {
          this.setError(error);
          throw error;
-        }),
+        })
      )
      .subscribe((entity) => {
        this.patchState({ entity });
@@ -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,
-          routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(businessId, complexId),
+          ...consumerComplexPosesNamedRoutes.poses.meta,
+          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 });
@@ -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>
@@ -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,
-        routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(
+        title: consumerComplexPosesNamedRoutes.poses.meta.title,
+        routerLink: consumerComplexPosesNamedRoutes.poses.meta.pagePath!(
          this.businessId(),
-          this.complexId(),
+          this.complexId()
        ),
      },
    ]);
@@ -1,5 +1,5 @@
-<div class="flex flex-col gap-6">
-  <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
+<div class="flex flex-col gap-4">
+  <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>
@@ -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');
  }
@@ -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>
@@ -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()" />
@@ -1,10 +1,13 @@
 <app-page-data-list
-  [pageTitle]="'لیست فاکتورها'"
+  [pageTitle]="'صورت‌حساب‌ها'"
  [columns]="columns"
-  emptyPlaceholderTitle="فاکتوری یافت نشد"
+  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>
@@ -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[] = [
-    { field: 'code', header: 'کد رهگیری' },
-    {
-      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',
-    },
-  ];
+  @Input() header: IColumn[] = saleInvoiceListConfig.columns;
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;

  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() {
@@ -63,7 +44,7 @@ export class ConsumerCustomerSaleInvoiceListComponent extends AbstractList<ICust

  toSinglePage(item: ICustomerSaleInvoicesResponse) {
    this.router.navigateByUrl(
-      consumerCustomerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(this.customerId, item.id),
+      consumerCustomerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(this.customerId, item.id)
    );
  }
 }
@@ -9,21 +9,21 @@ export const consumerCustomerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerCusto
      path: 'saleInvoices',
      loadComponent: () =>
        import('../../views/saleInvoices/list.component').then(
-          (m) => m.ConsumerCustomerSaleInvoicesComponent,
+          (m) => m.ConsumerCustomerSaleInvoicesComponent
        ),
      meta: {
-        title: 'فاکتورهای صادر شده',
-        pagePath: (customerId: string) => `consumer/customers/${customerId}`,
+        title: 'صورت‌حساب‌ها',
+        pagePath: (customerId: string) => `consumer/customers/${customerId}/saleInvoices`,
      },
    },
    saleInvoice: {
      path: 'saleInvoices/:invoiceId',
      loadComponent: () =>
        import('../../views/saleInvoices/single.component').then(
-          (m) => m.ConsumerCustomerSaleInvoiceComponent,
+          (m) => m.ConsumerCustomerSaleInvoiceComponent
        ),
      meta: {
-        title: 'فاکتور صادر شده',
+        title: 'صورت‌حساب‌',
        pagePath: (customerId: string, saleInvoiceId: string) =>
          `consumer/customers/${customerId}/saleInvoices/${saleInvoiceId}`,
      },
@@ -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 });
@@ -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()
+        ),
+      },
+    ]);
+  }
 }
@@ -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" />
@@ -1,15 +1,14 @@
 <app-page-data-list
-  pageTitle="آخرین فاکتورهای صادر شده امروز"
+  pageTitle="صورت‌حساب‌های امروز"
  [columns]="columns"
-  emptyPlaceholderTitle="تا به این لحظه فاکتوری صادر نشده است."
+  emptyPlaceholderTitle="تا به این لحظه صورت‌حسابی صادر نشده است."
  [items]="items()"
  [showDetails]="true"
  [loading]="loading()"
  (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
->
+  (onRefresh)="refresh()">
  <ng-template #moreActions>
-    <a routerLink pButton [routerLink]="invoicesPageRoute" outlined>تمامی فاکتورها</a>
+    <a routerLink pButton [routerLink]="invoicesPageRoute" outlined>تمامی صورت‌حساب‌ها</a>
  </ng-template>

  <ng-template #status let-item>
@@ -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 = [
-      { field: 'code', header: 'کد پیگیری' },
-      { field: 'total_amount', header: 'قیمت نهایی', type: 'price' },
-      {
-        field: 'pos',
-        header: 'پایانه',
-        customDataModel(item) {
-          return `${item.pos.name} - ${item.pos.complex.name} - ${item.pos.complex.business_activity.name}`;
-        },
-      },
-      {
-        field: 'consumer_account',
-        header: 'ایجاد شده توسط',
-        type: 'nested',
-        nestedOption: { path: 'consumer_account.account.username' },
-      },
-      {
-        field: 'invoice_date',
-        header: 'تاریخ فاکتور',
-        type: 'dateTime',
-      },
-      { field: 'status', header: 'وضعیت صدور', customDataModel: this.status },
-    ];
+    this.columns = saleInvoiceListConfig.columns
+      .filter((column) => column.field !== 'created_at')
+      .map((header) => {
+        if (header.field === 'status') {
+          return {
+            ...header,
+            customDataModel: this.status,
+          };
+        }
+        return header;
+      });
  }

  override getDataRequest() {
@@ -58,7 +47,7 @@ export class ConsumerStatisticsLatestInvoicesComponent extends AbstractList<ISta

  toSinglePage(invoice: IStatisticsSaleInvoicesResponse) {
    this.router.navigateByUrl(
-      consumerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(invoice.id),
+      consumerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(invoice.id)
    );
  }
 }
@@ -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()" />
@@ -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>
@@ -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');
  }
 }
@@ -1,11 +1,10 @@
-<app-card-data cardTitle="تغییر گذرواژه" [editable]="false">
-  <form [formGroup]="form" (submit)="submit()" class="max-w-lg mx-auto">
+<app-card-data cardTitle="تغییر رمز عبور" [editable]="false">
+  <form [formGroup]="form" (submit)="submit()" class="mx-auto max-w-lg">
    <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">
-      تغییر گذرواژه
+      [confirmPasswordControl]="form.controls.confirmPassword" />
+    <button type="submit" pButton [disabled]="form.invalid || loading()" class="mx-auto w-full max-w-xs">
+      تغییر رمز عبور
    </button>
  </form>
 </app-card-data>
@@ -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: 'رمز عبور با موفقیت به‌روز شد.' });
      });
  }
 }
@@ -1,14 +1,17 @@
 <app-page-data-list
-  [pageTitle]="'لیست فاکتورها'"
+  [pageTitle]="'صورت‌حساب‌ها'"
  [columns]="columns"
-  emptyPlaceholderTitle="فاکتوری یافت نشد"
+  emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
  [items]="items()"
  [loading]="loading()"
  [perPage]="responseMetaData()?.perPage"
  [currentPage]="responseMetaData()?.page"
-  [totalRecords]="responseMetaData()?.totalRecords || items().length"
+  [totalPages]="responseMetaData()?.totalPages || 1"
  [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>
@@ -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>) {
@@ -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}`,
    },
  },
@@ -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 });
@@ -8,20 +8,21 @@ export const PARTNER_MENU_ITEMS = [
        routerLink: ['/partner'],
      },
      {
-        label: 'حساب‌های کاربری',
-        icon: 'pi pi-fw pi-user',
-        routerLink: ['/partner/accounts'],
-      },
-      {
-        label: 'مشتری‌ها',
+        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[];
@@ -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>
@@ -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">
@@ -1,6 +1,6 @@
 <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
  <field-name [control]="form.controls.name" />
-  <field-economic-code [control]="form.controls.economic_code" />
+  <field-individual-economic-code [control]="form.controls.economic_code" />
  <field-fiscal-id [control]="form.controls.fiscal_id" />
  <field-invoice-number-sequence [control]="form.controls.invoice_number_sequence" />
  <field-partner-token [control]="form.controls.partner_token" />
@@ -1,8 +1,8 @@
 import { AbstractForm } from '@/shared/abstractClasses';
 import {
-  EconomicCodeComponent,
  FiscalIdComponent,
  GuildIdComponent,
+  IndividualEconomicCodeComponent,
  LicenseStartsAtComponent,
  NameComponent,
  PartnerTokenComponent,
@@ -22,7 +22,7 @@ import { PartnerConsumerBusinessActivitiesService } from '../../services/busines
  imports: [
    ReactiveFormsModule,
    NameComponent,
-    EconomicCodeComponent,
+    IndividualEconomicCodeComponent,
    FiscalIdComponent,
    PartnerTokenComponent,
    GuildIdComponent,
@@ -44,10 +44,10 @@ export class ConsumerBusinessActivitiesFormComponent extends AbstractForm<
  initForm = () => {
    const form = this.fb.group({
      name: fieldControl.name(this.initialValues?.name || ''),
-      economic_code: fieldControl.economic_code(this.initialValues?.economic_code || ''),
+      economic_code: fieldControl.individual_economic_code(this.initialValues?.economic_code || ''),
      fiscal_id: fieldControl.fiscal_id(this.initialValues?.fiscal_id || ''),
      invoice_number_sequence: fieldControl.invoice_number_sequence(
-        parseInt(this.initialValues?.invoice_number_sequence || '1'),
+        parseInt(this.initialValues?.invoice_number_sequence || '1')
      ),
      partner_token: fieldControl.partner_token(this.initialValues?.partner_token || ''),
      guild_id: fieldControl.guild_id(this.initialValues?.guild?.id || ''),
@@ -63,7 +63,7 @@ export class ConsumerBusinessActivitiesFormComponent extends AbstractForm<
        this.fb.control<string>('', {
          nonNullable: true,
          validators: fieldControl.license_starts_at('')[1],
-        }),
+        })
      );
    }

@@ -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>
@@ -17,7 +17,7 @@ export class ConsumerUserFormDialogComponent extends AbstractDialog {
  @Input() consumerId?: string;

  get preparedTitle() {
-    return `${this.editMode ? 'ویرایش' : 'افزودن'} مشتری`;
+    return `${this.editMode ? 'ویرایش' : 'افزودن'} مودی`;
  }

  onFormSubmit(response: IPartnerConsumerResponse) {
@@ -4,15 +4,14 @@
  [modal]="true"
  [style]="{ width: '500px' }"
  [closable]="true"
-  (onHide)="close()"
->
+  (onHide)="close()">
  <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
-    <uikit-datepicker
+    <!-- <uikit-datepicker
      label="تاریخ شروع لایسنس"
      [control]="form.controls.starts_at"
      name="starts_at"
      hint="مدت زمان لایسنس‌ها ۱ ساله هستند."
-    />
+    /> -->
    <!-- <uikit-datepicker label="تاریخ انقضا لایسنس"  [control]="form.controls.expires_at" name="expires_at" /> -->
    <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
  </form>
@@ -1,7 +1,7 @@
 import { AbstractFormDialog } from '@/shared/abstractClasses';
 import { SharedDialogComponent } from '@/shared/components/dialog/dialog.component';
 import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
-import { UikitFlatpickrJalaliComponent } from '@/uikit';
+// import { UikitFlatpickrJalaliComponent } from '@/uikit';
 import { Component, computed, inject, Input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { ILicenseRequest, ILicenseResponse } from '../../models';
@@ -10,12 +10,7 @@ import { LicensesService } from '../../services/licenses.service';
@Component({
  selector: 'partner-consumer-license-form',
  templateUrl: './form.component.html',
-  imports: [
-    ReactiveFormsModule,
-    SharedDialogComponent,
-    FormFooterActionsComponent,
-    UikitFlatpickrJalaliComponent,
-  ],
+  imports: [ReactiveFormsModule, SharedDialogComponent, FormFooterActionsComponent],
 })
 export class ConsumerLicenseFormComponent extends AbstractFormDialog<
  ILicenseRequest,
@@ -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()" />
@@ -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 || ''),
@@ -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}`,
    },
  },
@@ -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>
@@ -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>
@@ -1,10 +1,10 @@
 <app-page-data-list
-  pageTitle="لیست مشتری"
-  [addNewCtaLabel]="'افزودن مشتری'"
+  pageTitle="مودیان"
+  [addNewCtaLabel]="'افزودن مودی'"
  [columns]="columns"
  [showAdd]="true"
-  emptyPlaceholderTitle="مشتری یافت نشد"
-  emptyPlaceholderDescription="برای افزودن مشتری، روی دکمهٔ بالا کلیک کنید."
+  emptyPlaceholderTitle="مودی یافت نشد"
+  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()" />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ahasani	93ebc80da3	feat: enhance sale invoice component with dynamic invoice ID handling and navigation improvements Production CI / validate-and-build (push) Failing after 1m6s Details	2026-06-17 14:57:44 +03:30
ahasani	4e4cc08224	feat: enhance invoice handling with success messages and payment data integration Production CI / validate-and-build (push) Failing after 1m7s Details	2026-06-17 10:03:06 +03:30
ahasani	e5f53c2265	set loading in correction and return form	2026-06-17 09:21:20 +03:30
ahasani	b57d6b4e4b	set sepas favicon and update many things in correction and shared sale invoice Production CI / validate-and-build (push) Failing after 1m2s Details	2026-06-17 08:48:34 +03:30
ahasani	ea458c7b72	refactor: update terminology from "مشتری" to "مودی" and "ارایه‌دهنده" to "PSP" across the application Production CI / validate-and-build (push) Failing after 1m6s Details - 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.	2026-06-16 15:47:23 +03:30
ahasani	151eff2f7c	set novin tenant Production CI / validate-and-build (push) Failing after 1m1s Details	2026-06-16 00:03:02 +03:30
ahasani	1a0c40ecde	feat: update apiBaseUrl for TIS tenant environment configuration Production CI / validate-and-build (push) Failing after 1m1s Details	2026-06-15 21:43:55 +03:30
ahasani	d1dd67aee7	feat: update branding and localization for various components and configurations Production CI / validate-and-build (push) Failing after 1m15s Details	2026-06-15 21:36:09 +03:30
ahasani	f7f8a91a85	Add branding configuration and assets for Sepehr tenant Production CI / validate-and-build (push) Failing after 1m2s Details - Created branding.config.ts to define branding settings including app title, support contact information, and working hours. - Added brandingAssets.ts to import and export logo and login images for the Sepehr tenant. - Introduced config.ts to specify application type as POS for the Sepehr tenant.	2026-06-15 20:36:56 +03:30
ahasani	2c90f8091e	feat: replace national_id with economic_code in customer forms and models Production CI / validate-and-build (push) Failing after 1m1s Details	2026-06-15 19:34:23 +03:30
ahasani	d6aa165592	feat(payment): update payment bridge and form components - Refactor PosPaymentBridgeAbstract to enforce PosPaymentResult type for emitPaymentResultForTest method. - Simplify PosPaymentBridgeService by removing commented-out code and improving error handling. - Replace PosPaymentFormDialogComponent with SharedInvoicePaymentFormDialog in root.component.html for better payment handling. - Enhance root.component.ts to manage payment form visibility and submission logic. - Update light-bottomsheet.component.html for improved styling. - Add new return form features including item removal and total price calculation in returnForm components. - Introduce new payment form dialog for handling invoice payments with detailed structure and validation. - Implement payment handling logic in sale-invoice-single-view component to support correction payments. - Ensure proper integration of payment components in the shared components index.	2026-06-15 17:15:28 +03:30
ahasani	5ee03cf761	feat: update invoice components and add correction payment dialog Production CI / validate-and-build (push) Failing after 1m1s Details - Updated return form instructions for clarity. - Refined labels in sale invoice info card for consistency. - Enhanced sale invoice view with a correction payment dialog for increased user interaction. - Improved invoice print preparation utility for better data handling. - Adjusted paginator component for first and last page navigation. - Modified layout styles for better responsiveness and user experience. - Updated environment configurations for different setups.	2026-06-14 16:33:51 +03:30
ahasani	72954fb5d1	feat: add current password field to change password form and update service payload structure	2026-06-11 17:53:06 +03:30
ahasani	b4cd4c05f2	feat: enhance inner pages header with back button functionality and emit event on back click fix: update total price info handling in correction form and ensure accurate calculations refactor: streamline sale invoice single view component by extracting info card into a separate component style: adjust button sizes in payment forms for better UI consistency feat: implement season picker navigation controls to prevent out-of-bounds selection fix: improve price formatting utility to handle undefined values gracefully chore: update environment configuration for API base URL feat: add navigation service to manage routing history and back navigation	2026-06-11 16:13:48 +03:30
ahasani	88f45eee38	refactor: update labels and translations in various components Production CI / validate-and-build (push) Failing after 1m2s Details - Changed 'تغییر گذرواژه' to 'تغییر رمز عبور' in layout.component.ts - Updated HTML structure in list.component.html and saleInvoices components for consistency and improved styling. - Modified sale-invoice-card.component.html to enhance the display of invoice details. - Adjusted sale-invoice-card.component.ts to handle customer types more effectively. - Enhanced the handling of invoice statuses in saleInvoices components. - Improved layout and styling in shop components for better user experience. - Refactored key-value component for better readability and maintainability. - Updated upload file component to streamline file selection process. - Added new styles in customize.scss and psp.scss for consistent UI. - Adjusted environment configuration for better API endpoint management.	2026-06-09 13:31:48 +03:30
ahasani	5fa07c7ee8	feat: enhance invoice correction form with item editing and price info display	2026-06-08 13:35:58 +03:30
ahasani	788f4023f3	refactor: remove change password form and related service, update root component to use tabs	2026-06-07 14:33:11 +03:30
ahasani	2f67801700	feat: implement change password functionality with dialog and service integration	2026-06-07 13:56:36 +03:30
ahasani	cd09b09e3b	set ci/cd Production CI / validate-and-build (push) Failing after 1m5s Details	2026-06-07 12:45:46 +03:30
ahasani	eb39f42b8c	feat: add correction and return from sale functionalities to sale invoices - Added new API routes for correction and return from sale in POS_SALE_INVOICES_API_ROUTES. - Implemented correction and return from sale methods in PosSaleInvoicesService. - Updated PosSaleInvoiceStore to include actions for correction and return from sale. - Enhanced single.component to handle correction and return from sale events. - Created correction and return from sale forms with appropriate validation and submission logic. - Updated sale-invoice-single-view component to manage correction and return from sale actions. - Added models for correction and return from sale requests. - Improved user interface messages and form handling for better user experience.	2026-06-06 19:52:58 +03:30
ahasani	560b3516e1	feat: add customer selection component for individual and legal customers, update forms to utilize new component	2026-06-05 01:33:37 +03:30
ahasani	694b2ec946	refactor: replace economic code fields with individual and legal variants, add equal length validation	2026-06-03 17:48:54 +03:30
ahasani	8d6fa8860b	update input	2026-06-02 13:45:57 +03:30
ahasani	1f9166bed3	some ui fix and debug input field, separate price field	2026-06-02 12:22:32 +03:30
ahasani	ae963a60ce	update invoice filter and paginator	2026-06-01 16:22:20 +03:30
ahasani	d44004d555	update saleinvoice single and create return from sale form, update agent.md file,	2026-06-01 13:53:42 +03:30
ahasani	c271a36f7e	create invoice settlementStatus catalog and set to single invoice details, update single invoice detail actions	2026-05-31 17:12:43 +03:30
ahasani	4ec6143068	set own datepicker and change فاکتور to صورت‌حساب	2026-05-31 13:54:34 +03:30
ahasani	f50219a094	transform pos payload forms to shared	2026-05-31 10:34:43 +03:30
ahasani	f2a496134b	update tis env	2026-05-30 19:09:08 +03:30
ahasani	90c51edad4	some ui fix	2026-05-30 19:05:23 +03:30
ahasani	d678b6c699	debug	2026-05-28 18:27:38 +03:30
ahasani	550db47b88	update sale invoice and payload forms of pos	2026-05-28 16:37:58 +03:30
ahasani	9fdd5e451c	update sale invoices models and some ui fix	2026-05-26 12:06:43 +03:30
ahasani	eb671d5949	feat: enhance form components with validation and dynamic properties; update payment handling and UI interactions	2026-05-24 19:40:02 +03:30
ahasani	cdd2bd6bee	refactor: restructure order and payload components for improved functionality - Updated `PosOrderSectionComponent` to emit `onSubmit` instead of `onSuccess` and removed payment form visibility logic. - Deleted unused `payload-form.component.html` and `payload-form.component.ts`. - Introduced `PayloadFormDialogComponent` to handle payload form logic and rapid invoice creation. - Enhanced `PosGoldPayloadFormComponent` and `PosStandardPayloadFormComponent` to support rapid invoice submissions. - Added `PosGoodCategoriesComponent` for better category management in the goods view. - Implemented `FavoriteCTAComponent` for managing favorite goods with loading states. - Created `PosGoodsGridViewComponent` and `PosGoodsListViewComponent` for displaying goods in grid and list formats respectively. - Improved UI elements across various components for consistency and better user experience.	2026-05-24 12:42:21 +03:30
ahasani	f18d7a1f04	feat: implement change password and send to fiscal activation modules with forms and services	2026-05-24 10:44:35 +03:30