diff --git a/src/app/core/services/native-bridge.service.ts b/src/app/core/services/native-bridge.service.ts
index 8a20bf7..8d6e810 100644
--- a/src/app/core/services/native-bridge.service.ts
+++ b/src/app/core/services/native-bridge.service.ts
@@ -135,7 +135,6 @@ export class NativeBridgeService {
       this.toastService.info({ text: 'در حال چاپ ...' });
       // @ts-ignore
       window.NativeBridge.print(JSON.stringify(payload));
-      console.log('payload', payload);
 
       return { success: true };
     } catch (error) {
diff --git a/src/app/domains/consumer/modules/accounts/components/permissions/list.component.html b/src/app/domains/consumer/modules/accounts/components/permissions/list.component.html
index 763c881..eed9300 100644
--- a/src/app/domains/consumer/modules/accounts/components/permissions/list.component.html
+++ b/src/app/domains/consumer/modules/accounts/components/permissions/list.component.html
@@ -1,15 +1,15 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="مدیریت سطح دسترسی">
     @if (isOwner()) {
-      <div class="py-20 flex items-center justify-center">
+      <div class="flex items-center justify-center py-20">
         کاربر با سطح Owner به تمامی سطوح دسترسی داشته و قابل ویرایش نمی‌باشد
       </div>
     } @else if (loading()) {
-      <div class="py-20 flex items-center justify-center">
+      <div class="flex items-center justify-center py-20">
         <p-progressSpinner />
       </div>
     } @else if (permissions()) {
-      <div class="flex flex-col gap-6">
+      <div class="flex flex-col gap-4">
         <p-message severity="secondary"> پیام مفهومی برای مشخص کردن نوع دسترسی دادن</p-message>
         @for (pos of permissions()?.poses; track $index) {
           <div class="flex items-center gap-4">
diff --git a/src/app/domains/consumer/modules/accounts/views/single.component.html b/src/app/domains/consumer/modules/accounts/views/single.component.html
index 321ebf4..894fecd 100644
--- a/src/app/domains/consumer/modules/accounts/views/single.component.html
+++ b/src/app/domains/consumer/modules/accounts/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات کاربری" [editable]="false" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
diff --git a/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.html b/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.html
index 3d05561..eec7a8b 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.html
+++ b/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.html
@@ -4,14 +4,13 @@
   [modal]="true"
   [style]="{ width: '500px' }"
   [closable]="true"
-  (onHide)="close()"
->
+  (onHide)="close()">
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <field-name [control]="form.controls.name" />
 
-    <field-pos-type [control]="form.controls.pos_type" />
+    <!-- <field-pos-type [control]="form.controls.pos_type" /> -->
 
-    @if (form.controls.pos_type.value === "PSP") {
+    @if (form.controls.pos_type.value === 'PSP') {
       <field-serial-number [control]="form.controls.serial_number" />
       <field-device-id [control]="form.controls.device_id" />
       <field-provider-id [control]="form.controls.provider_id" />
@@ -22,8 +21,7 @@
       <field-username [control]="form.controls.username" />
       <shared-password-input
         [passwordControl]="form.controls.password"
-        [confirmPasswordControl]="form.controls.confirmPassword"
-      />
+        [confirmPasswordControl]="form.controls.confirmPassword" />
     }
 
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
diff --git a/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.ts b/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.ts
index 35d8de5..5d163e9 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/components/poses/form.component.ts
@@ -4,7 +4,6 @@ import { AbstractFormDialog } from '@/shared/abstractClasses';
 import {
   DeviceIdComponent,
   NameComponent,
-  PosTypeComponent,
   ProviderIdComponent,
   SerialNumberComponent,
   SharedPasswordInputComponent,
@@ -29,7 +28,6 @@ import { ConsumerPosesService } from '../../services/poses.service';
     FormFooterActionsComponent,
     DeviceIdComponent,
     ProviderIdComponent,
-    PosTypeComponent,
     SerialNumberComponent,
     UsernameComponent,
     Divider,
@@ -46,7 +44,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
   initForm = () => {
     const form = this.fb.group({
       name: fieldControl.name(this.initialValues?.name || ''),
-      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || ''),
+      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || 'PSP'),
       serial_number: fieldControl.serial_number(this.initialValues?.serial_number || ''),
       device_id: fieldControl.device_id(this.initialValues?.device?.id || ''),
       provider_id: fieldControl.provider_id(this.initialValues?.provider?.id || ''),
@@ -96,7 +94,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
         this.fb.control<string>('', {
           nonNullable: true,
           validators: fieldControl.username('')[1],
-        }),
+        })
       );
       // @ts-ignore
       form.addControl(
@@ -104,7 +102,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
         this.fb.control<string>('', {
           nonNullable: true,
           validators: [Validators.required],
-        }),
+        })
       );
       // @ts-ignore
       form.addControl(
@@ -112,7 +110,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
         this.fb.control<string>('', {
           nonNullable: true,
           validators: [Validators.required],
-        }),
+        })
       );
       form.addValidators([MustMatch('password', 'confirmPassword')]);
     }
diff --git a/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.html b/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.html
index ffd993e..bea89f1 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.html
+++ b/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  pageTitle="لیست پایانه‌های فروش"
+  pageTitle="پایانه‌های فروش"
   [columns]="columns"
   [addNewCtaLabel]="'افزودن پایانه فروش'"
   emptyPlaceholderTitle="پایانه فروشی یافت نشد."
@@ -12,8 +12,7 @@
   (onAdd)="openAddForm()"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
->
+  (onRefresh)="refresh()">
 </app-page-data-list>
 <consumer-pos-form
   [(visible)]="visibleForm"
@@ -22,5 +21,4 @@
   [complexId]="complexId"
   [posId]="selectedItemForEdit()?.id || ''"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
-/>
+  (onSubmit)="refresh()" />
diff --git a/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.ts b/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.ts
index 15fb69b..874c7ca 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/components/poses/list.component.ts
@@ -7,7 +7,7 @@ import {
 } from '@/shared/components/pageDataList/page-data-list.component';
 import { Component, inject, Input } from '@angular/core';
 import { Router } from '@angular/router';
-import { consumerPosesNamedRoutes } from '../../constants/routes/poses';
+import { consumerComplexPosesNamedRoutes } from '../../constants/routes/poses';
 import { IPosResponse } from '../../models';
 import { ConsumerPosesService } from '../../services/poses.service';
 import { ConsumerPosFormComponent } from './form.component';
@@ -36,7 +36,7 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
 
   toSinglePage(item: IPosResponse) {
     this.router.navigateByUrl(
-      consumerPosesNamedRoutes.pos.meta.pagePath!(this.businessId, this.complexId, item.id),
+      consumerComplexPosesNamedRoutes.pos.meta.pagePath!(this.businessId, this.complexId, item.id)
     );
   }
 }
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 008b061..73b2003 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,8 +1,13 @@
 <app-page-data-list
-  pageTitle="صورت‌حساب‌ها"
+  [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
-  emptyPlaceholderTitle="تا به حال صورت‌حسابی توسط این پایانه ایجاد نشده است."
+  emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
   [items]="items()"
   [loading]="loading()"
+  [showDetails]="true"
+  (onDetails)="toSinglePage($event)"
   (onRefresh)="refresh()">
+  <ng-template #status let-item>
+    <catalog-tax-provider-status-tag [status]="item.status.value" [translate]="item.status.translate" />
+  </ng-template>
 </app-page-data-list>
diff --git a/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.ts b/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.ts
index cf4e504..ba5af9c 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/components/salesInvoices/list.component.ts
@@ -1,47 +1,52 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
-import { Component, inject, Input } from '@angular/core';
+import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
+import { Component, inject, Input, TemplateRef, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { consumerSaleInvoicesNamedRoutes } from '../../../saleInvoices/constants/routes';
 import { ISalesInvoicesResponse } from '../../models';
 import { ConsumerSalesInvoicesService } from '../../services/invoices.service';
 
 @Component({
   selector: 'consumer-salesInvoices-list',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent],
+  imports: [PageDataListComponent, CatalogTaxProviderStatusTagComponent],
 })
 export class ConsumerSalesInvoicesComponent extends AbstractList<ISalesInvoicesResponse> {
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;
+
   @Input({ required: true }) complexId!: string;
   @Input({ required: true }) posId!: string;
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
-    // { field: 'id', header: 'شناسه', type: 'id' },
-    { field: 'code', header: 'کد رهگیری' },
-    { field: 'total_amount', header: 'مبلغ کل', type: 'price' },
-    {
-      field: 'items_count',
-      header: 'تعداد کالاها',
-      customDataModel(item) {
-        return `${item.items.length} عدد`;
-      },
-    },
-    {
-      field: 'invoice_date',
-      header: 'تاریخ',
-      type: 'date',
-    },
-  ];
+  @Input() header: IColumn[] = saleInvoiceListConfig.columns;
 
   private readonly service = inject(ConsumerSalesInvoicesService);
+  private readonly router = inject(Router);
 
   override setColumns(): void {
-    this.columns = this.header;
+    this.columns = this.header
+      .map((header) => {
+        if (header.field === 'status') {
+          return {
+            ...header,
+            customDataModel: this.status,
+          };
+        }
+        return header;
+      })
+      .filter((header) => header.field !== 'pos');
   }
 
   override getDataRequest() {
     return this.service.getAll(this.complexId, this.posId);
   }
+
+  toSinglePage(item: ISalesInvoicesResponse) {
+    this.router.navigateByUrl(consumerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(item.id));
+  }
 }
diff --git a/src/app/domains/consumer/modules/businessActivities/constants/routes/poses.ts b/src/app/domains/consumer/modules/businessActivities/constants/routes/poses.ts
index 3bcf34c..857990c 100644
--- a/src/app/domains/consumer/modules/businessActivities/constants/routes/poses.ts
+++ b/src/app/domains/consumer/modules/businessActivities/constants/routes/poses.ts
@@ -6,7 +6,7 @@ export type TPosesRouteNames = 'poses' | 'pos';
 const baseUrl = (businessId: string, complexId: string) =>
   `/consumer/business_activities/${businessId}/complexes/${complexId}/poses`;
 
-export const consumerPosesNamedRoutes: NamedRoutes<TPosesRouteNames> = {
+export const consumerComplexPosesNamedRoutes: NamedRoutes<TPosesRouteNames> = {
   poses: {
     path: 'poses',
     loadComponent: () =>
@@ -31,17 +31,17 @@ export const consumerPosesNamedRoutes: NamedRoutes<TPosesRouteNames> = {
 };
 
 export const CONSUMER_POSES_ROUTES: Routes = [
-  consumerPosesNamedRoutes.poses,
+  consumerComplexPosesNamedRoutes.poses,
   {
-    path: consumerPosesNamedRoutes.pos.path,
+    path: consumerComplexPosesNamedRoutes.pos.path,
     loadComponent: () =>
       import('../../components/poses/layout.component').then(
-        (m) => m.SuperAdminConsumerPosLayoutComponent,
+        (m) => m.SuperAdminConsumerPosLayoutComponent
       ),
     children: [
       {
         path: '',
-        loadComponent: consumerPosesNamedRoutes.pos.loadComponent,
+        loadComponent: consumerComplexPosesNamedRoutes.pos.loadComponent,
       },
     ],
   },
diff --git a/src/app/domains/consumer/modules/businessActivities/models/salesInvoices_io.d.ts b/src/app/domains/consumer/modules/businessActivities/models/salesInvoices_io.d.ts
index 96eea20..8e6d2ce 100644
--- a/src/app/domains/consumer/modules/businessActivities/models/salesInvoices_io.d.ts
+++ b/src/app/domains/consumer/modules/businessActivities/models/salesInvoices_io.d.ts
@@ -1,11 +1,15 @@
 import ISummary from '@/core/models/summary';
 import { TCustomerInfo, TPosOrderGoodPayload } from '@/domains/pos/modules/shop/models';
+import { TspProviderResponseStatus } from '@/shared/catalog';
+import { IEnumTranslate } from '@/shared/models';
 
 export interface ISalesInvoicesRawResponse {
   id: string;
+  invoice_number: string;
   code: string;
   invoice_date: string;
   total_amount: string;
+  status: IEnumTranslate<TspProviderResponseStatus>;
   items: Item[];
   payments: Payment[];
   customer?: TCustomerInfo;
diff --git a/src/app/domains/consumer/modules/businessActivities/store/businessActivity.store.ts b/src/app/domains/consumer/modules/businessActivities/store/businessActivity.store.ts
index 7836d8e..c665b10 100644
--- a/src/app/domains/consumer/modules/businessActivities/store/businessActivity.store.ts
+++ b/src/app/domains/consumer/modules/businessActivities/store/businessActivity.store.ts
@@ -54,7 +54,7 @@ export class BusinessActivityStore extends EntityStore<
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });
diff --git a/src/app/domains/consumer/modules/businessActivities/store/pos.store.ts b/src/app/domains/consumer/modules/businessActivities/store/pos.store.ts
index 2762105..c3c5909 100644
--- a/src/app/domains/consumer/modules/businessActivities/store/pos.store.ts
+++ b/src/app/domains/consumer/modules/businessActivities/store/pos.store.ts
@@ -2,7 +2,7 @@ import { defaultBaseStateData, EntityState, EntityStore } from '@/core/state';
 import { computed, inject, Injectable } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { catchError, finalize } from 'rxjs';
-import { consumerPosesNamedRoutes } from '../constants/routes/poses';
+import { consumerComplexPosesNamedRoutes } from '../constants/routes/poses';
 import { IPosResponse } from '../models';
 import { ConsumerPosesService } from '../services/poses.service';
 
@@ -28,12 +28,16 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
     this.patchState({
       breadcrumbItems: [
         {
-          ...consumerPosesNamedRoutes.poses.meta,
-          routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(businessId, complexId),
+          ...consumerComplexPosesNamedRoutes.poses.meta,
+          routerLink: consumerComplexPosesNamedRoutes.poses.meta.pagePath!(businessId, complexId),
         },
         {
           title: this.entity()?.name,
-          routerLink: consumerPosesNamedRoutes.pos.meta.pagePath!(businessId, complexId, posId),
+          routerLink: consumerComplexPosesNamedRoutes.pos.meta.pagePath!(
+            businessId,
+            complexId,
+            posId
+          ),
         },
       ],
     });
@@ -50,7 +54,7 @@ export class PosStore extends EntityStore<IPosResponse, PosState> {
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });
diff --git a/src/app/domains/consumer/modules/businessActivities/views/complexes/single.component.html b/src/app/domains/consumer/modules/businessActivities/views/complexes/single.component.html
index f4a3eb9..bff8335 100644
--- a/src/app/domains/consumer/modules/businessActivities/views/complexes/single.component.html
+++ b/src/app/domains/consumer/modules/businessActivities/views/complexes/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات شعبه" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -17,6 +17,5 @@
     [businessActivityId]="businessId()"
     [complexId]="complexId()"
     [initialValues]="complex() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/consumer/modules/businessActivities/views/poses/list.component.ts b/src/app/domains/consumer/modules/businessActivities/views/poses/list.component.ts
index 5be7b5f..1f7a17d 100644
--- a/src/app/domains/consumer/modules/businessActivities/views/poses/list.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/views/poses/list.component.ts
@@ -4,7 +4,7 @@ import pageParamsUtils from '@/utils/page-params.utils';
 import { Component, computed, inject, signal } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ConsumerPosesComponent } from '../../components/poses/list.component';
-import { consumerPosesNamedRoutes } from '../../constants/routes/poses';
+import { consumerComplexPosesNamedRoutes } from '../../constants/routes/poses';
 import { BusinessActivityStore } from '../../store/businessActivity.store';
 import { ConsumerComplexStore } from '../../store/complex.store';
 
@@ -32,10 +32,10 @@ export class ConsumerPosListPageComponent {
       ...this.businessStore.breadcrumbItems(),
       ...this.complexStore.breadcrumbItems(),
       {
-        title: consumerPosesNamedRoutes.poses.meta.title,
-        routerLink: consumerPosesNamedRoutes.poses.meta.pagePath!(
+        title: consumerComplexPosesNamedRoutes.poses.meta.title,
+        routerLink: consumerComplexPosesNamedRoutes.poses.meta.pagePath!(
           this.businessId(),
-          this.complexId(),
+          this.complexId()
         ),
       },
     ]);
diff --git a/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html b/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html
index e9a4e71..88429fb 100644
--- a/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html
+++ b/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html
@@ -1,5 +1,5 @@
-<div class="flex flex-col gap-6">
-  <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
+<div class="flex flex-col gap-4">
+  <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [backRoute]="backRoute()" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <p-button type="button" variant="outlined" size="small" (onClick)="toPosLanding()"> ورود به پایانه </p-button>
     </ng-template>
@@ -24,6 +24,5 @@
     [complexId]="complexId()"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.ts b/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.ts
index e159060..812d160 100644
--- a/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.ts
@@ -8,6 +8,7 @@ import { Button } from 'primeng/button';
 import { COOKIE_KEYS } from 'src/assets/constants';
 import { ConsumerPosFormComponent } from '../../components/poses/form.component';
 import { ConsumerSalesInvoicesComponent } from '../../components/salesInvoices/list.component';
+import { consumerComplexPosesNamedRoutes } from '../../constants/routes/poses';
 import { BusinessActivityStore } from '../../store/businessActivity.store';
 import { ConsumerComplexStore } from '../../store/complex.store';
 import { PosStore } from '../../store/pos.store';
@@ -38,6 +39,11 @@ export class ConsumerComplexPosPageComponent {
   readonly posId = signal<string>(this.pageParams()['posId']!);
   editMode = signal<boolean>(false);
 
+  backRoute = computed(
+    () =>
+      `${consumerComplexPosesNamedRoutes.poses.meta.pagePath!(this.businessId(), this.complexId())}`
+  );
+
   constructor() {
     effect(() => {
       if (this.pos()?.id) {
@@ -59,7 +65,7 @@ export class ConsumerComplexPosPageComponent {
       sameSite: 'Lax', // or 'Strict' for same-site requests only
       secure: false,
       path: '/',
-      domain: 'localhost',
+      domain: window.location.hostname,
     });
     window.open('/pos', '_blank');
   }
diff --git a/src/app/domains/consumer/modules/businessActivities/views/single.component.html b/src/app/domains/consumer/modules/businessActivities/views/single.component.html
index 8a7278f..e9bfd4e 100644
--- a/src/app/domains/consumer/modules/businessActivities/views/single.component.html
+++ b/src/app/domains/consumer/modules/businessActivities/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <a routerLink pButton [routerLink]="goodsPageRoute()" outlined size="small">مدیریت کالاها</a>
@@ -25,6 +25,5 @@
     [editMode]="true"
     [businessId]="businessId()"
     [initialValues]="business() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/consumer/modules/customers/components/list.component.html b/src/app/domains/consumer/modules/customers/components/list.component.html
index ad48961..31a5b7b 100644
--- a/src/app/domains/consumer/modules/customers/components/list.component.html
+++ b/src/app/domains/consumer/modules/customers/components/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  [pageTitle]="'لیست مشتری'"
+  [pageTitle]="'مشتری‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="مشتری یافت نشد"
   [items]="items()"
@@ -8,8 +8,7 @@
   [showDetails]="true"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
-/>
+  (onRefresh)="refresh()" />
 
 @if (selectedItemForEdit()) {
   <consumer-customer-form-dialog [(visible)]="visibleForm" [customer]="selectedItemForEdit()!" (onSubmit)="refresh()" />
diff --git a/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.html b/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.html
index 7bd032f..73b2003 100644
--- a/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.html
+++ b/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.html
@@ -1,9 +1,13 @@
 <app-page-data-list
-  [pageTitle]="'لیست صورت‌حساب‌'"
+  [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()" />
+  (onRefresh)="refresh()">
+  <ng-template #status let-item>
+    <catalog-tax-provider-status-tag [status]="item.status.value" [translate]="item.status.translate" />
+  </ng-template>
+</app-page-data-list>
diff --git a/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.ts b/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.ts
index 13183fe..0855ab2 100644
--- a/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.ts
+++ b/src/app/domains/consumer/modules/customers/components/saleInvoices/list.component.ts
@@ -1,10 +1,12 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
-import { Component, inject, Input } from '@angular/core';
+import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
+import { Component, inject, Input, TemplateRef, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { consumerCustomerSaleInvoicesNamedRoutes } from '../../constants/routes/saleInvoices';
 import { ICustomerSaleInvoicesResponse } from '../../models/saleInvoices.io';
@@ -13,48 +15,27 @@ import { CustomerSaleInvoicesService } from '../../services/saleInvoices.service
 @Component({
   selector: 'consumer-customer-saleInvoice-list',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent],
+  imports: [PageDataListComponent, CatalogTaxProviderStatusTagComponent],
 })
 export class ConsumerCustomerSaleInvoiceListComponent extends AbstractList<ICustomerSaleInvoicesResponse> {
   @Input({ required: true }) customerId!: string;
   @Input() fullHeight?: boolean;
-  @Input() header: IColumn[] = [
-    { field: 'code', header: 'کد رهگیری' },
-    {
-      field: 'total_amount',
-      header: 'قیمت نهایی',
-      type: 'price',
-    },
-    {
-      field: 'pos',
-      header: 'پایانه',
-      customDataModel(item: ICustomerSaleInvoicesResponse) {
-        return `${item.pos.complex.business_activity.name}، شعبه ${item.pos.complex.name}، پایانه فروش ${item.pos.name}`;
-      },
-    },
-    {
-      field: 'account',
-      header: 'ایجاد شده توسط',
-      type: 'nested',
-      nestedOption: { path: 'account.account.username' },
-    },
-    {
-      field: 'invoice_date',
-      header: 'تاریخ صورت‌حساب‌',
-      type: 'date',
-    },
-    {
-      field: 'created_at',
-      header: 'تاریخ ایجاد',
-      type: 'date',
-    },
-  ];
+  @Input() header: IColumn[] = saleInvoiceListConfig.columns;
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;
 
   private readonly service = inject(CustomerSaleInvoicesService);
   private readonly router = inject(Router);
 
   override setColumns(): void {
-    this.columns = this.header;
+    this.columns = this.header.map((header) => {
+      if (header.field === 'status') {
+        return {
+          ...header,
+          customDataModel: this.status,
+        };
+      }
+      return header;
+    });
   }
 
   override getDataRequest() {
diff --git a/src/app/domains/consumer/modules/customers/constants/routes/saleInvoices.ts b/src/app/domains/consumer/modules/customers/constants/routes/saleInvoices.ts
index 5078526..eb127f8 100644
--- a/src/app/domains/consumer/modules/customers/constants/routes/saleInvoices.ts
+++ b/src/app/domains/consumer/modules/customers/constants/routes/saleInvoices.ts
@@ -12,8 +12,8 @@ export const consumerCustomerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerCusto
           (m) => m.ConsumerCustomerSaleInvoicesComponent
         ),
       meta: {
-        title: 'صورت‌حساب‌های صادر شده',
-        pagePath: (customerId: string) => `consumer/customers/${customerId}`,
+        title: 'صورت‌حساب‌ها',
+        pagePath: (customerId: string) => `consumer/customers/${customerId}/saleInvoices`,
       },
     },
     saleInvoice: {
@@ -23,7 +23,7 @@ export const consumerCustomerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerCusto
           (m) => m.ConsumerCustomerSaleInvoiceComponent
         ),
       meta: {
-        title: 'صورت‌حساب‌ صادر شده',
+        title: 'صورت‌حساب‌',
         pagePath: (customerId: string, saleInvoiceId: string) =>
           `consumer/customers/${customerId}/saleInvoices/${saleInvoiceId}`,
       },
diff --git a/src/app/domains/consumer/modules/customers/store/saleInvoice.store.ts b/src/app/domains/consumer/modules/customers/store/saleInvoice.store.ts
index ce5c130..bf37b63 100644
--- a/src/app/domains/consumer/modules/customers/store/saleInvoice.store.ts
+++ b/src/app/domains/consumer/modules/customers/store/saleInvoice.store.ts
@@ -36,10 +36,10 @@ export class ConsumerCustomerSaleInvoiceStore extends EntityStore<
             consumerCustomerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!(customerId),
         },
         {
-          title: this.entity()?.code,
+          title: `صورت‌حساب ${this.entity()?.invoice_number}`,
           routerLink: consumerCustomerSaleInvoicesNamedRoutes.saleInvoice.meta.pagePath!(
             customerId,
-            invoiceId,
+            invoiceId
           ),
         },
       ],
@@ -57,7 +57,7 @@ export class ConsumerCustomerSaleInvoiceStore extends EntityStore<
         catchError((error) => {
           this.setError(error);
           throw error;
-        }),
+        })
       )
       .subscribe((entity) => {
         this.patchState({ entity });
diff --git a/src/app/domains/consumer/modules/customers/views/saleInvoices/list.component.ts b/src/app/domains/consumer/modules/customers/views/saleInvoices/list.component.ts
index 9e07400..72ff61f 100644
--- a/src/app/domains/consumer/modules/customers/views/saleInvoices/list.component.ts
+++ b/src/app/domains/consumer/modules/customers/views/saleInvoices/list.component.ts
@@ -1,7 +1,11 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
-import { Component, inject, signal } from '@angular/core';
+import { BreadcrumbService } from '@/core/services';
+import pageParamsUtils from '@/utils/page-params.utils';
+import { Component, computed, inject, signal } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ConsumerCustomerSaleInvoiceListComponent } from '../../components/saleInvoices/list.component';
+import { consumerCustomerSaleInvoicesNamedRoutes } from '../../constants/routes/saleInvoices';
+import { ConsumerCustomerStore } from '../../store/customer.store';
 
 @Component({
   selector: 'consumer-customer-saleInvoices',
@@ -10,6 +14,25 @@ import { ConsumerCustomerSaleInvoiceListComponent } from '../../components/saleI
 })
 export class ConsumerCustomerSaleInvoicesComponent {
   private readonly route = inject(ActivatedRoute);
+  private readonly breadcrumbService = inject(BreadcrumbService);
+  private readonly store = inject(ConsumerCustomerStore);
 
-  readonly customerId = signal<string>(this.route.snapshot.paramMap.get('customerId')!);
+  pageParams = computed(() => pageParamsUtils(this.route));
+  customerId = signal<string>(this.pageParams()['customerId']);
+
+  ngAfterViewInit() {
+    this.setBreadcrumb();
+  }
+
+  setBreadcrumb() {
+    this.breadcrumbService.setItems([
+      ...this.store.breadcrumbItems(),
+      {
+        title: consumerCustomerSaleInvoicesNamedRoutes.saleInvoices.meta.title,
+        routerLink: consumerCustomerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!(
+          this.customerId()
+        ),
+      },
+    ]);
+  }
 }
diff --git a/src/app/domains/consumer/modules/customers/views/saleInvoices/single.component.ts b/src/app/domains/consumer/modules/customers/views/saleInvoices/single.component.ts
index f728a61..43396d0 100644
--- a/src/app/domains/consumer/modules/customers/views/saleInvoices/single.component.ts
+++ b/src/app/domains/consumer/modules/customers/views/saleInvoices/single.component.ts
@@ -28,6 +28,8 @@ export class ConsumerCustomerSaleInvoiceComponent {
   constructor() {
     effect(() => {
       if (this.invoice()?.id) {
+        console.log('inja');
+
         this.setBreadcrumb();
       }
     });
diff --git a/src/app/domains/consumer/modules/customers/views/single.component.html b/src/app/domains/consumer/modules/customers/views/single.component.html
index c4f30e7..bd72b07 100644
--- a/src/app/domains/consumer/modules/customers/views/single.component.html
+++ b/src/app/domains/consumer/modules/customers/views/single.component.html
@@ -1,18 +1,17 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data
     [cardTitle]="`اطلاعات مشتری (${customer() ? (customer()?.type === 'LEGAL' ? 'حقوقی' : 'حقیقی') : ''})`"
     [editable]="true"
-    [(editMode)]="editMode"
-  >
+    [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
-      @if (customer()?.type === "LEGAL") {
+      @if (customer()?.type === 'LEGAL') {
         <div class="listKeyValue">
           <app-key-value label="عنوان" [value]="customer()?.legal?.company_name" />
           <app-key-value label="کد اقتصادی" [value]="customer()?.legal?.economic_code" />
           <app-key-value label="شماره ثبت" [value]="customer()?.legal?.registration_number" />
           <app-key-value label="کد پستی" [value]="customer()?.legal?.postal_code" />
         </div>
-      } @else if (customer()?.type === "INDIVIDUAL") {
+      } @else if (customer()?.type === 'INDIVIDUAL') {
         <div class="listKeyValue">
           <app-key-value label="نام" [value]="customer()?.individual?.first_name" />
           <app-key-value label="نام خانوادگی" [value]="customer()?.individual?.last_name" />
diff --git a/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.html b/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.html
index d563b39..62b0671 100644
--- a/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.html
+++ b/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.html
@@ -1,7 +1,7 @@
 <app-page-data-list
-  pageTitle="آخرین صورت‌حساب‌های صادر شده امروز"
+  pageTitle="صورت‌حساب‌های امروز"
   [columns]="columns"
-  emptyPlaceholderTitle="تا به این لحظه صورت‌حساب‌ی صادر نشده است."
+  emptyPlaceholderTitle="تا به این لحظه صورت‌حسابی صادر نشده است."
   [items]="items()"
   [showDetails]="true"
   [loading]="loading()"
diff --git a/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.ts b/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.ts
index 446c3a8..4f08fce 100644
--- a/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.ts
+++ b/src/app/domains/consumer/modules/dashboard/components/statistics/latestInvoices/latest-Invoices.component.ts
@@ -2,6 +2,7 @@ import { consumerSaleInvoicesNamedRoutes } from '@/domains/consumer/modules/sale
 import { AbstractList } from '@/shared/abstractClasses';
 import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
+import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
 import { Component, inject, TemplateRef, ViewChild } from '@angular/core';
 import { Router, RouterLink } from '@angular/router';
 import { ButtonDirective } from 'primeng/button';
@@ -27,29 +28,7 @@ export class ConsumerStatisticsLatestInvoicesComponent extends AbstractList<ISta
   readonly invoicesPageRoute = consumerSaleInvoicesNamedRoutes.saleInvoices.meta.pagePath!();
 
   override setColumns(): void {
-    this.columns = [
-      { field: 'code', header: 'کد پیگیری' },
-      { field: 'total_amount', header: 'قیمت نهایی', type: 'price' },
-      {
-        field: 'pos',
-        header: 'پایانه',
-        customDataModel(item) {
-          return `${item.pos.name} - ${item.pos.complex.name} - ${item.pos.complex.business_activity.name}`;
-        },
-      },
-      {
-        field: 'consumer_account',
-        header: 'ایجاد شده توسط',
-        type: 'nested',
-        nestedOption: { path: 'consumer_account.account.username' },
-      },
-      {
-        field: 'invoice_date',
-        header: 'تاریخ صورت‌حساب‌',
-        type: 'dateTime',
-      },
-      { field: 'status', header: 'وضعیت صدور', customDataModel: this.status },
-    ];
+    this.columns = saleInvoiceListConfig.columns.filter((column) => column.field !== 'created_at');
   }
 
   override getDataRequest() {
diff --git a/src/app/domains/consumer/modules/poses/components/list.component.html b/src/app/domains/consumer/modules/poses/components/list.component.html
index 4909fe1..3d8d226 100644
--- a/src/app/domains/consumer/modules/poses/components/list.component.html
+++ b/src/app/domains/consumer/modules/poses/components/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  pageTitle="لیست پایانه‌های فروش"
+  pageTitle="پایانه‌های فروش"
   [columns]="columns"
   emptyPlaceholderTitle="پایانه فروشی یافت نشد."
   [items]="items()"
@@ -8,8 +8,7 @@
   [showEdit]="true"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
->
+  (onRefresh)="refresh()">
   <ng-template #toPosLandingAction let-item>
     <p-button type="button" variant="outlined" (onClick)="toPosLanding(item.id)"> ورود به پایانه </p-button>
   </ng-template>
@@ -19,5 +18,4 @@
   [editMode]="editMode()"
   [posId]="selectedItemForEdit()?.id || ''"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
-/>
+  (onSubmit)="refresh()" />
diff --git a/src/app/domains/consumer/modules/poses/views/single.component.html b/src/app/domains/consumer/modules/poses/views/single.component.html
index 26cfc60..d3f117d 100644
--- a/src/app/domains/consumer/modules/poses/views/single.component.html
+++ b/src/app/domains/consumer/modules/poses/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <p-button type="button" variant="outlined" size="small" (onClick)="toPosLanding()"> ورود به پایانه </p-button>
@@ -20,6 +20,5 @@
     [editMode]="true"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/consumer/modules/poses/views/single.component.ts b/src/app/domains/consumer/modules/poses/views/single.component.ts
index ea9eb9c..5ff5e81 100644
--- a/src/app/domains/consumer/modules/poses/views/single.component.ts
+++ b/src/app/domains/consumer/modules/poses/views/single.component.ts
@@ -44,12 +44,17 @@ export class ConsumerPosPageComponent {
 
   toPosLanding() {
     this.cookieService.set(COOKIE_KEYS.POS_ID, '', new Date());
+
+    console.log('COOKIE_KEYS.POS_ID', COOKIE_KEYS.POS_ID);
+
     this.cookieService.set(COOKIE_KEYS.POS_ID, this.posId(), {
       sameSite: 'Lax', // or 'Strict' for same-site requests only
       secure: false,
       path: '/',
-      domain: 'localhost',
+      domain: window.location.hostname,
     });
+    console.log('this.posId', this.posId());
+
     window.open('/pos', '_blank');
   }
 }
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 ae9dfe6..efa7dc2 100644
--- a/src/app/domains/consumer/modules/saleInvoices/components/list.component.html
+++ b/src/app/domains/consumer/modules/saleInvoices/components/list.component.html
@@ -1,7 +1,7 @@
 <app-page-data-list
   [pageTitle]="'صورت‌حساب‌ها'"
   [columns]="columns"
-  emptyPlaceholderTitle="صورت‌حساب‌ی یافت نشد"
+  emptyPlaceholderTitle="صورت‌حسابی یافت نشد"
   [items]="items()"
   [loading]="loading()"
   [perPage]="responseMetaData()?.perPage"
@@ -10,4 +10,8 @@
   [showDetails]="true"
   (onDetails)="toSinglePage($event)"
   (onRefresh)="refresh()"
-  (onChangePage)="changePage($event)" />
+  (onChangePage)="changePage($event)">
+  <ng-template #status let-item>
+    <catalog-tax-provider-status-tag [status]="item.status.value" [translate]="item.status.translate" />
+  </ng-template>
+</app-page-data-list>
diff --git a/src/app/domains/consumer/modules/saleInvoices/components/list.component.ts b/src/app/domains/consumer/modules/saleInvoices/components/list.component.ts
index 2667f1d..eb9ee92 100644
--- a/src/app/domains/consumer/modules/saleInvoices/components/list.component.ts
+++ b/src/app/domains/consumer/modules/saleInvoices/components/list.component.ts
@@ -1,13 +1,14 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { Maybe } from '@/core';
+import { IPaginatedQuery } from '@/core/models/service.model';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { CatalogTaxProviderStatusTagComponent } from '@/shared/catalog';
 import {
   IColumn,
   PageDataListComponent,
 } from '@/shared/components/pageDataList/page-data-list.component';
-import { IPaginatedQuery } from '@/core/models/service.model';
 import { saleInvoiceListConfig } from '@/shared/constants/list-configs';
-import { Component, inject, Input } from '@angular/core';
+import { Component, inject, Input, TemplateRef, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { consumerSaleInvoicesNamedRoutes } from '../constants/routes';
 import { IConsumerSaleInvoicesResponse } from '../models';
@@ -16,7 +17,7 @@ import { ConsumerSaleInvoicesService } from '../services/main.service';
 @Component({
   selector: 'consumer-saleInvoice-list',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent],
+  imports: [PageDataListComponent, CatalogTaxProviderStatusTagComponent],
 })
 export class ConsumerSaleInvoiceListComponent extends AbstractList<
   IConsumerSaleInvoicesResponse,
@@ -24,12 +25,21 @@ export class ConsumerSaleInvoiceListComponent extends AbstractList<
 > {
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = saleInvoiceListConfig.columns;
+  @ViewChild('status', { static: true }) status!: TemplateRef<any>;
 
   private readonly service = inject(ConsumerSaleInvoicesService);
   private readonly router = inject(Router);
 
   override setColumns(): void {
-    this.columns = this.header;
+    this.columns = this.header.map((header) => {
+      if (header.field === 'status') {
+        return {
+          ...header,
+          customDataModel: this.status,
+        };
+      }
+      return header;
+    });
   }
 
   override getDataRequest(payload: Maybe<IPaginatedQuery>) {
diff --git a/src/app/domains/consumer/modules/saleInvoices/constants/routes/index.ts b/src/app/domains/consumer/modules/saleInvoices/constants/routes/index.ts
index 8f58fa0..9206a7d 100644
--- a/src/app/domains/consumer/modules/saleInvoices/constants/routes/index.ts
+++ b/src/app/domains/consumer/modules/saleInvoices/constants/routes/index.ts
@@ -9,7 +9,7 @@ export const consumerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerSaleInvoicesR
     loadComponent: () =>
       import('../../views/list.component').then((m) => m.ConsumerSaleInvoicesComponent),
     meta: {
-      title: 'صورت‌حساب‌های صادر شده',
+      title: 'صورت‌حساب‌ها',
       pagePath: () => `/consumer/sale_invoices`,
     },
   },
@@ -18,7 +18,7 @@ export const consumerSaleInvoicesNamedRoutes: NamedRoutes<TConsumerSaleInvoicesR
     loadComponent: () =>
       import('../../views/single.component').then((m) => m.ConsumerSaleInvoiceComponent),
     meta: {
-      title: 'صورت‌حساب‌ صادر شده',
+      title: 'صورت‌حساب‌',
       pagePath: (saleInvoiceId: string) => `/consumer/sale_invoices/${saleInvoiceId}`,
     },
   },
diff --git a/src/app/domains/partner/modules/accounts/views/single.component.html b/src/app/domains/partner/modules/accounts/views/single.component.html
index 76c7796..4595d0f 100644
--- a/src/app/domains/partner/modules/accounts/views/single.component.html
+++ b/src/app/domains/partner/modules/accounts/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات کاربری" [editable]="false" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
diff --git a/src/app/domains/partner/modules/consumers/components/poses/form.component.html b/src/app/domains/partner/modules/consumers/components/poses/form.component.html
index 0dd0f2f..38dff05 100644
--- a/src/app/domains/partner/modules/consumers/components/poses/form.component.html
+++ b/src/app/domains/partner/modules/consumers/components/poses/form.component.html
@@ -1,8 +1,8 @@
 <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
   <field-name [control]="form.controls.name" />
-  <field-pos-type [control]="form.controls.pos_type" />
+  <!-- <field-pos-type [control]="form.controls.pos_type" /> -->
 
-  @if (form.controls.pos_type.value === "PSP") {
+  @if (form.controls.pos_type.value === 'PSP') {
     <field-serial-number [control]="form.controls.serial_number" />
     <field-device-id [control]="form.controls.device_id" />
     <field-provider-id [control]="form.controls.provider_id" />
@@ -13,8 +13,7 @@
     <field-username [control]="form.controls.username" />
     <shared-password-input
       [passwordControl]="form.controls.password"
-      [confirmPasswordControl]="form.controls.confirmPassword"
-    />
+      [confirmPasswordControl]="form.controls.confirmPassword" />
   }
 
   <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
diff --git a/src/app/domains/partner/modules/consumers/components/poses/form.component.ts b/src/app/domains/partner/modules/consumers/components/poses/form.component.ts
index b675f52..f92722e 100644
--- a/src/app/domains/partner/modules/consumers/components/poses/form.component.ts
+++ b/src/app/domains/partner/modules/consumers/components/poses/form.component.ts
@@ -4,7 +4,6 @@ import { AbstractForm } from '@/shared/abstractClasses';
 import {
   DeviceIdComponent,
   NameComponent,
-  PosTypeComponent,
   ProviderIdComponent,
   SerialNumberComponent,
   SharedPasswordInputComponent,
@@ -27,7 +26,6 @@ import { PartnerPosesService } from '../../services/poses.service';
     FormFooterActionsComponent,
     DeviceIdComponent,
     ProviderIdComponent,
-    PosTypeComponent,
     SerialNumberComponent,
     UsernameComponent,
     Divider,
@@ -45,7 +43,7 @@ export class ConsumerPosFormContentComponent extends AbstractForm<IPosRequest, I
   initForm = () => {
     const form = this.fb.group({
       name: fieldControl.name(this.initialValues?.name || ''),
-      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || ''),
+      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || 'PSP'),
       serial_number: fieldControl.serial_number(this.initialValues?.serial_number || ''),
       device_id: fieldControl.device_id(this.initialValues?.device?.id || ''),
       provider_id: fieldControl.provider_id(this.initialValues?.provider?.id || ''),
diff --git a/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html b/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html
index d4ad6c2..04897c3 100644
--- a/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html
+++ b/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <button pButton outlined size="small" (click)="showAccountsChargeDialog()">شارژ کاربر</button>
@@ -22,13 +22,11 @@
     [consumerId]="consumerId()"
     [businessActivityId]="businessId()"
     [initialValues]="businessActivity() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
   <partner-charge-account-form-dialog
     [(visible)]="visibleAccountsChargeForm"
     [consumerId]="consumerId()"
     [businessId]="businessId()"
-    (onSubmit)="getData()"
-  >
+    (onSubmit)="getData()">
   </partner-charge-account-form-dialog>
 </div>
diff --git a/src/app/domains/partner/modules/consumers/views/complexes/single.component.html b/src/app/domains/partner/modules/consumers/views/complexes/single.component.html
index 3de6b94..0cffda0 100644
--- a/src/app/domains/partner/modules/consumers/views/complexes/single.component.html
+++ b/src/app/domains/partner/modules/consumers/views/complexes/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات شعبه" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -18,6 +18,5 @@
     [businessActivityId]="businessId()"
     [complexId]="complexId()"
     [initialValues]="complex() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/partner/modules/consumers/views/list.component.html b/src/app/domains/partner/modules/consumers/views/list.component.html
index 6156ea9..aea05f9 100644
--- a/src/app/domains/partner/modules/consumers/views/list.component.html
+++ b/src/app/domains/partner/modules/consumers/views/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  pageTitle="لیست مشتری"
+  pageTitle="مشتری‌ها"
   [addNewCtaLabel]="'افزودن مشتری'"
   [columns]="columns"
   [showAdd]="true"
@@ -13,8 +13,7 @@
   (onAdd)="openAddForm()"
   (onDetails)="toSinglePage($event)"
   (onEdit)="onEditClick($event)"
-  (onRefresh)="refresh()"
-/>
+  (onRefresh)="refresh()" />
 <partner-create-consumer-wrapper [(visible)]="visibleCreateForm" (onSubmit)="refresh()" />
 
 <partner-consumer-form
@@ -22,5 +21,4 @@
   [editMode]="true"
   [consumerId]="selectedItemForEdit()?.id"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
-/>
+  (onSubmit)="refresh()" />
diff --git a/src/app/domains/partner/modules/consumers/views/poses/single.component.html b/src/app/domains/partner/modules/consumers/views/poses/single.component.html
index 1b13fb1..af08d5a 100644
--- a/src/app/domains/partner/modules/consumers/views/poses/single.component.html
+++ b/src/app/domains/partner/modules/consumers/views/poses/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -15,6 +15,5 @@
     [complexId]="complexId()"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/partner/modules/consumers/views/single.component.html b/src/app/domains/partner/modules/consumers/views/single.component.html
index edc3b57..fe603b9 100644
--- a/src/app/domains/partner/modules/consumers/views/single.component.html
+++ b/src/app/domains/partner/modules/consumers/views/single.component.html
@@ -1,11 +1,11 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات مشتری" [editable]="true" [(editMode)]="editMode">
     <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()?.type?.translate" />
-        @if (consumer()?.type?.value === "LEGAL") {
+        @if (consumer()?.type?.value === 'LEGAL') {
           <app-key-value label="شناسه ملی" [value]="consumer()?.legal?.registration_code" />
         } @else {
           <app-key-value label="شماره موبایل" [value]="consumer()?.individual?.mobile_number" />
@@ -28,6 +28,5 @@
     [editMode]="true"
     [consumerId]="consumerId()"
     [initialValues]="consumer() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/partner/modules/customers/components/list.component.html b/src/app/domains/partner/modules/customers/components/list.component.html
index 95a6587..cdebbf8 100644
--- a/src/app/domains/partner/modules/customers/components/list.component.html
+++ b/src/app/domains/partner/modules/customers/components/list.component.html
@@ -1,5 +1,5 @@
 <app-page-data-list
-  [pageTitle]="'لیست مشتری'"
+  [pageTitle]="'مشتری‌ها'"
   [columns]="columns"
   emptyPlaceholderTitle="مشتری یافت نشد"
   [items]="items()"
@@ -8,5 +8,4 @@
   [showDetails]="true"
   (onEdit)="onEditClick($event)"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
-/>
+  (onRefresh)="refresh()" />
diff --git a/src/app/domains/partner/modules/customers/views/single.component.html b/src/app/domains/partner/modules/customers/views/single.component.html
index c36d41f..9fcf7a4 100644
--- a/src/app/domains/partner/modules/customers/views/single.component.html
+++ b/src/app/domains/partner/modules/customers/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات مشتری" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
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 d10d822..d1e70d5 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
@@ -32,7 +32,7 @@
     }
   } @else if (!items() || items().length === 0) {
     <div class="col-span-1">
-      <p class="text-muted-color text-center">صورت‌حساب‌ی یافت نشد.</p>
+      <p class="text-muted-color text-center">صورت‌حسابی یافت نشد.</p>
     </div>
   } @else {
     @for (item of items(); track item.id) {
diff --git a/src/app/domains/pos/modules/shop/components/order/order-submitted-dialog.component.ts b/src/app/domains/pos/modules/shop/components/order/order-submitted-dialog.component.ts
index 0d8a50b..66d2964 100644
--- a/src/app/domains/pos/modules/shop/components/order/order-submitted-dialog.component.ts
+++ b/src/app/domains/pos/modules/shop/components/order/order-submitted-dialog.component.ts
@@ -3,13 +3,14 @@ import { ToastService } from '@/core/services/toast.service';
 import { PosInfoStore } from '@/domains/pos/store';
 import { AbstractDialog } from '@/shared/abstractClasses/abstract-dialog';
 import { SharedLightBottomsheetComponent } from '@/shared/components/dialog/light-bottomsheet.component';
-import { formatJalali } from '@/utils';
+import { prepareInvoicePrintPayload } from '@/shared/components/invoices/prepare-print.util';
 import { Component, computed, inject, Input, signal } from '@angular/core';
 import { Router } from '@angular/router';
 import { QRCodeComponent } from 'angularx-qrcode';
 import { ButtonDirective } from 'primeng/button';
 import { finalize } from 'rxjs';
 import { posSaleInvoicesNamedRoutes } from '../../../saleInvoices/constants';
+import { PosConfigPrintService } from '../../../configs/components/print/services/main.service';
 import { PosSaleInvoicesService } from '../../../saleInvoices/services/main.service';
 import { IPosOrderResponse } from '../../models';
 
@@ -22,6 +23,7 @@ export class PosOrderSubmittedDialogComponent extends AbstractDialog {
   @Input({ required: true }) invoice!: IPosOrderResponse;
   private readonly nativeBridgeService = inject(NativeBridgeService);
   private readonly service = inject(PosSaleInvoicesService);
+  private readonly printConfigService = inject(PosConfigPrintService);
   private readonly toastService = inject(ToastService);
   private readonly posInfoStore = inject(PosInfoStore);
   private readonly router = inject(Router);
@@ -60,19 +62,13 @@ export class PosOrderSubmittedDialogComponent extends AbstractDialog {
   }
 
   printInvoice() {
-    const printResult = this.nativeBridgeService.print([
-      {
-        title: `فروشگاه ${this.posName()}`,
-        items: [
-          {
-            label: 'شماره صورت‌حساب‌',
-            value: this.invoice.code,
-          },
-          { label: 'تاریخ', value: formatJalali(this.invoice.invoice_date, 'YYYY/MM/DD') },
-          { label: 'مبلغ کل', value: this.invoice.total_amount },
-        ],
-      },
-    ]);
+    const mustPrintConfig = this.printConfigService.getVisibleItems();
+    const printItems = prepareInvoicePrintPayload(this.invoice, mustPrintConfig, this.posName());
+    if (!printItems?.length) {
+      this.toastService.warn({ text: 'اطلاعات کافی برای چاپ صورت‌حساب وجود ندارد.' });
+      return;
+    }
+    this.nativeBridgeService.print(printItems);
   }
 
   sendToTsp() {}
diff --git a/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.html b/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.html
index 1201ba8..b58771b 100644
--- a/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.html
+++ b/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.html
@@ -4,14 +4,13 @@
   [modal]="true"
   [style]="{ width: '500px' }"
   [closable]="true"
-  (onHide)="close()"
->
+  (onHide)="close()">
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <field-name [control]="form.controls.name" />
     <field-serial-number [control]="form.controls.serial_number" />
     <!-- <app-input label="مدل دستگاه" [control]="form.controls.model" name="model" /> -->
-    <field-pos-type [control]="form.controls.pos_type" />
-    @if (form.controls.pos_type.value === "PSP") {
+    <!-- <field-pos-type [control]="form.controls.pos_type" /> -->
+    @if (form.controls.pos_type.value === 'PSP') {
       <field-device-id [control]="form.controls.device_id" />
       <field-provider-id [control]="form.controls.provider_id" />
     }
diff --git a/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.ts b/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.ts
index e2b1ee8..739e556 100644
--- a/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.ts
+++ b/src/app/domains/superAdmin/modules/consumers/components/poses/form.component.ts
@@ -3,7 +3,6 @@ import { AbstractFormDialog } from '@/shared/abstractClasses';
 import {
   DeviceIdComponent,
   NameComponent,
-  PosTypeComponent,
   ProviderIdComponent,
   SerialNumberComponent,
 } from '@/shared/components';
@@ -25,7 +24,6 @@ import { AdminPosesService } from '../../services/poses.service';
     FormFooterActionsComponent,
     DeviceIdComponent,
     ProviderIdComponent,
-    PosTypeComponent,
     SerialNumberComponent,
   ],
 })
@@ -42,7 +40,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
       name: fieldControl.name(this.initialValues?.name || ''),
       serial_number: fieldControl.serial_number(this.initialValues?.serial_number || '', true),
       // model: [this.initialValues?.model || '', [Validators.required]],
-      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || ''),
+      pos_type: fieldControl.pos_type(this.initialValues?.pos_type || 'PSP'),
       device_id: fieldControl.device_id(this.initialValues?.device?.id || ''),
       provider_id: fieldControl.provider_id(this.initialValues?.provider?.id || ''),
     });
@@ -54,7 +52,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
           this.fb.control<string>(this.initialValues?.device?.id ?? '', {
             nonNullable: true,
             validators: fieldControl.device_id('', true)[1],
-          }),
+          })
         );
         // @ts-ignore
         form.addControl(
@@ -62,7 +60,7 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
           this.fb.control<string>(this.initialValues?.provider?.id ?? '', {
             nonNullable: true,
             validators: fieldControl.provider_id('', true)[1],
-          }),
+          })
         );
       } else {
         // @ts-ignore
diff --git a/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.html b/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.html
index 640949f..cd4b223 100644
--- a/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.html
+++ b/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.html
@@ -1,13 +1,12 @@
 <app-page-data-list
-  pageTitle="لیست پایانه‌های فروش"
+  pageTitle="پایانه‌های فروش"
   [columns]="columns"
   emptyPlaceholderTitle="پایانه فروشی یافت نشد."
   [items]="items()"
   [loading]="loading()"
   [showDetails]="true"
   (onDetails)="toSinglePage($event)"
-  (onRefresh)="refresh()"
->
+  (onRefresh)="refresh()">
 </app-page-data-list>
 <superAdmin-consumer-pos-form
   [(visible)]="visibleForm"
@@ -17,5 +16,4 @@
   [complexId]="complexId"
   [posId]="selectedItemForEdit()?.id || ''"
   [initialValues]="selectedItemForEdit() || undefined"
-  (onSubmit)="refresh()"
-/>
+  (onSubmit)="refresh()" />
diff --git a/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html
index cd33abb..bdccf4b 100644
--- a/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html
+++ b/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -19,6 +19,5 @@
     [consumerId]="consumerId()"
     [businessActivityId]="businessId()"
     [initialValues]="businessActivity() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html
index 6993e92..99168d1 100644
--- a/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html
+++ b/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات شعبه" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -18,6 +18,5 @@
     [businessActivityId]="businessId()"
     [complexId]="complexId()"
     [initialValues]="complex() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/superAdmin/modules/consumers/views/poses/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/poses/single.component.html
index 4297ab7..2837f63 100644
--- a/src/app/domains/superAdmin/modules/consumers/views/poses/single.component.html
+++ b/src/app/domains/superAdmin/modules/consumers/views/poses/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات پایانه‌ فروش" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -15,6 +15,5 @@
     [complexId]="complexId()"
     [posId]="posId()"
     [initialValues]="pos() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/superAdmin/modules/consumers/views/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/single.component.html
index 1f3e1e3..f04b2c1 100644
--- a/src/app/domains/superAdmin/modules/consumers/views/single.component.html
+++ b/src/app/domains/superAdmin/modules/consumers/views/single.component.html
@@ -1,11 +1,11 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات مشتری" [(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()?.type?.translate" />
-        @if (consumer()?.type?.value === "LEGAL") {
+        @if (consumer()?.type?.value === 'LEGAL') {
           <app-key-value label="شناسه ملی" [value]="consumer()?.legal?.registration_code" />
         } @else {
           <app-key-value label="شماره موبایل" [value]="consumer()?.individual?.mobile_number" />
@@ -28,6 +28,5 @@
     [editMode]="true"
     [consumerId]="consumerId()"
     [initialValues]="consumer() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/superAdmin/modules/guilds/views/single.component.html b/src/app/domains/superAdmin/modules/guilds/views/single.component.html
index 7c4d7d3..e87fb4d 100644
--- a/src/app/domains/superAdmin/modules/guilds/views/single.component.html
+++ b/src/app/domains/superAdmin/modules/guilds/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات صنف" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -8,13 +8,13 @@
     </div>
   </app-card-data>
 
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <admin-guild-good-categories-list [guildId]="guildId()" [showAllBtn]="true" class="w-full" />
   </div>
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <admin-guild-goods-list [guildId]="guildId()" [showAllBtn]="true" class="w-full" />
   </div>
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <admin-guild-stock-keeping-units-list [guildId]="guildId()" class="w-full" />
   </div>
 
@@ -23,6 +23,5 @@
     [editMode]="true"
     [guildId]="guildId()"
     [initialValues]="guild() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/domains/superAdmin/modules/partners/views/single.component.html b/src/app/domains/superAdmin/modules/partners/views/single.component.html
index 389b1cc..a554cd2 100644
--- a/src/app/domains/superAdmin/modules/partners/views/single.component.html
+++ b/src/app/domains/superAdmin/modules/partners/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات شریک تجاری" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreActions>
       <p-button outlined size="small" (onClick)="openChargeAccountDialog()"> شارژ کاربر </p-button>
@@ -9,7 +9,7 @@
         <app-key-value label="عنوان" [value]="partner()?.name" />
         <app-key-value label="کد" [value]="partner()?.code" />
 
-        <div class="col-span-3 grid grid-cols-3 gap-4 mt-6">
+        <div class="col-span-3 mt-6 grid grid-cols-3 gap-4">
           <partner-license-info-template
             title="لایسنس‌ها"
             [total]="partner()?.licenses_status?.total || 0"
@@ -19,8 +19,7 @@
               (partner()?.licenses_status?.total || 0) -
               (partner()?.licenses_status?.used || 0) -
               (partner()?.licenses_status?.expired || 0)
-            "
-          />
+            " />
 
           <partner-license-info-template
             title="شارژ کاربران"
@@ -31,8 +30,7 @@
               (partner()?.account_quota_status?.total || 0) -
               (partner()?.account_quota_status?.used || 0) -
               (partner()?.account_quota_status?.expired || 0)
-            "
-          />
+            " />
 
           <partner-license-info-template
             title="تمدید لایسنس‌ها"
@@ -43,8 +41,7 @@
               (partner()?.license_renew_status?.total || 0) -
               (partner()?.license_renew_status?.used || 0) -
               (partner()?.license_renew_status?.expired || 0)
-            "
-          />
+            " />
         </div>
         <!--
         <p-divider align="center" class="col-span-3">اطلاعات لایسنس‌ها</p-divider>
@@ -98,19 +95,19 @@
     </div>
   </app-card-data>
 
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <admin-partner-licenses [partnerId]="partnerId()" class="w-full" />
   </div>
 
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <admin-partner-chargeLicenseTransaction-list [partnerId]="partnerId()" class="w-full" />
   </div>
 
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <admin-partner-chargeAccount-list [partnerId]="partnerId()" class="w-full"></admin-partner-chargeAccount-list>
   </div>
 
-  <div class="max-h-125 flex">
+  <div class="flex max-h-125">
     <superAdmin-partner-account-list [partnerId]="partnerId()" class="w-full" />
   </div>
 </div>
@@ -120,17 +117,14 @@
   [editMode]="true"
   [partnerId]="partnerId()"
   [initialValues]="partner() || undefined"
-  (onSubmit)="getData()"
-/>
+  (onSubmit)="getData()" />
 
 <partner-charge-license-form-dialog
   [(visible)]="visibleChargeFormDialog"
   [partnerId]="partnerId()"
-  (onSubmit)="getData()"
-/>
+  (onSubmit)="getData()" />
 
 <admin-partner-charge-account-form-dialog
   [(visible)]="visibleChargeAccountFormDialog"
   [partnerId]="partnerId()"
-  (onSubmit)="getData()"
-></admin-partner-charge-account-form-dialog>
+  (onSubmit)="getData()"></admin-partner-charge-account-form-dialog>
diff --git a/src/app/domains/superAdmin/modules/users/views/single.component.html b/src/app/domains/superAdmin/modules/users/views/single.component.html
index 669fae5..b8766ae 100644
--- a/src/app/domains/superAdmin/modules/users/views/single.component.html
+++ b/src/app/domains/superAdmin/modules/users/views/single.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-6">
+<div class="flex flex-col gap-4">
   <app-card-data cardTitle="اطلاعات کاربر" [editable]="true" [(editMode)]="editMode">
     <div class="flex flex-col gap-4">
       <div class="listKeyValue">
@@ -15,6 +15,5 @@
     [editMode]="true"
     [userId]="userId()"
     [initialValues]="user() || undefined"
-    (onSubmit)="getData()"
-  />
+    (onSubmit)="getData()" />
 </div>
diff --git a/src/app/layout/default/app.layout.component.html b/src/app/layout/default/app.layout.component.html
index 633b784..9d25d3c 100644
--- a/src/app/layout/default/app.layout.component.html
+++ b/src/app/layout/default/app.layout.component.html
@@ -10,8 +10,8 @@
     <app-sidebar></app-sidebar>
   }
   <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">
+    [class]="`layout-main-container p-4 ps-1 ${!showMenu() ? 'hideMenu' : ''} grow ${isFullPage ? 'isFullPage' : ''}`">
+    <div class="layout-main flex flex-1 flex-col gap-4">
       @if (showBreadcrumb) {
         <app-breadcrumb class="shrink-0 overflow-hidden rounded-md" />
       }
diff --git a/src/app/layout/default/app.sidebar.component.html b/src/app/layout/default/app.sidebar.component.html
index 5b5d42e..a2e0656 100644
--- a/src/app/layout/default/app.sidebar.component.html
+++ b/src/app/layout/default/app.sidebar.component.html
@@ -1,14 +1,16 @@
-<div class="layout-sidebar flex flex-col gap-4">
-  <div class="grow">
-    <app-menu></app-menu>
-  </div>
-  <div class="shrink-0 sticky bottom-0">
-    <p-divider class="mb-1!" />
-    <div class="py-2 w-full text-center flex items-center gap-2">
-      <div class="w-10 h-10">
-        <img [src]="logo" alt="Logo" class="object-contain" />
+<div class="layout-sidebar">
+  <div class="flex flex-col gap-4">
+    <div class="grow">
+      <app-menu></app-menu>
+    </div>
+    <div class="sticky bottom-0 shrink-0">
+      <p-divider class="mb-1!" />
+      <div class="flex w-full items-center gap-2 py-2 text-center">
+        <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>
       </div>
-      <span class="text-muted-color text-sm font-medium">مدیریت صورت‌حساب‌های مالیاتی پاژن</span>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/abstractClasses/abstract-list.ts b/src/app/shared/abstractClasses/abstract-list.ts
index 73eb289..eb9ed40 100644
--- a/src/app/shared/abstractClasses/abstract-list.ts
+++ b/src/app/shared/abstractClasses/abstract-list.ts
@@ -5,7 +5,7 @@ import {
   IPaginatedResponse,
   IResponseMetadata,
 } from '@/core/models/service.model';
-import { Component, signal } from '@angular/core';
+import { Component, Input, signal } from '@angular/core';
 import { catchError, finalize, Observable } from 'rxjs';
 import { IColumn } from '../components/pageDataList/page-data-list.component';
 
@@ -14,6 +14,8 @@ import { IColumn } from '../components/pageDataList/page-data-list.component';
   template: '',
 })
 export abstract class AbstractList<ResponseModel, RequestParams = null> {
+  @Input() withPagination?: boolean = false;
+
   columns = [] as IColumn[];
   loading = signal(false);
   items = signal<ResponseModel[]>([]);
@@ -21,7 +23,6 @@ export abstract class AbstractList<ResponseModel, RequestParams = null> {
   requestPayload = signal<Maybe<RequestParams>>(null);
   selectedItemForEdit = signal<Maybe<ResponseModel>>(null);
   editMode = signal(false);
-  withPagination = signal(false);
   responseMetaData = signal<Maybe<IResponseMetadata>>(null);
 
   ngOnInit() {
@@ -43,7 +44,7 @@ export abstract class AbstractList<ResponseModel, RequestParams = null> {
         }),
         catchError((error) => {
           throw error;
-        }),
+        })
       )
       .subscribe((res) => {
         if ('meta' in res) {
@@ -60,7 +61,7 @@ export abstract class AbstractList<ResponseModel, RequestParams = null> {
   }
 
   abstract getDataRequest(
-    payload: Maybe<RequestParams>,
+    payload: Maybe<RequestParams>
   ): Observable<IPaginatedResponse<ResponseModel> | IListingResponse<ResponseModel>> | void;
 
   abstract setColumns(): void;
@@ -90,7 +91,7 @@ export abstract class AbstractList<ResponseModel, RequestParams = null> {
           ...(prev || {}),
           page,
           ...(perPage ? ({ pageSize: perPage } as IPaginatedQuery) : {}),
-        }) as any,
+        }) as any
     );
     this.responseMetaData.update((prev) => (prev ? { ...prev, page } : prev));
     this.getData();
diff --git a/src/app/shared/components/dialog/light-bottomsheet.component.ts b/src/app/shared/components/dialog/light-bottomsheet.component.ts
index bc6fca9..e5386ec 100644
--- a/src/app/shared/components/dialog/light-bottomsheet.component.ts
+++ b/src/app/shared/components/dialog/light-bottomsheet.component.ts
@@ -29,7 +29,7 @@ import { Button } from 'primeng/button';
       .light-bottomsheet-mask {
         position: absolute;
         inset: 0;
-        background: rgba(15, 23, 42, 0.22);
+        background: rgba(15, 23, 42, 0.52);
       }
 
       .light-bottomsheet-panel {
diff --git a/src/app/shared/components/input/input.component.ts b/src/app/shared/components/input/input.component.ts
index 6bd8fad..a051881 100644
--- a/src/app/shared/components/input/input.component.ts
+++ b/src/app/shared/components/input/input.component.ts
@@ -243,8 +243,6 @@ export class InputComponent {
   }
 
   private isOutOfRange(numericValue: number): { min: boolean; max: boolean } {
-    console.log('min', this.min, 'max', this.max, 'numericValue', numericValue);
-
     const min = this.min !== undefined && this.min !== null ? this.min : Number.NEGATIVE_INFINITY;
     const max = this.max !== undefined && this.max !== null ? this.max : Number.POSITIVE_INFINITY;
 
@@ -277,12 +275,9 @@ export class InputComponent {
     const controlValue = isIdentifierField ? value : value === '' ? '' : numericValue;
     this.control.setValue(controlValue);
     target.value = value;
-    console.log('value', value, 'controlValue', controlValue, 'numericValue', numericValue);
   }
 
   onInput($event: Event) {
-    console.log('$event', $event);
-
     const target = $event.target as HTMLInputElement | null;
     if (!target) return;
 
@@ -296,14 +291,10 @@ export class InputComponent {
       value = this.normalizeLeadingZeros(value, allowDecimal);
 
       value = this.enforceMaxLength(value);
-      console.log('$value', value);
       let numericValue = this.parseNumericValue(value);
 
       const range = this.isOutOfRange(numericValue);
-      console.log('$range', range);
       if (value !== '' && (range.min || range.max)) {
-        console.log('in if');
-
         this.notifyRangeError(range);
         value = this.lastValidNumericValue;
         numericValue = this.parseNumericValue(value);
diff --git a/src/app/shared/components/invoices/correctionForm/form.component.html b/src/app/shared/components/invoices/correctionForm/form.component.html
index 78342b7..30563b0 100644
--- a/src/app/shared/components/invoices/correctionForm/form.component.html
+++ b/src/app/shared/components/invoices/correctionForm/form.component.html
@@ -43,7 +43,7 @@
 
   <pos-order-price-info-card [info]="totalPriceInfo" />
 
-  <app-form-footer-actions />
+  <app-form-footer-actions [loading]="submitLoading()" />
 </form>
 
 <shared-light-bottomsheet
diff --git a/src/app/shared/components/invoices/correctionForm/form.component.ts b/src/app/shared/components/invoices/correctionForm/form.component.ts
index a4968de..d154828 100644
--- a/src/app/shared/components/invoices/correctionForm/form.component.ts
+++ b/src/app/shared/components/invoices/correctionForm/form.component.ts
@@ -39,6 +39,7 @@ export class SharedCorrectionFormComponent extends AbstractForm<
   CorrectionInvoiceFormValue,
   IInvoiceItem[]
 > {
+  @Input() beforeSubmit?: (payload: CorrectionInvoiceFormValue) => Promise<boolean> | boolean;
   @Input({ required: true }) invoiceDate!: string;
   @Input() visible = false;
 
@@ -212,7 +213,7 @@ export class SharedCorrectionFormComponent extends AbstractForm<
     this.backToList();
   }
 
-  override submitForm() {
+  private buildSubmitPayload(): CorrectionInvoiceFormValue | null {
     const items =
       this.initialValues?.map(
         (item, index) => this.itemDrafts[item.id] || this.mappedInitialItems[index]
@@ -226,12 +227,33 @@ export class SharedCorrectionFormComponent extends AbstractForm<
 
     if (!hasChanges) {
       this.toastService.warn({ text: 'هیچ تغییری در مقادیر ثبت نشده است.' });
-      return;
+      return null;
     }
 
-    this.onSubmit.emit({
+    return {
       invoice_date: this.form.controls.invoice_date.value || '',
       items,
-    });
+    };
+  }
+
+  override async submit() {
+    this.form.markAllAsTouched();
+    if (!this.form.valid) return;
+
+    const payload = this.buildSubmitPayload();
+    if (!payload) return;
+
+    this.submitLoading.set(true);
+    try {
+      const canSubmit = (await this.beforeSubmit?.(payload)) ?? true;
+      if (!canSubmit) return;
+      this.onSubmit.emit(payload);
+    } finally {
+      this.submitLoading.set(false);
+    }
+  }
+
+  override submitForm() {
+    // Submit flow is handled in overridden async submit()
   }
 }
diff --git a/src/app/shared/components/invoices/prepare-print.util.ts b/src/app/shared/components/invoices/prepare-print.util.ts
new file mode 100644
index 0000000..818085a
--- /dev/null
+++ b/src/app/shared/components/invoices/prepare-print.util.ts
@@ -0,0 +1,177 @@
+import { INativePrintRequest } from '@/core/services/native-bridge.service';
+import { formatJalali, formatWithCurrency } from '@/utils';
+
+export function prepareInvoicePrintPayload(
+  invoice: any,
+  mustPrintConfig: Record<string, any>,
+  posName?: string
+): INativePrintRequest[] | null {
+  if (!invoice) return null;
+
+  const defaultPrintItems: INativePrintRequest[] = [
+    {
+      title: 'اطلاعات صورت‌حساب',
+      items: [
+        {
+          label: 'شماره',
+          value: String(invoice.invoice_number ?? invoice.code ?? '-'),
+          show: true,
+        },
+        {
+          label: 'شماره منحصر به فرد مالیاتی',
+          value: String(invoice.tax_id || '-'),
+          show: true,
+        },
+        {
+          label: 'نوع',
+          value: String(invoice.type?.translate || '-'),
+          show: mustPrintConfig['invoice_template'],
+        },
+        {
+          label: 'موضوع',
+          value: String(invoice.pos?.complex?.business_activity?.guild?.name || '-'),
+          show: mustPrintConfig['invoice_template'] ?? true,
+        },
+        {
+          label: 'تاریخ',
+          value: String(invoice.invoice_date ? formatJalali(invoice.invoice_date) : '-'),
+          show: true,
+        },
+        {
+          label: 'وضعیت صدور',
+          value: String(invoice.status?.translate || '-'),
+          show: mustPrintConfig['show_payment_info'] ?? true,
+        },
+      ]
+        .filter((item: any) => item.show)
+        .map(({ label, value }) => ({ label, value })),
+    },
+    {
+      title: `اطلاعات فروشنده`,
+      items: [
+        {
+          label: 'فروشگاه',
+          value: String(invoice.pos?.complex?.business_activity?.name || '-'),
+          show: mustPrintConfig['business_name'],
+        },
+        {
+          label: 'شعبه',
+          value: String(invoice.pos?.complex?.name || '-'),
+          show: mustPrintConfig['complex_name'],
+        },
+        {
+          label: 'پایانه‌ فروش',
+          value: String(invoice.pos?.name || posName || '-'),
+          show: mustPrintConfig['pos_name'],
+        },
+        {
+          label: 'شماره اقتصادی',
+          value: String(invoice.pos?.complex?.business_activity?.economic_code || '-'),
+          show: mustPrintConfig['economic_code'],
+        },
+      ]
+        .filter((item: any) => item.show)
+        .map(({ label, value }) => ({ label, value })),
+    },
+    {
+      title: `اطلاعات خریدار`,
+      items: [
+        {
+          label: 'نام خریدار',
+          value: String(
+            (invoice.customer
+              ? invoice.customer.type === 'LEGAL'
+                ? invoice.customer.legal?.company_name
+                : `${invoice.customer.individual?.first_name || ''} ${
+                    invoice.customer.individual?.last_name || ''
+                  }`.trim()
+              : invoice.unknown_customer?.name) || '-'
+          ),
+          show: mustPrintConfig['customer_name'],
+        },
+        {
+          label: 'شماره اقتصادی',
+          value: String(
+            (invoice.customer
+              ? invoice.customer.type === 'LEGAL'
+                ? invoice.customer.legal?.economic_code
+                : invoice.customer.individual?.economic_code || '-'
+              : '-') || '-'
+          ),
+          show: mustPrintConfig['customer_economic_code'],
+        },
+      ]
+        .filter((item: any) => item.show)
+        .map(({ label, value }) => ({ label, value })),
+    },
+  ].filter((item) => item.items.length);
+
+  if (mustPrintConfig['show_items'] && Array.isArray(invoice.items)) {
+    for (const item of invoice.items) {
+      defaultPrintItems.push({
+        title: 'جزییات صورت‌حساب',
+        items: [
+          {
+            label: 'شرح',
+            value: String(item.good_snapshot?.name || '-'),
+            show: mustPrintConfig['item_name'] ?? true,
+          },
+          {
+            label: 'شناسه کالا / خدمت',
+            value: String(item.sku_code || '-'),
+            show: mustPrintConfig['item_sku'] ?? true,
+          },
+          {
+            label: 'تعداد / مقدار',
+            value: `${item.quantity || 0} ${item.measure_unit_text || ''}`.trim(),
+            show: mustPrintConfig['item_quantity'] ?? true,
+          },
+          {
+            label: 'قیمت واحد',
+            value: formatWithCurrency(item.unit_price || 0),
+            show: mustPrintConfig['item_base_amount'] ?? true,
+          },
+          {
+            label: 'اجرت',
+            value: formatWithCurrency(item.payload?.wages || 0),
+            show:
+              (mustPrintConfig['item_wage'] ?? true) && item.good_snapshot?.pricing_model === 'GOLD',
+          },
+          {
+            label: 'سود',
+            value: formatWithCurrency(item.payload?.profit || 0),
+            show:
+              (mustPrintConfig['item_profit'] ?? true) &&
+              item.good_snapshot?.pricing_model === 'GOLD',
+          },
+          {
+            label: 'حق‌العمل',
+            value: formatWithCurrency(item.payload?.commission || 0),
+            show:
+              (mustPrintConfig['item_commission'] ?? true) &&
+              item.good_snapshot?.pricing_model === 'GOLD',
+          },
+          {
+            label: 'مالیات بر ارزش افزوده',
+            value: formatWithCurrency(item.tax_amount || 0),
+            show: mustPrintConfig['item_tax'] ?? true,
+          },
+          {
+            label: 'تخفیف',
+            value: formatWithCurrency(item.discount_amount || 0),
+            show: mustPrintConfig['item_discount'] ?? true,
+          },
+          {
+            label: 'مبلغ کل',
+            value: formatWithCurrency(item.total_amount || 0),
+            show: mustPrintConfig['item_total_amount'] ?? true,
+          },
+        ]
+          .filter((part: any) => part.show)
+          .map(({ label, value }) => ({ label, value })),
+      });
+    }
+  }
+
+  return defaultPrintItems;
+}
diff --git a/src/app/shared/components/invoices/returnForm/form.component.html b/src/app/shared/components/invoices/returnForm/form.component.html
index 13096c1..10a9409 100644
--- a/src/app/shared/components/invoices/returnForm/form.component.html
+++ b/src/app/shared/components/invoices/returnForm/form.component.html
@@ -3,7 +3,7 @@
     <ol class="list-disc ps-4">
       <li>تعداد محصولات/خدمات خود را کم و یا حذف کنید</li>
       <li>حداقل ۱ خدمت/سرویس بایستی باقی بماند</li>
-      <li>تخفیف‌ها، مالیات و قیمت نهایی تمام شده با توجه به مقادیر فاکتور اصلی به صورت سیستمی محاسبه خواهند شد.</li>
+      <li>تخفیف‌ها، مالیات و مبلغ کل تمام شده با توجه به مقادیر فاکتور اصلی به صورت سیستمی محاسبه خواهند شد.</li>
     </ol>
   </p-message>
 
diff --git a/src/app/shared/components/invoices/sale-invoice-single-info-card.component.html b/src/app/shared/components/invoices/sale-invoice-single-info-card.component.html
index 5fcc34c..0946e2a 100644
--- a/src/app/shared/components/invoices/sale-invoice-single-info-card.component.html
+++ b/src/app/shared/components/invoices/sale-invoice-single-info-card.component.html
@@ -4,11 +4,11 @@
       <div class="listKeyValue">
         <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" />
-        <app-key-value label="نوع صورت‌حساب">
+        <app-key-value label="تاریخ ایجاد" [value]="invoice.created_at" type="dateTime" />
+        <app-key-value label="نوع">
           <catalog-invoice-type-tag [status]="invoice.type.value" />
         </app-key-value>
-        <app-key-value label="وضعیت صدور به سامانه‌ی مودیان">
+        <app-key-value label="وضعیت صدور">
           <catalog-tax-provider-status-tag [status]="invoice.status.value" [translate]="invoice.status.translate" />
         </app-key-value>
         <div class="col-span-full">
@@ -17,8 +17,8 @@
       </div>
       <p-divider align="center"> اطلاعات مالی</p-divider>
       <div class="grid items-center gap-3 sm:grid-cols-2 sm:gap-4 md:grid-cols-3">
-        <app-key-value label="مبلغ تخفیف" [value]="invoice.discount_amount" type="price" />
-        <app-key-value label="مبلغ مالیات" [value]="invoice.tax_amount" type="price" />
+        <app-key-value label="تخفیف" [value]="invoice.discount_amount" type="price" />
+        <app-key-value label="مالیات" [value]="invoice.tax_amount" type="price" />
         <app-key-value label="مجموع قابل پرداخت" [value]="invoice.total_amount" type="price" />
       </div>
 
diff --git a/src/app/shared/components/invoices/sale-invoice-single-info-card.component.ts b/src/app/shared/components/invoices/sale-invoice-single-info-card.component.ts
index b4cd6ec..ff6cdeb 100644
--- a/src/app/shared/components/invoices/sale-invoice-single-info-card.component.ts
+++ b/src/app/shared/components/invoices/sale-invoice-single-info-card.component.ts
@@ -87,17 +87,17 @@ export class SaleInvoiceSingleInfoCardComponent {
     },
     {
       field: 'discount_amount',
-      header: 'مبلغ تخفیف',
+      header: 'تخفیف',
       type: 'price',
     },
     {
       field: 'tax_amount',
-      header: 'مبلغ مالیات',
+      header: 'مالیات',
       type: 'price',
     },
     {
       field: 'total_amount',
-      header: 'مبلغ قابل پرداخت',
+      header: 'قابل پرداخت',
       type: 'price',
     },
   ];
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 c7b4c8b..5268448 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
@@ -7,13 +7,18 @@
     <ng-template #actions>
       <p-button (click)="showQrCode()" icon="pi pi-qrcode" outlined size="small" />
       <p-button (click)="printInvoice()" icon="pi pi-print" outlined size="small" label="چاپ" />
+      @if (!isApplication) {
+        <p-button (click)="menu.toggle($event)" icon="pi pi-ellipsis-v" label="عملیات بیشتر" outlined size="small">
+        </p-button>
+        <p-menu #menu [model]="moreActionMenuItems()" [popup]="true"></p-menu>
+      }
     </ng-template>
   </app-inner-pages-header>
-  <div class="p-4">
+  <div class="py-4 max-md:p-4">
     <shared-sale-invoice-single-info-card [loading]="loading" [invoice]="invoice" [variant]="variant" />
   </div>
 
-  @if (moreActionMenuItems().length) {
+  @if (isApplication && moreActionMenuItems().length) {
     <div class="border-surface-border bg-surface-card sticky bottom-0 z-10 mt-4 w-full rounded-t-2xl border-t p-3">
       <div class="flex flex-wrap justify-center gap-2">
         @for (action of moreActionMenuItems(); track action.label || $index) {
@@ -41,6 +46,7 @@
       [visible]="showCorrectionForm()"
       [initialValues]="invoice.items"
       [invoiceDate]="invoice.invoice_date"
+      [beforeSubmit]="beforeCorrectionSubmitHandler.bind(this)"
       (onSubmit)="correctionSubmit($event)" />
   </shared-light-bottomsheet>
   <shared-light-bottomsheet [(visible)]="showQrCodeDialog" header="کد QR">
@@ -53,4 +59,27 @@
       </p-card>
     </div>
   </shared-light-bottomsheet>
+
+  <shared-light-bottomsheet [(visible)]="showCorrectionPaymentDialog" header="پرداخت اصلاحی">
+    <div class="flex flex-col gap-4">
+      <div class="text-sm">مبلغ اصلاحی افزایش یافته است. لطفاً مبلغ پرداختی را ثبت کنید.</div>
+      <div class="border-surface-border rounded-lg border p-3">
+        <div class="text-muted-color text-xs">حداقل مبلغ موردنیاز</div>
+        <div class="text-lg font-bold" [appPriceMask]="correctionRequiredPayment()"></div>
+      </div>
+      <div class="flex flex-col gap-2">
+        <label class="text-sm font-medium">مبلغ پرداختی</label>
+        <input
+          type="number"
+          min="0"
+          class="border-surface-border w-full rounded-md border px-3 py-2"
+          [value]="correctionPaymentAmount()"
+          (input)="onCorrectionPaymentAmountChange($event)" />
+      </div>
+      <div class="flex justify-end gap-2">
+        <button pButton type="button" severity="secondary" label="انصراف" (click)="cancelCorrectionPayment()"></button>
+        <button pButton type="button" label="تایید پرداخت" (click)="confirmCorrectionPayment()"></button>
+      </div>
+    </div>
+  </shared-light-bottomsheet>
 }
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 481e059..b376181 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
@@ -10,8 +10,8 @@ import { TspProviderResponseStatus } from '@/shared/catalog';
 import { SharedLightBottomsheetComponent } from '@/shared/components';
 import { ISaleInvoiceFullResponse } from '@/shared/components/invoices/sale-invoice-full-response.model';
 import { PageLoadingComponent } from '@/shared/components/page-loading.component';
+import { PriceMaskDirective } from '@/shared/directives';
 import { UikitEmptyStateComponent } from '@/uikit';
-import { formatJalali, formatWithCurrency } from '@/utils';
 import {
   Component,
   computed,
@@ -28,12 +28,15 @@ import { Router } from '@angular/router';
 import { QRCodeComponent } from 'angularx-qrcode';
 import { Button, ButtonDirective } from 'primeng/button';
 import { Card } from 'primeng/card';
+import { Menu } from 'primeng/menu';
 import { TableModule } from 'primeng/table';
 import { Observable } from 'rxjs';
+import config from 'src/config';
 import { AppConfirmationService } from '../confirmationDialog/confirmation-dialog.service';
 import { InnerPagesHeaderComponent } from '../innerPagesHeader/inner-pages-header.component';
 import { SharedCorrectionFormComponent } from './correctionForm';
 import { CorrectionInvoiceFormValue, ICorrectionRequest, ReturnFromSaleFormValue } from './models';
+import { prepareInvoicePrintPayload } from './prepare-print.util';
 import { SharedReturnFormComponent } from './returnForm/form.component';
 import {
   SaleInvoiceSingleInfoCardComponent,
@@ -64,6 +67,8 @@ type TActionMenuItem = {
     SaleInvoiceSingleInfoCardComponent,
     QRCodeComponent,
     Card,
+    PriceMaskDirective,
+    Menu,
   ],
 })
 export class SharedSaleInvoiceSingleViewComponent {
@@ -83,6 +88,7 @@ export class SharedSaleInvoiceSingleViewComponent {
   @Input() sendToTspLoading: boolean = false;
   @Input() resendToTspLoading: boolean = false;
   @Input() inquiryLoading: boolean = false;
+  @Input() beforeCorrectionSubmit?: (data: ICorrectionRequest) => Promise<boolean> | boolean;
 
   @Output() onRefresh = new EventEmitter<void>();
   @Output() onSendToTsp = new EventEmitter<Observable<any>>();
@@ -97,6 +103,11 @@ export class SharedSaleInvoiceSingleViewComponent {
   showCorrectionForm = signal(false);
   showReturnFromSaleForm = signal(false);
   showQrCodeDialog = signal(false);
+  showCorrectionPaymentDialog = signal(false);
+  correctionRequiredPayment = signal(0);
+  correctionPaymentAmount = signal(0);
+  readonly isApplication = config.isPosApplication;
+  private pendingCorrectionSubmitResolver: Maybe<(allowed: boolean) => void> = null;
 
   publicInvoiceRoute = computed(() => {
     if (this.invoice) {
@@ -227,164 +238,7 @@ export class SharedSaleInvoiceSingleViewComponent {
   preparePrint = async () => {
     if (this.invoice) {
       const mustPrintConfig = await this.service.getVisibleItems();
-
-      const defaultPrintItems = [
-        {
-          title: 'اطلاعات صورت‌حساب',
-          items: [
-            {
-              label: 'شماره',
-              value: this.invoice.invoice_number.toString(),
-              show: true,
-            },
-            {
-              label: 'شماره منحصر به فرد مالیاتی',
-              value: this.invoice.tax_id || '-',
-              show: true,
-            },
-            {
-              label: 'نوع',
-              value: this.invoice.type.translate,
-              show: mustPrintConfig.invoice_template,
-            },
-            {
-              label: 'موضوع',
-              value: this.invoice.pos.complex.business_activity.guild.name,
-              show: mustPrintConfig.invoice_template ?? true,
-            },
-            {
-              label: 'تاریخ',
-              value: formatJalali(this.invoice.invoice_date),
-              show: true,
-            },
-            {
-              label: 'وضعیت صدور',
-              value: this.invoice.status.translate,
-              show: mustPrintConfig.show_payment_info ?? true,
-            },
-          ].filter((item) => item.show),
-        },
-        {
-          title: `اطلاعات فروشنده`,
-          items: [
-            {
-              label: 'فروشگاه',
-              value: this.invoice.pos.complex.business_activity.name,
-              show: mustPrintConfig.business_name,
-            },
-            {
-              label: 'شعبه',
-              value: this.invoice.pos.complex.name,
-              show: mustPrintConfig.complex_name,
-            },
-            {
-              label: 'پایانه‌ فروش',
-              value: this.invoice.pos.name,
-              show: mustPrintConfig.pos_name,
-            },
-            {
-              label: 'شماره اقتصادی',
-              value: this.invoice.pos.complex.business_activity.economic_code,
-              show: mustPrintConfig.economic_code,
-            },
-          ].filter((item) => item.show),
-        },
-        {
-          title: `اطلاعات خریدار`,
-          items: [
-            {
-              label: 'نام خریدار',
-              value:
-                (this.invoice.customer
-                  ? this.invoice.customer.type === 'LEGAL'
-                    ? this.invoice.customer.legal?.company_name
-                    : `${this.invoice.customer.individual?.first_name} ${this.invoice.customer.individual?.last_name}`
-                  : this.invoice.unknown_customer?.name) || '-',
-              show: mustPrintConfig.customer_name,
-            },
-            {
-              label: 'شماره اقتصادی',
-              value:
-                (this.invoice.customer
-                  ? this.invoice.customer.type === 'LEGAL'
-                    ? this.invoice.customer.legal?.economic_code
-                    : this.invoice.customer.individual?.economic_code || '-'
-                  : '-') || '-',
-              show: mustPrintConfig.customer_economic_code,
-            },
-          ].filter((item) => item.show),
-        },
-      ].filter((item) => item.items.length);
-
-      if (mustPrintConfig.show_items) {
-        for (let item of this.invoice.items) {
-          defaultPrintItems.push({
-            title: 'جزییات صورت‌حساب',
-            items: [
-              {
-                label: 'شرح',
-                value: item.good_snapshot.name,
-                show: mustPrintConfig.item_name ?? true,
-              },
-              {
-                label: 'شناسه کالا / خدمت',
-                value: item.sku_code,
-                show: mustPrintConfig.item_sku ?? true,
-              },
-              {
-                label: 'تعداد / مقدار',
-                value: `${item.quantity} ${item.measure_unit_text}`,
-                show: mustPrintConfig.item_quantity ?? true,
-              },
-              {
-                label: 'قیمت واحد',
-                value: formatWithCurrency(item.unit_price),
-                show: mustPrintConfig.item_base_amount ?? true,
-              },
-              {
-                label: 'اجرت',
-                value: formatWithCurrency(item.payload.wages),
-                show:
-                  (mustPrintConfig.item_wage ?? true) &&
-                  item.good_snapshot.pricing_model === 'GOLD',
-              },
-              {
-                label: 'سود',
-                value: formatWithCurrency(item.payload.profit),
-                show:
-                  (mustPrintConfig.item_profit ?? true) &&
-                  item.good_snapshot.pricing_model === 'GOLD',
-              },
-              {
-                label: 'حق‌العمل',
-                value: formatWithCurrency(item.payload.commission),
-                show:
-                  (mustPrintConfig.item_commission ?? true) &&
-                  item.good_snapshot.pricing_model === 'GOLD',
-              },
-              {
-                label: 'مالیات بر ارزش افزوده',
-                value: formatWithCurrency(item.tax_amount),
-                show: mustPrintConfig.item_tax ?? true,
-              },
-              {
-                label: 'تخفیف',
-                value: formatWithCurrency(item.discount_amount),
-                show: mustPrintConfig.item_discount ?? true,
-              },
-              {
-                label: 'مبلغ کل',
-                value: formatWithCurrency(item.total_amount),
-                show: mustPrintConfig.item_total_amount ?? true,
-              },
-            ],
-          });
-        }
-      }
-
-      console.log(defaultPrintItems);
-
-      return defaultPrintItems;
+      return prepareInvoicePrintPayload(this.invoice, mustPrintConfig, this.posName());
     }
     return null;
   };
@@ -427,6 +281,53 @@ export class SharedSaleInvoiceSingleViewComponent {
     this.sendCorrection(this.mapCorrectionRequest(event));
   }
 
+  async beforeCorrectionSubmitHandler(event: CorrectionInvoiceFormValue): Promise<boolean> {
+    const mapped = this.mapCorrectionRequest(event);
+    const oldTotalAmount = Number(this.invoice?.total_amount || 0);
+    const newTotalAmount = Number(mapped.total_amount || 0);
+
+    if (newTotalAmount <= oldTotalAmount) {
+      return true;
+    }
+
+    const requiredAmount = newTotalAmount - oldTotalAmount;
+    this.correctionRequiredPayment.set(requiredAmount);
+    this.correctionPaymentAmount.set(requiredAmount);
+    this.showCorrectionPaymentDialog.set(true);
+
+    const allowByDialog = await new Promise<boolean>((resolve) => {
+      this.pendingCorrectionSubmitResolver = resolve;
+    });
+
+    if (!allowByDialog) {
+      return false;
+    }
+
+    return (await this.beforeCorrectionSubmit?.(mapped)) ?? true;
+  }
+
+  onCorrectionPaymentAmountChange(event: Event) {
+    const value = Number((event.target as HTMLInputElement)?.value || 0);
+    this.correctionPaymentAmount.set(Number.isFinite(value) ? value : 0);
+  }
+
+  confirmCorrectionPayment() {
+    if (this.correctionPaymentAmount() < this.correctionRequiredPayment()) {
+      this.toastService.warn({ text: 'مبلغ پرداختی باید حداقل برابر با افزایش مبلغ باشد.' });
+      return;
+    }
+
+    this.showCorrectionPaymentDialog.set(false);
+    this.pendingCorrectionSubmitResolver?.(true);
+    this.pendingCorrectionSubmitResolver = null;
+  }
+
+  cancelCorrectionPayment() {
+    this.showCorrectionPaymentDialog.set(false);
+    this.pendingCorrectionSubmitResolver?.(false);
+    this.pendingCorrectionSubmitResolver = null;
+  }
+
   private mapReturnFromSaleRequest(event: ReturnFromSaleFormValue): IPosReturnFromSaleRequest {
     const invoiceItems = this.invoice?.items || [];
     const itemMap = new Map(invoiceItems.map((item) => [item.id, item]));
diff --git a/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html b/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html
index ce4da1a..73cedeb 100644
--- a/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html
+++ b/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html
@@ -1,10 +1,9 @@
-<div [ngClass]="{ 'h-full overflow-auto': true, 'border border-surface-border cardShadow': hasCaption }">
+<div [ngClass]="{ 'h-full overflow-auto': true, 'border-surface-border cardShadow border': hasCaption }">
   <div
     [ngClass]="{
       'px-4': hasCaption,
       'pb-4': true,
-    }"
-  >
+    }">
     @if (hasCaption && captionBox) {
       <div class="pt-4">
         <ng-container [ngTemplateOutlet]="captionBox"></ng-container>
@@ -13,10 +12,10 @@
     }
     <div class="grid grid-cols-1 gap-3" [ngClass]="{ 'pt-4': hasCaption }">
       @for (item of items; track `gridView_${$index}`) {
-        <div class="card border border-surface-border bg-surface-0! mb-0! rounded-2xl p-4!">
+        <div class="card border-surface-border bg-surface-card! mb-0! rounded-2xl border p-4!">
           <div [ngClass]="{ listKeyValue: true, 'mb-2': expandable }">
             @for (col of columns; track `gridView_${col.field.toString()}_${$index}`) {
-              @if (col.type !== "index") {
+              @if (col.type !== 'index') {
                 <app-key-value [label]="col.header" [variant]="col.variant">
                   <app-page-data-value [item]="item" [column]="col" (thumbnailClick)="openThumbnailModal($event)" />
                 </app-key-value>
@@ -25,10 +24,10 @@
           </div>
           @if (expandable) {
             <p-accordion [unstyled]="true" [value]="['0']">
-              <p-accordion-panel value="0" class="border! rounded-lg! overflow-hidden">
+              <p-accordion-panel value="0" class="overflow-hidden rounded-lg! border!">
                 <p-accordion-header class="bg-surface-200! text-text-color! py-2!">
                   <ng-template #toggleicon let-active="active">
-                    <div class="flex items-center gap-4 w-full">
+                    <div class="flex w-full items-center gap-4">
                       <i [ngClass]="{ 'pi pi-chevron-left text-xs! transition': true, '-rotate-90': active }"></i>
                       جزییات بیشتر
                     </div>
@@ -37,13 +36,12 @@
                 <p-accordion-content>
                   <div class="listKeyValue pt-4">
                     @for (col of expandColumns; track `gridView_expand_${col.field.toString()}_${$index}`) {
-                      @if (col.type !== "index") {
+                      @if (col.type !== 'index') {
                         <app-key-value [label]="col.header" [variant]="col.variant">
                           <app-page-data-value
                             [item]="item[expandableItemKey!]"
                             [column]="col"
-                            (thumbnailClick)="openThumbnailModal($event)"
-                          />
+                            (thumbnailClick)="openThumbnailModal($event)" />
                         </app-key-value>
                       }
                     }
@@ -54,7 +52,7 @@
           }
           @if (showEdit || showDelete || showDetails) {
             <hr class="my-2" />
-            <div class="flex justify-center gap-2 mt-4">
+            <div class="mt-4 flex justify-center gap-2">
               @if (showEdit) {
                 <p-button
                   icon="pi pi-pencil"
@@ -62,8 +60,7 @@
                   size="small"
                   outlined
                   severity="secondary"
-                  (click)="edit(item)"
-                >
+                  (click)="edit(item)">
                 </p-button>
               }
               @if (showDelete) {
@@ -77,8 +74,7 @@
                   size="small"
                   outlined
                   severity="primary"
-                  (click)="details(item)"
-                >
+                  (click)="details(item)">
                 </p-button>
               }
             </div>
@@ -87,7 +83,7 @@
       }
       @if (loading) {
         @for (i of [1, 2, 3, 4]; track `grid_view_loading${$index}`) {
-          <div class="w-full h-40">
+          <div class="h-40 w-full">
             <p-skeleton height="100%"></p-skeleton>
           </div>
         }
diff --git a/src/app/shared/components/pageDataList/page-data-list-table-view.component.html b/src/app/shared/components/pageDataList/page-data-list-table-view.component.html
index dd3a865..65c233b 100644
--- a/src/app/shared/components/pageDataList/page-data-list-table-view.component.html
+++ b/src/app/shared/components/pageDataList/page-data-list-table-view.component.html
@@ -1,4 +1,4 @@
-<div class="h-full flex flex-col gap-4 cardShadow">
+<div class="cardShadow flex h-full flex-col gap-4">
   <p-table
     [columns]="columns"
     [scrollable]="true"
@@ -9,9 +9,8 @@
     [showFirstLastIcon]="false"
     [expandedRowKeys]="expandedRows"
     [dataKey]="dataKey"
-    class="max-sm:hidden! grow flex! flex-col overflow-hidden"
-    [tableStyleClass]="!items.length && !loading ? 'h-full' : ''"
-  >
+    class="flex! grow flex-col overflow-hidden max-sm:hidden!"
+    [tableStyleClass]="!items.length && !loading ? 'h-full' : ''">
     @if (captionBox) {
       <ng-template #caption>
         <ng-container [ngTemplateOutlet]="captionBox"> </ng-container>
@@ -24,14 +23,13 @@
           <th style="width: 3rem"></th>
         }
         @if (showIndex) {
-          <th [style]="{ width: '3rem', minWidth: '3rem' }"></th>
+          <th [style]="{ width: '3rem', minWidth: '3rem' }">#</th>
         }
         @for (col of columns; track col.header) {
           <th
             [style]="
               col.type === 'index' ? { width: '3rem', minWidth: '3rem' } : { width: col.width, minWidth: col.minWidth }
-            "
-          >
+            ">
             {{ col.header }}
           </th>
         }
@@ -52,8 +50,7 @@
               [text]="true"
               [rounded]="true"
               [plain]="true"
-              [icon]="expanded ? 'pi pi-chevron-down' : 'pi pi-chevron-left'"
-            />
+              [icon]="expanded ? 'pi pi-chevron-down' : 'pi pi-chevron-left'" />
           </td>
         }
         @if (showIndex) {
@@ -75,8 +72,7 @@
             [showEdit]="showEdit"
             (edit)="edit(item)"
             (delete)="remove(item)"
-            (details)="details(item)"
-          ></td>
+            (details)="details(item)"></td>
         }
       </tr>
     </ng-template>
@@ -96,9 +92,8 @@
                   stripedRows
                   [showFirstLastIcon]="false"
                   [expandedRowKeys]="expandedRows"
-                  class="grow flex! flex-col overflow-hidden"
-                  [tableStyleClass]="!item.items?.length && !loading ? 'h-full' : ''"
-                >
+                  class="flex! grow flex-col overflow-hidden"
+                  [tableStyleClass]="!item.items?.length && !loading ? 'h-full' : ''">
                   <ng-template #header let-columns>
                     <tr>
                       @for (col of expandColumns; track col.header) {
@@ -107,8 +102,7 @@
                             col.type === 'index'
                               ? { width: '3rem', minWidth: '3rem' }
                               : { width: col.width, minWidth: col.minWidth }
-                          "
-                        >
+                          ">
                           {{ col.header }}
                         </th>
                       }
@@ -120,14 +114,13 @@
                       @for (col of expandColumns; track col.field) {
                         <td>
                           {{ item.name }}
-                          @if (col.type === "index") {
+                          @if (col.type === 'index') {
                             {{ i * (currentPage || 1) + 1 }}
                           } @else {
                             <app-page-data-value
                               [item]="item"
                               [column]="col"
-                              (thumbnailClick)="openThumbnailModal($event)"
-                            />
+                              (thumbnailClick)="openThumbnailModal($event)" />
                           }
                         </td>
                       }
@@ -142,8 +135,7 @@
                           [description]="emptyPlaceholderDescription"
                           [ctaLabel]="emptyPlaceholderCtaLabel || addNewCtaLabel"
                           [showCTA]="showAdd"
-                          (ctaClick)="openAddForm()"
-                        ></uikit-empty-state>
+                          (ctaClick)="openAddForm()"></uikit-empty-state>
                       </td>
                     </tr>
                   </ng-template>
@@ -155,8 +147,7 @@
                       [label]="col.header"
                       [value]="item[expandableItemKey][col.field]"
                       [type]="col.type || 'simple'"
-                      [variant]="col.variant"
-                    />
+                      [variant]="col.variant" />
                   }
                 </div>
               }
diff --git a/src/app/shared/components/pageDataList/page-data-list.component.ts b/src/app/shared/components/pageDataList/page-data-list.component.ts
index af22401..f62963d 100644
--- a/src/app/shared/components/pageDataList/page-data-list.component.ts
+++ b/src/app/shared/components/pageDataList/page-data-list.component.ts
@@ -189,7 +189,7 @@ export class PageDataListComponent<I = any> {
   };
 
   get showPaginator() {
-    return !!(this.totalPages && this.perPage && this.totalPages > this.perPage);
+    return !!(this.totalPages && this.totalPages > 1);
   }
 
   getPreviewClasses(item: Record<string, any>, column: IColumn): any {
diff --git a/src/app/shared/components/pageDataList/page-data-value.component.ts b/src/app/shared/components/pageDataList/page-data-value.component.ts
index 784e355..9a8f5ed 100644
--- a/src/app/shared/components/pageDataList/page-data-value.component.ts
+++ b/src/app/shared/components/pageDataList/page-data-value.component.ts
@@ -12,11 +12,11 @@ import { IColumn } from './page-data-list.component';
   template: `
     @if (column.type === 'thumbnail') {
       <div
-        class="w-20 h-20 rounded-2xl overflow-hidden bg-surface-100 cursor-pointer"
+        class="bg-surface-100 h-20 w-20 cursor-pointer overflow-hidden rounded-2xl"
         (click)="thumbnailClick.emit(item)"
       >
         @if (readFieldValue(item, column.field)) {
-          <img [src]="readFieldValue(item, column.field)" class="w-full h-full object-cover" />
+          <img [src]="readFieldValue(item, column.field)" class="h-full w-full object-cover" />
         }
       </div>
     } @else if (column.variant === 'tag') {
@@ -68,12 +68,19 @@ export class PageDataValueComponent {
 
     let data = item[String(field)];
     if (column.type === 'nested') {
-      const path = column.nestedOption?.path;
-      if (!path) return '-';
-      data = path
-        .split('.')
-        .reduce((obj: any, key: string) => (obj && obj[key] !== undefined ? obj[key] : null), item);
-      type = column.nestedOption?.type || 'simple';
+      try {
+        const path = column.nestedOption?.path;
+        if (!path) return '-';
+        data = path
+          .split('.')
+          .reduce(
+            (obj: any, key: string) => (obj && obj[key] !== undefined ? obj[key] : null),
+            item
+          );
+        type = column.nestedOption?.type || 'simple';
+      } catch (e) {
+        return '-';
+      }
     }
 
     switch (type) {
diff --git a/src/app/shared/constants/list-configs/sale-invoice-list.const.ts b/src/app/shared/constants/list-configs/sale-invoice-list.const.ts
index 2391708..079e7d1 100644
--- a/src/app/shared/constants/list-configs/sale-invoice-list.const.ts
+++ b/src/app/shared/constants/list-configs/sale-invoice-list.const.ts
@@ -3,15 +3,11 @@ import { IListConfig } from './list-config.model';
 export const saleInvoiceListConfig: IListConfig = {
   pageTitle: 'مدیریت صورت‌حساب‌های فروش',
   addNewCtaLabel: 'افزودن صورت‌حساب‌',
-  emptyPlaceholderTitle: 'صورت‌حساب‌ی یافت نشد',
+  emptyPlaceholderTitle: 'صورت‌حسابی یافت نشد',
   emptyPlaceholderDescription: 'برای افزودن صورت‌حساب‌، روی دکمهٔ بالا کلیک کنید.',
   columns: [
-    { field: 'code', header: 'کد رهگیری' },
-    {
-      field: 'total_amount',
-      header: 'قیمت نهایی',
-      type: 'price',
-    },
+    { field: 'invoice_number', header: 'شماره' },
+
     {
       field: 'pos',
       header: 'پایانه',
@@ -19,15 +15,24 @@ export const saleInvoiceListConfig: IListConfig = {
         return `${item.pos.name} (${item.pos.complex.name} - ${item.pos.complex.business_activity.name})`;
       },
     },
+    // {
+    //   field: 'consumer_account',
+    //   header: 'ایجاد شده توسط',
+    //   type: 'nested',
+    //   nestedOption: { path: 'consumer_account.account.username' },
+    // },
     {
-      field: 'consumer_account',
-      header: 'ایجاد شده توسط',
-      type: 'nested',
-      nestedOption: { path: 'consumer_account.account.username' },
+      field: 'total_amount',
+      header: 'مبلغ کل',
+      type: 'price',
+    },
+    {
+      field: 'status',
+      header: 'وضعیت',
     },
     {
       field: 'invoice_date',
-      header: 'تاریخ صورت‌حساب‌',
+      header: 'تاریخ',
       type: 'date',
     },
     {
diff --git a/src/app/uikit/paginator.component.html b/src/app/uikit/paginator.component.html
index 104be61..2dca52a 100644
--- a/src/app/uikit/paginator.component.html
+++ b/src/app/uikit/paginator.component.html
@@ -1,5 +1,15 @@
 @if (totalPages > 1) {
   <div class="flex items-center justify-center gap-3 p-4">
+    @if (totalPages > 5) {
+      <button
+        pButton
+        icon="pi pi-angle-double-right"
+        size="small"
+        severity="secondary"
+        outlined
+        [disabled]="loading || currentPage === 1"
+        (click)="goToFirstPage()"></button>
+    }
     <button
       pButton
       icon="pi pi-angle-right"
@@ -25,5 +35,15 @@
       outlined
       [disabled]="loading || currentPage >= totalPages"
       (click)="nextPage()"></button>
+    @if (totalPages > 5) {
+      <button
+        pButton
+        icon="pi pi-angle-double-left"
+        size="small"
+        severity="secondary"
+        outlined
+        [disabled]="loading || currentPage === totalPages"
+        (click)="goToLastPage()"></button>
+    }
   </div>
 }
diff --git a/src/app/uikit/paginator.component.ts b/src/app/uikit/paginator.component.ts
index 90a6830..b290746 100644
--- a/src/app/uikit/paginator.component.ts
+++ b/src/app/uikit/paginator.component.ts
@@ -53,6 +53,18 @@ export class PaginatorComponent {
     }
   }
 
+  goToFirstPage() {
+    if (this.currentPage !== 1) {
+      this.onPageChange(1);
+    }
+  }
+
+  goToLastPage() {
+    if (this.currentPage !== this.totalPages) {
+      this.onPageChange(this.totalPages);
+    }
+  }
+
   ngOnInit() {
     this.init();
   }
diff --git a/src/assets/layout/_main.scss b/src/assets/layout/_main.scss
index 53e35c2..c64dae2 100644
--- a/src/assets/layout/_main.scss
+++ b/src/assets/layout/_main.scss
@@ -1,7 +1,23 @@
 .layout-main-container {
+  display: flex;
+  flex-direction: column;
+  // height: 100vh;
+  // overflow: hidden;
+  justify-content: space-between;
   // 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/layout/_menu.scss b/src/assets/layout/_menu.scss
index 612b76d..d0f1092 100644
--- a/src/assets/layout/_menu.scss
+++ b/src/assets/layout/_menu.scss
@@ -3,18 +3,22 @@
 .layout-sidebar {
   position: fixed;
   width: 20rem;
-  height: calc(100vh - 7rem);
+  height: calc(100vh - 4.5rem);
   z-index: 999;
   overflow-y: auto;
   user-select: none;
-  top: 6rem;
-  right: 2rem;
+  top: 4.5rem;
+  right: 1.5rem;
+  padding: 1rem 0;
   transition:
     transform var(--layout-section-transition-duration),
     right var(--layout-section-transition-duration);
-  background-color: var(--surface-overlay);
-  border-radius: var(--content-border-radius);
-  padding: 0.5rem 1.5rem;
+  > * {
+    background-color: var(--surface-overlay);
+    border-radius: var(--content-border-radius);
+    padding: 0.5rem 1.5rem;
+    height: 100%;
+  }
 }
 
 .layout-menu {
diff --git a/src/assets/layout/_responsive.scss b/src/assets/layout/_responsive.scss
index 288f414..3b9314a 100644
--- a/src/assets/layout/_responsive.scss
+++ b/src/assets/layout/_responsive.scss
@@ -91,11 +91,14 @@
       right: 0;
       top: 0;
       height: 100vh;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
+      padding: 0;
       transition:
         transform 0.4s cubic-bezier(0.05, 0.74, 0.2, 0.99),
-        left 0.4s cubic-bezier(0.05, 0.74, 0.2, 0.99);
+        right 0.4s cubic-bezier(0.05, 0.74, 0.2, 0.99);
+      > * {
+        border-top-right-radius: 0 !important;
+        border-bottom-right-radius: 0 !important;
+      }
     }
 
     .layout-mask {
diff --git a/src/environments/environment.tis.ts b/src/environments/environment.tis.ts
index 02aff61..ad272c8 100644
--- a/src/environments/environment.tis.ts
+++ b/src/environments/environment.tis.ts
@@ -2,8 +2,8 @@
 export const environment = {
   production: true,
   // apiBaseUrl: 'https://psp-api.shift-am.ir',
-  // apiBaseUrl: 'http://192.168.128.73:5002',
-  apiBaseUrl: 'http://192.168.0.162:5002',
+  apiBaseUrl: 'http://192.168.128.73:5002',
+  // apiBaseUrl: 'http://192.168.0.162:5002',
   // apiBaseUrl: 'http://localhost:5002',
   host: 'localhost',
   port: 5000,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 8055915..61b7975 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -2,8 +2,8 @@
 export const environment = {
   production: false,
   // apiBaseUrl: 'http://194.59.214.243:5002',
-  apiBaseUrl: 'http://192.168.128.73:5002',
-  // apiBaseUrl: 'http://localhost:5002',
+  // apiBaseUrl: 'http://192.168.128.73:5002',
+  apiBaseUrl: 'http://localhost:5002',
   // host: 'http://194.59.214.243',
   host: 'localhost',
   port: 5000,
diff --git a/src/presets.ts b/src/presets.ts
index 23aa6c4..8027432 100644
--- a/src/presets.ts
+++ b/src/presets.ts
@@ -25,6 +25,9 @@ const MyPreset = definePreset(Aura, {
     },
 
     card: {
+      root: {
+        borderRadius: '0.5rem',
+      },
       body: {
         padding: '0.875rem 1rem',
       },