From 88f45eee389164c96054a164d139e3485399efad Mon Sep 17 00:00:00 2001
From: ahasani194 <ahasani194@gmail.com>
Date: Tue, 9 Jun 2026 13:31:48 +0330
Subject: [PATCH] refactor: update labels and translations in various
 components
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Changed 'تغییر گذرواژه' to 'تغییر رمز عبور' in layout.component.ts
- Updated HTML structure in list.component.html and saleInvoices components for consistency and improved styling.
- Modified sale-invoice-card.component.html to enhance the display of invoice details.
- Adjusted sale-invoice-card.component.ts to handle customer types more effectively.
- Enhanced the handling of invoice statuses in saleInvoices components.
- Improved layout and styling in shop components for better user experience.
- Refactored key-value component for better readability and maintainability.
- Updated upload file component to streamline file selection process.
- Added new styles in customize.scss and psp.scss for consistent UI.
- Adjusted environment configuration for better API endpoint management.
---
 angular.json                                  |   8 ++
 .../accounts/components/form.component.html   |   2 +-
 .../salesInvoices/list.component.html         |   2 +-
 .../reset-password-card.component.html        |  11 +-
 .../reset-password-card.component.ts          |   4 +-
 .../components/list.component.html            |   2 +-
 .../accounts/components/form.component.html   |   2 +-
 .../reset-password-card.component.html        |  11 +-
 .../reset-password-card.component.ts          |   4 +-
 .../components/change-password.component.ts   |   2 +-
 .../layouts/pagesLayout/layout.component.ts   |   2 +-
 .../components/list.component.html            |   2 +-
 .../components/list.component.html            |  10 +-
 .../sale-invoice-card.component.html          |  12 +-
 .../components/sale-invoice-card.component.ts |  24 ++--
 .../pos/modules/saleInvoices/models/io.d.ts   |  23 ++--
 .../saleInvoices/views/single.component.html  |   2 +
 .../saleInvoices/views/single.component.ts    |   7 +-
 .../order/order-card-template.component.html  |  32 +++--
 .../views/categories.component.html           |  19 +--
 .../components/views/list-view.component.html |   2 +-
 .../modules/shop/views/root.component.html    |   2 +-
 .../pos/modules/shop/views/root.component.ts  |   2 +-
 .../invoice-type-card.component.html          |   2 +-
 .../statistics/views/root.component.html      | 110 +++++++++---------
 .../layout/default/app.layout.component.html  |  26 ++---
 .../saleInvoices/views/single.component.html  |   2 +-
 .../change-password-form-dialog.component.ts  |  13 ++-
 .../confirmation-dialog.component.html        |   2 +-
 .../correctionForm/form.component.html        |   2 +-
 .../sale-invoice-single-view.component.html   |  11 +-
 .../sale-invoice-single-view.component.ts     |  25 ++--
 .../key-value.component.html                  |  21 ++--
 .../uploadFile/upload-file.component.html     |  12 +-
 .../uploadFile/upload-file.component.ts       |  23 +++-
 .../datepicker/datepicker.component.html      |   2 +-
 src/assets/customize.scss                     |   4 +-
 src/assets/layout/_core.scss                  |   6 -
 src/assets/layout/_main.scss                  |  18 +--
 src/assets/psp.scss                           |   7 ++
 src/environments/environment.tis.ts           |   5 +-
 41 files changed, 240 insertions(+), 238 deletions(-)
 create mode 100644 src/assets/psp.scss

diff --git a/angular.json b/angular.json
index 2d9b2f2..ec228eb 100644
--- a/angular.json
+++ b/angular.json
@@ -100,6 +100,10 @@
                                     "input": "public-tis"
                                 }
                             ],
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ],
                             "budgets": [
                                 {
                                     "maximumError": "3MB",
@@ -144,6 +148,10 @@
                                     "input": "public-tis"
                                 }
                             ],
+                            "styles": [
+                                "src/assets/styles.scss",
+                                "src/assets/psp.scss"
+                            ],
                             "budgets": [
                                 {
                                     "maximumError": "2.5MB",
diff --git a/src/app/domains/consumer/modules/accounts/components/form.component.html b/src/app/domains/consumer/modules/accounts/components/form.component.html
index 203ddde..bd0d79f 100644
--- a/src/app/domains/consumer/modules/accounts/components/form.component.html
+++ b/src/app/domains/consumer/modules/accounts/components/form.component.html
@@ -1,5 +1,5 @@
 <shared-dialog
-  header="تغییر گذرواژه"
+  header="تغییر رمز عبور"
   [(visible)]="visible"
   [modal]="true"
   [style]="{ width: '500px' }"
diff --git a/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.html b/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.html
index 31c952b..008b061 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.html
+++ b/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  pageTitle="لیست صورت‌حساب‌ها"
+  pageTitle="صورت‌حساب‌ها"
   [columns]="columns"
   emptyPlaceholderTitle="تا به حال صورت‌حسابی توسط این پایانه ایجاد نشده است."
   [items]="items()"
diff --git a/src/app/domains/consumer/modules/profile/components/reset-password-card.component.html b/src/app/domains/consumer/modules/profile/components/reset-password-card.component.html
index 70ce531..e1e4b69 100644
--- a/src/app/domains/consumer/modules/profile/components/reset-password-card.component.html
+++ b/src/app/domains/consumer/modules/profile/components/reset-password-card.component.html
@@ -1,11 +1,10 @@
-<app-card-data cardTitle="تغییر گذرواژه" [editable]="false">
-  <form [formGroup]="form" (submit)="submit()" class="max-w-lg mx-auto">
+<app-card-data cardTitle="تغییر رمز عبور" [editable]="false">
+  <form [formGroup]="form" (submit)="submit()" class="mx-auto max-w-lg">
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
-    />
-    <button type="submit" pButton [disabled]="form.invalid || loading()" class="w-full max-w-xs mx-auto">
-      تغییر گذرواژه
+      [confirmPasswordControl]="form.controls.confirmPassword" />
+    <button type="submit" pButton [disabled]="form.invalid || loading()" class="mx-auto w-full max-w-xs">
+      تغییر رمز عبور
     </button>
   </form>
 </app-card-data>
diff --git a/src/app/domains/consumer/modules/profile/components/reset-password-card.component.ts b/src/app/domains/consumer/modules/profile/components/reset-password-card.component.ts
index 114f35b..03ee30b 100644
--- a/src/app/domains/consumer/modules/profile/components/reset-password-card.component.ts
+++ b/src/app/domains/consumer/modules/profile/components/reset-password-card.component.ts
@@ -25,7 +25,7 @@ export class ConsumerResetPasswordCardComponent {
       password: fieldControl.password(),
       confirmPassword: fieldControl.confirmPassword(),
     },
-    { validators: [MustMatch('password', 'confirmPassword')] },
+    { validators: [MustMatch('password', 'confirmPassword')] }
   );
 
   submit() {
@@ -40,7 +40,7 @@ export class ConsumerResetPasswordCardComponent {
       .pipe(finalize(() => this.loading.set(false)))
       .subscribe(() => {
         this.form.reset();
-        this.toastService.success({ text: 'گذرواژه با موفقیت به‌روز شد.' });
+        this.toastService.success({ text: 'رمز عبور با موفقیت به‌روز شد.' });
       });
   }
 }
diff --git a/src/app/domains/consumer/modules/saleInvoices/components/list.component.html b/src/app/domains/consumer/modules/saleInvoices/components/list.component.html
index 023f4ac..ae9dfe6 100644
--- a/src/app/domains/consumer/modules/saleInvoices/components/list.component.html
+++ b/src/app/domains/consumer/modules/saleInvoices/components/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  [pageTitle]="'لیست صورت‌حساب‌ها'"
+  [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="صورت‌حساب‌ی یافت نشد"
   [items]="items()"
diff --git a/src/app/domains/partner/modules/accounts/components/form.component.html b/src/app/domains/partner/modules/accounts/components/form.component.html
index 203ddde..bd0d79f 100644
--- a/src/app/domains/partner/modules/accounts/components/form.component.html
+++ b/src/app/domains/partner/modules/accounts/components/form.component.html
@@ -1,5 +1,5 @@
 <shared-dialog
-  header="تغییر گذرواژه"
+  header="تغییر رمز عبور"
   [(visible)]="visible"
   [modal]="true"
   [style]="{ width: '500px' }"
diff --git a/src/app/domains/partner/modules/profile/components/reset-password-card.component.html b/src/app/domains/partner/modules/profile/components/reset-password-card.component.html
index 70ce531..e1e4b69 100644
--- a/src/app/domains/partner/modules/profile/components/reset-password-card.component.html
+++ b/src/app/domains/partner/modules/profile/components/reset-password-card.component.html
@@ -1,11 +1,10 @@
-<app-card-data cardTitle="تغییر گذرواژه" [editable]="false">
-  <form [formGroup]="form" (submit)="submit()" class="max-w-lg mx-auto">
+<app-card-data cardTitle="تغییر رمز عبور" [editable]="false">
+  <form [formGroup]="form" (submit)="submit()" class="mx-auto max-w-lg">
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
-    />
-    <button type="submit" pButton [disabled]="form.invalid || loading()" class="w-full max-w-xs mx-auto">
-      تغییر گذرواژه
+      [confirmPasswordControl]="form.controls.confirmPassword" />
+    <button type="submit" pButton [disabled]="form.invalid || loading()" class="mx-auto w-full max-w-xs">
+      تغییر رمز عبور
     </button>
   </form>
 </app-card-data>
diff --git a/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts b/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts
index 2ac8dd8..46f7cc8 100644
--- a/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts
+++ b/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts
@@ -25,7 +25,7 @@ export class PartnerResetPasswordCardComponent {
       password: fieldControl.password(),
       confirmPassword: fieldControl.confirmPassword(),
     },
-    { validators: [MustMatch('password', 'confirmPassword')] },
+    { validators: [MustMatch('password', 'confirmPassword')] }
   );
 
   submit() {
@@ -40,7 +40,7 @@ export class PartnerResetPasswordCardComponent {
       .pipe(finalize(() => this.loading.set(false)))
       .subscribe(() => {
         this.form.reset();
-        this.toastService.success({ text: 'گذرواژه با موفقیت به‌روز شد.' });
+        this.toastService.success({ text: 'رمز عبور با موفقیت به‌روز شد.' });
       });
   }
 }
diff --git a/src/app/domains/pos/components/change-password.component.ts b/src/app/domains/pos/components/change-password.component.ts
index 5bbb080..7532d02 100644
--- a/src/app/domains/pos/components/change-password.component.ts
+++ b/src/app/domains/pos/components/change-password.component.ts
@@ -27,7 +27,7 @@ export class PosChangePasswordComponent extends AbstractDialog {
       .pipe(finalize(() => this.submitLoading.set(false)))
       .subscribe(() => {
         this.toastService.success({
-          text: 'تغییر گذرواژه با موفقیت انجام شد.',
+          text: 'تغییر رمز عبور با موفقیت انجام شد.',
         });
         this.submitLoading.set(false);
         this.close();
diff --git a/src/app/domains/pos/layouts/pagesLayout/layout.component.ts b/src/app/domains/pos/layouts/pagesLayout/layout.component.ts
index 7352374..80650c0 100644
--- a/src/app/domains/pos/layouts/pagesLayout/layout.component.ts
+++ b/src/app/domains/pos/layouts/pagesLayout/layout.component.ts
@@ -81,7 +81,7 @@ export class PosPagesLayoutComponent {
       disabled: true,
     },
     {
-      label: 'تغییر گذرواژه',
+      label: 'تغییر رمز عبور',
       icon: 'pi pi-key',
       command: this.showChangePasswordDialog,
     },
diff --git a/src/app/domains/pos/modules/goodsManagement/components/list.component.html b/src/app/domains/pos/modules/goodsManagement/components/list.component.html
index 2830339..4eecf17 100644
--- a/src/app/domains/pos/modules/goodsManagement/components/list.component.html
+++ b/src/app/domains/pos/modules/goodsManagement/components/list.component.html
@@ -16,7 +16,7 @@
     }
   } @else {
     @for (good of items(); track good.id) {
-      <div class="bg-surface-card flex items-center gap-2 rounded-lg px-3 py-1 shadow-xs">
+      <div class="bg-surface-card flex items-center gap-2 rounded-lg px-3 py-1">
         <div class="flex grow items-center gap-2">
           <img
             [src]="good.image_url || goodPlaceholder"
diff --git a/src/app/domains/pos/modules/saleInvoices/components/list.component.html b/src/app/domains/pos/modules/saleInvoices/components/list.component.html
index f8ee6de..d10d822 100644
--- a/src/app/domains/pos/modules/saleInvoices/components/list.component.html
+++ b/src/app/domains/pos/modules/saleInvoices/components/list.component.html
@@ -1,5 +1,5 @@
 <div class="bg-surface-card">
-  <app-inner-pages-header pageTitle="لیست صورت‌حساب‌های صادر شده" [backRoute]="backRoute">
+  <app-inner-pages-header pageTitle="صورت‌حساب‌های صادر شده" [backRoute]="backRoute">
     <ng-template #actions>
       <div class="flex gap-1">
         <p-button
@@ -16,11 +16,9 @@
     <div class="flex flex-wrap gap-2 px-4 pb-2">
       @for (filter of activeFilters(); track filter.key) {
         @if (filter.key !== 'page') {
-          <p-chip
-            removable
-            [label]="filter.label + ': ' + filter.value"
-            class="border-surface-border border"
-            (onRemove)="removeFilter(filter.key)" />
+          <p-chip removable class="border-surface-border border" (onRemove)="removeFilter(filter.key)">
+            <span class="text-sm"> {{ filter.label }}: {{ filter.value }} </span>
+          </p-chip>
         }
       }
     </div>
diff --git a/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.html b/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.html
index 5adea42..fe8e1b7 100644
--- a/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.html
+++ b/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.html
@@ -1,18 +1,18 @@
 <p-card class="border-surface-border relative overflow-visible border p-0!">
   <div class="flex w-full items-center justify-between gap-4">
-    <span> {{ saleInvoice.invoice_number }} - {{ saleInvoice.code }} </span>
+    <span class="text-lg font-bold"> {{ saleInvoice.invoice_number }}</span>
     <catalog-tax-provider-status-tag [status]="saleInvoice.status.value" [translate]="saleInvoice.status.translate" />
   </div>
   <hr />
-  <div class="grid grid-cols-1 gap-4">
-    <app-key-value alignment="end" label="نوع صورت‌حساب">
-      {{ preparedInvoiceType() }}
-    </app-key-value>
+  <div class="grid grid-cols-1 gap-3">
+    <app-key-value alignment="end" label="تاریخ" [value]="saleInvoice.created_at" type="date" />
     <app-key-value alignment="end" label="مبلغ کل" [value]="saleInvoice.total_amount" type="price" />
     <app-key-value alignment="end" label="نوع صورت‌حساب‌">
       <catalog-invoice-type-tag [status]="saleInvoice.type.value" />
     </app-key-value>
-    <app-key-value alignment="end" label="تاریخ صورت‌حساب‌" [value]="saleInvoice.created_at" type="date" />
+    <app-key-value alignment="end" label="مشتری">
+      {{ preparedInvoiceType() }}
+    </app-key-value>
   </div>
   <hr />
   <div class="flex items-center justify-center gap-4">
diff --git a/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.ts b/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.ts
index aca79d6..574a57a 100644
--- a/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.ts
+++ b/src/app/domains/pos/modules/saleInvoices/components/sale-invoice-card.component.ts
@@ -50,20 +50,20 @@ export class SaleInvoiceCardComponent {
   );
   preparedInvoiceType = computed(() => {
     if (!this.saleInvoice) return '';
-    const { customer } = this.saleInvoice;
+    const { customer, unknown_customer } = this.saleInvoice;
 
-    if (customer) {
-      const { legal, individual } = customer;
-      let text = 'نوع اول - ';
-      if (legal) {
-        text += `حقوقی (${legal.company_name})`;
+    if (unknown_customer?.name || unknown_customer?.national_code) {
+      return `${unknown_customer.name || unknown_customer?.national_code || 'رهگذر'} (نوع دوم)`;
+    } else if (customer) {
+      const { legal, individual, type } = customer;
+      switch (type) {
+        case 'INDIVIDUAL':
+          return `${individual ? individual.first_name + ' ' + individual.last_name : '-----'} (نوع اول)`;
+        case 'LEGAL':
+          return `${legal?.name || '-----'} (نوع اول)`;
       }
-      if (individual) {
-        text += `حقیقی (${individual.first_name} ${individual.last_name})`;
-      }
-      return text;
     }
-    return 'نوع دوم (بدون اطلاعات خریدار)';
+    return 'رهگذر (نوع دوم)';
   });
 
   sendInvoice() {
@@ -103,7 +103,7 @@ export class SaleInvoiceCardComponent {
       .retrySendToTsp(this.saleInvoice.id)
       .pipe(finalize(() => this.resendingLoading.set(false)))
       .subscribe((res) => {
-        if (res.status === 'FAILURE') {
+        if (res.status === 'SEND_FAILURE') {
           this.toastService.error({
             text: res.message || 'خطا در ارسال مجدد صورت‌حساب‌ رخ داده است.',
           });
diff --git a/src/app/domains/pos/modules/saleInvoices/models/io.d.ts b/src/app/domains/pos/modules/saleInvoices/models/io.d.ts
index b20d1c4..49c8b0b 100644
--- a/src/app/domains/pos/modules/saleInvoices/models/io.d.ts
+++ b/src/app/domains/pos/modules/saleInvoices/models/io.d.ts
@@ -2,6 +2,7 @@ import { Maybe } from '@/core';
 import ISummary from '@/core/models/summary';
 import { InvoiceTypes, TspProviderResponseStatus } from '@/shared/catalog';
 import { IEnumTranslate } from '@/shared/models/enum_translate.type';
+import { IIndividualCustomer, ILegalCustomer } from '../../shop/models';
 
 export interface IPosSaleInvoicesSummaryRawResponse {
   id: string;
@@ -10,6 +11,7 @@ export interface IPosSaleInvoicesSummaryRawResponse {
   invoice_date: string;
   created_at: string;
   total_amount: string;
+  unknown_customer: Partial<UnknownCoustomer>;
   customer: Maybe<Customer>;
   status: IEnumTranslate<TspProviderResponseStatus>;
   type: IEnumTranslate<InvoiceTypes>;
@@ -30,6 +32,10 @@ export interface IPosSaleInvoicesRawResponse extends IPosSaleInvoicesSummaryRawR
 
 export interface IPosSaleInvoicesResponse extends IPosSaleInvoicesRawResponse {}
 
+interface UnknownCoustomer {
+  name?: string;
+  national_code?: string;
+}
 interface ConsumerAccount {
   role: string;
   account: Account;
@@ -55,19 +61,6 @@ interface Payments {
 
 interface Customer {
   type: string;
-  individual: Individual;
-  legal: Legal;
-}
-
-interface Individual {
-  first_name: string;
-  last_name: string;
-  national_code: string;
-  mobile_number: string;
-}
-
-interface Legal {
-  company_name: string;
-  economic_code: string;
-  registration_number: string;
+  individual: IIndividualCustomer;
+  legal: ILegalCustomer;
 }
diff --git a/src/app/domains/pos/modules/saleInvoices/views/single.component.html b/src/app/domains/pos/modules/saleInvoices/views/single.component.html
index b92f920..548fa4d 100644
--- a/src/app/domains/pos/modules/saleInvoices/views/single.component.html
+++ b/src/app/domains/pos/modules/saleInvoices/views/single.component.html
@@ -4,7 +4,9 @@
   [backRoute]="backRoute()"
   [sendToTspLoading]="sendToTspLoading()"
   [inquiryLoading]="inquiryLoading()"
+  [resendToTspLoading]="resendToTspLoading()"
   (onSendToTsp)="sendToTsp()"
+  (onResendToTsp)="resendToTsp()"
   (onInquiry)="inquiry()"
   (onCorrection)="correction($event)"
   (onReturnFromSale)="returnFromSale($event)"
diff --git a/src/app/domains/pos/modules/saleInvoices/views/single.component.ts b/src/app/domains/pos/modules/saleInvoices/views/single.component.ts
index f81c7ed..2d11ba1 100644
--- a/src/app/domains/pos/modules/saleInvoices/views/single.component.ts
+++ b/src/app/domains/pos/modules/saleInvoices/views/single.component.ts
@@ -78,7 +78,12 @@ export class PosSaleInvoiceComponent {
           this.resendToTspLoading.set(false);
         })
       )
-      .subscribe();
+      .subscribe((res) => {
+        this.toastService.success({
+          text: res.message || 'ارسال مجدد صورت‌حساب با موفقیت انجام شد.',
+        });
+        this.store.updateStatus(res.status);
+      });
   }
   correction(data: IPosCorrectionRequest) {
     this.correctionLoading.set(true);
diff --git a/src/app/domains/pos/modules/shop/components/order/order-card-template.component.html b/src/app/domains/pos/modules/shop/components/order/order-card-template.component.html
index 04eda23..58a6264 100644
--- a/src/app/domains/pos/modules/shop/components/order/order-card-template.component.html
+++ b/src/app/domains/pos/modules/shop/components/order/order-card-template.component.html
@@ -1,21 +1,20 @@
-<div class="border border-surface-border rounded-xl p-2 shadow-sm">
-  <div class="flex gap-3 items-center">
+<div class="border-surface-border rounded-xl border p-2">
+  <div class="flex items-center gap-3">
     <img
       [src]="inOrderGood.good.image_url || placeholderImage"
       loading="lazy"
       decoding="async"
-      class="w-24 h-24 rounded-md bg-surface-100 object-cover shrink-0 border border-surface-border"
-    />
-    <div class="flex flex-col grow justify-between overflow-hidden">
-      <div class="flex items-stretch grow gap-4">
-        <div class="flex flex-col justify-between gap-2 grow overflow-hidden py-1">
-          <div class="shrink-0 flex flex-col w-full overflow-hidden">
-            <div class="flex w-full overflow-hidden gap-1 items-center">
-              <span class="font-bold text-lg text-ellipsis text-nowrap overflow-hidden">
+      class="bg-surface-100 border-surface-border h-24 w-24 shrink-0 rounded-md border object-cover" />
+    <div class="flex grow flex-col justify-between overflow-hidden">
+      <div class="flex grow items-stretch gap-4">
+        <div class="flex grow flex-col justify-between gap-2 overflow-hidden py-1">
+          <div class="flex w-full shrink-0 flex-col overflow-hidden">
+            <div class="flex w-full items-center gap-1 overflow-hidden">
+              <span class="overflow-hidden text-lg font-bold text-nowrap text-ellipsis">
                 {{ inOrderGood.good.name }}
               </span>
             </div>
-            <span class="text-sm text-ellipsis text-nowrap overflow-hidden">
+            <span class="overflow-hidden text-sm text-nowrap text-ellipsis">
               {{ inOrderGood.quantity }} {{ inOrderGood.good.measure_unit.name }}
             </span>
           </div>
@@ -23,7 +22,7 @@
             <span [appPriceMask]="inOrderGood.total_amount"></span>
           } @else {
             <div class="flex flex-col">
-              <span class="line-through text-muted-color text-xs" [appPriceMask]="inOrderGood.base_total_amount"></span>
+              <span class="text-muted-color text-xs line-through" [appPriceMask]="inOrderGood.base_total_amount"></span>
               <span [appPriceMask]="inOrderGood.base_total_amount - inOrderGood.discount_amount"></span>
             </div>
           }
@@ -36,8 +35,7 @@
             size="small"
             severity="secondary"
             class="ms-auto"
-            (click)="editOrderItem()"
-          ></button>
+            (click)="editOrderItem()"></button>
           <button
             pButton
             type="button"
@@ -45,8 +43,7 @@
             size="small"
             severity="danger"
             class="ms-auto"
-            (click)="removeGoodFromOrder()"
-          ></button>
+            (click)="removeGoodFromOrder()"></button>
         </div>
       </div>
     </div>
@@ -58,6 +55,5 @@
     [(visible)]="visible"
     [good]="inOrderGood.good"
     [initialValues]="inOrderGood"
-    [orderItemId]="inOrderGood.id"
-  />
+    [orderItemId]="inOrderGood.id" />
 }
diff --git a/src/app/domains/pos/modules/shop/components/views/categories.component.html b/src/app/domains/pos/modules/shop/components/views/categories.component.html
index df83d2f..ef31be1 100644
--- a/src/app/domains/pos/modules/shop/components/views/categories.component.html
+++ b/src/app/domains/pos/modules/shop/components/views/categories.component.html
@@ -1,31 +1,32 @@
 <div class="overflow-x-auto">
-  <div class="w-full overflow-visible flex gap-3 px-4">
+  <div class="flex w-full gap-3 overflow-visible px-4">
     @if (loading()) {
       @for (i of [1, 2, 3, 4, 5]; track i) {
-        <p-skeleton width="6rem" height="2.5rem" />
+        <div class="h-10 w-24 shrink-0">
+          <p-skeleton width="100%" height="100%" />
+        </div>
       }
     } @else {
       @for (category of categories(); track category.id) {
         <div
           [class]="
-            'h-10 rounded-lg px-3 flex items-center gap-3 border border-surface-border cursor-pointer bg-surface-100 hover:bg-surface-200 transition-all shrink-0' +
+            'border-surface-border bg-surface-100 hover:bg-surface-200 flex h-10 shrink-0 cursor-pointer items-center gap-3 rounded-lg border px-3 transition-all' +
             (selectedCategory() === category.id ? ' bg-surface-card' : '')
           "
-          (click)="changeSelectedCategory(category)"
-        >
-          <span class="text-sm text-muted-color font-bold"> {{ category.name }}</span>
+          (click)="changeSelectedCategory(category)">
+          <span class="text-muted-color text-sm font-bold"> {{ category.name }}</span>
           <div
             [class]="
-              'flex items-center justify-center py-0.5 px-2 rounded-sm bg-surface-300 text-xs text-muted-color' +
+              'bg-surface-300 text-muted-color flex items-center justify-center rounded-sm px-2 py-0.5 text-xs' +
               (selectedCategory() === category.id ? ' bg-amber-400! text-white' : '')
-            "
-          >
+            ">
             <span>
               {{ category.goods_count }}
             </span>
           </div>
         </div>
       }
+      <div class="invisible w-1 shrink-0 opacity-0"></div>
     }
   </div>
 </div>
diff --git a/src/app/domains/pos/modules/shop/components/views/list-view.component.html b/src/app/domains/pos/modules/shop/components/views/list-view.component.html
index d120125..bb6d471 100644
--- a/src/app/domains/pos/modules/shop/components/views/list-view.component.html
+++ b/src/app/domains/pos/modules/shop/components/views/list-view.component.html
@@ -7,7 +7,7 @@
     }
   } @else {
     @for (good of visibleGoods(); track good.id) {
-      <div class="bg-surface-card flex items-center gap-2 rounded-lg px-3 py-1 shadow-xs">
+      <div class="bg-surface-card flex items-center gap-2 rounded-lg px-3 py-1">
         <div class="flex grow items-center gap-2">
           <img
             [src]="good.image_url || goodPlaceholder"
diff --git a/src/app/domains/pos/modules/shop/views/root.component.html b/src/app/domains/pos/modules/shop/views/root.component.html
index 30b50da..1225140 100644
--- a/src/app/domains/pos/modules/shop/views/root.component.html
+++ b/src/app/domains/pos/modules/shop/views/root.component.html
@@ -18,7 +18,7 @@
     <button
       type="button"
       pButton
-      class="border-surface-border bg-surface-0 sticky! inset-x-0 right-0 bottom-0 z-1200 w-full rounded-b-none! border-t px-4 py-3 shadow-[0_-4px_16px_rgba(0,0,0,0.08)] md:hidden!"
+      class="border-surface-border bg-surface-0 sticky! inset-x-0 right-0 bottom-0 z-120 w-full rounded-b-none! border-t px-4 py-3 md:hidden!"
       (click)="openInvoiceBottomSheet()">
       <!-- [style.paddingBottom]="'calc(0.75rem + {{env(safe-area-inset-bottom)}})'" -->
       <div class="mx-auto flex w-full max-w-3xl items-center justify-between">
diff --git a/src/app/domains/pos/modules/shop/views/root.component.ts b/src/app/domains/pos/modules/shop/views/root.component.ts
index 574824a..3f36bf8 100644
--- a/src/app/domains/pos/modules/shop/views/root.component.ts
+++ b/src/app/domains/pos/modules/shop/views/root.component.ts
@@ -17,7 +17,7 @@ import { PosLandingStore } from '../store/main.store';
 @Component({
   selector: 'pos-shop',
   templateUrl: './root.component.html',
-  host: { class: 'grow overflow-hidden' },
+  host: { class: 'grow' },
   changeDetection: ChangeDetectionStrategy.OnPush,
 
   imports: [
diff --git a/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html b/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html
index 517d36b..444006c 100644
--- a/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html
+++ b/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html
@@ -1,5 +1,5 @@
 <div
-  class="text-surface-700 relative flex flex-col gap-4 overflow-hidden rounded-lg border px-4 py-4 pe-2"
+  class="text-surface-700 relative flex h-full flex-col gap-4 overflow-hidden rounded-lg border py-4 ps-3 pe-2"
   [style.backgroundColor]="preparedInfo().bgColor"
   [style.borderColor]="preparedInfo().borderColor"
   (click)="showDetails()">
diff --git a/src/app/domains/pos/modules/statistics/views/root.component.html b/src/app/domains/pos/modules/statistics/views/root.component.html
index e981588..8cc3501 100644
--- a/src/app/domains/pos/modules/statistics/views/root.component.html
+++ b/src/app/domains/pos/modules/statistics/views/root.component.html
@@ -1,57 +1,59 @@
-<div class="flex flex-col gap-6 p-4">
-  <season-picker (onChange)="onDateChanged($event)" />
-  <div class="grid grid-cols-2 gap-4">
-    @if (loading()) {
-      @for (_ of [0, 1, 2, 3, 4, 5]; track $index) {
-        <div class="h-32 w-full">
-          <p-skeleton width="100%" height="100%"></p-skeleton>
-        </div>
-      }
-    } @else {
-      <pos-statistics-invoice-type-card
-        type="all"
-        [loading]="loading()"
-        [totalAmount]="item()?.all?.total_amount"
-        [totalTaxAmount]="item()?.all?.total_tax"
-        [count]="item()?.all?.count"
-        (onClick)="toInvoicesPage('all')" />
-      <pos-statistics-invoice-type-card
-        type="success"
-        [loading]="loading()"
-        [totalAmount]="item()?.success?.total_amount"
-        [totalTaxAmount]="item()?.success?.total_tax"
-        [count]="item()?.success?.count"
-        (onClick)="toInvoicesPage('success')" />
-      <pos-statistics-invoice-type-card
-        type="failure"
-        [loading]="loading()"
-        [totalAmount]="item()?.failure?.total_amount"
-        [totalTaxAmount]="item()?.failure?.total_tax"
-        [count]="item()?.failure?.count"
-        (onClick)="toInvoicesPage('failure')" />
-      <pos-statistics-invoice-type-card
-        type="not_send"
-        [loading]="loading()"
-        [totalAmount]="item()?.not_send?.total_amount"
-        [totalTaxAmount]="item()?.not_send?.total_tax"
-        [count]="item()?.not_send?.count"
-        (onClick)="toInvoicesPage('not_send')" />
-      <pos-statistics-invoice-type-card
-        type="pending"
-        [loading]="loading()"
-        [totalAmount]="item()?.pending?.total_amount"
-        [totalTaxAmount]="item()?.pending?.total_tax"
-        [count]="item()?.pending?.count"
-        (onClick)="toInvoicesPage('pending')" />
-      <pos-statistics-invoice-type-card
-        type="not_original"
-        [loading]="loading()"
-        [totalAmount]="item()?.not_original?.total_amount"
-        [totalTaxAmount]="item()?.not_original?.total_tax"
-        [count]="item()?.not_original?.count" />
-    }
-  </div>
-  <div class="fixed inset-x-0 bottom-0 p-4">
+<div class="flex min-h-[calc(100svh-5.5rem)] flex-col p-4 pt-0!">
+  <div class="bg-surface-ground sticky top-[5.5rem] z-10 w-full pt-4!">
     <button pButton [routerLink]="shopRoute" size="large" class="w-full">ایجاد صورت‌حساب جدید</button>
   </div>
+  <season-picker class="mt-6 mb-4 block w-full" (onChange)="onDateChanged($event)" />
+  <div class="flex-1">
+    <div class="grid grid-cols-2 items-stretch gap-2">
+      @if (loading()) {
+        @for (_ of [0, 1, 2, 3, 4, 5]; track $index) {
+          <div class="h-32 w-full">
+            <p-skeleton width="100%" height="100%"></p-skeleton>
+          </div>
+        }
+      } @else {
+        <pos-statistics-invoice-type-card
+          type="all"
+          [loading]="loading()"
+          [totalAmount]="item()?.all?.total_amount"
+          [totalTaxAmount]="item()?.all?.total_tax"
+          [count]="item()?.all?.count"
+          (onClick)="toInvoicesPage('all')" />
+        <pos-statistics-invoice-type-card
+          type="success"
+          [loading]="loading()"
+          [totalAmount]="item()?.success?.total_amount"
+          [totalTaxAmount]="item()?.success?.total_tax"
+          [count]="item()?.success?.count"
+          (onClick)="toInvoicesPage('success')" />
+        <pos-statistics-invoice-type-card
+          type="failure"
+          [loading]="loading()"
+          [totalAmount]="item()?.failure?.total_amount"
+          [totalTaxAmount]="item()?.failure?.total_tax"
+          [count]="item()?.failure?.count"
+          (onClick)="toInvoicesPage('failure')" />
+        <pos-statistics-invoice-type-card
+          type="not_send"
+          [loading]="loading()"
+          [totalAmount]="item()?.not_send?.total_amount"
+          [totalTaxAmount]="item()?.not_send?.total_tax"
+          [count]="item()?.not_send?.count"
+          (onClick)="toInvoicesPage('not_send')" />
+        <pos-statistics-invoice-type-card
+          type="pending"
+          [loading]="loading()"
+          [totalAmount]="item()?.pending?.total_amount"
+          [totalTaxAmount]="item()?.pending?.total_tax"
+          [count]="item()?.pending?.count"
+          (onClick)="toInvoicesPage('pending')" />
+        <pos-statistics-invoice-type-card
+          type="not_original"
+          [loading]="loading()"
+          [totalAmount]="item()?.not_original?.total_amount"
+          [totalTaxAmount]="item()?.not_original?.total_tax"
+          [count]="item()?.not_original?.count" />
+      }
+    </div>
+  </div>
 </div>
diff --git a/src/app/layout/default/app.layout.component.html b/src/app/layout/default/app.layout.component.html
index 87bd206..633b784 100644
--- a/src/app/layout/default/app.layout.component.html
+++ b/src/app/layout/default/app.layout.component.html
@@ -1,29 +1,27 @@
-<div class="layout-wrapper" [ngClass]="containerClass">
+<div class="layout-wrapper flex min-h-svh flex-col" [ngClass]="containerClass">
   @if (!fullPageLoading()) {
     <app-topbar
       [showMenu]="showMenu()"
       [startTemplate]="topBarStartAction"
       [centerTemplate]="topBarCenterAction"
-      [endTemplate]="topBarEndAction || topBarMoreAction"
-    />
+      [endTemplate]="topBarEndAction || topBarMoreAction" />
   }
   @if (showMenu()) {
     <app-sidebar></app-sidebar>
   }
-  <div [class]="`layout-main-container ${!showMenu() ? 'hideMenu' : ''} grow ${isFullPage ? 'isFullPage' : ''}`">
-    <div class="layout-main flex flex-col gap-4">
+  <div
+    [class]="`flex flex-col justify-between ${!showMenu() ? 'hideMenu m0 ps-0' : ''} grow ${isFullPage ? 'isFullPage p-0 ps-0' : ''}`">
+    <div class="flex flex-1 flex-col gap-4">
       @if (showBreadcrumb) {
-        <app-breadcrumb class="rounded-md overflow-hidden shrink-0" />
+        <app-breadcrumb class="shrink-0 overflow-hidden rounded-md" />
       }
-      <div [class]="`rounded-md flex flex-col grow`">
+      <div [class]="`flex min-h-0 flex-1 flex-col rounded-md`">
         <!--  style="container-type: size" -->
-        <div class="h-full">
-          @if (content) {
-            <ng-container [ngTemplateOutlet]="content"></ng-container>
-          } @else {
-            <router-outlet></router-outlet>
-          }
-        </div>
+        @if (content) {
+          <ng-container [ngTemplateOutlet]="content"></ng-container>
+        } @else {
+          <router-outlet></router-outlet>
+        }
       </div>
     </div>
     <app-footer></app-footer>
diff --git a/src/app/modules/saleInvoices/views/single.component.html b/src/app/modules/saleInvoices/views/single.component.html
index c0d837f..eda4480 100644
--- a/src/app/modules/saleInvoices/views/single.component.html
+++ b/src/app/modules/saleInvoices/views/single.component.html
@@ -1,3 +1,3 @@
-<div class="p-4">
+<div class="min-h-dvh p-4">
   <shared-sale-invoice-single-view [loading]="loading()" [invoice]="invoice()" />
 </div>
diff --git a/src/app/shared/components/changePasswordFormDialog/change-password-form-dialog.component.ts b/src/app/shared/components/changePasswordFormDialog/change-password-form-dialog.component.ts
index 5a2a7ac..27b1619 100644
--- a/src/app/shared/components/changePasswordFormDialog/change-password-form-dialog.component.ts
+++ b/src/app/shared/components/changePasswordFormDialog/change-password-form-dialog.component.ts
@@ -1,10 +1,10 @@
 import { MustMatch, password } from '@/core/validators';
 import { AbstractDialog } from '@/shared/abstractClasses/abstract-dialog';
+import { SharedDialogComponent } from '@/shared/components/dialog/dialog.component';
 import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
 import { Component, EventEmitter, Output, input } from '@angular/core';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { SharedPasswordInputComponent } from '../passwordInput/password-input.component';
-import { SharedDialogComponent } from '@/shared/components/dialog/dialog.component';
 
 export interface IChangePasswordSubmitPayload {
   password: string;
@@ -14,7 +14,12 @@ export interface IChangePasswordSubmitPayload {
 @Component({
   selector: 'shared-change-password-form-dialog',
   templateUrl: './change-password-form-dialog.component.html',
-  imports: [ReactiveFormsModule, SharedDialogComponent, FormFooterActionsComponent, SharedPasswordInputComponent],
+  imports: [
+    ReactiveFormsModule,
+    SharedDialogComponent,
+    FormFooterActionsComponent,
+    SharedPasswordInputComponent,
+  ],
 })
 export class ChangePasswordFormDialogComponent extends AbstractDialog {
   title = input<string>('');
@@ -31,11 +36,11 @@ export class ChangePasswordFormDialogComponent extends AbstractDialog {
     },
     {
       validators: [MustMatch('password', 'confirmPassword')],
-    },
+    }
   );
 
   get dialogHeader() {
-    return this.title() ? `تغییر گذرواژه ${this.title()}` : 'تغییر گذرواژه';
+    return this.title() ? `تغییر رمز عبور ${this.title()}` : 'تغییر رمز عبور';
   }
 
   submit() {
diff --git a/src/app/shared/components/confirmationDialog/confirmation-dialog.component.html b/src/app/shared/components/confirmationDialog/confirmation-dialog.component.html
index badad39..9cea5b0 100644
--- a/src/app/shared/components/confirmationDialog/confirmation-dialog.component.html
+++ b/src/app/shared/components/confirmationDialog/confirmation-dialog.component.html
@@ -4,7 +4,7 @@
       <div class="bg-surface-card flex flex-col items-center rounded p-8">
         <div
           class="bg-primary text-primary-contrast -mt-20 inline-flex h-24 w-24 items-center justify-center rounded-full">
-          <i class="pi pi-question text-5xl!"></i>
+          <i class="pi pi-question rotate-y-180 text-5xl!"></i>
         </div>
         <span class="mt-6 mb-2 block text-2xl font-bold">{{ message.header }}</span>
         <p class="mb-0">{{ message.message }}</p>
diff --git a/src/app/shared/components/invoices/correctionForm/form.component.html b/src/app/shared/components/invoices/correctionForm/form.component.html
index f4001d2..4243126 100644
--- a/src/app/shared/components/invoices/correctionForm/form.component.html
+++ b/src/app/shared/components/invoices/correctionForm/form.component.html
@@ -3,7 +3,7 @@
 
   <div class="mt-4 flex flex-col gap-3">
     @for (item of initialValues || []; track item.id) {
-      <div class="border-surface-border rounded-xl border p-2 shadow-sm">
+      <div class="border-surface-border rounded-xl border p-2">
         <div class="flex items-center gap-3">
           <img
             [src]="item.good_snapshot.image_url || ''"
diff --git a/src/app/shared/components/invoices/sale-invoice-single-view.component.html b/src/app/shared/components/invoices/sale-invoice-single-view.component.html
index c780c14..9b2947a 100644
--- a/src/app/shared/components/invoices/sale-invoice-single-view.component.html
+++ b/src/app/shared/components/invoices/sale-invoice-single-view.component.html
@@ -3,13 +3,7 @@
 } @else if (!invoice) {
   <uikit-empty-state> </uikit-empty-state>
 } @else {
-  <p-dialog [visible]="actionLoading" [closable]="false" header="لطفا صبر کنید">
-    <div class="flex h-[30svh] flex-col items-center justify-center gap-6">
-      <p-progressSpinner />
-      <span class="text-lg font-bold">در حال ارسال درخواست شما...</span>
-    </div>
-  </p-dialog>
-  <app-inner-pages-header pageTitle="اطلاعات صورت‌حساب‌" [backRoute]="backRoute">
+  <app-inner-pages-header [pageTitle]="`صورت‌حساب ${invoice.invoice_number}`" [backRoute]="backRoute">
     <ng-template #actions>
       <p-button (click)="printInvoice()" icon="pi pi-print" outlined size="small" label="چاپ" />
     </ng-template>
@@ -18,7 +12,6 @@
     <p-card>
       <div class="flex flex-col gap-4">
         <div class="listKeyValue">
-          <app-key-value label="شماره صورت‌حساب" [value]="invoice.invoice_number" />
           <app-key-value label="شماره منحصر به فرد مالیاتی" [value]="invoice.tax_id" />
           <app-key-value label="تاریخ صورت‌حساب‌" [value]="invoice.invoice_date" type="date" />
           <app-key-value label="تاریخ ایجاد صورت‌حساب‌" [value]="invoice.created_at" type="dateTime" />
@@ -117,9 +110,9 @@
             pButton
             [label]="action.label || ''"
             [icon]="action.icon || ''"
-            size="small"
             [severity]="$any(action).severity || 'secondary'"
             [outlined]="$any(action).severity === 'secondary'"
+            [loading]="actionLoading"
             (click)="action.command()"></button>
         }
       </div>
diff --git a/src/app/shared/components/invoices/sale-invoice-single-view.component.ts b/src/app/shared/components/invoices/sale-invoice-single-view.component.ts
index a3c77a8..aea40ea 100644
--- a/src/app/shared/components/invoices/sale-invoice-single-view.component.ts
+++ b/src/app/shared/components/invoices/sale-invoice-single-view.component.ts
@@ -110,17 +110,6 @@ export class SharedSaleInvoiceSingleViewComponent {
   showCorrectionForm = signal(false);
   showReturnFromSaleForm = signal(false);
 
-  constructor() {
-    this.showErrors = this.showErrors.bind(this);
-    this.showRevokeConfirmation = this.showRevokeConfirmation.bind(this);
-    this.showCorrection = this.showCorrection.bind(this);
-    this.showReturnFromSale = this.showReturnFromSale.bind(this);
-    this.printInvoice = this.printInvoice.bind(this);
-    this.send = this.send.bind(this);
-    this.resend = this.resend.bind(this);
-    this.inquiry = this.inquiry.bind(this);
-  }
-
   showErrors = () => {};
   inquiry = () => {
     this.onInquiry.emit();
@@ -150,49 +139,49 @@ export class SharedSaleInvoiceSingleViewComponent {
       icon: 'pi pi-send',
       neededStatus: TspProviderResponseStatus.SEND_FAILURE,
       severity: 'info',
-      command: this.resend,
+      command: () => this.resend(),
     },
     {
       label: 'ارسال صورت‌حساب',
       icon: 'pi pi-send',
       neededStatus: TspProviderResponseStatus.NOT_SEND,
       severity: 'info',
-      command: this.send,
+      command: () => this.send(),
     },
     {
       label: 'استعلام وضعیت',
       icon: 'pi pi-info',
       neededStatus: TspProviderResponseStatus.FISCAL_QUEUED,
       severity: 'info',
-      command: this.inquiry,
+      command: () => this.inquiry(),
     },
     {
       label: 'دلایل خطا',
       icon: 'pi pi-question',
       neededStatus: TspProviderResponseStatus.FAILURE,
       severity: 'danger',
-      command: this.showErrors,
+      command: () => this.showErrors(),
     },
     {
       label: 'ابطال',
       icon: 'pi pi-eraser',
       neededStatus: TspProviderResponseStatus.SUCCESS,
       severity: 'danger',
-      command: this.showRevokeConfirmation,
+      command: () => this.showRevokeConfirmation(),
     },
     {
       label: 'اصلاح',
       icon: 'pi pi-file-edit',
       neededStatus: TspProviderResponseStatus.SUCCESS,
       severity: 'warn',
-      command: this.showCorrection,
+      command: () => this.showCorrection(),
     },
     {
       label: 'برگشت از فروش',
       icon: 'pi pi-cart-minus',
       neededStatus: TspProviderResponseStatus.SUCCESS,
       severity: 'warn',
-      command: this.showReturnFromSale,
+      command: () => this.showReturnFromSale(),
     },
   ];
 
diff --git a/src/app/shared/components/key-value.component/key-value.component.html b/src/app/shared/components/key-value.component/key-value.component.html
index aad9ec2..97d35ee 100644
--- a/src/app/shared/components/key-value.component/key-value.component.html
+++ b/src/app/shared/components/key-value.component/key-value.component.html
@@ -1,25 +1,24 @@
-<div class="inline-flex flex-col gap-1 w-full">
-  <div class="inline-flex gap-2 items-center w-full">
-    <span class="text-muted-color text-base font-normal flex-auto grow-0">{{ label }}:</span>
+<div class="inline-flex w-full flex-col gap-1">
+  <div class="inline-flex w-full items-center gap-2">
+    <span class="text-muted-color flex-auto grow-0 text-base font-normal">{{ label }}:</span>
     <div
-      class="shrink-0 grow max-sm:text-left"
+      class="text-text-color shrink-0 grow text-base font-bold max-sm:text-left"
       [ngClass]="{
         'text-right': alignment === 'start',
         'text-center': alignment === 'center',
         'text-left': alignment === 'end',
-      }"
-    >
+      }">
       <ng-content>
-        @if (type === "thumbnail") {
-          <div class="w-20 h-20 rounded-2xl overflow-hidden bg-surface-100 cursor-pointer">
+        @if (type === 'thumbnail') {
+          <div class="bg-surface-100 h-20 w-20 cursor-pointer overflow-hidden rounded-2xl">
             @if (valueToShow()) {
-              <img [src]="valueToShow()" class="w-full h-full object-cover" />
+              <img [src]="valueToShow()" class="h-full w-full object-cover" />
             }
           </div>
-        } @else if (valueType() === "tag") {
+        } @else if (valueType() === 'tag') {
           <p-tag [value]="valueToShow()?.toString()" [severity]="value ? 'contrast' : 'danger'" />
         } @else {
-          <span class="text-text-color text-base font-bold grow"> {{ valueToShow() }}</span>
+          <span class="text-text-color grow text-base font-bold"> {{ valueToShow() }}</span>
         }
       </ng-content>
     </div>
diff --git a/src/app/shared/components/uploadFile/upload-file.component.html b/src/app/shared/components/uploadFile/upload-file.component.html
index f01a3b0..2c6c5dc 100644
--- a/src/app/shared/components/uploadFile/upload-file.component.html
+++ b/src/app/shared/components/uploadFile/upload-file.component.html
@@ -15,6 +15,14 @@
     [style]="{ display: 'none' }"
   >
   </ng-template>
+  <input
+    #cameraInput
+    type="file"
+    class="hidden"
+    [accept]="accept"
+    [attr.capture]="accept?.includes('image') ? cameraCapture : null"
+    (change)="onNativeFileSelected($event)"
+  />
   <ng-template
     #content
     let-files
@@ -35,7 +43,7 @@
                 icon="pi pi-pencil"
                 severity="warn"
                 size="small"
-                (click)="chooseCallback()"
+                (click)="openFilePicker()"
               ></button>
               <button
                 pButton
@@ -49,7 +57,7 @@
           </div>
         </div>
       } @else {
-        <div class="flex items-center justify-center flex-col cursor-pointer py-5 w-full" (click)="chooseCallback()">
+        <div class="flex items-center justify-center flex-col cursor-pointer py-5 w-full" (click)="openFilePicker()">
           <i class="pi pi-cloud-upload border-2! rounded-full! p-8! text-4xl! text-muted-color!"></i>
           <p class="mt-6 mb-0">فایل مورد نظر خود را در اینجا رها کنید</p>
         </div>
diff --git a/src/app/shared/components/uploadFile/upload-file.component.ts b/src/app/shared/components/uploadFile/upload-file.component.ts
index 93325cc..89cda7a 100644
--- a/src/app/shared/components/uploadFile/upload-file.component.ts
+++ b/src/app/shared/components/uploadFile/upload-file.component.ts
@@ -1,6 +1,7 @@
 import { Maybe } from '@/core';
 import {
   Component,
+  ElementRef,
   EventEmitter,
   Input,
   OnChanges,
@@ -22,6 +23,7 @@ export class SharedUploadFileComponent implements OnChanges, OnDestroy {
   @Input() loading: boolean = false;
   @Input() name: string = 'file';
   @Input() accept: string = 'image/*';
+  @Input() cameraCapture: 'user' | 'environment' = 'environment';
   @Input() maxSize: Maybe<number> = 5 * 1024 * 1024;
   @Input() error: Maybe<string> = null;
   @Input() hint: Maybe<string> = null;
@@ -30,6 +32,7 @@ export class SharedUploadFileComponent implements OnChanges, OnDestroy {
   @Output() onSelect = new EventEmitter<onSelectFileArgs>();
 
   @ViewChild(FileUpload) uploader?: FileUpload;
+  @ViewChild('cameraInput') cameraInput?: ElementRef<HTMLInputElement>;
 
   filePreview: Maybe<string> = null;
   private objectUrl: Maybe<string> = null;
@@ -63,8 +66,26 @@ export class SharedUploadFileComponent implements OnChanges, OnDestroy {
     this.onSelect.emit({ data: payload, file });
   }
 
+  openFilePicker() {
+    this.cameraInput?.nativeElement.click();
+  }
+
+  onNativeFileSelected(event: Event) {
+    const input = event.target as HTMLInputElement;
+    const file = input.files?.[0];
+    if (!file) {
+      return;
+    }
+
+    this.setPreviewFromFile(file);
+    const payload = new FormData();
+    payload.append(this.name, file, file.name);
+    this.onSelect.emit({ data: payload, file });
+    input.value = '';
+  }
+
   onEditFile() {
-    this.uploader?.choose();
+    this.openFilePicker();
   }
 
   onDeleteFilePreview() {
diff --git a/src/app/uikit/datepicker/datepicker.component.html b/src/app/uikit/datepicker/datepicker.component.html
index f22730d..d141e34 100644
--- a/src/app/uikit/datepicker/datepicker.component.html
+++ b/src/app/uikit/datepicker/datepicker.component.html
@@ -2,7 +2,7 @@
   <input pInputText readonly [name]="name" [value]="valueToShow" class="w-full" />
 </uikit-field>
 <p-popover #op appendTo="body">
-  <div #wrapperRef class="dir-rtl border-divider bg-background-paper w-full min-w-sm overflow-auto rounded-md">
+  <div #wrapperRef class="dir-rtl border-divider bg-background-paper w-full min-w-[320px] overflow-auto rounded-md">
     <div class="bg-primary-main sticky top-0 flex justify-center px-3">
       <div class="flex items-center gap-3">
         <div class="flex h-8 items-center">
diff --git a/src/assets/customize.scss b/src/assets/customize.scss
index 9a2c342..62ba38b 100644
--- a/src/assets/customize.scss
+++ b/src/assets/customize.scss
@@ -3,7 +3,7 @@
 }
 
 .listKeyValue {
-  @apply grid md:grid-cols-3 sm:grid-cols-2 sm:gap-4 gap-3 items-center;
+  @apply grid items-center gap-3 sm:grid-cols-2 sm:gap-4 md:grid-cols-3;
 }
 
 .cardShadow {
@@ -11,7 +11,7 @@
 }
 
 .summaryList {
-  @apply max-h-125 flex;
+  @apply flex max-h-125;
   > * {
     @apply w-full;
   }
diff --git a/src/assets/layout/_core.scss b/src/assets/layout/_core.scss
index 405db59..c44ecc6 100644
--- a/src/assets/layout/_core.scss
+++ b/src/assets/layout/_core.scss
@@ -13,12 +13,6 @@ a {
   text-decoration: none;
 }
 
-.layout-wrapper {
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-}
-
 html {
   scroll-behavior: smooth;
   font-size: 14px;
diff --git a/src/assets/layout/_main.scss b/src/assets/layout/_main.scss
index 6f20ca1..53e35c2 100644
--- a/src/assets/layout/_main.scss
+++ b/src/assets/layout/_main.scss
@@ -1,23 +1,7 @@
 .layout-main-container {
-  display: flex;
-  flex-direction: column;
-  // height: 100vh;
-  // overflow: hidden;
-  justify-content: space-between;
-  padding: 2rem 1rem 2rem 2rem;
+  // padding: 2rem 1rem 2rem 2rem;
   transition: margin-inline-start var(--layout-section-transition-duration);
   &.hideMenu {
-    margin: 0 !important;
     transform: translateX(0) !important;
-    padding-inline-start: 2rem !important;
-  }
-  &.isFullPage {
-    padding-inline-start: 0 !important;
-    padding: 0 !important;
   }
 }
-
-.layout-main {
-  flex: 1 1 auto;
-  // overflow: auto;
-}
diff --git a/src/assets/psp.scss b/src/assets/psp.scss
new file mode 100644
index 0000000..2bf5f27
--- /dev/null
+++ b/src/assets/psp.scss
@@ -0,0 +1,7 @@
+.p-inputtext {
+  box-shadow: none !important;
+}
+
+* {
+  box-shadow: none !important;
+}
diff --git a/src/environments/environment.tis.ts b/src/environments/environment.tis.ts
index 914a195..612d694 100644
--- a/src/environments/environment.tis.ts
+++ b/src/environments/environment.tis.ts
@@ -1,9 +1,10 @@
 // TIS tenant environment configuration
 export const environment = {
   production: true,
-  // apiBaseUrl: 'https://psp-api.shift-am.ir',
+  apiBaseUrl: 'https://psp-api.shift-am.ir',
   // apiBaseUrl: 'http://192.168.128.73:5002',
-  apiBaseUrl: 'http://localhost:5002',
+  // apiBaseUrl: 'http://192.168.0.162:5002',
+  // apiBaseUrl: 'http://localhost:5002',
   host: 'localhost',
   port: 5000,
   enableLogging: false,