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.

.env.production

@@ -1,2 +1,9 @@
 TENANT=default
 DIST_DIR=default
+PRODUCTION=false
+API_BASE_URL=https://psp-api.shift-am.ir
+HOST=localhost
+PORT=5001
+ENABLE_LOGGING=false
+ENABLE_DEBUG=false
+ENABLE_NATIVE_BRIDGE=false

.env.tis

@@ -1,2 +1,12 @@
 TENANT=tis
 DIST_DIR=tis
+# TIS_BUILD_DATE=
+# TIS_APP_VERSION=
+# TIS_BUILD_NUMBER=
+PRODUCTION=true
+API_BASE_URL=http://192.168.128.73:5002
+HOST=localhost
+PORT=5000
+ENABLE_LOGGING=false
+ENABLE_DEBUG=false
+ENABLE_NATIVE_BRIDGE=true

.gitea/workflows/deploy.yml

@@ -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

.gitea/workflows/production.yml

@@ -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

.gitignore

@@ -42,5 +42,5 @@ testem.log
 .DS_Store
 Thumbs.db
 
-
-/false
+.env.*
+.env

.prettierrc.json

@@ -5,28 +5,28 @@
     "endOfLine": "lf",
     "overrides": [
         {
-            "files": "*.html",
+            "files": "**/*.html",
             "options": {
                 "bracketSameLine": true,
                 "printWidth": 120
             }
         },
         {
-            "files": "*.scss",
+            "files": "**/*.scss",
             "options": {
                 "printWidth": 120,
                 "singleQuote": false
             }
         },
         {
-            "files": "*.less",
+            "files": "**/*.less",
             "options": {
                 "printWidth": 120,
                 "singleQuote": false
             }
         },
         {
-            "files": "*.json",
+            "files": "**/*.json",
             "options": {
                 "printWidth": 100
             }
@@ -40,6 +40,10 @@
     "semi": true,
     "singleQuote": true,
     "tabWidth": 2,
+    "tailwindAttributes": [
+        "class",
+        "ngClass"
+    ],
     "trailingComma": "es5",
     "useTabs": false
 }

AGENT.md

@@ -1,117 +0,0 @@
-# AGENT.md
-
-## Purpose
-
-- This file defines repository-specific instructions for coding agents.
-- Scope is the full repo unless a deeper `AGENT.md` overrides it.
-
-## Stack Context
-
-- Frontend: Angular 20 standalone app.
-- Package manager: `pnpm`.
-- Deployment: Docker / Docker Compose with tenant-specific services.
-- Current service mapping expectation:
-  - `app_default` on host port `8090`
-  - `app_tis` on host port `8091`
-
-## Tenant Build Rules
-
-- `default` tenant currently builds via `ng build` and outputs to `dist/production`.
-- `tis` tenant builds via `ng build --configuration tis` and outputs to `dist/tis`.
-- Keep Docker `DIST_DIR` aligned with actual Angular output path.
-- Do not assume `default` Angular configuration is usable unless verified (it may reference missing replacements).
-
-## Input Component Rules
-
-- File: `src/app/shared/components/input/input.component.ts`
-- For `type === 'number'` or `type === 'price'`:
-  - Normalize Persian/Arabic digits to English digits.
-  - Allow only digits and `.`.
-  - Support `fixed` precision formatting when provided.
-- Keep behavior for identifier fields (`mobile`, `phone`, `postalCode`, `nationalId`) string-safe.
-
-## Change Policy
-
-- Keep changes minimal and scoped to user request.
-- Prefer root-cause fixes over temporary workarounds.
-- Avoid unrelated refactors.
-- Reuse existing patterns and naming conventions.
-
-## Do / Don't
-
-- Do follow existing field wrapper style in `src/app/shared/components/fields/*.component.ts`.
-- Do reuse `app-input` and set only required props (`type`, `label`, `name`, constraints).
-- Do register every new field in:
-  - `src/app/shared/components/fields/index.ts`
-  - `src/app/shared/constants/fields/index.ts`
-- Do keep control keys consistent across form group, field component `name`, and `fieldControl` key.
-- Don't add one-off field patterns when an existing field component can be reused.
-- Don't use invalid Angular file replacements for directories or empty paths.
-- Don't change tenant output directories without updating Docker `DIST_DIR`.
-
-## How To Create Form Fields
-
-- Create a wrapper component in `src/app/shared/components/fields`.
-- Use the same pattern as existing files like:
-  - `src/app/shared/components/fields/name.component.ts`
-  - `src/app/shared/components/fields/unit_price.component.ts`
-- Minimal wrapper shape:
-  - `selector`: `field-<field-name>`
-  - template: `<app-input ... />`
-  - inputs: `control` (required), optional `name`, optional `label`
-
-Example pattern:
-
-```ts
-@Component({
-  selector: 'field-example',
-  template: `<app-input [label]="label" [control]="control" [name]="name" type="simple" />`,
-  imports: [ReactiveFormsModule, InputComponent],
-})
-export class ExampleComponent {
-  @Input({ required: true }) control = new FormControl<string>('');
-  @Input() name = 'example';
-  @Input() label = 'Example';
-}
-```
-
-## Register New Fields
-
-- Export the component from:
-  - `src/app/shared/components/fields/index.ts`
-- Add its form control factory in:
-  - `src/app/shared/constants/fields/index.ts`
-- `fieldControl` entry shape:
-  - key must match form control name
-  - return tuple: `[defaultValue, validators]`
-
-Example:
-
-```ts
-example: (value = '', isRequired = true): ControlConfig => [
-  value,
-  isRequired ? [Validators.required] : [],
-],
-```
-
-## Using Fields In Forms
-
-- In form group builders, use `fieldControl.<key>(initialValue, isRequired)` for consistency.
-- In templates, render matching wrapper component and pass the matching control:
-  - `<field-example [control]="form.controls.example" />`
-- For numeric/price behavior, use `app-input` `type="number"` or `type="price"` and optional `[fixed]`.
-
-## Validation Checklist
-
-- For TypeScript-only changes, run:
-  - `pnpm -s exec tsc -p tsconfig.app.json --noEmit`
-- For Docker/build changes, verify with:
-  - `docker compose build app_default`
-  - `docker compose build app_tis`
-- Start with targeted validation, then broader checks only if needed.
-
-## Communication Expectations
-
-- Report exactly which files changed and why.
-- Call out any assumptions or discovered config mismatches.
-- If validation is blocked (permissions, missing dependencies), state it clearly and provide next command.

Dockerfile

@@ -6,6 +6,7 @@ ARG DIST_DIR=tis
 
 WORKDIR /app
 
+RUN npm config set registry "https://hub.megan.ir/npm/"
 RUN npm install -g pnpm
 
 COPY package.json pnpm-lock.yaml ./

Dockerfile.dev

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.4
 # Development Dockerfile with hot reload support
 FROM node:20-alpine
 
@@ -10,7 +11,8 @@ RUN npm install -g pnpm
 COPY package.json pnpm-lock.yaml ./
 
 # Install dependencies
-RUN pnpm install --frozen-lockfile
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
+    pnpm config set store-dir /pnpm/store && pnpm install --frozen-lockfile
 
 # Copy source code
 COPY . .

Dockerfile.staging

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.4
 # Build stage for staging environment
 FROM node:20-alpine AS builder
 
@@ -10,7 +11,8 @@ RUN npm install -g pnpm
 COPY package.json pnpm-lock.yaml ./
 
 # Install dependencies
-RUN pnpm install --frozen-lockfile
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
+    pnpm config set store-dir /pnpm/store && pnpm install --frozen-lockfile
 
 # Copy source code
 COPY . .

agents.md

@@ -0,0 +1,254 @@
+# AGENT.md
+
+## Scope
+
+Applies to the full repository unless overridden by a deeper `AGENT.md`.
+
+Stack:
+- Angular 20
+- Standalone components
+- pnpm
+- Docker
+- RTK
+
+---
+
+
+# RTK RULES (MANDATORY)
+
+Always prefer RTK commands.
+
+Use:
+
+- `rtk ls`
+- `rtk grep`
+- `rtk smart`
+- `rtk read`
+- `rtk git diff`
+- `rtk git status`
+
+Avoid raw:
+- `cat`
+- `grep`
+- `rg`
+- `tree`
+- `git diff`
+- recursive `find`
+
+Use raw shell only for:
+- builds
+- runtime/debugging
+- Docker
+- pnpm
+- commands RTK cannot perform
+
+---
+
+# FILE READING POLICY
+
+Preferred order:
+
+1. `rtk grep`
+2. `rtk smart`
+3. `rtk read`
+
+Rules:
+- Search before reading.
+- Read only required files.
+- Do not read TS/HTML/SCSS together unless required.
+- Stop exploring once edit location is clear.
+- Avoid rereading unchanged files.
+
+Large files:
+- `rtk read <file> -l aggressive`
+
+---
+
+# ANGULAR WORKFLOW
+
+For components:
+
+1. `rtk grep "<component-name>"`
+2. `rtk smart component.ts`
+3. Read template only if UI changes are required
+4. Read styles only if styling changes are required
+
+Avoid broad module inspection.
+
+---
+
+# TOKEN RULES
+
+Do not:
+- dump large files
+- scan unrelated folders
+- inspect generated directories
+- perform repeated searches
+- over-explain edits
+
+Avoid:
+- `dist/`
+- `.angular/`
+- `coverage/`
+- `node_modules/`
+- `.git/`
+
+---
+
+# CHANGE POLICY
+
+- Keep changes minimal and scoped.
+- Reuse existing patterns.
+- Avoid unrelated refactors.
+- Preserve tenant separation.
+- Prefer root-cause fixes.
+
+---
+
+# PROJECT RULES
+
+## Tenant Builds
+
+- `default` → `dist/production`
+- `tis` → `dist/tis`
+
+Keep Docker `DIST_DIR` aligned with Angular output.
+
+Do not use Angular `fileReplacements` for static assets.
+
+---
+
+## Input Component
+
+File:
+- `src/app/shared/components/input/input.component.ts`
+
+For:
+- `type="number"`
+- `type="price"`
+
+Requirements:
+- normalize Persian/Arabic digits
+- allow only digits and `.`
+- support fixed precision
+- keep identifier fields string-safe
+
+---
+
+## Shared Field Rules
+
+When creating fields:
+- use shared field wrappers
+- reuse `app-input`
+- register exports in shared indexes
+- keep control names consistent
+
+---
+
+# VALIDATION
+
+TypeScript:
+- `pnpm -s exec tsc -p tsconfig.app.json --noEmit`
+
+Docker:
+- `docker compose build app_default`
+- `docker compose build app_tis`
+
+Validate only impacted areas when possible.
+
+---
+
+# FINAL RESPONSE RULES
+
+Keep final responses under 10 lines unless:
+- validation failed
+- architecture changed
+- user requested explanation
+
+Prefer:
+
+Updated:
+- file1
+- file2
+
+Validation:
+- tsc passed
+
+
+# TARGETED READ RULES
+
+Do not read files larger than 300 lines unless required.
+
+For changes at a known location:
+
+- read the surrounding symbol only
+- avoid full-file reads
+
+Prefer:
+- rtk grep
+- rtk smart
+- targeted read
+
+Avoid:
+- opening 400+ line files for small edits
+
+# REASONING OUTPUT RULES
+
+Do not expose internal reasoning.
+
+Never output:
+- "I think..."
+- "I'm considering..."
+- "I wonder..."
+- "Maybe..."
+- implementation deliberation
+- "It sounds..."
+
+Never explain alternative approaches unless requested.
+
+Use:
+
+Inspecting confirmation dialog.
+
+Updating async accept support.
+
+Validation passed.
+
+
+# INVESTIGATION LIMITS
+
+For localized fixes:
+
+- maximum 3 file reads before first edit
+- maximum 1 related-file read unless required
+
+Stop searching once the edit target is identified.
+
+# REVIEW MODE
+
+During reviews:
+
+- inspect changed files only
+- avoid loading unrelated dependencies
+- avoid architecture exploration
+- avoid repository-wide searches
+
+Review only code directly affected by the diff.
+
+
+# HARD TOKEN LIMITS
+
+For localized fixes:
+
+- Never read files larger than 300 lines unless the target symbol cannot be isolated.
+- Never read an entire file when a symbol-level read is possible.
+- Never read more than 5 total files before the first edit.
+- Never open a file already summarized by `rtk smart` unless implementation details are required.
+
+When a file exceeds 300 lines:
+
+1. rtk grep
+2. rtk smart
+3. read only the relevant symbol/section
+
+Avoid full-file reads.

angular.json

@@ -44,15 +44,20 @@
                                 }
                             ],
                             "outputHashing": "all",
-                            "outputPath": "dist/default",
-                            "serviceWorker": "ngsw-config.json"
+                            "outputPath": "dist/default"
                         },
                         "development": {
                             "extractLicenses": false,
                             "optimization": false,
                             "sourceMap": true
                         },
-                        "production": {
+                        "novin": {
+                            "assets": [
+                                {
+                                    "glob": "**/*",
+                                    "input": "public-novin"
+                                }
+                            ],
                             "budgets": [
                                 {
                                     "maximumError": "3MB",
@@ -65,6 +70,48 @@
                                     "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": [
+                                {
+                                    "maximumError": "2.5MB",
+                                    "maximumWarning": "1.5MB",
+                                    "type": "initial"
+                                },
+                                {
+                                    "maximumError": "6kB",
+                                    "maximumWarning": "3kB",
+                                    "type": "anyComponentStyle"
+                                }
+                            ],
                             "fileReplacements": [
                                 {
                                     "replace": "src/environments/environment.ts",
@@ -80,8 +127,55 @@
                                 }
                             ],
                             "outputHashing": "all",
-                            "outputPath": "dist/production",
-                            "serviceWorker": "ngsw-config.json"
+                            "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,
@@ -93,7 +187,6 @@
                             ],
                             "optimization": true,
                             "outputHashing": "all",
-                            "serviceWorker": "ngsw-config.json",
                             "sourceMap": false
                         },
                         "tis": {
@@ -116,6 +209,14 @@
                                 }
                             ],
                             "fileReplacements": [
+                                {
+                                    "replace": "src/config.ts",
+                                    "with": "src/tenants/tis/config.ts"
+                                },
+                                {
+                                    "replace": "src/assets/images/brandingAssets.ts",
+                                    "with": "src/tenants/tis/brandingAssets.ts"
+                                },
                                 {
                                     "replace": "src/environments/environment.ts",
                                     "with": "src/environments/environment.tis.ts"
@@ -131,11 +232,70 @@
                             ],
                             "outputHashing": "all",
                             "outputPath": "dist/tis",
-                            "serviceWorker": "ngsw-config.json"
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ]
+                        },
+                        "tis-development": {
+                            "assets": [
+                                {
+                                    "glob": "**/*",
+                                    "input": "public-tis"
+                                }
+                            ],
+                            "budgets": [
+                                {
+                                    "maximumError": "2.5MB",
+                                    "maximumWarning": "1.5MB",
+                                    "type": "initial"
+                                },
+                                {
+                                    "maximumError": "6kB",
+                                    "maximumWarning": "3kB",
+                                    "type": "anyComponentStyle"
+                                }
+                            ],
+                            "extractLicenses": false,
+                            "fileReplacements": [
+                                {
+                                    "replace": "src/config.ts",
+                                    "with": "src/tenants/tis/config.ts"
+                                },
+                                {
+                                    "replace": "src/assets/images/brandingAssets.ts",
+                                    "with": "src/tenants/tis/brandingAssets.ts"
+                                },
+                                {
+                                    "replace": "src/environments/environment.ts",
+                                    "with": "src/environments/environment.tis.ts"
+                                },
+                                {
+                                    "replace": "src/app.routes.ts",
+                                    "with": "src/tenants/tis/app.routes.ts"
+                                },
+                                {
+                                    "replace": "src/app/branding/branding.config.ts",
+                                    "with": "src/tenants/tis/branding.config.ts"
+                                }
+                            ],
+                            "optimization": false,
+                            "outputHashing": "all",
+                            "outputPath": "dist/tis",
+                            "sourceMap": true,
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ]
                         }
                     },
                     "defaultConfiguration": "production",
                     "options": {
+                        "allowedCommonJsDependencies": [
+                            "dayjs",
+                            "dayjs/locale/fa",
+                            "dayjs/plugin/relativeTime"
+                        ],
                         "assets": [
                             {
                                 "glob": "**/*",
@@ -166,14 +326,20 @@
                         "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"
                         },
                         "tis": {
-                            "buildTarget": "pos.client:build:tis"
+                            "buildTarget": "pos.client:build:tis-development"
                         }
                     },
                     "defaultConfiguration": "development",

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: .

ngsw-config.json

@@ -1,8 +1,9 @@
 {
   "$schema": "./node_modules/@angular/service-worker/config/schema.json",
   "appData": {
-    "appVersion": "0.0.0",
-    "buildDate": "2026-05-04T18:58:47.135Z"
+    "appVersion": "0.0.24",
+    "buildDate": "2026-05-16T20:25:55.273Z",
+    "buildNumber": 24
   },
   "assetGroups": [
     {
@@ -10,10 +11,7 @@
       "name": "app",
       "resources": {
         "files": [
-          "/favicon.ico",
-          "/index.html",
-          "/*.css",
-          "/*.js"
+          "/favicon.ico"
         ]
       },
       "updateMode": "prefetch"
@@ -40,27 +38,6 @@
       "updateMode": "prefetch"
     }
   ],
-  "dataGroups": [
-    {
-      "cacheConfig": {
-        "maxAge": "1h",
-        "maxSize": 100,
-        "strategy": "freshness",
-        "timeout": "10s"
-      },
-      "name": "api-fresh",
-      "urls": [
-        "/api/**",
-        "https://*/api/**",
-        "http://*/api/**"
-      ]
-    }
-  ],
-  "index": "/index.html",
-  "navigationUrls": [
-    "/**",
-    "!/**/*.*",
-    "!/**/*__*",
-    "!/**/*__*/**"
-  ]
+  "dataGroups": [],
+  "index": "/index.html"
 }

package.json

@@ -12,11 +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",
@@ -55,26 +53,18 @@
         "typescript": "~5.8.3"
     },
     "name": "psp_panel",
-    "prettier": {
-        "overrides": [
-            {
-                "files": "*.html",
-                "options": {
-                    "parser": "angular"
-                }
-            }
-        ]
-    },
     "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",
-        "prebuild": "node scripts/update-ngsw-appdata.js",
-        "prebuild:tis": "node scripts/tis/prepare-tis-logo.js && node scripts/tis/update-tis-ngsw-appdata.js",
         "prestart": "node aspnetcore-https",
         "start": "run-script-os",
-        "start:tis": "ng serve --configuration tis",
+        "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-tis/favicon/site.webmanifest

@@ -2,12 +2,24 @@
   "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",

public/favicon/site.webmanifest

@@ -2,23 +2,35 @@
   "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": "/web-app-manifest-192x192.png",
+      "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": "/web-app-manifest-512x512.png",
+      "src": "/favicon/web-app-manifest-512x512.png",
       "type": "image/png"
     }
   ],
   "id": "/",
-  "name": "نرم افزار صورت‌حساب‌های مالیاتی پاژن",
+  "name": "نرم افزار صورت‌حساب‌های مالیاتی سپاس",
   "scope": "/",
-  "short_name": "پاژن",
+  "short_name": "سپاس",
   "start_url": "/",
   "theme_color": "#ffffff"
 }

scripts/tis/update-tis-ngsw-appdata.js

@@ -10,11 +10,20 @@ const ngswConfig = JSON.parse(fs.readFileSync(ngswConfigPath, 'utf8'));
 
 const now = new Date();
 const buildDate = process.env.TIS_BUILD_DATE || now.toISOString();
-const appVersion = process.env.TIS_APP_VERSION || packageJson.version || '0.0.0';
+const previousAppVersion = ngswConfig.appData?.appVersion || packageJson.version || '0.0.0';
+const appVersion =
+  process.env.TIS_APP_VERSION ||
+  previousAppVersion.replace(
+    /^(\d+)\.(\d+)\.(\d+)$/,
+    (_, major, minor, patch) => `${major}.${minor}.${Number(patch) + 1}`,
+  );
+const previousBuildNumber = Number(ngswConfig.appData?.buildNumber || 0);
+const buildNumber = Number(process.env.TIS_BUILD_NUMBER || previousBuildNumber + 1);
 
 ngswConfig.appData = {
   ...(ngswConfig.appData || {}),
   appVersion,
+  buildNumber,
   buildDate,
 };
 

scripts/update-ngsw-appdata.js

@@ -10,11 +10,20 @@ const ngswConfig = JSON.parse(fs.readFileSync(ngswConfigPath, 'utf8'));
 
 const now = new Date();
 const buildDate = process.env.BUILD_DATE || now.toISOString();
-const appVersion = process.env.APP_VERSION || packageJson.version || '0.0.0';
+const previousAppVersion = ngswConfig.appData?.appVersion || packageJson.version || '0.0.0';
+const appVersion =
+  process.env.APP_VERSION ||
+  previousAppVersion.replace(
+    /^(\d+)\.(\d+)\.(\d+)$/,
+    (_, major, minor, patch) => `${major}.${minor}.${Number(patch) + 1}`,
+  );
+const previousBuildNumber = Number(ngswConfig.appData?.buildNumber || 0);
+const buildNumber = Number(process.env.BUILD_NUMBER || previousBuildNumber + 1);
 
 ngswConfig.appData = {
   ...(ngswConfig.appData || {}),
   appVersion,
+  buildNumber,
   buildDate,
 };
 

src/app.component.ts

@@ -1,23 +1,32 @@
+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" />
-    <p-confirmDialog />
+    <p-toast [position]="toastPosition" [baseZIndex]="3000" />
+    <app-shared-confirmation-dialog />
     <router-outlet />
   `,
 })
 export class AppComponent {
   toastPosition: 'top-center' | 'bottom-right' = 'bottom-right';
 
-  constructor() {
+  constructor(
+    private readonly pwaInstallService: PwaInstallService,
+    private readonly navigationService: NavigationService
+  ) {
     this.updateToastPosition();
+    if (brandingConfig.enableInstallPrompt) {
+      this.pwaInstallService.init();
+    }
   }
 
   @HostListener('window:resize')

src/app.config.ts

@@ -12,14 +12,14 @@ 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,
   withEnabledBlockingInitialNavigation,
   withInMemoryScrolling,
 } from '@angular/router';
-import { provideServiceWorker } from '@angular/service-worker';
+// import { provideServiceWorker } from '@angular/service-worker';
 // Use the consolidated preset that includes our custom variables
 import { ConfirmationService, MessageService } from 'primeng/api';
 import { providePrimeNG } from 'primeng/config';
@@ -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,11 +78,11 @@ export const appConfig: ApplicationConfig = {
     provideHttpClient(
       withFetch(),
       withInterceptors([loggingInterceptor, authInterceptor, errorInterceptor, dedupInterceptor]),
-      withInterceptorsFromDi(),
+      withInterceptorsFromDi()
     ),
-    provideServiceWorker('ngsw-worker.js', {
-      enabled: !isDevMode(),
-      registrationStrategy: 'registerWhenStable:30000',
-    }),
+    // provideServiceWorker('ngsw-worker.js', {
+    //   enabled: !isDevMode(),
+    //   registrationStrategy: 'registerWhenStable:30000',
+    // }),
   ],
 };

src/app.routes.ts

@@ -1 +1,29 @@
-export { appRoutes } from './tenants/default/app.routes';
+import { CONSUMER_ROUTES } from '@/domains/consumer/routes';
+import { PARTNER_ROUTES } from '@/domains/partner/routes';
+import { POS_ROUTES } from '@/domains/pos/routes';
+import { PROVIDER_ROUTES } from '@/domains/provider/routes';
+import { SUPER_ADMIN_ROUTES } from '@/domains/superAdmin/routes';
+import { PUBLIC_SALE_INVOICES_ROUTES } from '@/modules/saleInvoices/constants';
+import { Notfound } from '@/pages/notfound/notfound.component';
+import { Routes } from '@angular/router';
+
+export const appRoutes: Routes = [
+  {
+    path: '',
+    loadComponent: () => import('@/layout/default/app.layout.component').then((m) => m.AppLayout),
+    children: [SUPER_ADMIN_ROUTES, CONSUMER_ROUTES, PROVIDER_ROUTES, PARTNER_ROUTES],
+  },
+  {
+    path: 'pos',
+    loadComponent: () =>
+      import('@/domains/pos/layouts/layout.component').then((m) => m.PosLayoutComponent),
+    children: [POS_ROUTES],
+  },
+
+  {
+    path: 'auth',
+    loadComponent: () => import('@/modules/auth/pages/auth.component').then((m) => m.AuthComponent),
+  },
+  ...PUBLIC_SALE_INVOICES_ROUTES,
+  { path: '**', component: Notfound },
+];

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

@@ -6,8 +6,9 @@ import { HttpClient } from '@angular/common/http';
 import { computed, inject, Injectable, signal } from '@angular/core';
 import { Router } from '@angular/router';
 import { CookieService } from 'ngx-cookie-service';
-import { BehaviorSubject, Observable, throwError } from 'rxjs';
-import { catchError, finalize, tap } from 'rxjs/operators';
+import { BehaviorSubject, from, Observable, throwError } from 'rxjs';
+import { catchError, finalize, switchMap, tap } from 'rxjs/operators';
+import config from 'src/config';
 import { COOKIE_KEYS, LOCAL_STORAGE_KEYS } from '../../../assets/constants';
 import {
   IAuthAccountResponse,
@@ -75,17 +76,20 @@ export class AuthService {
     return this.http
       .post<IAuthResponse>(
         '/api/v1/auth/login',
-        { username, password },
+        { username, password, isPos: config.isPosApplication },
         {
           headers: baseHeaders,
         },
       )
       .pipe(
-        tap((response) => {
-          this.handleAuthSuccess(response);
+        switchMap((response) =>
+          from(
+            this.handleAuthSuccess(response).then(() => {
               this.refreshCookies();
               return response;
             }),
+          ),
+        ),
         catchError((error) => {
           console.error('Login error:', error);
           this.isLoadingSubject.next(false);
@@ -97,19 +101,19 @@ export class AuthService {
       );
   }
 
-  logout(): void {
+  async logout(): Promise<void> {
     localStorage.removeItem(LOCAL_STORAGE_KEYS.AUTH_TOKEN);
     localStorage.removeItem(LOCAL_STORAGE_KEYS.USER_DATA);
     localStorage.removeItem(LOCAL_STORAGE_KEYS.REFRESH_TOKEN);
-    this.refreshCookies();
+    await this.refreshCookies();
 
-    this.setCurrentUser(null);
+    await this.setCurrentUser(null);
     this.router.navigate(['/auth']);
   }
 
-  refreshCookies() {
-    this.cookieService.set(COOKIE_KEYS.POS_ID, '', new Date());
-    this.cookieService.set(COOKIE_KEYS.ACCESS_TOKEN, '', new Date());
+  async refreshCookies() {
+    await this.cookieService.set(COOKIE_KEYS.POS_ID, '', new Date());
+    await this.cookieService.set(COOKIE_KEYS.ACCESS_TOKEN, '', new Date());
   }
 
   doRefreshToken(): Observable<IAuthResponse> {
@@ -170,6 +174,22 @@ export class AuthService {
     return localStorage.getItem(LOCAL_STORAGE_KEYS.AUTH_TOKEN);
   }
 
+  waitForAuthReady(maxRetries = 20): Promise<boolean> {
+    return new Promise((resolve) => {
+      let retries = 0;
+      const check = () => {
+        const isReady = Boolean(this.getToken()) && Boolean(this.currentAccount());
+        if (isReady || retries >= maxRetries) {
+          resolve(isReady);
+          return;
+        }
+        retries += 1;
+        setTimeout(check, 0);
+      };
+      check();
+    });
+  }
+
   /**
    * Get current refresh token
    */
@@ -246,7 +266,7 @@ export class AuthService {
     return true;
   }
 
-  private handleAuthSuccess(response: IAuthResponse): void {
+  private async handleAuthSuccess(response: IAuthResponse): Promise<void> {
     localStorage.setItem(LOCAL_STORAGE_KEYS.AUTH_TOKEN, response.accessToken);
     this.token.set(response.accessToken);
     this.refreshToken.set(response.refreshToken);
@@ -259,7 +279,7 @@ export class AuthService {
     // this.navigateByRole(response.user.role);
   }
 
-  private setCurrentUser(account: Maybe<IAuthAccountResponse>): void {
+  private async setCurrentUser(account: Maybe<IAuthAccountResponse>): Promise<void> {
     this.currentAccount.set(account);
     this.currentAccountSubject.next(account);
     localStorage.setItem(LOCAL_STORAGE_KEYS.USER_DATA, JSON.stringify(account));

src/app/core/services/form-errors.service.ts

@@ -68,6 +68,18 @@ 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'];
+      out.push({ key: 'invalidFiscalId', message: info.message ?? `${label} معتبر نیست.` });
+    }
     // fallback: include any other error keys
     Object.keys(errors).forEach((k) => {
       if (
@@ -80,6 +92,7 @@ export class FormErrorsService {
           'max',
           'email',
           'pattern',
+          'invalidFiscalId',
         ].indexOf(k) === -1
       ) {
         try {

src/app/core/services/index.ts

@@ -4,3 +4,4 @@ export { ErrorHandlerService } from './error-handler.service';
 export { ConfigService } from './config.service';
 export * from './breadcrumb.service';
 export * from './native-bridge.service';
+export * from './pwa-install.service';

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

@@ -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');
@@ -109,7 +109,7 @@ export class NativeBridgeService {
     // }
   }
 
-  print(request: INativePrintRequest): INativeBridgeResult {
+  print(request: INativePrintRequest[]): INativeBridgeResult {
     return this.invokePrint(request);
   }
 
@@ -126,14 +126,16 @@ export class NativeBridgeService {
     }
   }
 
-  private invokePrint(payload: INativePrintRequest): INativeBridgeResult {
+  private invokePrint(payload: INativePrintRequest[]): INativeBridgeResult {
     if (!this.isEnabled() || !this.canPrint()) {
       this.toastService.warn({ text: 'متاسفانه ارتباط با چاپگر برقرار نیست.' });
       return { success: false, error: 'متاسفانه ارتباط با چاپگر برقرار نیست.' };
     }
     try {
+      this.toastService.info({ text: 'در حال چاپ ...' });
       // @ts-ignore
-      window.NativeBridge.print(JSON.stringify([payload]));
+      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/services/pwa-install.service.ts

@@ -0,0 +1,61 @@
+import { Injectable, signal } from '@angular/core';
+import { ConfirmationService } from 'primeng/api';
+
+@Injectable({ providedIn: 'root' })
+export class PwaInstallService {
+  private deferredInstallPrompt: any = null;
+  readonly isInstalled = signal(false);
+  readonly canInstall = signal(false);
+
+  constructor(private readonly confirmationService: ConfirmationService) {
+    this.init();
+  }
+
+  init() {
+    if (typeof window === 'undefined') {
+      return;
+    }
+
+    const standalone =
+      window.matchMedia('(display-mode: standalone)').matches ||
+      (window.navigator as any).standalone === true;
+
+    this.isInstalled.set(standalone);
+
+    window.addEventListener('beforeinstallprompt', (event: any) => {
+      event.preventDefault();
+
+      this.deferredInstallPrompt = event;
+      this.canInstall.set(true);
+    });
+
+    window.addEventListener('appinstalled', () => {
+      this.deferredInstallPrompt = null;
+      this.canInstall.set(false);
+      this.isInstalled.set(true);
+    });
+  }
+
+  openInstallConfirm() {
+    if (this.isInstalled() || !this.canInstall() || !this.deferredInstallPrompt) {
+      return;
+    }
+
+    this.confirmationService.confirm({
+      header: 'نصب اپلیکیشن',
+      message: 'برای ادامه می‌بایست نیازمندی‌های نرم‌افزار را نصب کنید',
+      acceptLabel: 'نصب',
+      rejectButtonProps: {
+        outlined: true,
+      },
+      accept: () => {
+        this.deferredInstallPrompt.prompt();
+        this.deferredInstallPrompt.userChoice.finally(() => {
+          this.deferredInstallPrompt = null;
+          this.canInstall.set(false);
+          window.location.reload();
+        });
+      },
+    });
+  }
+}

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

@@ -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);
   }
 

src/app/core/state/base-store.ts

@@ -197,11 +197,7 @@ export abstract class EntityStore<
     // @ts-ignore
     // @TODO: check to familiar with ts
     this.setState({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
     });
   }
 }

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/core/validators/equalLength.validator.ts

@@ -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;
+  };
+}

src/app/core/validators/fiscal-code.validator.ts

@@ -1,13 +0,0 @@
-import { ValidatorFn } from '@angular/forms';
-
-export function fiscalCodeValidator(): ValidatorFn {
-  return (control) => {
-    if (control.value === null || control.value === undefined || control.value === '') {
-      return null;
-    }
-    return null;
-    return control.value.length === 11 && /^[0-9]{11}$/.test(control.value)
-      ? null
-      : { fiscalCode: 'معتبر نیست' };
-  };
-}

src/app/core/validators/fiscal-id.validator.ts

@@ -0,0 +1,30 @@
+import { ValidatorFn } from '@angular/forms';
+
+export function fiscalIdValidator(): ValidatorFn {
+  return (control) => {
+    if (control.value === null || control.value === undefined || control.value === '') {
+      return null;
+    }
+
+    if (control.value.length < 6) {
+      return {
+        minlength: {
+          requiredLength: 6,
+          actualLength: control.value.length,
+        },
+      };
+    }
+
+    const pattern = /^[a-zA-Z0-9]*$/;
+
+    if (!pattern.test(control.value)) {
+      return {
+        invalidFiscalId: {
+          value: control.value,
+          message: 'شناسه مالی فقط می‌تواند شامل حروف انگلیسی و اعداد باشد',
+        },
+      };
+    }
+    return null;
+  };
+}

src/app/core/validators/index.ts

@@ -1,4 +1,5 @@
-export * from './fiscal-code.validator';
+export * from './equalLength.validator';
+export * from './fiscal-id.validator';
 export * from './greater.validator';
 export * from './iban.validator';
 export * from './mobile.validator';

src/app/core/validators/password.validator.ts

@@ -1,16 +1,21 @@
 import { ValidatorFn } from '@angular/forms';
 
-// Password must be minimum 8 characters, include at least one uppercase,
-// one lowercase, one number and one special character
-// export const PASSWORD_PATTERN = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]).{8,}$/;
-export const PASSWORD_PATTERN = /^[0-9]{6,}$/;
+// const PASSWORD_PATTERN = /^[a-zA-Z0-9_-]*$/;
 
-// Validator factory named `password` as requested. Returns `null` for empty
-// values so `Validators.required` can be used alongside it when needed.
 export function password(): ValidatorFn {
   return (control) => {
     const value = control?.value;
     if (value === null || value === undefined || String(value).length === 0) return null;
-    return PASSWORD_PATTERN.test(String(value)) ? null : { password: 'معتبر نیست' };
+
+    if (value.length < 6) {
+      return {
+        minlength: {
+          requiredLength: 6,
+          actualLength: value.length,
+        },
+      };
+    }
+    return null;
+    // return PASSWORD_PATTERN.test(String(value)) ? null : { password: 'معتبر نیست' };
   };
 }

src/app/domains/consumer/components/invoices/shared-saleInvoice.component.html

@@ -1,106 +0,0 @@
-@if (loading) {
-  <shared-page-loading />
-} @else if (!invoice) {
-  <uikit-empty-state> </uikit-empty-state>
-} @else {
-  <div class="flex flex-col gap-6">
-    <app-card-data cardTitle="اطلاعات فاکتور" [editable]="false" [backRoute]="backRoute">
-      <ng-template #moreActions>
-        <button
-          pButton
-          type="button"
-          label="چاپ"
-          icon="pi pi-print"
-          outlined
-          size="small"
-          (click)="printInvoice()"
-        ></button>
-      </ng-template>
-      <div class="flex flex-col gap-4">
-        <div class="listKeyValue">
-          <app-key-value label="کد رهگیری" [value]="invoice.code" />
-          <app-key-value label="تاریخ فاکتور" [value]="invoice.invoice_date" type="dateTime" />
-          <app-key-value label="تاریخ ایجاد فاکتور" [value]="invoice.created_at" type="dateTime" />
-          <app-key-value label="وضعیت صدور به سامانه‌ی مودیان">
-            <catalog-tax-provider-status-tag [status]="invoice.status.value" [translate]="invoice.status.translate" />
-          </app-key-value>
-          <div class="col-span-full">
-            <app-key-value label="توضیحات" [value]="invoice.notes" />
-          </div>
-        </div>
-        <p-divider align="center"> اطلاعات پرداخت </p-divider>
-        <div class="grid md:grid-cols-3 sm:grid-cols-2 sm:gap-4 gap-3 items-center">
-          <app-key-value label="مجموع قابل پرداخت" [value]="invoice.total_amount" type="price" />
-          @for (payment of invoice.payments; track $index) {
-            <app-key-value
-              [label]="`${payment.payment_method === 'SET_OF' ? 'تهاتر' : payment.payment_method === 'TERMINAL' ? 'پایانه' : 'نقدی'}`"
-              [value]="payment.amount"
-              type="price"
-            />
-          }
-        </div>
-
-        <p-divider align="center"> اطلاعات صادر کننده </p-divider>
-        <div class="listKeyValue">
-          <app-key-value label="کسب و کار" [value]="invoice.pos!.complex.business_activity.name" />
-          <app-key-value label="مجموعه" [value]="invoice.pos!.complex.name" />
-          <app-key-value label="پایانه فروش" [value]="invoice.pos!.name" />
-          <app-key-value label="ایجاد کننده" [value]="invoice.consumer_account.account.username" />
-        </div>
-
-        @if (variant !== "customer") {
-          <p-divider align="center"> اطلاعات مشتری </p-divider>
-          @if (invoice.customer) {
-            <div class="listKeyValue">
-              @if (invoice.customer.type === "INDIVIDUAL") {
-                <app-key-value label="نوع مشتری" value="حقیقی" />
-                <app-key-value label="نام" [value]="invoice.customer.individual?.first_name" />
-                <app-key-value label="نام خانوادگی" [value]="invoice.customer.individual?.last_name" />
-                <app-key-value label="کد اقتصادی" [value]="invoice.customer.individual?.economic_code" />
-                <app-key-value label="کد ملی" [value]="invoice.customer.individual?.national_id" />
-                <app-key-value label="کد پستی" [value]="invoice.customer.individual?.postal_code" />
-              } @else {
-                <app-key-value label="نوع مشتری" value="حقوقی" />
-                <app-key-value label="نام شرکت" [value]="invoice.customer.legal?.company_name" />
-                <app-key-value label="کد اقتصادی" [value]="invoice.customer.legal?.economic_code" />
-                <app-key-value label="کد ثبتی" [value]="invoice.customer.legal?.registration_number" />
-                <app-key-value label="کد پستی" [value]="invoice.customer.legal?.postal_code" />
-              }
-            </div>
-          } @else if (invoice.unknown_customer) {
-            <div class="listKeyValue">
-              <app-key-value label="نوع مشتری" value="نوع دوم" />
-              <app-key-value label="عنوان" [value]="invoice.unknown_customer.name" />
-              <app-key-value label="کد ثبتی" [value]="invoice.unknown_customer.national_code" />
-            </div>
-          } @else {
-            <p class="text-center text-text-color pt-3 pb-5">اطلاعات مشتری ثبت نشده است.</p>
-          }
-        }
-      </div>
-    </app-card-data>
-    <app-card-data cardTitle="کالاهای خریداری شده" [editable]="false">
-      <app-page-data-list
-        [columns]="columns"
-        [expandColumns]="expandableColumns"
-        [expandable]="true"
-        expandableItemKey="payload"
-        [items]="invoice.items"
-        [loading]="loading"
-        pageTitle=""
-        [showRefresh]="false"
-      >
-        <ng-template #totalAmount let-item>
-          @if (!item.discount_amount) {
-            <span [appPriceMask]="item.total_amount"></span>
-          } @else {
-            <!-- <div class="flex flex-col items-end">
-          <span class="line-through text-muted-color text-xs" [appPriceMask]="item.total_amount"></span>
-          <span [appPriceMask]="item.total_amount - item.discount_amount"></span>
-        </div> -->
-          }
-        </ng-template>
-      </app-page-data-list>
-    </app-card-data>
-  </div>
-}

src/app/domains/consumer/components/invoices/shared-saleInvoice.component.ts

@@ -1,137 +0,0 @@
-import { Maybe } from '@/core';
-import { NativeBridgeService } from '@/core/services';
-import { PosInfoStore } from '@/domains/pos/store';
-import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
-import { AppCardComponent, KeyValueComponent } from '@/shared/components';
-import { PageLoadingComponent } from '@/shared/components/page-loading.component';
-import {
-  IColumn,
-  PageDataListComponent,
-} from '@/shared/components/pageDataList/page-data-list.component';
-import { PriceMaskDirective } from '@/shared/directives';
-import { UikitEmptyStateComponent } from '@/uikit';
-import { formatJalali, getGoodUnitTypeProperties } from '@/utils';
-import {
-  Component,
-  computed,
-  EventEmitter,
-  inject,
-  Input,
-  Output,
-  TemplateRef,
-  ViewChild,
-} from '@angular/core';
-import { UrlTree } from '@angular/router';
-import { ButtonDirective } from 'primeng/button';
-import { Divider } from 'primeng/divider';
-import { TableModule } from 'primeng/table';
-import { ISaleInvoiceFullResponse } from '../../models';
-
-export type TConsumerSaleInvoice = 'full' | 'customer' | 'pos';
-
-@Component({
-  selector: 'consumer-saleInvoice-shared',
-  templateUrl: './shared-saleInvoice.component.html',
-  imports: [
-    AppCardComponent,
-    KeyValueComponent,
-    Divider,
-    ButtonDirective,
-    PageDataListComponent,
-    TableModule,
-    PageLoadingComponent,
-    UikitEmptyStateComponent,
-    PriceMaskDirective,
-    CatalogTaxProviderStatusTagComponent,
-  ],
-})
-export class ConsumerSaleInvoiceSharedComponent {
-  private readonly nativeBridge = inject(NativeBridgeService);
-
-  @Input({ required: true }) loading!: boolean;
-  @Input() invoice!: Maybe<ISaleInvoiceFullResponse>;
-  @Input() variant: TConsumerSaleInvoice = 'full';
-  @Input() backRoute?: UrlTree | string | any[];
-
-  @Output() onRefresh = new EventEmitter<void>();
-
-  @ViewChild('totalAmount', { static: false }) totalAmount!: TemplateRef<any>;
-  private readonly posInfoStore = inject(PosInfoStore);
-
-  readonly posName = computed(() => {
-    if (this.posInfoStore.entity()) {
-      const { name, businessActivity, complex } = this.posInfoStore.entity()!;
-      return `${name} (${businessActivity.name} - ${complex.name})`;
-    }
-    return '';
-  });
-
-  printInvoice = () => {
-    if (this.invoice) {
-      const printResult = this.nativeBridge.print({
-        title: `فروشگاه ${this.posName()}`,
-        items: [
-          {
-            label: 'شماره فاکتور',
-            value: this.invoice?.code,
-          },
-          { label: 'تاریخ', value: formatJalali(this.invoice.invoice_date, 'YYYY/MM/DD') },
-          { label: 'مبلغ کل', value: this.invoice.total_amount },
-        ],
-      });
-    }
-  };
-
-  columns: IColumn[] = [
-    {
-      field: 'name',
-      header: 'عنوان',
-      type: 'nested',
-      nestedOption: {
-        path: 'good.name',
-      },
-    },
-    {
-      field: 'unit_price',
-      header: 'قیمت واحد',
-      type: 'price',
-    },
-    {
-      field: 'quantity',
-      header: 'مقدار',
-      customDataModel(item) {
-        return `${item.quantity} ${getGoodUnitTypeProperties(item.good.unit_type).quantitySymbolText}`;
-      },
-    },
-    {
-      field: 'total_amount',
-      header: 'قیمت نهایی',
-      type: 'price',
-      // customDataModel: this.totalAmount,
-    },
-  ];
-
-  expandableColumns: IColumn[] = [
-    {
-      field: 'commission',
-      header: 'کارمزد',
-      type: 'price',
-    },
-    {
-      field: 'wages',
-      header: 'اجرت',
-      type: 'price',
-    },
-    {
-      field: 'profit',
-      header: 'سود',
-      type: 'price',
-    },
-  ];
-
-  expandedRows: { [key: string]: boolean } = {};
-
-  refresh() {
-    this.onRefresh.emit();
-  }
-}

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

@@ -9,28 +9,28 @@ export const CONSUMER_MENU_ITEMS = [
       },
       {
         label: 'فعالیت اقتصادی',
-        icon: 'pi pi-fw pi-home',
+        icon: 'pi pi-fw pi-shop',
         routerLink: ['/consumer/business_activities'],
       },
       {
-        label: 'پایانه‌های فروش',
-        icon: 'pi pi-fw pi-home',
+        label: 'پایانه‌‌ی فروش',
+        icon: 'pi pi-fw pi-tablet',
         routerLink: ['/consumer/poses'],
       },
       {
-        label: 'فاکتورها',
-        icon: 'pi pi-fw pi-home',
+        label: 'صورت‌حساب‌',
+        icon: 'pi pi-fw pi-receipt',
         routerLink: ['/consumer/sale_invoices'],
       },
       {
-        label: 'مشتری‌ها',
-        icon: 'pi pi-fw pi-home',
+        label: 'مشتری',
+        icon: 'pi pi-fw pi-users',
         routerLink: ['/consumer/customers'],
       },
 
       {
         label: 'حساب‌های کاربری',
-        icon: 'pi pi-fw pi-home',
+        icon: 'pi pi-fw pi-user',
         routerLink: ['/consumer/accounts'],
       },
     ],

src/app/domains/consumer/models/io.d.ts

@@ -1,9 +1,31 @@
+import { IEnumTranslate } from '@/shared/models/enum_translate.type';
+
 export interface IConsumerInfoRawResponse {
   id: string;
+  partner: Partner;
+  type: IEnumTranslate<'INDIVIDUAL' | 'LEGAL'>;
+  status: IEnumTranslate<'ACTIVE' | 'INACTIVE'>;
+  legal?: Legal;
+  individual?: Individual;
+  name: string;
+}
+export interface IConsumerInfoResponse extends IConsumerInfoRawResponse {}
+
+interface Individual {
   first_name: string;
   last_name: string;
   mobile_number: string;
-  status: string;
+  national_code: string;
   fullname: string;
 }
-export interface IConsumerInfoResponse extends IConsumerInfoRawResponse {}
+
+interface Legal {
+  company_name: string;
+  registration_number: string;
+}
+
+interface Partner {
+  id: string;
+  name: string;
+  code: string;
+}

src/app/domains/consumer/models/saleInvoice.io.ts

@@ -1,22 +1,5 @@
 import ISummary from '@/core/models/summary';
-import { TspProviderResponseStatus } from '@/shared/catalog';
-import { IEnumTranslate } from '@/shared/models/enum_translate.type';
-
-export interface ISaleInvoiceFullRawResponse {
-  id: string;
-  code: string;
-  total_amount: string;
-  invoice_date: string;
-  consumer_account: ConsumerAccount;
-  pos: Pos;
-  payments: Payment[];
-  items: Item[];
-  created_at: string;
-  notes?: string;
-  customer?: Customer;
-  unknown_customer?: UnknownCustomer;
-  status: IEnumTranslate<TspProviderResponseStatus>;
-}
+import { ISaleInvoiceFullRawResponse } from '@/shared/components/invoices/sale-invoice-full-response.model';
 
 export interface ISaleInvoiceFullResponse extends ISaleInvoiceFullRawResponse {}
 

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/store/account.store.ts

@@ -1,4 +1,4 @@
-import { EntityState, EntityStore } from '@/core/state';
+import { defaultBaseStateData, EntityState, EntityStore } from '@/core/state';
 import { computed, inject, Injectable } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { catchError, finalize } from 'rxjs';
@@ -17,11 +17,7 @@ export class AccountStore extends EntityStore<IAccountResponse, AccountState> {
   private readonly service = inject(AccountsService);
   constructor() {
     super({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }
@@ -64,11 +60,7 @@ export class AccountStore extends EntityStore<IAccountResponse, AccountState> {
 
   override reset(): void {
     this.setState({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }

src/app/domains/consumer/modules/accounts/views/list.component.ts

@@ -5,6 +5,7 @@ import {
   IChangePasswordSubmitPayload,
 } from '@/shared/components';
 import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
+import { accountListConfig } from '@/shared/constants/list-configs';
 import { Component, inject, signal } from '@angular/core';
 import { Router } from '@angular/router';
 import { finalize } from 'rxjs';
@@ -23,27 +24,7 @@ export class ConsumerAccountsComponent extends AbstractList<IAccountResponse> {
   passwordSubmitLoading = signal(false);
 
   override setColumns(): void {
-    this.columns = [
-      // { field: 'id', header: 'شناسه', type: 'id' },
-      {
-        field: 'username',
-        header: 'نام کاربری',
-        type: 'nested',
-        nestedOption: { path: 'account.username' },
-      },
-      {
-        field: 'pos',
-        header: 'پایانه',
-        customDataModel(item) {
-          return `${item.pos.name} - ${item.pos.complex.name} - ${item.pos.complex.business_activity.name}`;
-        },
-      },
-      {
-        field: 'created_at',
-        header: 'تاریخ ایجاد',
-        type: 'date',
-      },
-    ];
+    this.columns = accountListConfig.columns;
   }
 
   override getDataRequest() {

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/complexes/list.component.ts

@@ -4,6 +4,7 @@ import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
+import { complexListConfig } from '@/shared/constants/list-configs';
 import { Component, inject, Input } from '@angular/core';
 import { Router } from '@angular/router';
 import { consumerComplexesNamedRoutes } from '../../constants/routes/complexes';
@@ -19,16 +20,7 @@ import { ConsumerComplexFormComponent } from './form.component';
 export class ConsumerComplexListComponent extends AbstractList<IComplexResponse> {
   @Input({ required: true }) businessId!: string;
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
-    // { field: 'id', header: 'شناسه', type: 'id' },
-    { field: 'name', header: 'عنوان' },
-    { field: 'branch_code', header: 'کد شعبه' },
-    {
-      field: 'created_at',
-      header: 'تاریخ ایجاد',
-      type: 'date',
-    },
-  ];
+  @Input() header: IColumn[] = complexListConfig.columns;
 
   private readonly service = inject(ConsumerComplexesService);
   private readonly router = inject(Router);

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

@@ -4,12 +4,11 @@
   [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-fiscal-code [control]="form.controls.fiscal_id" />
+    <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" />
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />

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

@@ -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
     ),
   });
 

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

@@ -1,4 +1,4 @@
-<shared-good-form
+<shared-good-form-dialog
   [guildId]="guildId"
   [visible]="visible"
   (visibleChange)="visibleChange.emit($event)"
@@ -7,5 +7,4 @@
   [createFn]="create"
   [updateFn]="update"
   (onSubmit)="onSubmit.emit($event)"
-  (onClose)="onClose.emit()"
-/>
+  (onClose)="onClose.emit()" />

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

@@ -1,14 +1,15 @@
 import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
 
 import { AbstractDialog } from '@/shared/abstractClasses/abstract-dialog';
-import { IGoodResponse, SharedGoodFormComponent } from '@/shared/components/good';
+import { IGoodResponse } from '@/shared/components/good';
+import { ConsumerUserFormDialogComponent } from '@/shared/components/good/form-dialog.component';
 import { IConsumerBusinessActivityGoodResponse } from '../../models/goods_io';
 import { BusinessActivityGoodsService } from '../../services/goods.service';
 
 @Component({
   selector: 'consumer-businessActivity-good-form',
   templateUrl: './form.component.html',
-  imports: [SharedGoodFormComponent],
+  imports: [ConsumerUserFormDialogComponent],
 })
 export class ConsumerBusinessActivityGoodFormComponent extends AbstractDialog {
   @Input({ required: true }) businessId!: string;

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

@@ -4,6 +4,7 @@ import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
+import { goodListConfig } from '@/shared/constants/list-configs';
 import { Component, inject, Input } from '@angular/core';
 import { IConsumerBusinessActivityGoodResponse } from '../../models/goods_io';
 import { BusinessActivityGoodsService } from '../../services/goods.service';
@@ -18,22 +19,9 @@ export class ConsumerBusinessActivityGoodsListComponent extends AbstractList<ICo
   @Input({ required: true }) businessId!: string;
   @Input({ required: true }) guildId!: string;
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
-    // { field: 'id', header: 'شناسه', type: 'id' },
-    { field: 'name', header: 'عنوان' },
-    { field: 'sku', header: 'شناسه‌ عمومی' },
-    {
-      field: 'category',
-      header: 'دسته‌بندی',
-      type: 'nested',
-      nestedOption: { path: 'category.name' },
-    },
-    {
-      field: 'created_at',
-      header: 'تاریخ ایجاد',
-      type: 'date',
-    },
-  ];
+  @Input() header: IColumn[] = goodListConfig.columns;
+
+  listConfig = goodListConfig;
   service = inject(BusinessActivityGoodsService);
 
   override setColumns(): void {

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

@@ -4,6 +4,7 @@ import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
+import { businessActivityListConfig } from '@/shared/constants/list-configs';
 import { Component, inject, Input } from '@angular/core';
 import { Router } from '@angular/router';
 import { consumerBusinessActivityNamedRoutes } from '../constants';
@@ -18,33 +19,7 @@ import { ConsumerBusinessActivityFormComponent } from './form.component';
 })
 export class ConsumerBusinessActivityListComponent extends AbstractList<IBusinessActivityResponse> {
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
-    { field: 'name', header: 'عنوان' },
-    { field: 'guild', header: 'صنف', type: 'nested', nestedOption: { path: 'guild.name' } },
-    { field: 'economic_code', header: 'کد اقتصادی' },
-    {
-      field: 'license_info',
-      header: 'محدودیت کاربر',
-      customDataModel(item) {
-        const licenseInfo = (item as IBusinessActivityResponse).license_info;
-        if (!licenseInfo) {
-          return 'بدون مجوز';
-        }
-        return `${licenseInfo.accounts_limit} کاربر`;
-      },
-    },
-    {
-      field: 'license_info',
-      header: 'انقضا مجوز',
-      type: 'nested',
-      nestedOption: { path: 'license_info.expires_at', type: 'date' },
-    },
-    {
-      field: 'created_at',
-      header: 'تاریخ ایجاد',
-      type: 'date',
-    },
-  ];
+  @Input() header: IColumn[] = businessActivityListConfig.columns;
 
   private readonly service = inject(BusinessActivitiesService);
   private readonly router = inject(Router);

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,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>

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[] = [
-    // { 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));
+  }
 }

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,12 +1,15 @@
 import ISummary from '@/core/models/summary';
-import { TCustomerInfo, TPosOrderGoodPayload } from '@/domains/pos/modules/landing/models';
-import { UnitType } from '@/utils';
+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;
@@ -29,7 +32,7 @@ interface Payment {
 }
 
 interface Item {
-  unit_type: UnitType;
+  measure_unit: ISummary;
   discount: string;
   quantity: string;
   total_amount: string;
@@ -46,6 +49,6 @@ interface Good {
   barcode: null;
   local_sku: null;
   pricing_model: string;
-  unit_type: string;
+  measure_unit: ISummary;
   category: ISummary;
 }

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

@@ -1,4 +1,4 @@
-import { EntityState, EntityStore } from '@/core/state';
+import { defaultBaseStateData, EntityState, EntityStore } from '@/core/state';
 import { computed, inject, Injectable } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { catchError, finalize } from 'rxjs';
@@ -20,11 +20,7 @@ export class BusinessActivityStore extends EntityStore<
   private readonly service = inject(BusinessActivitiesService);
   constructor() {
     super({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }
@@ -58,7 +54,7 @@ export class BusinessActivityStore extends EntityStore<
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });
@@ -68,11 +64,7 @@ export class BusinessActivityStore extends EntityStore<
 
   override reset(): void {
     this.setState({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }

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

@@ -1,4 +1,4 @@
-import { EntityState, EntityStore } from '@/core/state';
+import { defaultBaseStateData, EntityState, EntityStore } from '@/core/state';
 import { computed, inject, Injectable } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { catchError, finalize } from 'rxjs';
@@ -17,11 +17,7 @@ export class ConsumerComplexStore extends EntityStore<IComplexResponse, ComplexS
   private readonly service = inject(ConsumerComplexesService);
   constructor() {
     super({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }
@@ -63,11 +59,7 @@ export class ConsumerComplexStore extends EntityStore<IComplexResponse, ComplexS
 
   override reset(): void {
     this.setState({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }

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

@@ -1,8 +1,8 @@
-import { EntityState, EntityStore } from '@/core/state';
+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';
 
@@ -17,11 +17,7 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
   private readonly service = inject(ConsumerPosesService);
   constructor() {
     super({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }
@@ -32,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
+          ),
         },
       ],
     });
@@ -54,7 +54,7 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });
@@ -64,11 +64,7 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
 
   override reset(): void {
     this.setState({
-      loading: false,
-      error: null,
-      entity: null,
-      initialized: false,
-      isRefreshing: false,
+      ...defaultBaseStateData,
       breadcrumbItems: [],
     });
   }

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,
-        routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(
+        title: consumerComplexPosesNamedRoutes.poses.meta.title,
+        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">
-  <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>

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()" />