diff --git a/src/app/domains/consumer/constants/components/pos/pos.ts b/src/app/domains/consumer/constants/components/pos/pos.ts index 9d911a7..b8d106e 100644 --- a/src/app/domains/consumer/constants/components/pos/pos.ts +++ b/src/app/domains/consumer/constants/components/pos/pos.ts @@ -10,7 +10,7 @@ export const columns: IColumn[] = [ { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } }, { field: 'provider', - header: 'ارایه‌دهنده', + header: 'PSP', type: 'nested', nestedOption: { path: 'provider.name' }, }, diff --git a/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html b/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html index 88429fb..d837611 100644 --- a/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html +++ b/src/app/domains/consumer/modules/businessActivities/views/poses/single.component.html @@ -10,7 +10,7 @@ - + diff --git a/src/app/domains/consumer/modules/poses/views/single.component.html b/src/app/domains/consumer/modules/poses/views/single.component.html index d3f117d..8dcc39f 100644 --- a/src/app/domains/consumer/modules/poses/views/single.component.html +++ b/src/app/domains/consumer/modules/poses/views/single.component.html @@ -10,7 +10,7 @@ - + diff --git a/src/app/domains/partner/constants/menuItems.const.ts b/src/app/domains/partner/constants/menuItems.const.ts index f30b89d..f1206e8 100644 --- a/src/app/domains/partner/constants/menuItems.const.ts +++ b/src/app/domains/partner/constants/menuItems.const.ts @@ -8,7 +8,7 @@ export const PARTNER_MENU_ITEMS = [ routerLink: ['/partner'], }, { - label: 'مشتری', + label: 'مودی', icon: 'pi pi-fw pi-users', routerLink: ['/partner/consumers'], }, diff --git a/src/app/domains/partner/modules/consumers/components/createConsumerWrapper/create-consumer-wrapper.component.html b/src/app/domains/partner/modules/consumers/components/createConsumerWrapper/create-consumer-wrapper.component.html index 01ef2ab..0d36c57 100644 --- a/src/app/domains/partner/modules/consumers/components/createConsumerWrapper/create-consumer-wrapper.component.html +++ b/src/app/domains/partner/modules/consumers/components/createConsumerWrapper/create-consumer-wrapper.component.html @@ -1,11 +1,10 @@ + (onHide)="close()"> اطلاعات اولیه @@ -24,16 +23,14 @@ + (onClose)="close()" /> } @case (3) { + (onClose)="close()" /> } @case (4) { + (onClose)="close()" /> } } diff --git a/src/app/domains/partner/modules/consumers/components/form-dialog.component.ts b/src/app/domains/partner/modules/consumers/components/form-dialog.component.ts index 9fd1a96..98142aa 100644 --- a/src/app/domains/partner/modules/consumers/components/form-dialog.component.ts +++ b/src/app/domains/partner/modules/consumers/components/form-dialog.component.ts @@ -17,7 +17,7 @@ export class ConsumerUserFormDialogComponent extends AbstractDialog { @Input() consumerId?: string; get preparedTitle() { - return `${this.editMode ? 'ویرایش' : 'افزودن'} مشتری`; + return `${this.editMode ? 'ویرایش' : 'افزودن'} مودی`; } onFormSubmit(response: IPartnerConsumerResponse) { diff --git a/src/app/domains/partner/modules/consumers/constants/routes/index.ts b/src/app/domains/partner/modules/consumers/constants/routes/index.ts index 878637f..eebc9ec 100644 --- a/src/app/domains/partner/modules/consumers/constants/routes/index.ts +++ b/src/app/domains/partner/modules/consumers/constants/routes/index.ts @@ -10,7 +10,7 @@ export const partnerConsumersNamedRoutes: NamedRoutes = { path: 'consumers', loadComponent: () => import('../../views/list.component').then((m) => m.ConsumersComponent), meta: { - title: 'مشتری‌ها', + title: 'مودیان', pagePath: () => '/partner/consumers', }, }, @@ -18,7 +18,7 @@ export const partnerConsumersNamedRoutes: NamedRoutes = { path: 'consumers/:consumerId', loadComponent: () => import('../../views/single.component').then((m) => m.ConsumerComponent), meta: { - title: 'مشتری', + title: 'مودی', pagePath: (guildId: string) => `/partner/consumers/${guildId}`, }, }, diff --git a/src/app/domains/partner/modules/consumers/views/list.component.html b/src/app/domains/partner/modules/consumers/views/list.component.html index aea05f9..363cb74 100644 --- a/src/app/domains/partner/modules/consumers/views/list.component.html +++ b/src/app/domains/partner/modules/consumers/views/list.component.html @@ -1,10 +1,10 @@ - +
- - + + @if (consumer()?.type?.value === 'LEGAL') { } @else { diff --git a/src/app/domains/partner/modules/licenses/components/filter-form.component.html b/src/app/domains/partner/modules/licenses/components/filter-form.component.html index bfb813a..9bc2805 100644 --- a/src/app/domains/partner/modules/licenses/components/filter-form.component.html +++ b/src/app/domains/partner/modules/licenses/components/filter-form.component.html @@ -1,7 +1,7 @@ -
- +
+ - + diff --git a/src/app/domains/partner/modules/licenses/components/list.component.ts b/src/app/domains/partner/modules/licenses/components/list.component.ts index ec98202..eb05508 100644 --- a/src/app/domains/partner/modules/licenses/components/list.component.ts +++ b/src/app/domains/partner/modules/licenses/components/list.component.ts @@ -18,7 +18,7 @@ export class PartnerLicenseListComponent extends AbstractList // { field: 'id', header: 'شناسه', type: 'id' }, { field: 'business_activity', - header: 'عنوان مشتری', + header: 'مودی', type: 'nested', nestedOption: { path: 'business_activity.consumer.name', diff --git a/src/app/domains/partner/modules/profile/components/reset-password-card.component.html b/src/app/domains/partner/modules/profile/components/reset-password-card.component.html deleted file mode 100644 index e1e4b69..0000000 --- a/src/app/domains/partner/modules/profile/components/reset-password-card.component.html +++ /dev/null @@ -1,10 +0,0 @@ - -
- - - -
 diff --git a/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts b/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts deleted file mode 100644 index 46f7cc8..0000000 --- a/src/app/domains/partner/modules/profile/components/reset-password-card.component.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { ToastService } from '@/core/services/toast.service'; -import { MustMatch } from '@/core/validators'; -import { AppCardComponent, SharedPasswordInputComponent } from '@/shared/components'; -import { fieldControl } from '@/shared/constants'; -import { Component, inject, signal } from '@angular/core'; -import { FormBuilder, ReactiveFormsModule } from '@angular/forms'; -import { ButtonDirective } from 'primeng/button'; -import { finalize } from 'rxjs'; -import { ProfileService } from '../services/main.service'; - -@Component({ - selector: 'partner-reset-password-card', - templateUrl: './reset-password-card.component.html', - imports: [ReactiveFormsModule, AppCardComponent, SharedPasswordInputComponent, ButtonDirective], -}) -export class PartnerResetPasswordCardComponent { - private readonly service = inject(ProfileService); - private readonly fb = inject(FormBuilder); - private readonly toastService = inject(ToastService); - - readonly loading = signal(false); - - form = this.fb.group( - { - password: fieldControl.password(), - confirmPassword: fieldControl.confirmPassword(), - }, - { validators: [MustMatch('password', 'confirmPassword')] } - ); - - submit() { - if (this.form.invalid) { - this.form.markAllAsTouched(); - return; - } - - this.loading.set(true); - this.service - .resetPassword({ password: this.form.value.password as string }) - .pipe(finalize(() => this.loading.set(false))) - .subscribe(() => { - this.form.reset(); - this.toastService.success({ text: 'رمز عبور با موفقیت به‌روز شد.' }); - }); - } -} diff --git a/src/app/domains/partner/modules/profile/models/io.d.ts b/src/app/domains/partner/modules/profile/models/io.d.ts index 3ae1790..5c4cd56 100644 --- a/src/app/domains/partner/modules/profile/models/io.d.ts +++ b/src/app/domains/partner/modules/profile/models/io.d.ts @@ -12,5 +12,6 @@ export interface IProfileRequestPayload { } export interface IResetPasswordRequest { + currentPassword: string; password: string; } diff --git a/src/app/domains/partner/modules/profile/views/single.component.html b/src/app/domains/partner/modules/profile/views/single.component.html index d0f181d..bf7afe8 100644 --- a/src/app/domains/partner/modules/profile/views/single.component.html +++ b/src/app/domains/partner/modules/profile/views/single.component.html @@ -1,5 +1,10 @@
+ + + تغییر گذرواژه + +
@@ -7,9 +12,13 @@
- - @if (editing()) { }
+ + diff --git a/src/app/domains/partner/modules/profile/views/single.component.ts b/src/app/domains/partner/modules/profile/views/single.component.ts index 44d4e7d..4af27e4 100644 --- a/src/app/domains/partner/modules/profile/views/single.component.ts +++ b/src/app/domains/partner/modules/profile/views/single.component.ts @@ -1,8 +1,16 @@ +import { ToastService } from '@/core/services/toast.service'; import { PartnerStore } from '@/domains/partner/store/main.store'; -import { AppCardComponent, KeyValueComponent } from '@/shared/components'; +import { + AppCardComponent, + ChangePasswordFormDialogComponent, + KeyValueComponent, +} from '@/shared/components'; import { Component, computed, inject, signal } from '@angular/core'; +import { Button } from 'primeng/button'; +import { finalize } from 'rxjs'; import { PartnerProfileFormComponent } from '../components/form.component'; -import { PartnerResetPasswordCardComponent } from '../components/reset-password-card.component'; +import { IResetPasswordRequest } from '../models'; +import { ProfileService } from '../services/main.service'; @Component({ selector: 'partner-profile', @@ -10,17 +18,22 @@ import { PartnerResetPasswordCardComponent } from '../components/reset-password- imports: [ AppCardComponent, KeyValueComponent, - PartnerResetPasswordCardComponent, PartnerProfileFormComponent, + Button, + ChangePasswordFormDialogComponent, ], }) export class PartnerProfileComponent { private readonly store = inject(PartnerStore); + private readonly service = inject(ProfileService); + private readonly toastService = inject(ToastService); + + readonly resetPasswordLoading = signal(false); + editing = signal(false); + resetPasswordDialog = signal(false); readonly profile = computed(() => this.store.entity()); - editing = signal(false); - edit() { this.editing.set(true); } @@ -28,4 +41,21 @@ export class PartnerProfileComponent { onEditSuccess() { this.store.getData(); } + openResetPasswordDialog() { + this.resetPasswordDialog.set(true); + } + + resetPassword(payload: IResetPasswordRequest) { + this.resetPasswordLoading.set(true); + + this.service + .resetPassword(payload) + .pipe(finalize(() => this.resetPasswordLoading.set(false))) + .subscribe(() => { + this.toastService.success({ + text: 'تغییر رمز عبور با موفقیت انجام شد.', + }); + this.resetPasswordDialog.set(false); + }); + } } diff --git a/src/app/domains/pos/modules/goodsManagement/views/create.component.html b/src/app/domains/pos/modules/goodsManagement/views/create.component.html index 942b293..a08a912 100644 --- a/src/app/domains/pos/modules/goodsManagement/views/create.component.html +++ b/src/app/domains/pos/modules/goodsManagement/views/create.component.html @@ -2,6 +2,11 @@
- +
diff --git a/src/app/domains/pos/modules/goodsManagement/views/update.component.html b/src/app/domains/pos/modules/goodsManagement/views/update.component.html index eadbb2d..fddf4e7 100644 --- a/src/app/domains/pos/modules/goodsManagement/views/update.component.html +++ b/src/app/domains/pos/modules/goodsManagement/views/update.component.html @@ -9,6 +9,7 @@ [initialValues]="item()!" [updateFn]="updateFn" [editMode]="true" + class="block w-full" (onSubmit)="onSubmit()" (onClose)="onPrev()" /> } diff --git a/src/app/domains/provider/modules/dashboard/views/index.component.html b/src/app/domains/provider/modules/dashboard/views/index.component.html index 60337af..6c334f2 100644 --- a/src/app/domains/provider/modules/dashboard/views/index.component.html +++ b/src/app/domains/provider/modules/dashboard/views/index.component.html @@ -1,3 +1,3 @@ -
- به پنل ارایه‌دهنده خوش آمدید +
+ به پنل PSP خوش آمدید
diff --git a/src/app/domains/superAdmin/constants/menuItems.const.ts b/src/app/domains/superAdmin/constants/menuItems.const.ts index a5df808..ec40933 100644 --- a/src/app/domains/superAdmin/constants/menuItems.const.ts +++ b/src/app/domains/superAdmin/constants/menuItems.const.ts @@ -8,7 +8,7 @@ export const SUPER_ADMIN_MENU_ITEMS = [ routerLink: ['/'], }, // { - // label: 'مشتری‌', + // label: 'مودی', // icon: 'pi pi-fw pi-id-card', // routerLink: ['/super_admin/consumers'], // }, @@ -19,7 +19,7 @@ export const SUPER_ADMIN_MENU_ITEMS = [ routerLink: ['/super_admin/partners'], }, { - label: 'ارایه‌دهنده', + label: 'PSP', icon: 'pi pi-fw pi-building-columns', routerLink: ['/super_admin/providers'], }, diff --git a/src/app/domains/superAdmin/modules/consumers/components/form.component.ts b/src/app/domains/superAdmin/modules/consumers/components/form.component.ts index daaf493..a2219cb 100644 --- a/src/app/domains/superAdmin/modules/consumers/components/form.component.ts +++ b/src/app/domains/superAdmin/modules/consumers/components/form.component.ts @@ -29,7 +29,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog< @Input() consumerId?: string; private service = inject(ConsumersService); - preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} مشتری`); + preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} مودی`); initForm = () => { const form = this.fb.group({ @@ -63,7 +63,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog< this.fb.control('', { nonNullable: true, validators: fieldControl.username('')[1], - }), + }) ); // @ts-ignore form.addControl( @@ -71,7 +71,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog< this.fb.control('', { nonNullable: true, validators: [Validators.required], - }), + }) ); // @ts-ignore form.addControl( @@ -79,7 +79,7 @@ export class ConsumerUserFormComponent extends AbstractFormDialog< this.fb.control('', { nonNullable: true, validators: [Validators.required], - }), + }) ); form.addValidators([MustMatch('password', 'confirmPassword')]); } 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 db80714..9e916f2 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 @@ -29,7 +29,7 @@ export class ConsumerPosesComponent extends AbstractList { { field: 'pos_type', header: 'نوع دستگاه' }, { field: 'provider', - header: 'ارایه‌دهنده', + header: 'PSP', type: 'nested', nestedOption: { path: 'provider.name' }, }, @@ -58,8 +58,8 @@ export class ConsumerPosesComponent extends AbstractList { this.consumerId, this.businessId, this.complexId, - item.id, - ), + item.id + ) ); } } diff --git a/src/app/domains/superAdmin/modules/consumers/constants/routes/index.ts b/src/app/domains/superAdmin/modules/consumers/constants/routes/index.ts index 2e51824..a79b332 100644 --- a/src/app/domains/superAdmin/modules/consumers/constants/routes/index.ts +++ b/src/app/domains/superAdmin/modules/consumers/constants/routes/index.ts @@ -10,7 +10,7 @@ export const superAdminConsumersNamedRoutes: NamedRoutes = path: 'consumers', loadComponent: () => import('../../views/list.component').then((m) => m.ConsumersComponent), meta: { - title: 'مشتری‌ها', + title: 'مودیان', pagePath: () => '/super_admin/consumers', }, }, @@ -18,7 +18,7 @@ export const superAdminConsumersNamedRoutes: NamedRoutes = path: 'consumers/:consumerId', loadComponent: () => import('../../views/single.component').then((m) => m.ConsumerComponent), meta: { - title: 'مشتری', + title: 'مودی', pagePath: (guildId: string) => `/super_admin/consumers/${guildId}`, }, }, diff --git a/src/app/domains/superAdmin/modules/consumers/views/list.component.html b/src/app/domains/superAdmin/modules/consumers/views/list.component.html index 8a59a38..a41034b 100644 --- a/src/app/domains/superAdmin/modules/consumers/views/list.component.html +++ b/src/app/domains/superAdmin/modules/consumers/views/list.component.html @@ -1,19 +1,17 @@ + (onRefresh)="refresh()" /> + (onSubmit)="refresh()" /> diff --git a/src/app/domains/superAdmin/modules/consumers/views/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/single.component.html index f04b2c1..17145a9 100644 --- a/src/app/domains/superAdmin/modules/consumers/views/single.component.html +++ b/src/app/domains/superAdmin/modules/consumers/views/single.component.html @@ -1,10 +1,10 @@
- +
- - + + @if (consumer()?.type?.value === 'LEGAL') { } @else { diff --git a/src/app/domains/superAdmin/modules/partners/components/licenses/list.component.ts b/src/app/domains/superAdmin/modules/partners/components/licenses/list.component.ts index 2c384d2..3af779a 100644 --- a/src/app/domains/superAdmin/modules/partners/components/licenses/list.component.ts +++ b/src/app/domains/superAdmin/modules/partners/components/licenses/list.component.ts @@ -20,7 +20,7 @@ export class AdminPartnerLicensesComponent extends AbstractList `${this.editMode ? 'ویرایش' : 'افزودن'} ارایه‌دهنده`); + preparedTitle = computed(() => `${this.editMode ? 'ویرایش' : 'افزودن'} PSP`); override ngOnChanges() { this.form.patchValue(this.initialValues ?? {}); diff --git a/src/app/domains/superAdmin/modules/providers/constants/routes/index.ts b/src/app/domains/superAdmin/modules/providers/constants/routes/index.ts index 3d9c5d0..006cd00 100644 --- a/src/app/domains/superAdmin/modules/providers/constants/routes/index.ts +++ b/src/app/domains/superAdmin/modules/providers/constants/routes/index.ts @@ -16,7 +16,7 @@ export const providersNamedRoutes: NamedRoutes = { path: 'providers/:providerId', loadComponent: () => import('../../views/single.component').then((m) => m.ProviderComponent), meta: { - title: 'ارایه‌دهنده', + title: 'PSP', pagePath: () => '/super_admin/providers/:providerId', }, }, diff --git a/src/app/domains/superAdmin/modules/providers/shared/select.component.html b/src/app/domains/superAdmin/modules/providers/shared/select.component.html index 2533a8e..fb19df4 100644 --- a/src/app/domains/superAdmin/modules/providers/shared/select.component.html +++ b/src/app/domains/superAdmin/modules/providers/shared/select.component.html @@ -4,24 +4,22 @@ [options]="items()" optionLabel="name" [optionValue]="selectOptionValue" - placeholder="انتخاب ارایه‌دهنده" + placeholder="انتخاب PSP" [formControl]="control" [showClear]="showClear" [filter]="true" - appendTo="body" - > + appendTo="body"> @if (canInsert) {
+ (onClick)="onOpenForm()" />
} diff --git a/src/app/domains/superAdmin/modules/providers/views/list.component.html b/src/app/domains/superAdmin/modules/providers/views/list.component.html index ddd25e1..905d8e0 100644 --- a/src/app/domains/superAdmin/modules/providers/views/list.component.html +++ b/src/app/domains/superAdmin/modules/providers/views/list.component.html @@ -1,21 +1,19 @@ + (onRefresh)="refresh()" /> + (onSubmit)="refresh()" /> diff --git a/src/app/layout/default/app.layout.component.ts b/src/app/layout/default/app.layout.component.ts index c43b1df..9511f86 100644 --- a/src/app/layout/default/app.layout.component.ts +++ b/src/app/layout/default/app.layout.component.ts @@ -36,7 +36,7 @@ export class AppLayout { constructor( public layoutService: LayoutService, public renderer: Renderer2, - public router: Router, + public router: Router ) { this.layoutService.headerSlot$.subscribe((tpl) => (this.topBarMoreAction = tpl)); this.layoutService.topbarStartSlot$.subscribe((tpl) => (this.topBarStartAction = tpl)); @@ -105,7 +105,7 @@ export class AppLayout { } else { document.body.className = document.body.className.replace( new RegExp('(^|\\b)' + 'blocked-scroll'.split(' ').join('|') + '(\\b|$)', 'gi'), - ' ', + ' ' ); } } @@ -169,6 +169,10 @@ export class AppLayout { } } + ngOnChanges() { + console.log('layout changed'); + } + ngOnDestroy() { if (this.overlayMenuOpenSubscription) { this.overlayMenuOpenSubscription.unsubscribe(); diff --git a/src/app/layout/default/app.topbar.component.html b/src/app/layout/default/app.topbar.component.html index c50c177..40bf336 100644 --- a/src/app/layout/default/app.topbar.component.html +++ b/src/app/layout/default/app.topbar.component.html @@ -9,13 +9,12 @@ size="large" icon="pi pi-bars" class="layout-menu-button layout-topbar-action" - (click)="layoutService.onMenuToggle()" - > + (click)="layoutService.onMenuToggle()"> } -
+ {{ panelTitle() }} -
+ } @@ -34,13 +33,12 @@ [icon]="`pi ${layoutService.isDarkTheme() ? 'pi-moon' : 'pi-sun'}`" text size="large" - (click)="toggleDarkMode()" - > + (click)="toggleDarkMode()">
- +
diff --git a/src/app/shared/catalog/providers/components/select.component.ts b/src/app/shared/catalog/providers/components/select.component.ts index d3801f7..fcb943b 100644 --- a/src/app/shared/catalog/providers/components/select.component.ts +++ b/src/app/shared/catalog/providers/components/select.component.ts @@ -21,7 +21,7 @@ export class CatalogProviderSelectComponent extends AbstractSelectComponent< private readonly service = inject(CatalogsService); get preparedLabel() { - return this.label || 'انتخاب ارایه‌دهنده'; + return this.label || 'انتخاب PSP'; } ngOnInit() { diff --git a/src/app/shared/constants/list-configs/consumer-account-list.const.ts b/src/app/shared/constants/list-configs/consumer-account-list.const.ts index b19ec2d..6527c14 100644 --- a/src/app/shared/constants/list-configs/consumer-account-list.const.ts +++ b/src/app/shared/constants/list-configs/consumer-account-list.const.ts @@ -1,7 +1,7 @@ import { IListConfig } from './list-config.model'; export const consumerAccountListConfig: IListConfig = { - pageTitle: 'مدیریت حساب‌های مشتری', + pageTitle: 'مدیریت حساب‌های مودی', addNewCtaLabel: 'افزودن حساب', emptyPlaceholderTitle: 'حسابی یافت نشد', emptyPlaceholderDescription: 'برای افزودن حساب، روی دکمهٔ بالا کلیک کنید.', diff --git a/src/app/shared/constants/list-configs/consumer-list.const.ts b/src/app/shared/constants/list-configs/consumer-list.const.ts index 5189102..0bfaea4 100644 --- a/src/app/shared/constants/list-configs/consumer-list.const.ts +++ b/src/app/shared/constants/list-configs/consumer-list.const.ts @@ -1,10 +1,10 @@ import { IListConfig } from './list-config.model'; export const consumerListConfig: IListConfig = { - pageTitle: 'مدیریت مشتری‌ها', - addNewCtaLabel: 'افزودن مشتری', - emptyPlaceholderTitle: 'مشتری‌ای یافت نشد', - emptyPlaceholderDescription: 'برای افزودن مشتری، روی دکمهٔ بالا کلیک کنید.', + pageTitle: 'مدیریت مودیان', + addNewCtaLabel: 'افزودن مودی', + emptyPlaceholderTitle: 'مودی‌ای یافت نشد', + emptyPlaceholderDescription: 'برای افزودن مودی، روی دکمهٔ بالا کلیک کنید.', columns: [ { field: 'name', header: 'عنوان' }, { @@ -16,7 +16,7 @@ export const consumerListConfig: IListConfig = { }, { field: 'partner', - header: 'ارایه‌دهنده', + header: 'PSP', type: 'nested', nestedOption: { path: 'partner.name' }, }, diff --git a/src/app/shared/constants/list-configs/license-list.const.ts b/src/app/shared/constants/list-configs/license-list.const.ts index 9079a90..328d5c8 100644 --- a/src/app/shared/constants/list-configs/license-list.const.ts +++ b/src/app/shared/constants/list-configs/license-list.const.ts @@ -8,7 +8,7 @@ export const licenseListConfig: IListConfig = { columns: [ { field: 'consumer', - header: 'مشتری', + header: 'مودی', customDataModel(item: any) { return `${item.consumer.first_name} ${item.consumer.last_name}`; }, diff --git a/src/app/shared/constants/list-configs/partner-list.const.ts b/src/app/shared/constants/list-configs/partner-list.const.ts index e22e6bb..ed8c520 100644 --- a/src/app/shared/constants/list-configs/partner-list.const.ts +++ b/src/app/shared/constants/list-configs/partner-list.const.ts @@ -2,9 +2,9 @@ import { IListConfig } from './list-config.model'; export const partnerListConfig: IListConfig = { pageTitle: 'مدیریت ارایه‌دهندگان', - addNewCtaLabel: 'افزودن ارایه‌دهنده', + addNewCtaLabel: 'افزودن PSP', emptyPlaceholderTitle: 'ارایه‌دهندگان‌ای یافت نشد', - emptyPlaceholderDescription: 'برای افزودن ارایه‌دهنده، روی دکمهٔ بالا کلیک کنید.', + emptyPlaceholderDescription: 'برای افزودن PSP، روی دکمهٔ بالا کلیک کنید.', columns: [ { field: 'name', header: 'عنوان' }, { field: 'code', header: 'کد' }, diff --git a/src/app/shared/constants/list-configs/pos-list.const.ts b/src/app/shared/constants/list-configs/pos-list.const.ts index 0263c5d..47df0d4 100644 --- a/src/app/shared/constants/list-configs/pos-list.const.ts +++ b/src/app/shared/constants/list-configs/pos-list.const.ts @@ -12,7 +12,7 @@ export const posListConfig: IListConfig = { { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } }, { field: 'provider', - header: 'ارایه‌دهنده', + header: 'PSP', type: 'nested', nestedOption: { path: 'provider.name' }, }, diff --git a/src/assets/constants/accountTypes.const.ts b/src/assets/constants/accountTypes.const.ts index ae5dedc..a0864da 100644 --- a/src/assets/constants/accountTypes.const.ts +++ b/src/assets/constants/accountTypes.const.ts @@ -13,5 +13,5 @@ export const AccountTypeTranslates = { CONSUMER: 'مصرف کننده', SUPER_ADMIN: 'مدیر کل سیستم', ADMIN: 'مدیر', - PROVIDER: 'ارایه‌دهنده', + PROVIDER: 'PSP', } as Record; diff --git a/src/assets/layout/_core.scss b/src/assets/layout/_core.scss index c44ecc6..f0cd43a 100644 --- a/src/assets/layout/_core.scss +++ b/src/assets/layout/_core.scss @@ -9,6 +9,18 @@ body { line-height: 1.2; } +html.application-pos, +body.application-pos { + width: 100%; + max-width: 600px; + margin-left: auto; + margin-right: auto; +} + +body.application-pos { + overflow-x: hidden; +} + a { text-decoration: none; } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3e9188a..5b6abd6 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,8 +3,8 @@ export const environment = { production: false, // apiBaseUrl: 'http://194.59.214.243:5002', // apiBaseUrl: 'http://192.168.128.73:5002', - // apiBaseUrl: 'http://localhost:5002', - apiBaseUrl: 'https://psp-api.shift-am.ir', + apiBaseUrl: 'http://localhost:5002', + // apiBaseUrl: 'https://psp-api.shift-am.ir', // host: 'http://194.59.214.243', host: 'localhost', port: 5000, diff --git a/src/main.ts b/src/main.ts index 3f37829..650d1d4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,6 +17,7 @@ if (themeMeta) { } if (config.isPosApplication) { + document.documentElement.classList.add('application-pos'); document.body.classList.add('application-pos'); }