feat: enhance inner pages header with back button functionality and emit event on back click

fix: update total price info handling in correction form and ensure accurate calculations

refactor: streamline sale invoice single view component by extracting info card into a separate component

style: adjust button sizes in payment forms for better UI consistency

feat: implement season picker navigation controls to prevent out-of-bounds selection

fix: improve price formatting utility to handle undefined values gracefully

chore: update environment configuration for API base URL

feat: add navigation service to manage routing history and back navigation

src/app/shared/components/invoices/correctionForm/form.component.html

@@ -41,7 +41,7 @@
     }
   </div>
 
-  <pos-order-price-info-card [info]="getTotalPriceInfo()" />
+  <pos-order-price-info-card [info]="totalPriceInfo" />
 
   <app-form-footer-actions />
 </form>

src/app/shared/components/invoices/correctionForm/form.component.ts

@@ -48,6 +48,12 @@ export class SharedCorrectionFormComponent extends AbstractForm<
 
   itemDrafts: Record<string, TCorrectionItemPayload> = {};
   mappedInitialItems: TCorrectionItemPayload[] = [];
+  totalPriceInfo = {
+    totalBaseAmount: 0,
+    discountAmount: 0,
+    taxAmount: 0,
+    totalAmount: 0,
+  };
   showItemEditSheet = signal(false);
   activeItemIndex = signal<number | null>(null);
 
@@ -57,6 +63,7 @@ export class SharedCorrectionFormComponent extends AbstractForm<
     );
     this.itemDrafts = {};
     this.mappedInitialItems = (this.initialValues || []).map((item) => this.mapToInitialItem(item));
+    this.recalculateTotalPriceInfo();
     this.showItemEditSheet.set(false);
     this.activeItemIndex.set(null);
   }
@@ -91,9 +98,9 @@ export class SharedCorrectionFormComponent extends AbstractForm<
       good_id: item.good_id,
       unit_price: Number(item.unit_price || 0),
       quantity: Number(item.quantity || 0),
-      discount_amount: Number(item.discount || 0),
+      discount_amount: Number(item.discount_amount || 0),
       total_amount: Number(item.total_amount || 0),
-      tax_amount: 0,
+      tax_amount: Number(item.tax_amount || 0),
       base_total_amount: Number(item.unit_price || 0) * Number(item.quantity || 0),
       measure_unit: (item.good_snapshot?.measure_unit || {}) as ISummary,
     };
@@ -158,9 +165,6 @@ export class SharedCorrectionFormComponent extends AbstractForm<
     const previews = (this.initialValues || [])
       .map((_, index) => this.getItemPreview(index))
       .filter(Boolean);
-
-    console.log('previews', previews);
-
     return previews.reduce(
       (acc, item: any) => {
         acc.totalBaseAmount += Number(item.base_total_amount || 0);
@@ -178,6 +182,10 @@ export class SharedCorrectionFormComponent extends AbstractForm<
     );
   }
 
+  private recalculateTotalPriceInfo() {
+    this.totalPriceInfo = this.getTotalPriceInfo();
+  }
+
   saveActiveItemDraft(
     goldForm?: SharedGoldPayloadFormComponent,
     standardForm?: SharedStandardPayloadFormComponent
@@ -200,6 +208,7 @@ export class SharedCorrectionFormComponent extends AbstractForm<
       id: item.id,
       pricing_model: item.good_snapshot?.pricing_model || '',
     };
+    this.recalculateTotalPriceInfo();
     this.backToList();
   }
 

src/app/shared/components/invoices/sale-invoice-full-response.model.ts

@@ -40,12 +40,13 @@ export interface IInvoiceItem {
   measure_unit_text: string;
   sku_code: string;
   unit_price: string;
-  discount: string;
+  discount_amount: string;
   total_amount: string;
   notes?: string;
   payload: Payload;
   good_snapshot: Goodsnapshot;
   good: GoodSummary;
+  tax_amount: string;
 }
 interface GoodSummary {
   name: string;
@@ -132,7 +133,12 @@ interface Pos extends ISummary {
 }
 
 interface Complex extends ISummary {
-  business_activity: ISummary;
+  business_activity: BusinessActivity;
+}
+
+interface BusinessActivity extends ISummary {
+  economic_code: string;
+  guild: ISummary;
 }
 
 interface ConsumerAccount {

src/app/shared/components/invoices/sale-invoice-single-info-card.component.html

@@ -0,0 +1,93 @@
+@if (invoice) {
+  <p-card>
+    <div class="flex flex-col gap-4">
+      <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="نوع صورت‌حساب">
+          <catalog-invoice-type-tag [status]="invoice.type.value" />
+        </app-key-value>
+        <app-key-value label="وضعیت صدور به سامانه‌ی مودیان">
+          <catalog-tax-provider-status-tag [status]="invoice.status.value" [translate]="invoice.status.translate" />
+        </app-key-value>
+        <div class="col-span-full">
+          <app-key-value label="توضیحات" [value]="invoice.notes || '----'" />
+        </div>
+      </div>
+      <p-divider align="center"> اطلاعات مالی</p-divider>
+      <div class="grid 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.total_amount" type="price" />
+      </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="نحوه‌ی تسویه‌حساب">
+          <catalog-invoice-settlement-type-tag [type]="invoice.settlement_type.value" />
+        </app-key-value>
+
+        @for (payment of invoice.payments; track $index) {
+          <app-key-value
+            [label]="`${payment.payment_method === 'SET_OFF' ? 'تهاتر' : payment.payment_method === 'TERMINAL' ? 'پوز' : 'نقدی/ کارت‌خوان دیگر/ کارت به کارت'}`"
+            [value]="payment.amount"
+            type="price" />
+        }
+      </div>
+
+      <p-divider align="center"> اطلاعات صادر کننده </p-divider>
+      <div class="listKeyValue">
+        <app-key-value label="کسب و کار" [value]="invoice.pos!.complex.business_activity.name" />
+        <app-key-value label="مجموعه" [value]="invoice.pos!.complex.name" />
+        <app-key-value label="پایانه فروش" [value]="invoice.pos!.name" />
+        @if (invoice.consumer_account?.account?.username) {
+          <app-key-value label="ایجاد کننده" [value]="invoice.consumer_account.account.username" />
+        }
+      </div>
+
+      @if (variant !== 'customer') {
+        <p-divider align="center"> اطلاعات مشتری </p-divider>
+        @if (invoice.customer) {
+          <div class="listKeyValue">
+            @if (invoice.customer.type === 'INDIVIDUAL') {
+              <app-key-value label="نوع مشتری" value="حقیقی" />
+              <app-key-value label="نام" [value]="invoice.customer.individual?.first_name" />
+              <app-key-value label="نام خانوادگی" [value]="invoice.customer.individual?.last_name" />
+              <app-key-value label="کد اقتصادی" [value]="invoice.customer.individual?.economic_code" />
+              <app-key-value label="کد ملی" [value]="invoice.customer.individual?.national_id" />
+              <app-key-value label="کد پستی" [value]="invoice.customer.individual?.postal_code" />
+            } @else {
+              <app-key-value label="نوع مشتری" value="حقوقی" />
+              <app-key-value label="نام شرکت" [value]="invoice.customer.legal?.company_name" />
+              <app-key-value label="کد اقتصادی" [value]="invoice.customer.legal?.economic_code" />
+              <app-key-value label="کد ثبتی" [value]="invoice.customer.legal?.registration_number" />
+              <app-key-value label="کد پستی" [value]="invoice.customer.legal?.postal_code" />
+            }
+          </div>
+        } @else if (invoice.unknown_customer) {
+          <div class="listKeyValue">
+            <app-key-value label="نوع مشتری" value="نوع دوم" />
+            <app-key-value label="عنوان" [value]="invoice.unknown_customer.name" />
+            <app-key-value label="کد ثبتی" [value]="invoice.unknown_customer.national_code" />
+          </div>
+        } @else {
+          <p class="text-text-color pt-3 pb-5 text-center">اطلاعات مشتری ثبت نشده است.</p>
+        }
+      }
+      <p-divider align="center"> کالاهای خریداری شده </p-divider>
+      <app-page-data-list
+        [columns]="columns"
+        [items]="invoice.items"
+        [loading]="loading"
+        pageTitle=""
+        [showRefresh]="false">
+        <ng-template #totalAmount let-item>
+          @if (!item.discount_amount) {
+            <span [appPriceMask]="item.total_amount"></span>
+          }
+        </ng-template>
+      </app-page-data-list>
+    </div>
+  </p-card>
+}

src/app/shared/components/invoices/sale-invoice-single-info-card.component.ts

@@ -0,0 +1,104 @@
+import { Maybe } from '@/core';
+import {
+  CatalogInvoiceTypeTagComponent,
+  CatalogTaxProviderStatusTagComponent,
+} from '@/shared/catalog';
+import { CatalogInvoiceSettlementTypeTagComponent } from '@/shared/catalog/invoiceSettlementType';
+import { PriceMaskDirective } from '@/shared/directives';
+import { Component, Input } from '@angular/core';
+import { Card } from 'primeng/card';
+import { Divider } from 'primeng/divider';
+import { KeyValueComponent } from '../key-value.component/key-value.component';
+import { IColumn, PageDataListComponent } from '../pageDataList/page-data-list.component';
+import { ISaleInvoiceFullResponse } from './sale-invoice-full-response.model';
+
+export type TSaleInvoiceSingleViewVariant = 'full' | 'customer' | 'pos';
+
+@Component({
+  selector: 'shared-sale-invoice-single-info-card',
+  templateUrl: './sale-invoice-single-info-card.component.html',
+  imports: [
+    Card,
+    KeyValueComponent,
+    CatalogInvoiceTypeTagComponent,
+    CatalogTaxProviderStatusTagComponent,
+    Divider,
+    CatalogInvoiceSettlementTypeTagComponent,
+    PageDataListComponent,
+    PriceMaskDirective,
+  ],
+})
+export class SaleInvoiceSingleInfoCardComponent {
+  @Input({ required: true }) loading!: boolean;
+  @Input() invoice!: Maybe<ISaleInvoiceFullResponse>;
+  @Input() variant: TSaleInvoiceSingleViewVariant = 'full';
+
+  columns: IColumn[] = [
+    {
+      field: 'name',
+      header: 'عنوان',
+      type: 'nested',
+      nestedOption: {
+        path: 'good_snapshot.name',
+      },
+    },
+    {
+      field: 'sku_code',
+      header: 'شناسه کالا',
+    },
+    {
+      field: 'unit_price',
+      header: 'قیمت واحد',
+      type: 'price',
+    },
+    {
+      field: 'quantity',
+      header: 'مقدار',
+      customDataModel(item) {
+        return `${item.quantity} ${item.measure_unit_text}`;
+      },
+    },
+    {
+      field: 'commission',
+      header: 'کارمزد',
+      type: 'nested',
+      nestedOption: {
+        path: 'payload.commission',
+        type: 'price',
+      },
+    },
+    {
+      field: 'wages',
+      header: 'اجرت',
+      type: 'nested',
+      nestedOption: {
+        path: 'payload.wages',
+        type: 'price',
+      },
+    },
+    {
+      field: 'profit',
+      header: 'سود',
+      type: 'nested',
+      nestedOption: {
+        path: 'payload.profit',
+        type: 'price',
+      },
+    },
+    {
+      field: 'discount_amount',
+      header: 'مبلغ تخفیف',
+      type: 'price',
+    },
+    {
+      field: 'tax_amount',
+      header: 'مبلغ مالیات',
+      type: 'price',
+    },
+    {
+      field: 'total_amount',
+      header: 'مبلغ قابل پرداخت',
+      type: 'price',
+    },
+  ];
+}

src/app/shared/components/invoices/sale-invoice-single-view.component.html

@@ -3,103 +3,14 @@
 } @else if (!invoice) {
   <uikit-empty-state> </uikit-empty-state>
 } @else {
-  <app-inner-pages-header [pageTitle]="`صورت‌حساب ${invoice.invoice_number}`" [backRoute]="backRoute">
+  <app-inner-pages-header [pageTitle]="`صورت‌حساب ${invoice.invoice_number}`" (onBackClick)="backToPrevPage()">
     <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="چاپ" />
     </ng-template>
   </app-inner-pages-header>
   <div class="p-4">
-    <p-card>
-      <div class="flex flex-col gap-4">
-        <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="نوع صورت‌حساب">
-            <catalog-invoice-type-tag [status]="invoice.type.value" />
-          </app-key-value>
-          <app-key-value label="وضعیت صدور به سامانه‌ی مودیان">
-            <catalog-tax-provider-status-tag [status]="invoice.status.value" [translate]="invoice.status.translate" />
-          </app-key-value>
-          <div class="col-span-full">
-            <app-key-value label="توضیحات" [value]="invoice.notes || '----'" />
-          </div>
-        </div>
-        <p-divider align="center"> اطلاعات مالی</p-divider>
-        <div class="grid 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.total_amount" type="price" />
-        </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="نحوه‌ی تسویه‌حساب">
-            <catalog-invoice-settlement-type-tag [type]="invoice.settlement_type.value" />
-          </app-key-value>
-
-          @for (payment of invoice.payments; track $index) {
-            <app-key-value
-              [label]="`${payment.payment_method === 'SET_OFF' ? 'تهاتر' : payment.payment_method === 'TERMINAL' ? 'پوز' : 'نقدی/ کارت‌خوان دیگر/ کارت به کارت'}`"
-              [value]="payment.amount"
-              type="price" />
-          }
-        </div>
-
-        <p-divider align="center"> اطلاعات صادر کننده </p-divider>
-        <div class="listKeyValue">
-          <app-key-value label="کسب و کار" [value]="invoice.pos!.complex.business_activity.name" />
-          <app-key-value label="مجموعه" [value]="invoice.pos!.complex.name" />
-          <app-key-value label="پایانه فروش" [value]="invoice.pos!.name" />
-          @if (invoice.consumer_account?.account?.username) {
-            <app-key-value label="ایجاد کننده" [value]="invoice.consumer_account.account.username" />
-          }
-        </div>
-
-        @if (variant !== 'customer') {
-          <p-divider align="center"> اطلاعات مشتری </p-divider>
-          @if (invoice.customer) {
-            <div class="listKeyValue">
-              @if (invoice.customer.type === 'INDIVIDUAL') {
-                <app-key-value label="نوع مشتری" value="حقیقی" />
-                <app-key-value label="نام" [value]="invoice.customer.individual?.first_name" />
-                <app-key-value label="نام خانوادگی" [value]="invoice.customer.individual?.last_name" />
-                <app-key-value label="کد اقتصادی" [value]="invoice.customer.individual?.economic_code" />
-                <app-key-value label="کد ملی" [value]="invoice.customer.individual?.national_id" />
-                <app-key-value label="کد پستی" [value]="invoice.customer.individual?.postal_code" />
-              } @else {
-                <app-key-value label="نوع مشتری" value="حقوقی" />
-                <app-key-value label="نام شرکت" [value]="invoice.customer.legal?.company_name" />
-                <app-key-value label="کد اقتصادی" [value]="invoice.customer.legal?.economic_code" />
-                <app-key-value label="کد ثبتی" [value]="invoice.customer.legal?.registration_number" />
-                <app-key-value label="کد پستی" [value]="invoice.customer.legal?.postal_code" />
-              }
-            </div>
-          } @else if (invoice.unknown_customer) {
-            <div class="listKeyValue">
-              <app-key-value label="نوع مشتری" value="نوع دوم" />
-              <app-key-value label="عنوان" [value]="invoice.unknown_customer.name" />
-              <app-key-value label="کد ثبتی" [value]="invoice.unknown_customer.national_code" />
-            </div>
-          } @else {
-            <p class="text-text-color pt-3 pb-5 text-center">اطلاعات مشتری ثبت نشده است.</p>
-          }
-        }
-        <p-divider align="center"> کالاهای خریداری شده </p-divider>
-        <app-page-data-list
-          [columns]="columns"
-          [items]="invoice.items"
-          [loading]="loading"
-          pageTitle=""
-          [showRefresh]="false">
-          <ng-template #totalAmount let-item>
-            @if (!item.discount_amount) {
-              <span [appPriceMask]="item.total_amount"></span>
-            }
-          </ng-template>
-        </app-page-data-list>
-      </div>
-    </p-card>
+    <shared-sale-invoice-single-info-card [loading]="loading" [invoice]="invoice" [variant]="variant" />
   </div>
 
   @if (moreActionMenuItems().length) {
@@ -132,4 +43,14 @@
       [invoiceDate]="invoice.invoice_date"
       (onSubmit)="correctionSubmit($event)" />
   </shared-light-bottomsheet>
+  <shared-light-bottomsheet [(visible)]="showQrCodeDialog" header="کد QR">
+    <div class="flex flex-col gap-4">
+      <span class="text-center text-lg font-bold">
+        برای امکان دسترسی به صورت‌حساب به صورت آنلاین، کد QR را اسکن کنید.
+      </span>
+      <p-card class="mx-auto">
+        <qrcode [qrdata]="publicInvoiceRoute()" [width]="220" [errorCorrectionLevel]="'M'"></qrcode>
+      </p-card>
+    </div>
+  </shared-light-bottomsheet>
 }

src/app/shared/components/invoices/sale-invoice-single-view.component.ts

@@ -1,26 +1,17 @@
 import { Maybe } from '@/core';
 import { NativeBridgeService } from '@/core/services';
+import { NavigationService } from '@/core/services/navigation.service';
 import { ToastService } from '@/core/services/toast.service';
 import { PosConfigPrintService } from '@/domains/pos/modules/configs/components/print/services/main.service';
 import { IPosReturnFromSaleRequest } from '@/domains/pos/modules/saleInvoices/models/returnFromSale';
 import { IPosOrderItem } from '@/domains/pos/modules/shop/models';
 import { PosInfoStore } from '@/domains/pos/store';
-import {
-  CatalogInvoiceTypeTagComponent,
-  CatalogTaxProviderStatusTagComponent,
-  TspProviderResponseStatus,
-} from '@/shared/catalog';
-import { CatalogInvoiceSettlementTypeTagComponent } from '@/shared/catalog/invoiceSettlementType';
-import { KeyValueComponent, SharedLightBottomsheetComponent } from '@/shared/components';
+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 {
-  IColumn,
-  PageDataListComponent,
-} from '@/shared/components/pageDataList/page-data-list.component';
-import { PriceMaskDirective } from '@/shared/directives';
 import { UikitEmptyStateComponent } from '@/uikit';
-import { formatWithCurrency } from '@/utils';
+import { formatJalali, formatWithCurrency } from '@/utils';
 import {
   Component,
   computed,
@@ -33,12 +24,10 @@ import {
   TemplateRef,
   ViewChild,
 } from '@angular/core';
-import { UrlTree } from '@angular/router';
+import { Router } from '@angular/router';
+import { QRCodeComponent } from 'angularx-qrcode';
 import { Button, ButtonDirective } from 'primeng/button';
 import { Card } from 'primeng/card';
-import { Dialog } from 'primeng/dialog';
-import { Divider } from 'primeng/divider';
-import { ProgressSpinner } from 'primeng/progressspinner';
 import { TableModule } from 'primeng/table';
 import { Observable } from 'rxjs';
 import { AppConfirmationService } from '../confirmationDialog/confirmation-dialog.service';
@@ -46,8 +35,11 @@ import { InnerPagesHeaderComponent } from '../innerPagesHeader/inner-pages-heade
 import { SharedCorrectionFormComponent } from './correctionForm';
 import { CorrectionInvoiceFormValue, ICorrectionRequest, ReturnFromSaleFormValue } from './models';
 import { SharedReturnFormComponent } from './returnForm/form.component';
+import {
+  SaleInvoiceSingleInfoCardComponent,
+  TSaleInvoiceSingleViewVariant,
+} from './sale-invoice-single-info-card.component';
 
-export type TSaleInvoiceSingleViewVariant = 'full' | 'customer' | 'pos';
 type TActionMenuItem = {
   label: string;
   icon: string;
@@ -60,24 +52,17 @@ type TActionMenuItem = {
   selector: 'shared-sale-invoice-single-view',
   templateUrl: './sale-invoice-single-view.component.html',
   imports: [
-    KeyValueComponent,
-    Divider,
-    PageDataListComponent,
     TableModule,
     PageLoadingComponent,
     UikitEmptyStateComponent,
-    PriceMaskDirective,
-    CatalogTaxProviderStatusTagComponent,
-    CatalogInvoiceTypeTagComponent,
     Button,
-    CatalogInvoiceSettlementTypeTagComponent,
     SharedLightBottomsheetComponent,
-    ProgressSpinner,
     SharedReturnFormComponent,
     SharedCorrectionFormComponent,
-    Dialog,
     ButtonDirective,
     InnerPagesHeaderComponent,
+    SaleInvoiceSingleInfoCardComponent,
+    QRCodeComponent,
     Card,
   ],
 })
@@ -88,11 +73,13 @@ export class SharedSaleInvoiceSingleViewComponent {
   //TODO: below service Must be transform from pos to shared.
   private readonly service = inject(PosConfigPrintService);
   private readonly confirmationService = inject(AppConfirmationService);
+  private readonly router = inject(Router);
+  private readonly navigationService = inject(NavigationService);
 
   @Input({ required: true }) loading!: boolean;
   @Input() invoice!: Maybe<ISaleInvoiceFullResponse>;
   @Input() variant: TSaleInvoiceSingleViewVariant = 'full';
-  @Input() backRoute?: UrlTree | string | any[];
+  @Input() backRoute?: string;
   @Input() sendToTspLoading: boolean = false;
   @Input() resendToTspLoading: boolean = false;
   @Input() inquiryLoading: boolean = false;
@@ -109,6 +96,14 @@ export class SharedSaleInvoiceSingleViewComponent {
   moreActionMenuItems = signal<TActionMenuItem[]>([]);
   showCorrectionForm = signal(false);
   showReturnFromSaleForm = signal(false);
+  showQrCodeDialog = signal(false);
+
+  publicInvoiceRoute = computed(() => {
+    if (this.invoice) {
+      return `${window.location.origin}/sale-invoices/${this.invoice.id}`;
+    }
+    return '';
+  });
 
   showErrors = () => {};
   inquiry = () => {
@@ -231,39 +226,39 @@ export class SharedSaleInvoiceSingleViewComponent {
 
   preparePrint = async () => {
     if (this.invoice) {
-      const mustPrintConfig = await this.service.get();
+      const mustPrintConfig = await this.service.getVisibleItems();
 
       const defaultPrintItems = [
         {
           title: 'اطلاعات صورت‌حساب',
           items: [
+            {
+              label: 'شماره',
+              value: this.invoice.invoice_number.toString(),
+              show: true,
+            },
             {
               label: 'شماره منحصر به فرد مالیاتی',
-              value: 'this.invoice',
+              value: this.invoice.tax_id || '-',
               show: true,
             },
             {
-              label: 'شماره صورت‌حساب',
-              value: this.invoice.code,
-              show: true,
-            },
-            {
-              label: 'موضوع صورت‌حساب',
-              value: 'this.invoice',
-              show: mustPrintConfig.invoice_template ?? true,
-            },
-            {
-              label: 'نوع صورت‌حساب',
-              value: 'this.invoice',
+              label: 'نوع',
+              value: this.invoice.type.translate,
               show: mustPrintConfig.invoice_template,
             },
             {
-              label: 'تاریخ و ساعت',
-              value: this.invoice.invoice_date,
+              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: 'وضعیت صورت‌حساب مالیاتی',
+              label: 'وضعیت صدور',
               value: this.invoice.status.translate,
               show: mustPrintConfig.show_payment_info ?? true,
             },
@@ -273,23 +268,23 @@ export class SharedSaleInvoiceSingleViewComponent {
           title: `اطلاعات فروشنده`,
           items: [
             {
-              label: 'عنوان فروشگاه',
+              label: 'فروشگاه',
               value: this.invoice.pos.complex.business_activity.name,
               show: mustPrintConfig.business_name,
             },
             {
-              label: 'عنوان شعبه',
+              label: 'شعبه',
               value: this.invoice.pos.complex.name,
               show: mustPrintConfig.complex_name,
             },
             {
-              label: 'عنوان پایانه‌ فروش',
+              label: 'پایانه‌ فروش',
               value: this.invoice.pos.name,
               show: mustPrintConfig.pos_name,
             },
             {
               label: 'شماره اقتصادی',
-              value: 'this.invoice.pos.complex.business_activity.economic_code',
+              value: this.invoice.pos.complex.business_activity.economic_code,
               show: mustPrintConfig.economic_code,
             },
           ].filter((item) => item.show),
@@ -328,59 +323,67 @@ export class SharedSaleInvoiceSingleViewComponent {
             items: [
               {
                 label: 'شرح',
-                value: item.good.name,
-                show: mustPrintConfig.items?.name,
+                value: item.good_snapshot.name,
+                show: mustPrintConfig.item_name ?? true,
               },
               {
                 label: 'شناسه کالا / خدمت',
                 value: item.sku_code,
-                show: mustPrintConfig.items?.sku,
+                show: mustPrintConfig.item_sku ?? true,
               },
               {
                 label: 'تعداد / مقدار',
                 value: `${item.quantity} ${item.measure_unit_text}`,
-                show: mustPrintConfig.items?.quantity,
+                show: mustPrintConfig.item_quantity ?? true,
               },
               {
                 label: 'قیمت واحد',
                 value: formatWithCurrency(item.unit_price),
-                show: mustPrintConfig.items?.base_amount,
+                show: mustPrintConfig.item_base_amount ?? true,
               },
               {
                 label: 'اجرت',
                 value: formatWithCurrency(item.payload.wages),
-                show: mustPrintConfig.items?.wage && item.good_snapshot.pricing_model === 'GOLD',
+                show:
+                  (mustPrintConfig.item_wage ?? true) &&
+                  item.good_snapshot.pricing_model === 'GOLD',
               },
               {
                 label: 'سود',
-                value: formatWithCurrency(item.payload.wages),
-                show: mustPrintConfig.items?.profit && item.good_snapshot.pricing_model === 'GOLD',
+                value: formatWithCurrency(item.payload.profit),
+                show:
+                  (mustPrintConfig.item_profit ?? true) &&
+                  item.good_snapshot.pricing_model === 'GOLD',
               },
               {
                 label: 'حق‌العمل',
                 value: formatWithCurrency(item.payload.commission),
                 show:
-                  mustPrintConfig.items?.commission && item.good_snapshot.pricing_model === 'GOLD',
+                  (mustPrintConfig.item_commission ?? true) &&
+                  item.good_snapshot.pricing_model === 'GOLD',
               },
               {
                 label: 'مالیات بر ارزش افزوده',
-                value: 'item.good.tax',
-                show: mustPrintConfig.items?.tax,
+                value: formatWithCurrency(item.tax_amount),
+                show: mustPrintConfig.item_tax ?? true,
               },
               {
                 label: 'تخفیف',
-                value: formatWithCurrency(item.discount),
-                show: mustPrintConfig.items?.discount,
+                value: formatWithCurrency(item.discount_amount),
+                show: mustPrintConfig.item_discount ?? true,
               },
               {
                 label: 'مبلغ کل',
                 value: formatWithCurrency(item.total_amount),
-                show: mustPrintConfig.items?.total_amount,
+                show: mustPrintConfig.item_total_amount ?? true,
               },
             ],
           });
         }
       }
+
+      console.log(defaultPrintItems);
+
       return defaultPrintItems;
     }
     return null;
@@ -389,6 +392,7 @@ export class SharedSaleInvoiceSingleViewComponent {
   printInvoice = async () => {
     try {
       const printItems = await this.preparePrint();
+
       if (printItems) {
         this.nativeBridge.print(printItems);
       }
@@ -399,75 +403,6 @@ export class SharedSaleInvoiceSingleViewComponent {
     }
   };
 
-  columns: IColumn[] = [
-    {
-      field: 'name',
-      header: 'عنوان',
-      type: 'nested',
-      nestedOption: {
-        path: 'good_snapshot.name',
-      },
-    },
-    {
-      field: 'sku_code',
-      header: 'شناسه کالا',
-    },
-    {
-      field: 'unit_price',
-      header: 'قیمت واحد',
-      type: 'price',
-    },
-    {
-      field: 'quantity',
-      header: 'مقدار',
-      customDataModel(item) {
-        return `${item.quantity} ${item.measure_unit_text}`;
-      },
-    },
-    {
-      field: 'commission',
-      header: 'کارمزد',
-      type: 'nested',
-      nestedOption: {
-        path: 'payload.commission',
-        type: 'price',
-      },
-    },
-    {
-      field: 'wages',
-      header: 'اجرت',
-      type: 'nested',
-      nestedOption: {
-        path: 'payload.wages',
-        type: 'price',
-      },
-    },
-    {
-      field: 'profit',
-      header: 'سود',
-      type: 'nested',
-      nestedOption: {
-        path: 'payload.profit',
-        type: 'price',
-      },
-    },
-    {
-      field: 'discount_amount',
-      header: 'مبلغ تخفیف',
-      type: 'price',
-    },
-    {
-      field: 'tax_amount',
-      header: 'مبلغ مالیات',
-      type: 'price',
-    },
-    {
-      field: 'total_amount',
-      header: 'مبلغ قابل پرداخت',
-      type: 'price',
-    },
-  ];
-
   refresh() {
     this.onRefresh.emit();
   }
@@ -503,10 +438,10 @@ export class SharedSaleInvoiceSingleViewComponent {
 
         const quantity = Number(item.quantity || 0);
         const unit_price = Number(source.unit_price || 0);
-        const discount_amount = Number(source.discount || 0);
+        const discount_amount = Number(source.discount_amount || 0);
         const base_total_amount = unit_price * quantity;
         const total_amount = Number(source.total_amount || 0);
-        const tax_amount = Number(source.payload?.wages || 0);
+        const tax_amount = Number(source.tax_amount || 0);
 
         return {
           good_id: source.good_id,
@@ -537,4 +472,11 @@ export class SharedSaleInvoiceSingleViewComponent {
   returnSubmit(event: ReturnFromSaleFormValue) {
     this.sendReturnFromSale(this.mapReturnFromSaleRequest(event));
   }
+
+  backToPrevPage() {
+    this.navigationService.back(this.backRoute);
+  }
+  showQrCode() {
+    this.showQrCodeDialog.set(true);
+  }
 }