From 984b88958775580d985b6314a6b6d53fb804ac55 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Sat, 10 Jan 2026 15:55:05 +0330 Subject: [PATCH] order --- src/modules/order/entities/order-item.entity.ts | 6 +++++- src/modules/order/interface/order.interface.ts | 5 ++++- src/modules/payment/entities/payment-method.entity.ts | 5 ----- src/modules/payment/entities/payment.entity.ts | 7 +------ src/modules/ticket/entities/ticket.entity.ts | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/modules/order/entities/order-item.entity.ts b/src/modules/order/entities/order-item.entity.ts index 3bf1c04..34ca225 100644 --- a/src/modules/order/entities/order-item.entity.ts +++ b/src/modules/order/entities/order-item.entity.ts @@ -1,7 +1,8 @@ -import { Entity, Index, ManyToOne, Property } from '@mikro-orm/core'; +import { Entity, Enum, Index, ManyToOne, Property } from '@mikro-orm/core'; import { BaseEntity } from '../../../common/entities/base.entity'; import { Order } from './order.entity'; import { product } from 'src/modules/product/entities/product.entity'; +import { OrderItemStatus } from '../interface/order.interface'; @Entity({ tableName: 'order_items' }) @Index({ properties: ['order'] }) @@ -27,4 +28,7 @@ export class OrderItem extends BaseEntity { @Property({ nullable: true }) description?: string; + + @Enum(() => OrderItemStatus) + status!: OrderItemStatus; } diff --git a/src/modules/order/interface/order.interface.ts b/src/modules/order/interface/order.interface.ts index d7b13fb..d43391a 100644 --- a/src/modules/order/interface/order.interface.ts +++ b/src/modules/order/interface/order.interface.ts @@ -7,4 +7,7 @@ export enum OrderStatus { } - +export enum OrderItemStatus { + PENDING = 'pending', + VERIFIED = 'verified', +} diff --git a/src/modules/payment/entities/payment-method.entity.ts b/src/modules/payment/entities/payment-method.entity.ts index 63f5ad9..6200b4d 100644 --- a/src/modules/payment/entities/payment-method.entity.ts +++ b/src/modules/payment/entities/payment-method.entity.ts @@ -1,14 +1,9 @@ import { Entity, Enum, Index, ManyToOne, Property, Unique } from '@mikro-orm/core'; import { BaseEntity } from '../../../common/entities/base.entity'; -import { Restaurant } from 'src/modules/restaurants/entities/restaurant.entity'; import { PaymentGatewayEnum, PaymentMethodEnum } from '../interface/payment'; @Entity({ tableName: 'payment_methods' }) -@Unique({ properties: ['restaurant', 'method'] }) -@Index({ properties: ['restaurant', 'enabled'] }) export class PaymentMethod extends BaseEntity { - @ManyToOne(() => Restaurant) - restaurant!: Restaurant; @Enum(() => PaymentMethodEnum) method!: PaymentMethodEnum; diff --git a/src/modules/payment/entities/payment.entity.ts b/src/modules/payment/entities/payment.entity.ts index b888a65..8621124 100644 --- a/src/modules/payment/entities/payment.entity.ts +++ b/src/modules/payment/entities/payment.entity.ts @@ -13,7 +13,7 @@ export class Payment extends BaseEntity { amount!: number; @Property({ unique: true, nullable: true }) - referenceId?: string | null; + token?: string | null; @Enum(() => PaymentMethodEnum) method!: PaymentMethodEnum; @@ -27,9 +27,6 @@ export class Payment extends BaseEntity { @Enum(() => PaymentStatusEnum) status!: PaymentStatusEnum; - @Property({ nullable: true }) - cardPan?: string | null = null; - @Property({ type: 'json', nullable: true }) verifyResponse?: Record | null = null; @@ -39,6 +36,4 @@ export class Payment extends BaseEntity { @Property({ nullable: true }) failedAt?: Date | null = null; - @Property({ nullable: true }) - description?: string | null = null; } diff --git a/src/modules/ticket/entities/ticket.entity.ts b/src/modules/ticket/entities/ticket.entity.ts index d441e26..ebf46f7 100755 --- a/src/modules/ticket/entities/ticket.entity.ts +++ b/src/modules/ticket/entities/ticket.entity.ts @@ -33,7 +33,7 @@ export class Ticket extends BaseEntity { user: User; @ManyToOne(() => Ticket) - parent: Ticket[]; + parent: Ticket|null; @Property({ type: 'json' }) attachments: string[]