From d857361cb70b8433dbf56e31d4d0d980624113e6 Mon Sep 17 00:00:00 2001
From: ahasani194 <ahasani194@gmail.com>
Date: Fri, 24 Apr 2026 02:23:47 +0330
Subject: [PATCH] Refactor nested column definitions and improve license info
 handling

- Updated column definitions in various components to use `nestedOption` instead of `nestedPath` for better clarity and consistency.
- Removed commented-out license status checks and related UI elements from the layout component.
- Simplified license info interface by removing unnecessary properties.
- Enhanced consumer accounts and business activities components to display additional license information.
- Adjusted form components to conditionally include fields based on selected device type.
- Improved the handling of discount calculations in the gold payload form component.
- Added new fields for branch code in complex components and adjusted related views.
- Cleaned up unused console logs in form data utility.
---
 .../invoices/shared-saleInvoice.component.ts  |  4 +-
 .../license-info-dialog.component.html        |  4 +-
 .../license-info-dialog.component.ts          |  7 +--
 .../consumer/constants/components/pos/pos.ts  |  9 ++-
 .../consumer/layouts/layout.component.html    |  4 +-
 .../consumer/layouts/layout.component.ts      |  9 ++-
 src/app/domains/consumer/models/io.d.ts       | 10 ----
 .../modules/accounts/views/list.component.ts  | 14 ++++-
 .../components/complexes/list.component.ts    |  1 +
 .../components/goods/list.component.ts        |  7 ++-
 .../components/list.component.ts              | 19 ++++++-
 .../modules/businessActivities/models/io.d.ts |  9 +++
 .../views/complexes/single.component.html     |  1 +
 .../components/saleInvoices/list.component.ts |  2 +-
 .../poses/components/list.component.ts        |  4 +-
 .../saleInvoices/components/list.component.ts |  2 +-
 .../modules/accounts/views/list.component.ts  | 14 ++++-
 .../components/accounts/list.component.ts     |  6 +-
 .../businessActivities/list.component.ts      | 19 ++++++-
 .../components/poses/form.component.html      |  2 +-
 .../components/poses/form.component.ts        |  9 +++
 .../components/poses/list.component.ts        | 11 +++-
 .../models/businessActivities_io.d.ts         | 11 +++-
 .../businessActivities/single.component.html  |  2 +
 .../views/complexes/single.component.html     |  1 +
 .../consumers/views/single.component.html     | 28 ---------
 .../payloads/gold/form.component.html         | 15 ++++-
 .../payloads/gold/form.component.ts           | 26 ++++++++-
 .../components/accounts/list.component.ts     |  4 +-
 .../businessActivities/list.component.ts      |  2 +-
 .../components/poses/list.component.ts        | 11 +++-
 .../views/complexes/single.component.html     |  1 +
 .../modules/devices/views/list.component.ts   |  7 ++-
 .../guilds/components/goods/list.component.ts |  7 ++-
 .../components/accounts/list.component.ts     |  4 +-
 .../amount-percentage-input.component.html    | 11 ++++
 .../amount-percentage-input.component.ts      | 18 +++++-
 .../pageDataList/page-data-list.component.ts  | 57 +++++++++++--------
 src/app/uikit/uikit-field.component.html      | 10 +++-
 src/app/uikit/uikit-field.component.ts        |  4 +-
 src/app/utils/form-data.util.ts               |  3 -
 41 files changed, 268 insertions(+), 121 deletions(-)

diff --git a/src/app/domains/consumer/components/invoices/shared-saleInvoice.component.ts b/src/app/domains/consumer/components/invoices/shared-saleInvoice.component.ts
index 8aa5fff..23c62ef 100644
--- a/src/app/domains/consumer/components/invoices/shared-saleInvoice.component.ts
+++ b/src/app/domains/consumer/components/invoices/shared-saleInvoice.component.ts
@@ -44,7 +44,9 @@ export class ConsumerSaleInvoiceSharedComponent {
       field: 'name',
       header: 'عنوان',
       type: 'nested',
-      nestedPath: 'good.name',
+      nestedOption: {
+        path: 'good.name',
+      },
     },
     {
       field: 'unit_price',
diff --git a/src/app/domains/consumer/components/license-info-dialog.component.html b/src/app/domains/consumer/components/license-info-dialog.component.html
index 448a83e..32055cd 100644
--- a/src/app/domains/consumer/components/license-info-dialog.component.html
+++ b/src/app/domains/consumer/components/license-info-dialog.component.html
@@ -6,7 +6,7 @@
   [closable]="true"
   (onHide)="close()"
 >
-  @if (!licenseStatus()) {
+  <!-- @if (!licenseStatus()) {
     <p-message severity="warn" [closable]="false" variant="text" icon="pi pi-info-circle" class="mb-5">
       برای کاربر شما لایسنسی در نظر گرفته نشده است. برای پیگیری با پشتیبانی تماس بگیرید.
     </p-message>
@@ -21,5 +21,5 @@
       <app-key-value label="انقضای لایسنس" [value]="license()?.expires_at!" type="date" />
       <app-key-value label="ارایه شده توسط" [value]="license()?.partner?.name || 'برند نرم‌افزار'" />
     </div>
-  }
+  } -->
 </p-dialog>
diff --git a/src/app/domains/consumer/components/license-info-dialog.component.ts b/src/app/domains/consumer/components/license-info-dialog.component.ts
index 3899fd2..5ef5f48 100644
--- a/src/app/domains/consumer/components/license-info-dialog.component.ts
+++ b/src/app/domains/consumer/components/license-info-dialog.component.ts
@@ -1,7 +1,6 @@
 import { AbstractDialog } from '@/shared/abstractClasses/abstract-dialog';
 import { KeyValueComponent } from '@/shared/components';
-import { getLicenseStatus } from '@/utils';
-import { Component, computed, inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { Dialog } from 'primeng/dialog';
 import { Message } from 'primeng/message';
 import { ConsumerStore } from '../store/main.store';
@@ -14,7 +13,7 @@ import { ConsumerStore } from '../store/main.store';
 export class ConsumerLicenseInfoDialogComponent extends AbstractDialog {
   private readonly store = inject(ConsumerStore);
 
-  license = computed(() => this.store.entity()?.license_info);
+  // license = computed(() => this.store.entity()?.license_info);
 
-  licenseStatus = computed(() => getLicenseStatus(getLicenseStatus(this.license()?.expires_at)));
+  // licenseStatus = computed(() => getLicenseStatus(getLicenseStatus(this.license()?.expires_at)));
 }
diff --git a/src/app/domains/consumer/constants/components/pos/pos.ts b/src/app/domains/consumer/constants/components/pos/pos.ts
index 19c8ad1..20e7585 100644
--- a/src/app/domains/consumer/constants/components/pos/pos.ts
+++ b/src/app/domains/consumer/constants/components/pos/pos.ts
@@ -7,8 +7,13 @@ export const columns: IColumn[] = [
   { field: 'name', header: 'عنوان' },
   { field: 'serial', header: 'شماره سریال' },
   { field: 'pos_type', header: 'نوع دستگاه' },
-  { field: 'device', header: 'دستگاه', type: 'nested', nestedPath: 'device.name' },
-  { field: 'provider', header: 'ارایه‌دهنده', type: 'nested', nestedPath: 'provider.name' },
+  { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } },
+  {
+    field: 'provider',
+    header: 'ارایه‌دهنده',
+    type: 'nested',
+    nestedOption: { path: 'provider.name' },
+  },
   { field: 'status', header: 'وضعیت' },
   {
     field: 'created_at',
diff --git a/src/app/domains/consumer/layouts/layout.component.html b/src/app/domains/consumer/layouts/layout.component.html
index e1c60a3..22f07b3 100644
--- a/src/app/domains/consumer/layouts/layout.component.html
+++ b/src/app/domains/consumer/layouts/layout.component.html
@@ -1,4 +1,4 @@
-<ng-template #topBarMoreAction>
+<!-- <ng-template #topBarMoreAction>
   @if (licenseStatus() === "ACTIVE") {
     <p-button outlined severity="success" size="small" (click)="showLicenseInfo()">لایسنس فعال</p-button>
   } @else if (licenseStatus() === "EXPIRED") {
@@ -12,7 +12,7 @@
       <i class="pi pi-question-circle" pButtonIcon></i>
     </p-button>
   }
-</ng-template>
+</ng-template> -->
 
 <consumer-license-info-dialog [(visible)]="visibleLicenseInfo" />
 
diff --git a/src/app/domains/consumer/layouts/layout.component.ts b/src/app/domains/consumer/layouts/layout.component.ts
index 45d1628..795f970 100644
--- a/src/app/domains/consumer/layouts/layout.component.ts
+++ b/src/app/domains/consumer/layouts/layout.component.ts
@@ -1,6 +1,5 @@
 import { LayoutService } from '@/layout/service/layout.service';
-import { getLicenseStatus } from '@/utils';
-import { Component, computed, inject, signal, TemplateRef, ViewChild } from '@angular/core';
+import { Component, inject, signal, TemplateRef, ViewChild } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 import { Button, ButtonIcon } from 'primeng/button';
 import { ConsumerLicenseInfoDialogComponent } from '../components/license-info-dialog.component';
@@ -20,9 +19,9 @@ export class LayoutComponent {
 
   visibleLicenseInfo = signal(false);
 
-  licenseStatus = computed(() =>
-    getLicenseStatus(getLicenseStatus(this.store.entity()?.license_info?.expires_at)),
-  );
+  // licenseStatus = computed(() =>
+  //   getLicenseStatus(getLicenseStatus(this.store.entity()?.license_info?.expires_at)),
+  // );
 
   ngOnInit() {
     this.layoutService.setMenuItems(CONSUMER_MENU_ITEMS);
diff --git a/src/app/domains/consumer/models/io.d.ts b/src/app/domains/consumer/models/io.d.ts
index 578bdd1..bd4bc85 100644
--- a/src/app/domains/consumer/models/io.d.ts
+++ b/src/app/domains/consumer/models/io.d.ts
@@ -5,15 +5,5 @@ export interface IConsumerInfoRawResponse {
   mobile_number: string;
   status: string;
   fullname: string;
-  license_info: LicenseInfo;
 }
 export interface IConsumerInfoResponse extends IConsumerInfoRawResponse {}
-
-interface LicenseInfo {
-  id: string;
-  starts_at: string;
-  expires_at: string;
-  partner: {
-    name: string;
-  };
-}
diff --git a/src/app/domains/consumer/modules/accounts/views/list.component.ts b/src/app/domains/consumer/modules/accounts/views/list.component.ts
index 714ee2b..62a5254 100644
--- a/src/app/domains/consumer/modules/accounts/views/list.component.ts
+++ b/src/app/domains/consumer/modules/accounts/views/list.component.ts
@@ -20,9 +20,19 @@ export class ConsumerAccountsComponent extends AbstractList<IAccountResponse> {
   override setColumns(): void {
     this.columns = [
       { field: 'id', header: 'شناسه', type: 'id' },
-      { field: 'username', header: 'نام کاربری', type: 'nested', nestedPath: 'account.username' },
+      {
+        field: 'username',
+        header: 'نام کاربری',
+        type: 'nested',
+        nestedOption: { path: 'account.username' },
+      },
       { field: 'role', header: 'نقش' },
-      { field: 'status', header: 'وضعیت', type: 'nested', nestedPath: 'account.status' },
+      {
+        field: 'status',
+        header: 'وضعیت',
+        type: 'nested',
+        nestedOption: { path: 'account.status' },
+      },
       {
         field: 'created_at',
         header: 'تاریخ ایجاد',
diff --git a/src/app/domains/consumer/modules/businessActivities/components/complexes/list.component.ts b/src/app/domains/consumer/modules/businessActivities/components/complexes/list.component.ts
index 5596eb5..f50dca0 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/complexes/list.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/components/complexes/list.component.ts
@@ -22,6 +22,7 @@ export class ConsumerComplexListComponent extends AbstractList<IComplexResponse>
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
+    { field: 'branch_code', header: 'کد شعبه' },
     {
       field: 'created_at',
       header: 'تاریخ ایجاد',
diff --git a/src/app/domains/consumer/modules/businessActivities/components/goods/list.component.ts b/src/app/domains/consumer/modules/businessActivities/components/goods/list.component.ts
index 86c5046..bb4cb41 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/goods/list.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/components/goods/list.component.ts
@@ -23,7 +23,12 @@ export class ConsumerComplexGoodsListComponent extends AbstractList<IConsumerCom
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'sku', header: 'شناسه‌ی عمومی' },
-    { field: 'category', header: 'دسته‌بندی', type: 'nested', nestedPath: 'category.name' },
+    {
+      field: 'category',
+      header: 'دسته‌بندی',
+      type: 'nested',
+      nestedOption: { path: 'category.name' },
+    },
     {
       field: 'created_at',
       header: 'تاریخ ایجاد',
diff --git a/src/app/domains/consumer/modules/businessActivities/components/list.component.ts b/src/app/domains/consumer/modules/businessActivities/components/list.component.ts
index db0d24b..6bf7cd7 100644
--- a/src/app/domains/consumer/modules/businessActivities/components/list.component.ts
+++ b/src/app/domains/consumer/modules/businessActivities/components/list.component.ts
@@ -21,7 +21,24 @@ export class ConsumerBusinessActivityListComponent extends AbstractList<IBusines
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
-    { field: 'guild', header: 'صنف', type: 'nested', nestedPath: 'guild.name' },
+    { field: 'guild', header: 'صنف', type: 'nested', nestedOption: { path: 'guild.name' } },
+    {
+      field: 'license_info',
+      header: 'محدودیت کاربر',
+      customDataModel(item) {
+        const licenseInfo = (item as IBusinessActivityResponse).license_info;
+        if (!licenseInfo) {
+          return 'بدون مجوز';
+        }
+        return `${licenseInfo.accounts_limit} کاربر`;
+      },
+    },
+    {
+      field: 'license_info',
+      header: 'انقضای مجوز',
+      type: 'nested',
+      nestedOption: { path: 'license_info.expires_at', type: 'date' },
+    },
     {
       field: 'created_at',
       header: 'تاریخ ایجاد',
diff --git a/src/app/domains/consumer/modules/businessActivities/models/io.d.ts b/src/app/domains/consumer/modules/businessActivities/models/io.d.ts
index 9a9f1ca..2d12b53 100644
--- a/src/app/domains/consumer/modules/businessActivities/models/io.d.ts
+++ b/src/app/domains/consumer/modules/businessActivities/models/io.d.ts
@@ -5,6 +5,8 @@ export interface IBusinessActivityRawResponse {
   name: string;
   economic_code: string;
   guild: ISummary;
+  created_at: string;
+  license_info: LicenseInfo;
 }
 export interface IBusinessActivityResponse extends IBusinessActivityRawResponse {}
 
@@ -12,3 +14,10 @@ export interface IBusinessActivityRequest {
   economic_code: string;
   name: string;
 }
+
+interface LicenseInfo {
+  id: string;
+  starts_at: string;
+  expires_at: string;
+  accounts_limit: number;
+}
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 6ce51b1..ef22f77 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
@@ -3,6 +3,7 @@
     <div class="flex flex-col gap-4">
       <div class="grid grid-cols-3 gap-4 items-center">
         <app-key-value label="عنوان" [value]="complex()?.name" />
+        <app-key-value label="کد شعبه" [value]="complex()?.branch_code" />
         <app-key-value label="آدرس" [value]="complex()?.address" />
       </div>
     </div>
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 23c60fb..5fce05f 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
@@ -36,7 +36,7 @@ export class ConsumerCustomerSaleInvoiceListComponent extends AbstractList<ICust
       field: 'account',
       header: 'ایجاد شده توسط',
       type: 'nested',
-      nestedPath: 'account.account.username',
+      nestedOption: { path: 'account.account.username' },
     },
     {
       field: 'invoice_date',
diff --git a/src/app/domains/consumer/modules/poses/components/list.component.ts b/src/app/domains/consumer/modules/poses/components/list.component.ts
index 9e4b446..6b06009 100644
--- a/src/app/domains/consumer/modules/poses/components/list.component.ts
+++ b/src/app/domains/consumer/modules/poses/components/list.component.ts
@@ -39,13 +39,13 @@ export class ConsumerPosListComponent extends AbstractList<IPosResponse> {
         field: 'complex.business_activity',
         header: 'عنوان کسب و کار',
         type: 'nested',
-        nestedPath: 'complex.business_activity.name',
+        nestedOption: { path: 'complex.business_activity.name' },
       },
       {
         field: 'complex',
         header: 'عنوان شعبه',
         type: 'nested',
-        nestedPath: 'complex.name',
+        nestedOption: { path: 'complex.name' },
       },
       {
         field: 'customAction',
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 105b6d9..f0e470e 100644
--- a/src/app/domains/consumer/modules/saleInvoices/components/list.component.ts
+++ b/src/app/domains/consumer/modules/saleInvoices/components/list.component.ts
@@ -35,7 +35,7 @@ export class ConsumerSaleInvoiceListComponent extends AbstractList<IConsumerSale
       field: 'account',
       header: 'ایجاد شده توسط',
       type: 'nested',
-      nestedPath: 'account.account.username',
+      nestedOption: { path: 'account.account.username' },
     },
     {
       field: 'invoice_date',
diff --git a/src/app/domains/partner/modules/accounts/views/list.component.ts b/src/app/domains/partner/modules/accounts/views/list.component.ts
index 25d4c39..05f36ce 100644
--- a/src/app/domains/partner/modules/accounts/views/list.component.ts
+++ b/src/app/domains/partner/modules/accounts/views/list.component.ts
@@ -20,9 +20,19 @@ export class PartnerAccountsComponent extends AbstractList<IAccountResponse> {
   override setColumns(): void {
     this.columns = [
       { field: 'id', header: 'شناسه', type: 'id' },
-      { field: 'username', header: 'نام کاربری', type: 'nested', nestedPath: 'account.username' },
+      {
+        field: 'username',
+        header: 'نام کاربری',
+        type: 'nested',
+        nestedOption: { path: 'account.username' },
+      },
       { field: 'role', header: 'نقش' },
-      { field: 'status', header: 'وضعیت', type: 'nested', nestedPath: 'account.status' },
+      {
+        field: 'status',
+        header: 'وضعیت',
+        type: 'nested',
+        nestedOption: { path: 'account.status' },
+      },
       {
         field: 'created_at',
         header: 'تاریخ ایجاد',
diff --git a/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts b/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts
index 12a7030..f7e7c7c 100644
--- a/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts
+++ b/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts
@@ -20,17 +20,17 @@ export class ConsumerAccountListComponent extends AbstractList<IConsumerAccountR
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     {
-      field: 'username',
+      field: 'account',
       header: 'نام کاربری',
       type: 'nested',
-      nestedPath: 'account.username',
+      nestedOption: { path: 'account.username' },
     },
     { field: 'role', header: 'نوع حساب' },
     {
       field: 'status',
       header: 'وضعیت',
       type: 'nested',
-      nestedPath: 'account.status',
+      nestedOption: { path: 'account.status' },
     },
     {
       field: 'created_at',
diff --git a/src/app/domains/partner/modules/consumers/components/businessActivities/list.component.ts b/src/app/domains/partner/modules/consumers/components/businessActivities/list.component.ts
index 5220b2d..d77d68c 100644
--- a/src/app/domains/partner/modules/consumers/components/businessActivities/list.component.ts
+++ b/src/app/domains/partner/modules/consumers/components/businessActivities/list.component.ts
@@ -22,7 +22,24 @@ export class ConsumerBusinessActivitiesComponent extends AbstractList<IBusinessA
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
-    { field: 'guild', header: 'صنف', type: 'nested', nestedPath: 'name' },
+    { field: 'guild', header: 'صنف', type: 'nested', nestedOption: { path: 'guild.name' } },
+    {
+      field: 'license_info',
+      header: 'محدودیت کاربر',
+      customDataModel(item) {
+        const licenseInfo = (item as IBusinessActivityResponse).license_info;
+        if (!licenseInfo) {
+          return 'بدون مجوز';
+        }
+        return `${licenseInfo.accounts_limit} کاربر`;
+      },
+    },
+    {
+      field: 'license_info',
+      header: 'انقضای مجوز',
+      type: 'nested',
+      nestedOption: { path: 'license_info.expires_at', type: 'date' },
+    },
     {
       field: 'created_at',
       header: 'تاریخ ایجاد',
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 d902c50..f36b21d 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
@@ -8,10 +8,10 @@
 >
   <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
     <app-input label="عنوان" [control]="form.controls.name" name="name" />
-    <app-input label="سریال دستگاه" [control]="form.controls.serial" name="serial" />
     <!-- <app-input label="مدل دستگاه" [control]="form.controls.model" name="model" /> -->
     <app-enum-select [control]="form.controls.pos_type" type="posType" name="pos_type" />
     @if (form.controls.pos_type.value === "PSP") {
+      <app-input label="سریال دستگاه" [control]="form.controls.serial" name="serial" />
       <catalog-device-select [control]="form.controls.device_id" />
       <catalog-provider-select [control]="form.controls.provider_id" />
     }
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 dc3c8bd..5b06fe4 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
@@ -43,6 +43,13 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
     });
     form.controls.pos_type.valueChanges.subscribe((value) => {
       if (value === 'PSP') {
+        form.addControl(
+          'serial',
+          this.fb.control<string>(this.initialValues?.serial ?? '', {
+            nonNullable: true,
+            validators: [Validators.required],
+          }),
+        );
         form.addControl(
           'device_id',
           this.fb.control<string>(this.initialValues?.device?.id ?? '', {
@@ -58,6 +65,8 @@ export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IP
           }),
         );
       } else {
+        // @ts-ignore
+        form.removeControl('serial');
         // @ts-ignore
         form.removeControl('device_id');
         // @ts-ignore
diff --git a/src/app/domains/partner/modules/consumers/components/poses/list.component.ts b/src/app/domains/partner/modules/consumers/components/poses/list.component.ts
index 9ee367d..b3c144e 100644
--- a/src/app/domains/partner/modules/consumers/components/poses/list.component.ts
+++ b/src/app/domains/partner/modules/consumers/components/poses/list.component.ts
@@ -24,10 +24,15 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
-    { field: 'serial', header: 'شماره سریال' },
-    { field: 'device', header: 'دستگاه', type: 'nested', nestedPath: 'device.name' },
+    { field: 'serial_number', header: 'شماره سریال' },
+    { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } },
     { field: 'pos_type', header: 'نوع دستگاه' },
-    { field: 'provider', header: 'ارایه‌دهنده', type: 'nested', nestedPath: 'provider.name' },
+    {
+      field: 'provider',
+      header: 'ارایه‌دهنده',
+      type: 'nested',
+      nestedOption: { path: 'provider.name' },
+    },
     { field: 'status', header: 'وضعیت' },
     {
       field: 'created_at',
diff --git a/src/app/domains/partner/modules/consumers/models/businessActivities_io.d.ts b/src/app/domains/partner/modules/consumers/models/businessActivities_io.d.ts
index 7ca3553..29c3708 100644
--- a/src/app/domains/partner/modules/consumers/models/businessActivities_io.d.ts
+++ b/src/app/domains/partner/modules/consumers/models/businessActivities_io.d.ts
@@ -1,10 +1,12 @@
 import ISummary from '@/core/models/summary';
 
 export interface IBusinessActivityRawResponse {
+  id: string;
   name: string;
   economic_code: string;
   guild: ISummary;
-  id: string;
+  created_at: string;
+  license_info: LicenseInfo;
 }
 export interface IBusinessActivityResponse extends IBusinessActivityRawResponse {}
 
@@ -13,3 +15,10 @@ export interface IBusinessActivityRequest {
   economic_code: string;
   guild_id: string;
 }
+
+interface LicenseInfo {
+  id: string;
+  starts_at: string;
+  expires_at: string;
+  accounts_limit: number;
+}
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 e53c363..6603c20 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
@@ -5,6 +5,8 @@
         <app-key-value label="عنوان" [value]="businessActivity()?.name" />
         <app-key-value label="کد اقتصادی" [value]="businessActivity()?.economic_code" />
         <app-key-value label="صنف" [value]="businessActivity()?.guild?.name" />
+        <app-key-value label="تاریخ انقضای مجوز" [value]="businessActivity()?.license_info?.expires_at" type="date" />
+        <app-key-value label="تعداد کاربران مجاز" [value]="businessActivity()?.license_info?.accounts_limit" />
       </div>
     </div>
   </app-card-data>
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 68be6af..fc23176 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
@@ -3,6 +3,7 @@
     <div class="flex flex-col gap-4">
       <div class="grid grid-cols-3 gap-4 items-center">
         <app-key-value label="عنوان" [value]="complex()?.name" />
+        <app-key-value label="کد شعبه" [value]="complex()?.branch_code" />
         <app-key-value label="آدرس" [value]="complex()?.address" />
       </div>
     </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 d3a48c6..55573ae 100644
--- a/src/app/domains/partner/modules/consumers/views/single.component.html
+++ b/src/app/domains/partner/modules/consumers/views/single.component.html
@@ -6,25 +6,6 @@
         <app-key-value label="نام مشتری" [value]="consumer()?.fullname" />
         <app-key-value label="شماره موبایل" [value]="consumer()?.mobile_number" />
         <app-key-value label="وضعیت" [value]="consumer()?.status" />
-        @if (licenseStatus() === "EXPIRED") {
-          <app-key-value label="وضعیت لایسنس">
-            <p-button size="small" outlined severity="warn" (onClick)="openLicenseForm()">
-              منقضی شده در <span [jalaliDate]="license()!.expires_at"></span>
-            </p-button>
-          </app-key-value>
-          <!-- <app-key-value label="ارایه شده توسط" [value]="license()?.partner?.name || 'برند نرم‌افزار'" /> -->
-        } @else if (licenseStatus() === "ACTIVE") {
-          <app-key-value label="وضعیت لایسنس">
-            <p-button size="small" outlined severity="success" (onClick)="openLicenseForm()">
-              تا تاریخ <span [jalaliDate]="license()!.expires_at"></span>
-            </p-button>
-          </app-key-value>
-          <!-- <app-key-value label="ارایه شده توسط" [value]="license()?.partner?.name || 'برند نرم‌افزار'" /> -->
-        } @else {
-          <app-key-value label="وضعیت لایسنس">
-            <p-button size="small" outlined severity="danger" (onClick)="openLicenseForm()"> ارایه نشده </p-button>
-          </app-key-value>
-        }
       </div>
     </div>
   </app-card-data>
@@ -39,13 +20,4 @@
     [initialValues]="consumer() || undefined"
     (onSubmit)="getData()"
   />
-
-  <partner-consumer-license-form
-    [(visible)]="visibleLicenseForm"
-    [editMode]="!!license()?.id"
-    [consumerId]="consumerId()"
-    [licenseId]="license()?.id"
-    [initialValues]="license() || undefined"
-    (onSubmit)="getData()"
-  />
 </div>
diff --git a/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.html b/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.html
index 1aad815..6c7afc4 100644
--- a/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.html
+++ b/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.html
@@ -34,12 +34,21 @@
   <app-amount-percentage-input
     [percentageControl]="form.controls.discount_percentage"
     [amountControl]="form.controls.discount_amount"
-    [baseAmount]="baseTotalAmount()"
+    [baseAmount]="baseAmountForDiscountCalculation()"
     [minAmount]="0"
-    [maxAmount]="baseTotalAmount()"
+    [maxAmount]="baseAmountForDiscountCalculation()"
     name="discount"
     label="تخفیف"
-  />
+  >
+    <ng-template #labelSuffix>
+      <p-selectButton
+        [options]="discountTypeItems"
+        optionLabel="label"
+        optionValue="value"
+        (onChange)="changeDiscountCalculation($event)"
+      />
+    </ng-template>
+  </app-amount-percentage-input>
 
   <hr />
   <div class="flex flex-col gap-4 justify-center w-full">
diff --git a/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts b/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts
index 8baaa88..c4d34df 100644
--- a/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts
+++ b/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts
@@ -7,6 +7,7 @@ import { formatWithCurrency } from '@/utils';
 import { Component, EventEmitter, Output, signal } from '@angular/core';
 import { ReactiveFormsModule, Validators } from '@angular/forms';
 import { Button } from 'primeng/button';
+import { SelectButton, SelectButtonChangeEvent } from 'primeng/selectbutton';
 import { IGoldPayload, IPosOrderItem } from '../../../models';
 import { PosFormDialogAmountCardTemplateComponent } from '../form-dialog-amount-card-template.component';
 
@@ -19,6 +20,7 @@ import { PosFormDialogAmountCardTemplateComponent } from '../form-dialog-amount-
     EnumSelectComponent,
     Button,
     PosFormDialogAmountCardTemplateComponent,
+    SelectButton,
     AmountPercentageInputComponent,
   ],
 })
@@ -29,9 +31,22 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
   @Output() onSubmitForm = new EventEmitter<IGoldPayload>();
   @Output() onChangeTotalAmount = new EventEmitter<number>();
 
+  readonly discountTypeItems = [
+    {
+      label: 'از سود',
+      value: 1,
+    },
+    {
+      label: 'از کل',
+      value: 2,
+    },
+  ];
+
+  discountType = signal<number>(1);
   unitWithQuantity = signal<number>(0);
   totalAmountBeforeProfit = signal<number>(0);
   baseTotalAmount = signal<number>(0);
+  baseAmountForDiscountCalculation = signal<number>(0);
   taxAmount = signal<number>(0);
   totalAmount = signal<number>(0);
 
@@ -94,7 +109,7 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
 
   updateCalculateAmount(payload: Partial<IPosOrderItem<any>>) {
     const commissionAmount = Number(payload.payload?.commission_amount ?? '0');
-    const wageAmount = Number(payload.payload?.wages ?? '0');
+    const wageAmount = Number(payload.payload?.wages_amount ?? '0');
     const discountAmount = Number(payload.discount_amount ?? '0');
     const profitAmount = Number(payload.payload?.profit_amount ?? '0');
     const unitPrice = Number(payload.unit_price ?? '0');
@@ -103,6 +118,8 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
     const unitWithQuantity = unitPrice * quantity;
     const totalAmountBeforeProfit = unitWithQuantity + wageAmount + commissionAmount;
     const baseTotalAmount = totalAmountBeforeProfit + profitAmount;
+    const baseAmountForDiscountCalculation =
+      this.discountType() === 1 ? profitAmount : baseTotalAmount;
     const taxAmount = (profitAmount + commissionAmount + wageAmount - discountAmount) * 0.1;
     const totalAmount = baseTotalAmount - discountAmount + taxAmount;
 
@@ -111,6 +128,7 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
     this.baseTotalAmount.set(baseTotalAmount);
     this.taxAmount.set(taxAmount);
     this.totalAmount.set(totalAmount);
+    this.baseAmountForDiscountCalculation.set(baseAmountForDiscountCalculation);
 
     this.onChangeTotalAmount.emit(totalAmount);
   }
@@ -121,4 +139,10 @@ export class PosGoldPayloadFormComponent extends AbstractForm<
     }
     return `(${formatWithCurrency(amount)})`;
   }
+
+  changeDiscountCalculation($event: SelectButtonChangeEvent) {
+    this.discountType.set($event.value);
+
+    this.updateCalculateAmount(this.form.value as any);
+  }
 }
diff --git a/src/app/domains/superAdmin/modules/consumers/components/accounts/list.component.ts b/src/app/domains/superAdmin/modules/consumers/components/accounts/list.component.ts
index 876abd4..7ec7680 100644
--- a/src/app/domains/superAdmin/modules/consumers/components/accounts/list.component.ts
+++ b/src/app/domains/superAdmin/modules/consumers/components/accounts/list.component.ts
@@ -23,14 +23,14 @@ export class ConsumerAccountListComponent extends AbstractList<IConsumerAccountR
       field: 'username',
       header: 'نام کاربری',
       type: 'nested',
-      nestedPath: 'account.username',
+      nestedOption: { path: 'account.username' },
     },
     { field: 'role', header: 'نوع حساب' },
     {
       field: 'status',
       header: 'وضعیت',
       type: 'nested',
-      nestedPath: 'account.status',
+      nestedOption: { path: 'account.status' },
     },
     {
       field: 'created_at',
diff --git a/src/app/domains/superAdmin/modules/consumers/components/businessActivities/list.component.ts b/src/app/domains/superAdmin/modules/consumers/components/businessActivities/list.component.ts
index fac3cb2..5130b4d 100644
--- a/src/app/domains/superAdmin/modules/consumers/components/businessActivities/list.component.ts
+++ b/src/app/domains/superAdmin/modules/consumers/components/businessActivities/list.component.ts
@@ -22,7 +22,7 @@ export class ConsumerBusinessActivitiesComponent extends AbstractList<IBusinessA
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
-    { field: 'guild', header: 'صنف', type: 'nested', nestedPath: 'name' },
+    { field: 'guild', header: 'صنف', type: 'nested', nestedOption: { path: 'guild.name' } },
     {
       field: 'created_at',
       header: 'تاریخ ایجاد',
diff --git a/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.ts b/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.ts
index 40e201d..f767b10 100644
--- a/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.ts
+++ b/src/app/domains/superAdmin/modules/consumers/components/poses/list.component.ts
@@ -24,10 +24,15 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
   @Input() header: IColumn[] = [
     { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
-    { field: 'serial', header: 'شماره سریال' },
-    { field: 'device', header: 'دستگاه', type: 'nested', nestedPath: 'device.name' },
+    { field: 'serial_number', header: 'شماره سریال' },
+    { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } },
     { field: 'pos_type', header: 'نوع دستگاه' },
-    { field: 'provider', header: 'ارایه‌دهنده', type: 'nested', nestedPath: 'provider.name' },
+    {
+      field: 'provider',
+      header: 'ارایه‌دهنده',
+      type: 'nested',
+      nestedOption: { path: 'provider.name' },
+    },
     { field: 'status', header: 'وضعیت' },
     {
       field: 'created_at',
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 01192fb..1d2c588 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
@@ -3,6 +3,7 @@
     <div class="flex flex-col gap-4">
       <div class="grid grid-cols-3 gap-4 items-center">
         <app-key-value label="عنوان" [value]="complex()?.name" />
+        <app-key-value label="کد شعبه" [value]="complex()?.branch_code" />
         <app-key-value label="آدرس" [value]="complex()?.address" />
       </div>
     </div>
diff --git a/src/app/domains/superAdmin/modules/devices/views/list.component.ts b/src/app/domains/superAdmin/modules/devices/views/list.component.ts
index 05ed16d..da2bb11 100644
--- a/src/app/domains/superAdmin/modules/devices/views/list.component.ts
+++ b/src/app/domains/superAdmin/modules/devices/views/list.component.ts
@@ -18,7 +18,12 @@ export class DevicesComponent extends AbstractList<IDeviceResponse> {
     this.columns = [
       { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'عنوان' },
-      { field: 'brand', header: 'برند دستگاه', type: 'nested', nestedPath: 'name' },
+      {
+        field: 'brand',
+        header: 'برند دستگاه',
+        type: 'nested',
+        nestedOption: { path: 'brand.name' },
+      },
       {
         field: 'created_at',
         header: 'تاریخ ایجاد',
diff --git a/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.ts b/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.ts
index aa58f1a..e6c5db6 100644
--- a/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.ts
+++ b/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.ts
@@ -21,7 +21,12 @@ export class GuildGoodsListComponent extends AbstractList<IGuildGoodsResponse> {
     { field: 'image_url', header: 'تصویر', type: 'thumbnail' },
     { field: 'name', header: 'عنوان' },
     { field: 'sku', header: 'شناسه‌ی عمومی' },
-    { field: 'category', header: 'دسته‌بندی', type: 'nested', nestedPath: 'category.name' },
+    {
+      field: 'category',
+      header: 'دسته‌بندی',
+      type: 'nested',
+      nestedOption: { path: 'category.name' },
+    },
     {
       field: 'created_at',
       header: 'تاریخ ایجاد',
diff --git a/src/app/domains/superAdmin/modules/partners/components/accounts/list.component.ts b/src/app/domains/superAdmin/modules/partners/components/accounts/list.component.ts
index 28a9202..a198396 100644
--- a/src/app/domains/superAdmin/modules/partners/components/accounts/list.component.ts
+++ b/src/app/domains/superAdmin/modules/partners/components/accounts/list.component.ts
@@ -23,14 +23,14 @@ export class ConsumerAccountListComponent extends AbstractList<IPartnerAccountRe
       field: 'username',
       header: 'نام کاربری',
       type: 'nested',
-      nestedPath: 'account.username',
+      nestedOption: { path: 'account.username' },
     },
     { field: 'role', header: 'نوع حساب' },
     {
       field: 'status',
       header: 'وضعیت',
       type: 'nested',
-      nestedPath: 'account.status',
+      nestedOption: { path: 'account.status' },
     },
     {
       field: 'created_at',
diff --git a/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.html b/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.html
index 4a027f0..2119f0a 100644
--- a/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.html
+++ b/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.html
@@ -5,6 +5,17 @@
   [showLabel]="!!label"
   [showErrors]="showErrors"
 >
+  @if (labelSuffix) {
+    <ng-template #labelView>
+      <div class="flex gap-1 items-center">
+        <uikit-label [name]="name">
+          {{ preparedLabel() }}
+        </uikit-label>
+        <ng-container [ngTemplateOutlet]="labelSuffix"></ng-container>
+      </div>
+    </ng-template>
+  }
+
   <p-inputgroup>
     @if (selectedType.value === "amount") {
       <p-inputnumber
diff --git a/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.ts b/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.ts
index 9e157be..2559717 100644
--- a/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.ts
+++ b/src/app/shared/components/amountPercentageInput/amount-percentage-input.component.ts
@@ -1,8 +1,18 @@
 import { Maybe } from '@/core';
 import { ToastService } from '@/core/services/toast.service';
-import { UikitFieldComponent } from '@/uikit';
+import { UikitFieldComponent, UikitLabelComponent } from '@/uikit';
 import { formatWithCurrency } from '@/utils';
-import { Component, EventEmitter, inject, Input, Output, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  ContentChild,
+  EventEmitter,
+  inject,
+  Input,
+  Output,
+  signal,
+  TemplateRef,
+} from '@angular/core';
 import { FormControl, ReactiveFormsModule } from '@angular/forms';
 import { InputGroup } from 'primeng/inputgroup';
 import { InputGroupAddon } from 'primeng/inputgroupaddon';
@@ -27,6 +37,8 @@ interface IAmountPercentageInputSelect {
     InputText,
     Select,
     InputNumberModule,
+    CommonModule,
+    UikitLabelComponent,
   ],
 })
 export class AmountPercentageInputComponent {
@@ -52,6 +64,8 @@ export class AmountPercentageInputComponent {
   @Output() onTypeChange = new EventEmitter<TAmountPercentageInput>();
   @Output() blur = new EventEmitter<void>();
 
+  @ContentChild('labelSuffix', { static: false }) labelSuffix!: TemplateRef<any> | null;
+
   private readonly toastService = inject(ToastService);
 
   readonly typeSelectOptions: IAmountPercentageInputSelect[] = [
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 11b0475..c8d3d2e 100644
--- a/src/app/shared/components/pageDataList/page-data-list.component.ts
+++ b/src/app/shared/components/pageDataList/page-data-list.component.ts
@@ -22,14 +22,19 @@ import { TableModule } from 'primeng/table';
 import { KeyValueComponent } from '../key-value.component/key-value.component';
 import { TableActionRowComponent } from '../table-action-row.component';
 
+type TDataType = 'simple' | 'price' | 'boolean' | 'date' | 'nested' | 'index' | 'id' | 'thumbnail';
 export interface IColumn<T = any> {
   field: T extends object ? keyof T | string : string;
   header: string;
   width?: string;
   minWidth?: string;
   canCopy?: boolean;
-  type?: 'simple' | 'price' | 'boolean' | 'date' | 'nested' | 'index' | 'id' | 'thumbnail';
-  nestedPath?: string;
+  type?: TDataType;
+
+  nestedOption?: {
+    path: string;
+    type?: TDataType;
+  };
   thumbnailOptions?: {
     editable: boolean;
     deletable: boolean;
@@ -179,36 +184,38 @@ export class PageDataListComponent<I> {
   getCell(item: Record<string, any>, column: IColumn): any {
     if (!item || !column) return '';
     try {
-      const { field } = column;
+      let { field, type } = column;
 
       if (column.customDataModel) {
         return this.renderCustom(column, item);
       }
-      const data = item[String(field)];
-      switch (column.type) {
-        case 'id':
-          if (!data) return '-';
-          return `${data.slice(0, 5)}...${data.slice(data.length - 5, data.length)}`;
-        case 'date':
-          if (!data) return '-';
-          return formatJalali(data);
-        case 'boolean':
-          return data ? 'بله' : 'خیر';
-        case 'price':
-          return formatWithCurrency(data, false, 'ریال');
-        case 'nested': {
-          const path = column.nestedPath;
-          if (!path) return '-';
-          const nestedData = path
-            .split('.')
-            .reduce((obj, key) => (obj && obj[key] !== undefined ? obj[key] : null), item);
 
-          return nestedData || '-';
-        }
-        default:
-          break;
+      let data = item[String(field)];
+      if (column.type === 'nested') {
+        const path = column.nestedOption?.path;
+        if (!path) return '-';
+        data = path
+          .split('.')
+          .reduce((obj, key) => (obj && obj[key] !== undefined ? obj[key] : null), item);
+        type = column.nestedOption?.type || 'simple';
       }
 
+      if (type) {
+        switch (type) {
+          case 'id':
+            if (!data) return '-';
+            return `${data.slice(0, 5)}...${data.slice(data.length - 5, data.length)}`;
+          case 'date':
+            if (!data) return '-';
+            return formatJalali(data);
+          case 'boolean':
+            return data ? 'بله' : 'خیر';
+          case 'price':
+            return formatWithCurrency(data, false, 'ریال');
+          default:
+            break;
+        }
+      }
       if (data === undefined || data === null) {
         return '-';
       }
diff --git a/src/app/uikit/uikit-field.component.html b/src/app/uikit/uikit-field.component.html
index 93c3cd3..3af1b53 100644
--- a/src/app/uikit/uikit-field.component.html
+++ b/src/app/uikit/uikit-field.component.html
@@ -3,9 +3,13 @@
 <ng-template #fieldTemplate>
   @if (showLabel) {
     <div class="flex flex-col gap-1">
-      <uikit-label [name]="name" [invalid]="!!invalid || hasError">
-        {{ label }}
-      </uikit-label>
+      @if (labelView) {
+        <ng-container [ngTemplateOutlet]="labelView"> </ng-container>
+      } @else {
+        <uikit-label [name]="name" [invalid]="!!invalid || hasError">
+          {{ label }}
+        </uikit-label>
+      }
       <ng-container [ngTemplateOutlet]="contentTemplate" />
     </div>
   } @else {
diff --git a/src/app/uikit/uikit-field.component.ts b/src/app/uikit/uikit-field.component.ts
index 38dfd4f..671d5be 100644
--- a/src/app/uikit/uikit-field.component.ts
+++ b/src/app/uikit/uikit-field.component.ts
@@ -1,6 +1,6 @@
 import { FormErrorsService } from '@/core/services/form-errors.service';
 import { CommonModule } from '@angular/common';
-import { Component, Input, inject } from '@angular/core';
+import { Component, ContentChild, Input, TemplateRef, inject } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
 import { MessageModule } from 'primeng/message';
 import { UikitLabelComponent } from './uikit-label.component';
@@ -25,6 +25,8 @@ export class UikitFieldComponent {
   @Input() showErrors: boolean = true;
   @Input() showLabel: boolean = true;
 
+  @ContentChild('labelView', { static: false }) labelView!: TemplateRef<any> | null;
+
   private errorsService = inject(FormErrorsService);
 
   get hasError(): boolean {
diff --git a/src/app/utils/form-data.util.ts b/src/app/utils/form-data.util.ts
index 5fe239f..c515548 100644
--- a/src/app/utils/form-data.util.ts
+++ b/src/app/utils/form-data.util.ts
@@ -4,9 +4,6 @@ export function buildFormData(
 ): FormData {
   const formData = new FormData();
 
-  console.log(formGroup);
-  console.log(formGroup.controls);
-
   Object.keys(formGroup.controls).forEach((key) => {
     const control = formGroup.get(key);
     if (control && control.value !== null && control.value !== undefined) {