This commit is contained in:
2026-04-06 21:11:57 +03:30
parent b3fb4f4baf
commit 8990edf064
37 changed files with 140 additions and 59 deletions
@@ -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 'بدون لایسنس';
},
@@ -43,10 +43,7 @@ export class ConsumerComponent {
if (!this.store.entity()?.license?.expires_at) {
return null;
}
if (
new Date().toDateString() >
new Date(this.store.entity()?.license?.expires_at || '').toDateString()
) {
if (new Date().getTime() > new Date(this.store.entity()?.license?.expires_at || '').getTime()) {
return licenseStatus.EXPIRED;
}
return licenseStatus.ACTIVE;