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

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

angular.json

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

docker-compose.yml

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

package.json

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

public-novin/favicon/site.webmanifest

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

public-sepehr/favicon/site copy.webmanifest

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

public-sepehr/favicon/site.webmanifest

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

public/favicon/site.webmanifest

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

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

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

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

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

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

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

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

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

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

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

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

@@ -28,8 +28,6 @@ export class ConsumerCustomerSaleInvoiceComponent {
   constructor() {
     effect(() => {
       if (this.invoice()?.id) {
-        console.log('inja');
-
         this.setBreadcrumb();
       }
     });

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

@@ -28,7 +28,17 @@ export class ConsumerStatisticsLatestInvoicesComponent extends AbstractList<ISta
   readonly invoicesPageRoute = consumerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!();
 
   override setColumns(): void {
-    this.columns = saleInvoiceListConfig.columns.filter((column) => column.field !== 'created_at');
+    this.columns = saleInvoiceListConfig.columns
+      .filter((column) => column.field !== 'created_at')
+      .map((header) => {
+        if (header.field === 'status') {
+          return {
+            ...header,
+            customDataModel: this.status,
+          };
+        }
+        return header;
+      });
   }
 
   override getDataRequest() {

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,10 @@
 <app-page-data-list
-  pageTitle="مشتری‌ها"
+  pageTitle="مودیان"
-  [addNewCtaLabel]="'افزودن مشتری'"
+  [addNewCtaLabel]="'افزودن مودی'"
   [columns]="columns"
   [showAdd]="true"
-  emptyPlaceholderTitle="مشتری یافت نشد"
+  emptyPlaceholderTitle="مودی یافت نشد"
-  emptyPlaceholderDescription="برای افزودن مشتری، روی دکمهٔ بالا کلیک کنید."
+  emptyPlaceholderDescription="برای افزودن مودی، روی دکمهٔ بالا کلیک کنید."
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
 <ng-template #topbarCenter>
   @if (posInfo()) {
     <a [routerLink]="homeRouteLink" class="flex flex-col items-center justify-center gap-2">
-      <div class="h-8 w-8">
+      <div class="h-8 max-w-20">
         <img
           [src]="posInfo()?.partner?.logo_url ?? placeholderLogo"
           alt="Logo"

src/app/domains/pos/modules/configs/components/sendToFiscalActivation/services/main.service.ts

@@ -8,13 +8,13 @@ import {
 @Injectable({ providedIn: 'root' })
 export class PosConfigSendToFiscalActivationService {
   get(): IPosConfigSendToFiscalActivationResponse {
-    const defaultPrice = Boolean(
+    const sendToFiscalActivation = Boolean(
       window.localStorage.getItem(LOCAL_STORAGE_KEYS.POS_CONFIG_SEND_TO_FISCAL_ACTIVATION) ===
       'true'
     );
 
-    this.submit(defaultPrice);
+    this.submit(sendToFiscalActivation);
-    return defaultPrice;
+    return sendToFiscalActivation;
   }
 
   submit(data: IPosConfigSendToFiscalActivationPayload) {

src/app/domains/pos/modules/goodsManagement/views/create.component.html

@@ -2,6 +2,11 @@
   <app-inner-pages-header [pageTitle]="preparedPageTitle()" [backRoute]="backRoute" />
   <hr class="mt-0!" />
   <div class="flex w-full flex-col flex-wrap gap-3 p-4">
-    <shared-good-form [guildId]="guildId()" [createFn]="createFn" (onSubmit)="onSubmit()" (onClose)="onPrev()" />
+    <shared-good-form
+      [guildId]="guildId()"
+      [createFn]="createFn"
+      class="block w-full"
+      (onSubmit)="onSubmit()"
+      (onClose)="onPrev()" />
   </div>
 </div>

src/app/domains/pos/modules/goodsManagement/views/update.component.html

@@ -9,6 +9,7 @@
         [initialValues]="item()!"
         [updateFn]="updateFn"
         [editMode]="true"
+        class="block w-full"
         (onSubmit)="onSubmit()"
         (onClose)="onPrev()" />
     }

src/app/domains/pos/modules/saleInvoices/models/correction.ts

@@ -1,10 +1,3 @@
-import { IPosOrderItem } from '../../shop/models';
+import { ICorrectionRequest } from '@/shared/components/invoices/models';
 
-export interface IPosCorrectionRequest {
+export interface IPosCorrectionRequest extends ICorrectionRequest {}
-  total_amount: number;
-  discount_amount: number;
-  tax_amount: number;
-  invoice_date: string;
-  items: IPosOrderItem[];
-  notes?: string;
-}

src/app/domains/pos/modules/saleInvoices/models/fiscal.io.ts

@@ -1,6 +1,8 @@
 import { TspProviderResponseStatus } from '@/shared/catalog';
+import { IPosSaleInvoicesSummaryResponse } from './io';
 
 export interface IPosSaleInvoiceFiscalActionResponse {
+  invoice: IPosSaleInvoicesSummaryResponse;
   message?: string;
   status: TspProviderResponseStatus;
 }

src/app/domains/pos/modules/saleInvoices/models/returnFromSale.ts

@@ -1,10 +1,9 @@
-import { IPosOrderItem } from '../../shop/models';
-
 export interface IPosReturnFromSaleRequest {
-  total_amount: number;
-  discount_amount: number;
-  tax_amount: number;
   invoice_date: string;
-  items: IPosOrderItem[];
+  items: IPosReturnFromSaleItem[];
-  notes?: string;
+}
+
+export interface IPosReturnFromSaleItem {
+  good_id: string;
+  quantity: number;
 }

src/app/domains/pos/modules/saleInvoices/services/main.service.ts

@@ -13,6 +13,7 @@ import {
   IPosSaleInvoicesSummaryRawResponse,
   IPosSaleInvoicesSummaryResponse,
 } from '../models';
+import { IPosReturnFromSaleRequest } from '../models/returnFromSale';
 
 @Injectable({ providedIn: 'root' })
 export class PosSaleInvoicesService {
@@ -65,7 +66,10 @@ export class PosSaleInvoicesService {
     );
   }
 
-  returnFromSale(data: any, invoiceId: string): Observable<IPosSaleInvoiceFiscalActionResponse> {
+  returnFromSale(
+    data: IPosReturnFromSaleRequest,
+    invoiceId: string
+  ): Observable<IPosSaleInvoiceFiscalActionResponse> {
     return this.http.post<IPosSaleInvoiceFiscalActionResponse>(
       this.apiRoutes.tsp.returnFromSale(invoiceId),
       data

src/app/domains/pos/modules/saleInvoices/views/single.component.html

@@ -5,6 +5,8 @@
   [sendToTspLoading]="sendToTspLoading()"
   [inquiryLoading]="inquiryLoading()"
   [resendToTspLoading]="resendToTspLoading()"
+  [correctionLoading]="correctionLoading()"
+  [returnFromSaleLoading]="backFromSaleLoading()"
   (onSendToTsp)="sendToTsp()"
   (onResendToTsp)="resendToTsp()"
   (onInquiry)="inquiry()"

src/app/domains/pos/modules/saleInvoices/views/single.component.ts

@@ -1,10 +1,10 @@
 import { ToastService } from '@/core/services/toast.service';
 import taxProviderStatusTranslatorUtil from '@/shared/catalog/taxProviderStatus/tax-provider-status-translator.util';
 import { SharedSaleInvoiceSingleViewComponent } from '@/shared/components/invoices/sale-invoice-single-view.component';
-import pageParamsUtils from '@/utils/page-params.utils';
 import { Component, computed, inject, signal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
-import { finalize } from 'rxjs';
+import { distinctUntilChanged, finalize, map } from 'rxjs';
 import { posSaleInvoicesNamedRoutes } from '../constants';
 import { IPosCorrectionRequest } from '../models/correction';
 import { IPosReturnFromSaleRequest } from '../models/returnFromSale';
@@ -20,8 +20,20 @@ export class PosSaleInvoiceComponent {
   private readonly store = inject(PosSaleInvoiceStore);
   private readonly toastService = inject(ToastService);
 
-  pageParams = computed(() => pageParamsUtils(this.route));
+  invoiceId = signal<string>('');
-  invoiceId = signal<string>(this.pageParams()['invoiceId']);
+
+  constructor() {
+    this.route.paramMap
+      .pipe(
+        map((params) => params.get('invoiceId') ?? ''),
+        distinctUntilChanged(),
+        takeUntilDestroyed()
+      )
+      .subscribe((invoiceId) => {
+        this.invoiceId.set(invoiceId);
+        this.store.getData(invoiceId);
+      });
+  }
 
   inquiryLoading = signal(false);
   sendToTspLoading = signal(false);
@@ -94,7 +106,12 @@ export class PosSaleInvoiceComponent {
           this.correctionLoading.set(false);
         })
       )
-      .subscribe();
+      .subscribe((res) => {
+        this.toastService.success({
+          text: `اصلاحیه‌ی صورت‌حساب با شماره‌ی ${res.invoice?.invoice_number} با موفقیت ایجاد شد.`,
+        });
+        this.store.updateStatus(res.status);
+      });
   }
   returnFromSale(data: IPosReturnFromSaleRequest) {
     this.backFromSaleLoading.set(true);
@@ -105,7 +122,12 @@ export class PosSaleInvoiceComponent {
           this.backFromSaleLoading.set(false);
         })
       )
-      .subscribe();
+      .subscribe((res) => {
+        this.toastService.success({
+          text: `برگشت از فروش با شماره‌ی ${res.invoice?.invoice_number} با موفقیت ایجاد شد.`,
+        });
+        this.store.updateStatus(res.status);
+      });
   }
   revoke() {
     this.revokeLoading.set(true);
@@ -116,10 +138,11 @@ export class PosSaleInvoiceComponent {
           this.revokeLoading.set(false);
         })
       )
-      .subscribe();
+      .subscribe((res) => {
-  }
+        this.toastService.success({
-
+          text: `صورت‌حساب شماره‌ی ${res.invoice?.invoice_number} با موفقیت ابطال شد.`,
-  ngOnInit() {
+        });
-    this.store.getData(this.invoiceId());
+        this.store.updateStatus(res.status);
+      });
   }
 }

src/app/domains/pos/modules/shop/components/customers/unknown/form.component.html

@@ -1,5 +1,5 @@
 <form [formGroup]="form" (submit)="submit()">
   <app-input [control]="form.controls.name" name="name" label="نام مشتری" />
-  <app-input [control]="form.controls.national_id" name="national_id" label="شماره ملی" type="nationalId" />
+  <app-input [control]="form.controls.economic_code" name="economic_code" label="کد اقتصادی" />
   <app-form-footer-actions submitLabel="ثبت مشتری و ادامه" (onCancel)="close()" />
 </form>

src/app/domains/pos/modules/shop/components/customers/unknown/form.component.ts

@@ -1,4 +1,3 @@
-import { nationalIdValidator } from '@/core/validators/national-id.validator';
 import { AbstractForm } from '@/shared/abstractClasses';
 import { InputComponent } from '@/shared/components';
 import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
@@ -19,10 +18,7 @@ export class CustomerUnknownFormComponent extends AbstractForm<IUnknownCustomer,
 
   override showSuccessMessage = false;
   form = this.fb.group({
-    national_id: [
+    economic_code: [this.store?.customer().info?.customer_unknown?.economic_code || ''],
-      this.store?.customer().info?.customer_unknown?.national_id || '',
-      [nationalIdValidator()],
-    ],
     name: [this.store?.customer().info?.customer_unknown?.name || ''],
   });
 

src/app/domains/pos/modules/shop/components/order/order-section.component.ts

@@ -85,8 +85,6 @@ export class PosOrderSectionComponent {
   }
 
   submitAndPay() {
-    console.log('submitAndPay');
-
     this.onSubmit.emit();
   }
 

src/app/domains/pos/modules/shop/models/customer.ts

@@ -15,7 +15,7 @@ export interface ILegalCustomer {
 }
 
 export interface IUnknownCustomer {
-  national_id: string;
+  economic_code?: string;
   name: string;
 }
 

src/app/domains/pos/modules/shop/services/main.service.ts

@@ -44,11 +44,14 @@ export class PosService {
 
   getGoodCategories(): Observable<IListingResponse<IGoodCategoryResponse>> {
     return this.http.get<IListingResponse<IGoodCategoryRawResponse>>(
-      this.apiRoutes.goodCategories(),
+      this.apiRoutes.goodCategories()
     );
   }
 
-  submitOrder(payload: IPosOrderRequest): Observable<IPosOrderResponse> {
+  submitOrder(payload: IPosOrderRequest, send_to_tsp: boolean): Observable<IPosOrderResponse> {
-    return this.http.post<IPosOrderRawResponse>(this.apiRoutes.submitOrder(), payload);
+    return this.http.post<IPosOrderRawResponse>(this.apiRoutes.submitOrder(), {
+      ...payload,
+      send_to_tsp,
+    });
   }
 }

src/app/domains/pos/modules/shop/services/payment-bridge.abstract.ts

@@ -2,5 +2,5 @@ import { PosPaymentResult } from '../models';
 
 export abstract class PosPaymentBridgeAbstract {
   abstract registerPaymentResultListener(handler: (payload: PosPaymentResult) => void): () => void;
-  abstract emitPaymentResultForTest(payload: unknown): void;
+  abstract emitPaymentResultForTest(payload: PosPaymentResult): void;
 }

src/app/domains/pos/modules/shop/services/payment-bridge.service.ts

@@ -11,25 +11,9 @@ export class PosPaymentBridgeService extends PosPaymentBridgeAbstract {
     window.WebV = {
       onPaymentResult: (payload: PosPaymentResult) => {
         try {
-          // const parsedPayload: PosPaymentResult = JSON.parse(payload);
-          // this.toastServices.info({ text: payload.data?.customerCardNO || '', life: 10000 });
-          // this.toastServices.info({
-          //   text: payload.data?.responseCode || 'No response code',
-          //   life: 10000,
-          // });
-          // this.toastServices.info({ text: payload.data?.rrn || 'No response code', life: 10000 });
-          // this.toastServices.info({ text: payload.data?.stan || 'No response code', life: 10000 });
-          // this.toastServices.info({
-          //   text: payload.data?.terminalId || 'No response code',
-          //   life: 10000,
-          // });
-          // this.toastServices.info({
-          //   text: payload.data?.transactionDateTime || 'No response code',
-          //   life: 10000,
-          // });
           handler(payload);
         } catch (e) {
-          this.toastServices.error({ text: 'Failed to parse payment result', life: 10000 });
+          // this.toastServices.error({ text: 'Failed to parse payment result', life: 10000 });
           this.toastServices.error({
             text: e instanceof Error ? e.message : String(e),
             life: 10000,

src/app/domains/pos/modules/shop/store/main.store.ts

@@ -11,6 +11,7 @@ import {
 } from '@/utils';
 import { computed, inject, Injectable, signal } from '@angular/core';
 import { catchError, finalize, firstValueFrom, map, throwError } from 'rxjs';
+import { PosConfigSendToFiscalActivationService } from '../../configs/components/sendToFiscalActivation/services/main.service';
 import { ICustomer, IPayment, IPosOrderRequest, IPosOrderResponse } from '../models';
 import { IPosInOrderGood, IPosOrderItem } from '../models/types';
 import { PosService } from '../services/main.service';
@@ -64,6 +65,9 @@ export const INITIAL_POS_STATE: IPosLandingState = {
 @Injectable({ providedIn: 'any' })
 export class PosLandingStore {
   private readonly service = inject(PosService);
+  private readonly posConfigSendToFiscalActivationService = inject(
+    PosConfigSendToFiscalActivationService
+  );
 
   private state$ = signal<IPosLandingState>({ ...INITIAL_POS_STATE });
 
@@ -295,31 +299,33 @@ export class PosLandingStore {
 
     let res: Maybe<IPosOrderResponse> = null;
 
-    return this.service.submitOrder(orderPayload).pipe(
+    return this.service
-      finalize(() => {
+      .submitOrder(orderPayload, this.posConfigSendToFiscalActivationService.get())
-        this.setState({ submitOrderLoading: false });
+      .pipe(
-      }),
+        finalize(() => {
-      catchError((error) => throwError(() => error)),
+          this.setState({ submitOrderLoading: false });
+        }),
+        catchError((error) => throwError(() => error)),
 
-      map((_res) => {
+        map((_res) => {
-        if (_res) {
+          if (_res) {
-          this.setState({
+            this.setState({
-            inOrderGoods: [],
+              inOrderGoods: [],
-            customerDetails: {
+              customerDetails: {
-              type: CustomerType.UNKNOWN,
+                type: CustomerType.UNKNOWN,
-            },
+              },
-            invoiceDate: _res.invoice_date,
+              invoiceDate: _res.invoice_date,
-            payments: {
+              payments: {
-              cash: 0,
+                cash: 0,
-              set_off: 0,
+                set_off: 0,
-              terminals: [],
+                terminals: [],
-            },
+              },
-            orderNote: '',
+              orderNote: '',
-          });
+            });
-        }
+          }
 
-        return _res;
+          return _res;
-      })
+        })
-    );
+      );
   }
 }

src/app/domains/pos/modules/shop/views/root.component.html

@@ -40,7 +40,13 @@
       (onSubmit)="submitOrder()" />
   }
   @if (isVisiblePaymentForm()) {
-    <pos-payment-form-dialog [(visible)]="isVisiblePaymentForm" (onSubmit)="submitPayment($event)" />
+    <shared-invoice-payment-form-dialog
+      [(visible)]="isVisiblePaymentForm"
+      [totalAmount]="priceInfo().totalAmount"
+      [submitOrderLoading]="submitOrderLoading()"
+      [isGoldGuild]="isGoldGuild()"
+      [isUnknownCustomer]="isUnknownCustomer()"
+      (onSubmitPayment)="submitPayment($event)" />
   }
 
   @if (responseInvoice()) {

src/app/domains/pos/modules/shop/views/root.component.ts

@@ -2,16 +2,17 @@
 import { Maybe } from '@/core';
 import { PosInfoStore } from '@/domains/pos/store/pos.store';
 import { AbstractIsMobileComponent } from '@/shared/abstractClasses/abstract-is-mobile';
+import { PosPaymentFormDialogComponent } from '@/shared/components/invoices/payment';
 import { PageLoadingComponent } from '@/shared/components/page-loading.component';
 import { PriceMaskDirective } from '@/shared/directives';
 import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@angular/core';
 import { ButtonDirective } from 'primeng/button';
+import { finalize } from 'rxjs';
 import { PosOrderSectionDialogComponent } from '../components/order/order-section-dialog.component';
 import { PosOrderSectionComponent } from '../components/order/order-section.component';
 import { PosOrderSubmittedDialogComponent } from '../components/order/order-submitted-dialog.component';
-import { PosPaymentFormDialogComponent } from '../components/payment/form-dialog.component';
 import { PosGoodsComponent } from '../components/views/goods.component';
-import { IPosOrderResponse } from '../models';
+import { IPayment, IPosOrderResponse } from '../models';
 import { PosLandingStore } from '../store/main.store';
 
 @Component({
@@ -45,6 +46,11 @@ export class PosShopComponent extends AbstractIsMobileComponent {
   readonly error = computed(() => this.infoStore.error());
   readonly inOrderGoods = computed(() => this.landingStore.inOrderGoods());
   readonly priceInfo = computed(() => this.landingStore.orderPricingInfo());
+  readonly submitOrderLoading = computed(() => this.landingStore.submitOrderLoading());
+  readonly isGoldGuild = computed(
+    () => this.infoStore.entity()?.guild.code.toLowerCase() === 'gold'
+  );
+  readonly isUnknownCustomer = computed(() => this.landingStore.customer().type === 'UNKNOWN');
 
   // getData() {
   //   this.infoStore.getData().subscribe();
@@ -66,10 +72,25 @@ export class PosShopComponent extends AbstractIsMobileComponent {
     this.isVisiblePaymentForm.set(true);
   }
 
-  submitPayment(invoice: IPosOrderResponse) {
+  submitPayment(event: {
-    this.closeInvoiceBottomSheet();
+    payment: IPayment;
-    this.responseInvoice.set(invoice);
+    settlementType: 'CASH' | 'CREDIT' | 'MIXED';
-    this.isVisibleSuccessDialog.set(true);
+  }) {
+    this.landingStore.setSettlementType(event.settlementType);
+    this.landingStore.setPayment(event.payment);
+
+    this.landingStore
+      .submitOrder()
+      .pipe(
+        finalize(() => {
+          this.isVisiblePaymentForm.set(false);
+        })
+      )
+      .subscribe((invoice) => {
+        this.closeInvoiceBottomSheet();
+        this.responseInvoice.set(invoice as IPosOrderResponse);
+        this.isVisibleSuccessDialog.set(true);
+      });
   }
 
   closeSuccessDialog() {

src/app/domains/provider/modules/dashboard/views/index.component.html

@@ -1,3 +1,3 @@
-<div class="flex items-center justify-center h-svh w-svw">
+<div class="flex h-svh w-svw items-center justify-center">
-  <span class="text-center"> به پنل ارایه‌دهنده خوش آمدید </span>
+  <span class="text-center"> به پنل PSP خوش آمدید </span>
 </div>

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

@@ -7,11 +7,11 @@ export const SUPER_ADMIN_MENU_ITEMS = [
         icon: 'pi pi-fw pi-home',
         routerLink: ['/'],
       },
-      {
+      // {
-        label: 'مشتری‌',
+      //   label: 'مودی',
-        icon: 'pi pi-fw pi-id-card',
+      //   icon: 'pi pi-fw pi-id-card',
-        routerLink: ['/super_admin/consumers'],
+      //   routerLink: ['/super_admin/consumers'],
-      },
+      // },
 
       {
         label: 'شریک تجاری',
@@ -19,7 +19,7 @@ export const SUPER_ADMIN_MENU_ITEMS = [
         routerLink: ['/super_admin/partners'],
       },
       {
-        label: 'ارایه‌دهنده',
+        label: 'PSP',
         icon: 'pi pi-fw pi-building-columns',
         routerLink: ['/super_admin/providers'],
       },
@@ -40,11 +40,11 @@ export const SUPER_ADMIN_MENU_ITEMS = [
       //   icon: 'pi pi-fw pi-barcode',
       //   routerLink: [stockKeepingUnitsNamedRoutes.stockKeepingUnits.meta.pagePath!()],
       // },
-      {
+      // {
-        label: 'لایسنس‌',
+      //   label: 'لایسنس‌',
-        icon: 'pi pi-fw pi-key',
+      //   icon: 'pi pi-fw pi-key',
-        routerLink: ['/super_admin/licenses'],
+      //   routerLink: ['/super_admin/licenses'],
-      },
+      // },
       {
         label: 'برند دستگاه',
         icon: 'pi pi-fw pi-receipt',

src/app/domains/superAdmin/modules/consumers/components/form.component.ts

@@ -29,7 +29,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog<
   @Input() consumerId?: string;
   private service = inject(ConsumersService);
 
-  preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} مشتری`);
+  preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} مودی`);
 
   initForm = () => {
     const form = this.fb.group({
@@ -63,7 +63,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog<
         this.fb.control<string>('', {
           nonNullable: true,
           validators: fieldControl.username('')[1],
-        }),
+        })
       );
       // @ts-ignore
       form.addControl(
@@ -71,7 +71,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog<
         this.fb.control<string>('', {
           nonNullable: true,
           validators: [Validators.required],
-        }),
+        })
       );
       // @ts-ignore
       form.addControl(
@@ -79,7 +79,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog<
         this.fb.control<string>('', {
           nonNullable: true,
           validators: [Validators.required],
-        }),
+        })
       );
       form.addValidators([MustMatch('password', 'confirmPassword')]);
     }

src/app/domains/superAdmin/modules/consumers/components/poses/list.component.ts

@@ -29,7 +29,7 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
     { field: 'pos_type', header: 'نوع دستگاه' },
     {
       field: 'provider',
-      header: 'ارایه‌دهنده',
+      header: 'PSP',
       type: 'nested',
       nestedOption: { path: 'provider.name' },
     },
@@ -58,8 +58,8 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
         this.consumerId,
         this.businessId,
         this.complexId,
-        item.id,
+        item.id
-      ),
+      )
     );
   }
 }

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

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

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

@@ -1,19 +1,17 @@
 <app-page-data-list
-  pageTitle="مدیریت مشتری‌ها"
+  pageTitle="مدیریت مودیان"
   [columns]="columns"
-  emptyPlaceholderTitle="مشتری یافت نشد"
+  emptyPlaceholderTitle="مودی یافت نشد"
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"
   (onAdd)="openAddForm()"
   (onDetails)="toSinglePage($event)"
   (onEdit)="onEditClick($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()" />
-/>
 <superAdmin-consumer-form
   [(visible)]="visibleForm"
   [editMode]="editMode()"
   [consumerId]="selectedItemForEdit()?.id"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

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

@@ -1,10 +1,10 @@
 <div class="flex flex-col gap-4">
-  <app-card-data cardTitle="اطلاعات مشتری" [(editMode)]="editMode">
+  <app-card-data cardTitle="اطلاعات مودی" [(editMode)]="editMode">
     <ng-template #moreActions> </ng-template>
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
-        <app-key-value label="نام مشتری" [value]="consumer()?.name" />
+        <app-key-value label="نام" [value]="consumer()?.name" />
-        <app-key-value label="نوع مشتری" [value]="consumer()?.type?.translate" />
+        <app-key-value label="نوع" [value]="consumer()?.type?.translate" />
         @if (consumer()?.type?.value === 'LEGAL') {
           <app-key-value label="شناسه ملی" [value]="consumer()?.legal?.registration_code" />
         } @else {

src/app/domains/superAdmin/modules/guilds/components/stockKeepingUnits/form.component.html

@@ -3,13 +3,12 @@
   [(visible)]="visible"
   [modal]="true"
   [style]="{ width: '500px' }"
-  [closable]="true"
+  [closable]="true">
->
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <field-code [control]="form.controls.code" />
     <field-name [control]="form.controls.name" />
     <field-vat [control]="form.controls.VAT" />
-    <field-sku-type [control]="form.controls.type" />
+    <!-- <field-sku-type [control]="form.controls.type" /> -->
 
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
   </form>

src/app/domains/superAdmin/modules/guilds/components/stockKeepingUnits/list.component.html

@@ -9,16 +9,15 @@
   [fullHeight]="fullHeight"
   [showAdd]="true"
   [showEdit]="true"
+  [showAll]="showAllBtn"
   [allItemsPageRoute]="allItemsPageRoute()"
   (onEdit)="onEditClick($event)"
   (onAdd)="openAddForm()"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()" />
-/>
 
 <stock-keeping-unit-form
   [(visible)]="visibleForm"
   [initialValues]="selectedItemForEdit() || undefined"
   [guildId]="guildId"
   [editMode]="editMode()"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

src/app/domains/superAdmin/modules/guilds/components/stockKeepingUnits/list.component.ts

@@ -19,13 +19,14 @@ import { StockKeepingUnitFormComponent } from './form.component';
 export class GuildStockKeepingUnitsListComponent extends AbstractList<IStockKeepingUnitResponse> {
   @Input() guildId!: string;
   @Input() fullHeight?: boolean;
+  @Input() showAllBtn?: boolean;
   @Input() header: IColumn[] = skuListConfig.columns;
 
   listConfig = skuListConfig;
   service = inject(StockKeepingUnitsService);
 
   allItemsPageRoute = computed(() =>
-    stockKeepingUnitsNamedRoutes.stockKeepingUnits.meta.pagePath!(this.guildId),
+    stockKeepingUnitsNamedRoutes.stockKeepingUnits.meta.pagePath!(this.guildId)
   );
 
   override setColumns(): void {

src/app/domains/superAdmin/modules/guilds/constants/routes/stockKeepingUnits.ts

@@ -8,11 +8,11 @@ export const stockKeepingUnitsNamedRoutes: NamedRoutes<TStockKeepingUnitsRouteNa
     path: 'stock-keeping-units',
     loadComponent: () =>
       import('../../views/stockKeepingUnits/list.component').then(
-        (m) => m.GuildStockKeepingUnitsComponent,
+        (m) => m.GuildStockKeepingUnitsComponent
       ),
     meta: {
       title: 'شناسه کالاها',
-      pagePath: () => '/super_admin/guilds/:guildId/stock-keeping-units',
+      pagePath: (guildId: string) => `/super_admin/guilds/${guildId}/stock-keeping-units`,
     },
   },
 };

src/app/domains/superAdmin/modules/guilds/views/single.component.html

@@ -15,7 +15,7 @@
     <admin-guild-goods-list [guildId]="guildId()" [showAllBtn]="true" class="w-full" />
   </div>
   <div class="flex max-h-125">
-    <admin-guild-stock-keeping-units-list [guildId]="guildId()" class="w-full" />
+    <admin-guild-stock-keeping-units-list [guildId]="guildId()" [showAllBtn]="true" class="w-full" />
   </div>
 
   <admin-guild-form

src/app/domains/superAdmin/modules/partners/components/charge-license-form-dialog.component.html

@@ -7,12 +7,11 @@
   (onHide)="close()">
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <app-input label="تعداد شارژ" [control]="form.controls.quantity" type="number" />
-    <!-- <uikit-datepicker
+    <app-datepicker
       label="انقضای فروش"
       [control]="form.controls.activated_expires_at"
       name="activated_expires_at"
-      [minDate]="minDate"
+      [min]="minDate" />
-    /> -->
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
   </form>
 </shared-dialog>

src/app/domains/superAdmin/modules/partners/components/charge-license-form-dialog.component.ts

@@ -3,6 +3,7 @@ import { InputComponent } from '@/shared/components';
 import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
 // import { UikitFlatpickrJalaliComponent } from '@/uikit';
 import { SharedDialogComponent } from '@/shared/components/dialog/dialog.component';
+import { DatepickerComponent } from '@/uikit';
 import { nowJalali } from '@/utils';
 import { Component, inject, Input } from '@angular/core';
 import { ReactiveFormsModule, Validators } from '@angular/forms';
@@ -17,7 +18,7 @@ import { AdminPartnerChargeLicenseTransactionsService } from '../services/charge
     ReactiveFormsModule,
     InputComponent,
     FormFooterActionsComponent,
-    // UikitFlatpickrJalaliComponent,
+    DatepickerComponent,
   ],
 })
 export class PartnerChargeLicenseFormDialogComponent extends AbstractFormDialog<

src/app/domains/superAdmin/modules/partners/components/licenses/list.component.ts

@@ -20,7 +20,7 @@ export class AdminPartnerLicensesComponent extends AbstractList<IPartnerActivate
       // { field: 'id', header: 'شناسه', type: 'id' },
       {
         field: 'consumer',
-        header: 'مشتری',
+        header: 'مودی',
         customDataModel(item: IPartnerActivatedLicenseResponse) {
           return `${item.business_activity.consumer_name} (${item.business_activity.name})`;
         },

src/app/domains/superAdmin/modules/partners/views/list.component.html

@@ -13,8 +13,7 @@
   (onAdd)="openAddForm()"
   (onDetails)="toSinglePage($event)"
   (onEdit)="onEditClick($event)"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()">
->
   <ng-template #name let-item>
     <div class="flex items-center gap-2">
       <p-avatar
@@ -22,8 +21,7 @@
         [title]="item.name"
         [label]="item.logo_url ? '' : item.name.slice(0, 2)"
         shape="square"
-        size="large"
+        size="large"></p-avatar>
-      ></p-avatar>
       {{ item.name }}
     </div>
   </ng-template>
@@ -51,5 +49,4 @@
   [editMode]="editMode()"
   [partnerId]="selectedItemForEdit()?.id"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

src/app/domains/superAdmin/modules/providers/components/form.component.ts

@@ -54,7 +54,7 @@ export class ProviderFormComponent extends AbstractFormDialog<IProviderRequest,
 
   form = this.initForm();
 
-  preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} ارایه‌دهنده`);
+  preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} PSP`);
 
   override ngOnChanges() {
     this.form.patchValue(this.initialValues ?? {});

src/app/domains/superAdmin/modules/providers/constants/routes/index.ts

@@ -16,7 +16,7 @@ export const providersNamedRoutes: NamedRoutes<TProvidersRouteNames> = {
     path: 'providers/:providerId',
     loadComponent: () => import('../../views/single.component').then((m) => m.ProviderComponent),
     meta: {
-      title: 'ارایه‌دهنده',
+      title: 'PSP',
       pagePath: () => '/super_admin/providers/:providerId',
     },
   },

src/app/domains/superAdmin/modules/providers/shared/select.component.html

@@ -4,24 +4,22 @@
     [options]="items()"
     optionLabel="name"
     [optionValue]="selectOptionValue"
-    placeholder="انتخاب ارایه‌دهنده"
+    placeholder="انتخاب PSP"
     [formControl]="control"
     [showClear]="showClear"
     [filter]="true"
-    appendTo="body"
+    appendTo="body">
-  >
     @if (canInsert) {
       <ng-template #footer>
         <div class="p-3">
           <p-button
-            label="افزودن ارایه‌دهنده"
+            label="افزودن PSP"
             fluid
             severity="secondary"
             text
             size="small"
             icon="pi pi-plus"
-            (onClick)="onOpenForm()"
+            (onClick)="onOpenForm()" />
-          />
         </div>
       </ng-template>
     }

src/app/domains/superAdmin/modules/providers/views/list.component.html

@@ -1,21 +1,19 @@
 <app-page-data-list
-  [pageTitle]="'مدیریت ارایه‌دهنده‌گان'"
+  [pageTitle]="'مدیریت PSP'"
-  [addNewCtaLabel]="'افزودن ارایه‌دهنده‌'"
+  [addNewCtaLabel]="'افزودن PSP‌'"
   [columns]="columns"
   [showAdd]="true"
-  emptyPlaceholderTitle="ارایه‌دهنده‌ی یافت نشد"
+  emptyPlaceholderTitle="PSP‌ی یافت نشد"
-  emptyPlaceholderDescription="برای افزودن ارایه‌دهنده‌ی، روی دکمهٔ بالا کلیک کنید."
+  emptyPlaceholderDescription="برای افزودن PSP‌ی، روی دکمهٔ بالا کلیک کنید."
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"
   [showAdd]="true"
   (onAdd)="openAddForm()"
-  (onRefresh)="refresh()"
+  (onRefresh)="refresh()" />
-/>
 <provider-form
   [(visible)]="visibleForm"
   [editMode]="editMode()"
   [providerId]="selectedItemForEdit()?.id"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
+  (onSubmit)="refresh()" />
-/>

src/app/layout/default/app.layout.component.ts

@@ -36,7 +36,7 @@ export class AppLayout {
   constructor(
     public layoutService: LayoutService,
     public renderer: Renderer2,
-    public router: Router,
+    public router: Router
   ) {
     this.layoutService.headerSlot$.subscribe((tpl) => (this.topBarMoreAction = tpl));
     this.layoutService.topbarStartSlot$.subscribe((tpl) => (this.topBarStartAction = tpl));
@@ -105,7 +105,7 @@ export class AppLayout {
     } else {
       document.body.className = document.body.className.replace(
         new RegExp('(^|\\b)' + 'blocked-scroll'.split(' ').join('|') + '(\\b|$)', 'gi'),
-        ' ',
+        ' '
       );
     }
   }
@@ -169,6 +169,10 @@ export class AppLayout {
     }
   }
 
+  ngOnChanges() {
+    console.log('layout changed');
+  }
+
   ngOnDestroy() {
     if (this.overlayMenuOpenSubscription) {
       this.overlayMenuOpenSubscription.unsubscribe();

src/app/layout/default/app.sidebar.component.html

@@ -9,7 +9,7 @@
         <div class="h-10 w-10">
           <img [src]="logo" alt="Logo" class="object-contain" />
         </div>
-        <span class="text-muted-color text-sm font-medium">مدیریت صورت‌حساب‌های مالیاتی پاژن</span>
+        <span class="text-muted-color text-sm font-medium">مدیریت صورت‌حساب‌های مالیاتی سپاس</span>
       </div>
     </div>
   </div>

src/app/layout/default/app.topbar.component.html

@@ -9,13 +9,12 @@
           size="large"
           icon="pi pi-bars"
           class="layout-menu-button layout-topbar-action"
-          (click)="layoutService.onMenuToggle()"
+          (click)="layoutService.onMenuToggle()"></p-button>
-        ></p-button>
       }
-      <div class="flex items-center gap-2">
+      <a href="/" class="flex items-center gap-2">
         <img [src]="logo" width="32" />
         <span class="text-xl">{{ panelTitle() }}</span>
-      </div>
+      </a>
     }
   </ng-template>
   <ng-template #center>
@@ -34,13 +33,12 @@
           [icon]="`pi  ${layoutService.isDarkTheme() ? 'pi-moon' : 'pi-sun'}`"
           text
           size="large"
-          (click)="toggleDarkMode()"
+          (click)="toggleDarkMode()">
-        >
           <i [ngClass]="{}"></i>
         </p-button>
 
         <div class="">
-          <p-menu #menu [model]="profileMenuItems()" [popup]="true" />
+          <p-menu #menu appendTo="body" [model]="profileMenuItems()" [popup]="true" />
           <p-button (click)="menu.toggle($event)" icon="pi pi-user" text severity="contrast" size="large" />
         </div>
       </div>

src/app/layout/service/layout.service.ts

@@ -1,6 +1,7 @@
 import { computed, effect, Injectable, signal, TemplateRef } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { BehaviorSubject, Subject } from 'rxjs';
+import config from 'src/config';
 
 export interface layoutConfig {
   preset?: string;
@@ -39,7 +40,7 @@ export class LayoutService {
     preset: 'Aura',
     primary: 'surface',
     surface: null,
-    darkTheme: localStorage.getItem('isDarkTheme') === 'true',
+    darkTheme: config.isPosApplication ? false : localStorage.getItem('isDarkTheme') === 'true',
     menuMode: 'static',
   };
 
@@ -81,10 +82,12 @@ export class LayoutService {
 
   overlayOpen$ = this.overlayOpen.asObservable();
 
-  theme = computed(() => (this.layoutConfig()?.darkTheme ? 'light' : 'dark'));
+  theme = computed(() =>
+    config.isPosApplication ? 'light' : this.layoutConfig()?.darkTheme ? 'light' : 'dark'
+  );
 
   isSidebarActive = computed(
-    () => this.layoutState().overlayMenuActive || this.layoutState().staticMenuMobileActive,
+    () => this.layoutState().overlayMenuActive || this.layoutState().staticMenuMobileActive
   );
 
   isDarkTheme = computed(() => this.layoutConfig().darkTheme);

src/app/modules/auth/pages/auth.component.html

@@ -1,14 +1,13 @@
-<div class="bg-white h-svh relative">
+<div class="relative h-svh bg-white">
-  <div class="absolute inset-0 opacity-30 blur-xs flex items-center justify-center">
+  <div class="absolute inset-0 flex items-center justify-center opacity-30 blur-xs">
     <img [src]="authVector" alt="background image" class="w-full bg-cover bg-no-repeat" />
   </div>
-  <div class="flex justify-center items-center relative z-10 h-svh mx-auto bg-gray-800/80">
+  <div class="relative z-10 mx-auto flex h-svh items-center justify-center bg-gray-800/80">
     <div
-      class="flex flex-col items-center justify-center px-12 py-10 h-auto bg-surface-card border border-surface-border rounded-lg shadow w-full max-w-md"
+      class="bg-surface-card border-surface-border flex h-auto w-full max-w-md flex-col items-center justify-center rounded-lg border px-12 py-10 shadow">
-    >
+      <div class="mb-10 flex flex-col items-center justify-center gap-4 text-center">
-      <div class="flex flex-col gap-4 text-center mb-10 items-center justify-center">
+        <img [src]="logo" alt="مدیریت صورت‌حساب‌های مالیاتی" class="h-auto w-20" />
-        <img [src]="logo" alt="مدیریت صورت‌حساب‌های مالیاتی" class="w-20 h-auto" />
+        <span class="text-lg font-bold"> {{ authTitle }}</span>
-        <span class="text-lg font-bold"> به پنل مدیریت صورت‌حساب‌های مالیاتی پاژن خوش آمدید. </span>
       </div>
 
       <!-- @if (activeStep() === "login") { -->
@@ -18,8 +17,7 @@
         [defaultRole]="role"
         class="w-full"
         (onSuccessfullySubmit)="onLoggedIn($event)"
-        (onToSignup)="toSignUp()"
+        (onToSignup)="toSignUp()" />
-      />
       <!-- } @else if (activeStep() === "signup") {
         <auth-signup role="TEACHER" class="w-full" />
       } @else if (activeStep() === "otp") {

src/app/modules/auth/pages/auth.component.ts

@@ -1,3 +1,4 @@
+import { brandingConfig } from '@/branding/branding.config';
 import { IAuthResponse, TRoles } from '@/core';
 import { AuthService } from '@/core/services/auth.service';
 import { ToastService } from '@/core/services/toast.service';
@@ -34,6 +35,8 @@ export class AuthComponent {
   selectedRole = signal<TRoles | undefined>(this.role);
   accountRole = signal<string>('');
 
+  authTitle = `به پنل مدیریت صورت‌حساب‌های مالیاتی ${brandingConfig.title} خوش آمدید.`;
+
   toSignUp = () => {
     this.activeStep.set('signup');
   };

src/app/shared/catalog/invoiceTypes/invoice-type-tag.component.ts

@@ -17,6 +17,8 @@ export class CatalogInvoiceTypeTagComponent {
         return 'success';
       case 'CORRECTION':
         return 'warn';
+      case 'RETURN':
+        return 'warn';
       case 'REVOKE':
         return 'danger';
     }
@@ -28,6 +30,8 @@ export class CatalogInvoiceTypeTagComponent {
         return 'اصلی';
       case 'CORRECTION':
         return 'اصلاحی';
+      case 'RETURN':
+        return 'برگشت از فروش';
       case 'REVOKE':
         return 'ابطالی';
     }

src/app/shared/catalog/invoiceTypes/type.ts

@@ -1,6 +1,7 @@
 export const InvoiceTypes = {
   ORIGINAL: 'ORIGINAL',
   CORRECTION: 'CORRECTION',
+  RETURN: 'RETURN',
   REVOKE: 'REVOKE',
 } as const;