diff --git a/src/modules/payment/payments.module.ts b/src/modules/payment/payments.module.ts index dc13fb1..c1404b5 100644 --- a/src/modules/payment/payments.module.ts +++ b/src/modules/payment/payments.module.ts @@ -1,5 +1,4 @@ import { Module, forwardRef } from '@nestjs/common'; -// import { PaymentsService } from './services/payments.service'; import { MikroOrmModule } from '@mikro-orm/nestjs'; import { PaymentController } from './controllers/payment.controller'; import { AuthModule } from '../auth/auth.module'; @@ -11,8 +10,9 @@ import { PaymentRepository } from './repositories/payment.repository'; import { PaymentListeners } from './listeners/payment.listeners'; import { AdminModule } from '../admin/admin.module'; import { NotificationsModule } from '../notification/notifications.module'; -// import { OrderModule } from '../order/order.module'; import { UserModule } from '../user/user.module'; +import { PaymentService } from './services/payments.service'; +import { InvoiceModule } from '../invoice/invoice.module'; @Module({ imports: [ @@ -21,12 +21,12 @@ import { UserModule } from '../user/user.module'; JwtModule, AdminModule, NotificationsModule, - // forwardRef(() => OrderModule), + forwardRef(() => InvoiceModule), UserModule ], controllers: [PaymentController], providers: [ - // PaymentService, + PaymentService, PaymentRepository, ZarinpalGateway, GatewayManager, @@ -34,7 +34,7 @@ import { UserModule } from '../user/user.module'; ], exports: [ PaymentRepository, - // PaymentService, + PaymentService, // PaymentGatewayService, ], }) diff --git a/src/modules/payment/services/payments.service.ts b/src/modules/payment/services/payments.service.ts index ca3604b..36fce9e 100644 --- a/src/modules/payment/services/payments.service.ts +++ b/src/modules/payment/services/payments.service.ts @@ -28,7 +28,6 @@ export class PaymentService { constructor( private readonly em: EntityManager, - private readonly orderService: OrderService, private readonly paymentRepository: PaymentRepository, private readonly gatewayManager: GatewayManager, private readonly eventEmitter: EventEmitter2, diff --git a/src/modules/request/request.service.ts b/src/modules/request/request.service.ts index 0465cac..98a17f7 100644 --- a/src/modules/request/request.service.ts +++ b/src/modules/request/request.service.ts @@ -102,12 +102,17 @@ export class RequestService { .filter(Boolean), ), ]; + console.log(fieldIds); + if (fieldIds.length === 0) return; const fields = await this.fieldRepository.find( { id: { $in: fieldIds } }, { populate: ['options'] }, ); + + console.log('fields',fields) + const fieldMap = new Map(fields.map((f) => [f.id, f])); for (const item of items) { diff --git a/src/seeders/data/roles.data.ts b/src/seeders/data/roles.data.ts index 2d5d1e1..90f31d7 100644 --- a/src/seeders/data/roles.data.ts +++ b/src/seeders/data/roles.data.ts @@ -35,7 +35,7 @@ export const rolesData: RoleConfig[] = [ name: 'designer', title: 'طراح', isSystem: true, - permissionFilter: (name: PermissionEnum) => [PermissionEnum.VIEW_MY_ASSIGNED_INVOICED_REQUESTS].includes(name) + permissionFilter: (name: PermissionEnum) => [PermissionEnum.VIEW_ASSIGNED_ORDERS].includes(name) }, ];