update

src/app/domains/consumer/components/license-info-dialog.component.ts

@@ -20,10 +20,7 @@ export class ConsumerLicenseInfoDialogComponent extends AbstractDialog {
     if (!this.store.entity()?.license?.expires_at) {
       return null;
     }
-    if (
+    if (new Date().getTime() > new Date(this.store.entity()?.license?.expires_at || '').getTime()) {
-      new Date().toDateString() >
-      new Date(this.store.entity()?.license?.expires_at || '').toDateString()
-    ) {
       return licenseStatus.EXPIRED;
     }
     return licenseStatus.ACTIVE;

src/app/domains/consumer/layouts/layout.component.ts

@@ -24,10 +24,7 @@ export class LayoutComponent {
     if (!this.store.entity()?.license?.expires_at) {
       return null;
     }
-    if (
+    if (new Date().getTime() > new Date(this.store.entity()?.license?.expires_at || '').getTime()) {
-      new Date().toDateString() >
-      new Date(this.store.entity()?.license?.expires_at || '').toDateString()
-    ) {
       return licenseStatus.EXPIRED;
     }
     return licenseStatus.ACTIVE;

src/app/domains/consumer/modules/accounts/views/list.component.ts

@@ -16,7 +16,7 @@ export class ConsumerAccountsComponent extends AbstractList<IAccountResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'username', header: 'نام کاربری', type: 'nested', nestedPath: 'account.username' },
       { field: 'role', header: 'نقش' },
       { field: 'status', header: 'وضعیت', type: 'nested', nestedPath: 'account.status' },

src/app/domains/consumer/modules/businessActivities/components/complexes/list.component.ts

@@ -20,7 +20,7 @@ export class ConsumerComplexListComponent extends AbstractList<IComplexResponse>
   @Input({ required: true }) businessId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     {
       field: 'created_at',

src/app/domains/consumer/modules/businessActivities/components/goods/list.component.ts

@@ -20,7 +20,7 @@ export class ConsumerComplexGoodsListComponent extends AbstractList<IConsumerCom
   @Input({ required: true }) guildId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'sku', header: 'شناسه‌ی عمومی' },
     { field: 'category', header: 'دسته‌بندی', type: 'nested', nestedPath: 'category.name' },

src/app/domains/consumer/modules/businessActivities/components/list.component.ts

@@ -19,7 +19,7 @@ import { ConsumerBusinessActivityFormComponent } from './form.component';
 export class ConsumerBusinessActivityListComponent extends AbstractList<IBusinessActivityResponse> {
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'guild', header: 'صنف', type: 'nested', nestedPath: 'name' },
     {

src/app/domains/consumer/modules/businessActivities/components/poses/list.component.ts

@@ -21,7 +21,7 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
   @Input({ required: true }) complexId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'serial', header: 'شماره سریال' },
     { field: 'device', header: 'دستگاه', type: 'nested', nestedPath: 'device.name' },

src/app/domains/consumer/modules/businessActivities/views/list.component.ts

@@ -15,7 +15,7 @@ export class ConsumerBusinessActivitiesComponent extends AbstractList<IBusinessA
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'عنوان' },
       {
         field: 'created_at',

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

@@ -18,7 +18,7 @@ export class ConsumerAccountListComponent extends AbstractList<IConsumerAccountR
   @Input({ required: true }) consumerId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     {
       field: 'username',
       header: 'نام کاربری',

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

@@ -20,7 +20,7 @@ export class ConsumerBusinessActivitiesComponent extends AbstractList<IBusinessA
   @Input({ required: true }) consumerId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'guild', header: 'صنف', type: 'nested', nestedPath: 'name' },
     {

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

@@ -21,7 +21,7 @@ export class ConsumerComplexesComponent extends AbstractList<IComplexResponse> {
   @Input() businessId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     {
       field: 'created_at',

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

@@ -42,7 +42,6 @@
           [invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
         />
       </uikit-field>
-    }
       <p-divider align="center"> اطلاعات لایسنس </p-divider>
       <uikit-datepicker
         label="تاریخ شروع لایسنس"
@@ -52,6 +51,8 @@
       />
       <!-- <uikit-datepicker label="تاریخ انقضای لایسنس"  [control]="form.controls.license.controls.expires_at" name="license.expires_at" /> -->
       <app-partner-select label="شریک تجاری" [control]="form.controls.license.controls.partner_id" />
+    }
+
     <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
   </form>
 </p-dialog>

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

@@ -22,7 +22,7 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
   @Input({ required: true }) complexId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'serial', header: 'شماره سریال' },
     { field: 'device', header: 'دستگاه', type: 'nested', nestedPath: 'device.name' },

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

@@ -1,6 +1,7 @@
 // import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
 import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
+import { formatJalali } from '@/utils';
 import { Component, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { ConsumerUserFormComponent } from '../components/form.component';
@@ -19,7 +20,7 @@ export class ConsumersComponent extends AbstractList<IConsumerResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'fullname', header: 'نام' },
       { field: 'mobile_number', header: 'شماره موبایل' },
       { field: 'status', header: 'وضعیت' },
@@ -28,7 +29,7 @@ export class ConsumersComponent extends AbstractList<IConsumerResponse> {
         header: 'تاریخ انقضای لایسنس',
         customDataModel(item) {
           if (item.license) {
-            return item.license.expires_at;
+            return formatJalali(item.license.expires_at);
           }
           return 'بدون لایسنس';
         },

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

@@ -43,10 +43,7 @@ export class ConsumerComponent {
     if (!this.store.entity()?.license?.expires_at) {
       return null;
     }
-    if (
+    if (new Date().getTime() > new Date(this.store.entity()?.license?.expires_at || '').getTime()) {
-      new Date().toDateString() >
-      new Date(this.store.entity()?.license?.expires_at || '').toDateString()
-    ) {
       return licenseStatus.EXPIRED;
     }
     return licenseStatus.ACTIVE;

src/app/domains/superAdmin/modules/deviceBrands/views/list.component.ts

@@ -16,7 +16,7 @@ export class DeviceBrandsComponent extends AbstractList<IDeviceBrandResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'عنوان' },
       {
         field: 'created_at',

src/app/domains/superAdmin/modules/devices/views/list.component.ts

@@ -16,7 +16,7 @@ export class DevicesComponent extends AbstractList<IDeviceResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'عنوان' },
       { field: 'brand', header: 'برند دستگاه', type: 'nested', nestedPath: 'name' },
       {

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

@@ -18,7 +18,7 @@ export class GuildGoodCategoriesListComponent extends AbstractList<IGoodCategori
   @Input() guildId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'goods_count', header: 'تعداد کالاها' },
     {

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

@@ -18,7 +18,7 @@ export class GuildGoodsListComponent extends AbstractList<IGuildGoodsResponse> {
   @Input() guildId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'name', header: 'عنوان' },
     { field: 'sku', header: 'شناسه‌ی عمومی' },
     { field: 'category', header: 'دسته‌بندی', type: 'nested', nestedPath: 'category.name' },

src/app/domains/superAdmin/modules/guilds/views/list.component.ts

@@ -24,7 +24,7 @@ export class GuildsComponent extends AbstractList<IGuildResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'عنوان' },
       { field: 'code', header: 'کد' },
       { field: 'businessActivitiesCount', header: 'تعداد فعالیت‌‌های اقتصادی‌ مرتبط' },

src/app/domains/superAdmin/modules/licenses/constants/apiRoutes/index.ts

@@ -1,4 +1,4 @@
-const baseUrl = '/api/v1/admin/partners';
+const baseUrl = '/api/v1/admin/licenses';
 
 export const LICENSES_API_ROUTES = {
   list: () => `${baseUrl}`,

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

@@ -1,18 +1,11 @@
 <app-page-data-list
   [pageTitle]="'مدیریت لایسنس‌ها'"
-  [addNewCtaLabel]="'افزودن لایسنس جدید'"
   [columns]="columns"
-  [showAdd]="true"
   emptyPlaceholderTitle="لایسنسی یافت نشد"
-  emptyPlaceholderDescription="برای افزودن لایسنس جدید، روی دکمهٔ بالا کلیک کنید."
   [items]="items()"
   [loading]="loading()"
-  [showDetails]="true"
-  [showAdd]="true"
-  (onAdd)="openAddForm()"
 >
   <!-- <ng-template #role let-data>
     <catalog-role-tag [role]="data.role" />
   </ng-template> -->
 </app-page-data-list>
-<license-form [(visible)]="visibleForm" (onSubmit)="refresh()" />

src/app/domains/superAdmin/modules/licenses/views/list.component.ts

@@ -2,25 +2,34 @@
 import { AbstractList } from '@/shared/abstractClasses/abstract-list';
 import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
 import { Component, inject } from '@angular/core';
-import { LicenseFormComponent } from '../components/form.component';
 import { ILicenseResponse } from '../models';
 import { LicensesService } from '../services/main.service';
 
 @Component({
   selector: 'admin-licenses',
   templateUrl: './list.component.html',
-  imports: [PageDataListComponent, LicenseFormComponent],
+  imports: [PageDataListComponent],
 })
 export class LicensesComponent extends AbstractList<ILicenseResponse> {
   private readonly service = inject(LicensesService);
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       {
-        field: 'created_at',
+        field: 'consumer',
-        header: 'تاریخ ایجاد',
+        header: 'مشتری',
-        type: 'date',
+        customDataModel(item) {
+          return `${item.consumer.first_name} ${item.consumer.last_name}`;
+        },
+      },
+      { field: 'expires_at', header: 'تاریخ انقضا', type: 'date' },
+      {
+        field: 'partner',
+        header: 'ارایه شده توسط',
+        customDataModel(item) {
+          return item.partner?.name || 'برند نرم‌افزار';
+        },
       },
     ];
   }

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

@@ -18,7 +18,7 @@ export class ConsumerAccountListComponent extends AbstractList<IPartnerAccountRe
   @Input({ required: true }) partnerId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     {
       field: 'username',
       header: 'نام کاربری',

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

@@ -0,0 +1,11 @@
+<app-page-data-list
+  [pageTitle]="'لیست لایسنس‌ها'"
+  [columns]="columns"
+  emptyPlaceholderTitle="لایسنسی یافت نشد"
+  [items]="items()"
+  [loading]="loading()"
+>
+  <!-- <ng-template #role let-data>
+    <catalog-role-tag [role]="data.role" />
+  </ng-template> -->
+</app-page-data-list>

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

@@ -0,0 +1,35 @@
+// import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
+import { AbstractList } from '@/shared/abstractClasses/abstract-list';
+import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
+import { Component, inject, Input } from '@angular/core';
+import { IPartnerLicenseResponse } from '../../models';
+import { AdminPartnerLicensesService } from '../../services/licenses.service';
+
+@Component({
+  selector: 'admin-partner-licenses',
+  templateUrl: './list.component.html',
+  imports: [PageDataListComponent],
+})
+export class AdminPartnerLicensesComponent extends AbstractList<IPartnerLicenseResponse> {
+  @Input({ required: true }) partnerId!: string;
+
+  private readonly service = inject(AdminPartnerLicensesService);
+
+  override setColumns(): void {
+    this.columns = [
+      { field: 'id', header: 'شناسه', type: 'id' },
+      {
+        field: 'consumer',
+        header: 'مشتری',
+        customDataModel(item) {
+          return `${item.consumer.first_name} ${item.consumer.last_name}`;
+        },
+      },
+      { field: 'expires_at', header: 'تاریخ انقضا', type: 'date' },
+    ];
+  }
+
+  override getDataRequest() {
+    return this.service.getAll(this.partnerId);
+  }
+}

src/app/domains/superAdmin/modules/partners/constants/apiRoutes/licenses.ts

@@ -0,0 +1,5 @@
+const baseUrl = (partnerId: string) => `/api/v1/admin/partners/${partnerId}/licenses`;
+
+export const PARTNER_LICENSES_API_ROUTES = {
+  list: (partnerId: string) => `${baseUrl(partnerId)}`,
+};

src/app/domains/superAdmin/modules/partners/models/index.ts

@@ -1,2 +1,3 @@
 export * from './accounts_io';
 export * from './io';
+export * from './licenses_io';

src/app/domains/superAdmin/modules/partners/models/licenses_io.d.ts

@@ -0,0 +1,12 @@
+export interface IPartnerLicenseRawResponse {
+  id: string;
+  starts_at: string;
+  expires_at: string;
+  status: TLicenseStatus;
+  consumer: {
+    first_name: string;
+    last_name: string;
+    mobile_number: string;
+  };
+}
+export interface IPartnerLicenseResponse extends IPartnerLicenseRawResponse {}

src/app/domains/superAdmin/modules/partners/services/licenses.service.ts

@@ -0,0 +1,19 @@
+import { IPaginatedResponse } from '@/core/models/service.model';
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { PARTNER_LICENSES_API_ROUTES } from '../constants/apiRoutes/licenses';
+import { IPartnerLicenseRawResponse, IPartnerLicenseResponse } from '../models';
+
+@Injectable({ providedIn: 'root' })
+export class AdminPartnerLicensesService {
+  constructor(private http: HttpClient) {}
+
+  private apiRoutes = PARTNER_LICENSES_API_ROUTES;
+
+  getAll(partnerId: string): Observable<IPaginatedResponse<IPartnerLicenseResponse>> {
+    return this.http.get<IPaginatedResponse<IPartnerLicenseRawResponse>>(
+      this.apiRoutes.list(partnerId),
+    );
+  }
+}

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

@@ -19,7 +19,7 @@ export class PartnersComponent extends AbstractList<IPartnerResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'نام' },
       { field: 'code', header: 'کد' },
       { field: 'license_quota', header: 'تعداد لایسنس خریداری شده' },

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

@@ -2,7 +2,6 @@
   <app-card-data cardTitle="اطلاعات شریک تجاری" [editable]="true" [(editMode)]="editMode">
     <ng-template #moreAction>
       <p-button outlined size="small" (onClick)="openChargeDialog()"> شارژ لایسنس‌ </p-button>
-      {{ visibleChargeFormDialog() }}
     </ng-template>
     <div class="flex flex-col gap-4">
       <div class="grid grid-cols-3 gap-4 items-center">
@@ -14,6 +13,8 @@
     </div>
   </app-card-data>
 
+  <admin-partner-licenses [partnerId]="partnerId()" />
+
   <superAdmin-partner-account-list [partnerId]="partnerId()" />
 
   <partner-form

src/app/domains/superAdmin/modules/partners/views/single.component.ts

@@ -6,6 +6,7 @@ import { Button } from 'primeng/button';
 import { ConsumerAccountListComponent } from '../components/accounts/list.component';
 import { PartnerChargeLicenseFormDialogComponent } from '../components/charge-license-form-dialog.component';
 import { GuildFormComponent } from '../components/form.component';
+import { AdminPartnerLicensesComponent } from '../components/licenses/list.component';
 import { superAdminPartnersNamedRoutes } from '../constants';
 import { PartnerStore } from '../store/partner.store';
 
@@ -19,6 +20,7 @@ import { PartnerStore } from '../store/partner.store';
     ConsumerAccountListComponent,
     Button,
     PartnerChargeLicenseFormDialogComponent,
+    AdminPartnerLicensesComponent,
   ],
 })
 export class PartnerComponent {

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

@@ -16,7 +16,7 @@ export class ProvidersComponent extends AbstractList<IProviderResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'name', header: 'نام' },
       {
         field: 'created_at',

src/app/domains/superAdmin/modules/users/components/accounts/list.component.ts

@@ -18,7 +18,7 @@ export class UsersComponent extends AbstractList<IAccountResponse> {
   @Input() userId!: string;
   @Input() fullHeight?: boolean;
   @Input() header: IColumn[] = [
-    { field: 'id', header: 'شناسه' },
+    { field: 'id', header: 'شناسه', type: 'id' },
     { field: 'username', header: 'نام کاربری' },
     { field: 'type', header: 'نوع حساب' },
     {

src/app/domains/superAdmin/modules/users/views/list.component.ts

@@ -19,7 +19,7 @@ export class UsersComponent extends AbstractList<IUserResponse> {
 
   override setColumns(): void {
     this.columns = [
-      { field: 'id', header: 'شناسه' },
+      { field: 'id', header: 'شناسه', type: 'id' },
       { field: 'fullname', header: 'نام' },
       { field: 'mobile_number', header: 'شماره موبایل' },
       { field: 'national_code', header: 'کد ملی' },

src/assets/rtlSupport.scss

@@ -48,7 +48,7 @@ input.p-inputtext {
   margin-inline-end: 0.5rem;
 }
 
-.p-inputgroup > .p-component:first-child {
+.p-inputgroup > .p-component.hasSuffix:first-child {
   border-start-start-radius: 0 !important;
   border-end-start-radius: 0 !important;
   border-end-end-radius: var(--p-inputgroup-addon-border-radius);