diff --git a/src/modules/delivery/dto/create-delivery.dto.ts b/src/modules/delivery/dto/create-delivery.dto.ts index 2974905..c454876 100644 --- a/src/modules/delivery/dto/create-delivery.dto.ts +++ b/src/modules/delivery/dto/create-delivery.dto.ts @@ -10,7 +10,7 @@ export class CreateDeliveryDto { @ApiProperty({ example: 'سرو در رستوران', description: 'Delivery method display name' }) @IsString() - name!: string; + title!: string; @ApiProperty({ example: 5000, description: 'Delivery fee' }) @IsNumber() diff --git a/src/modules/delivery/entities/delivery.entity.ts b/src/modules/delivery/entities/delivery.entity.ts index f914eac..01a38cd 100644 --- a/src/modules/delivery/entities/delivery.entity.ts +++ b/src/modules/delivery/entities/delivery.entity.ts @@ -5,8 +5,8 @@ import { DeliveryFeeTypeEnum, DeliveryMethodEnum } from '../interface/delivery'; @Entity({ tableName: 'deliveries' }) export class Delivery extends BaseEntity { - @Property({ fieldName: 'title' }) - name!: string; + @Property() + title!: string; @Enum(() => DeliveryMethodEnum) method!: DeliveryMethodEnum; diff --git a/src/modules/delivery/providers/delivery.service.ts b/src/modules/delivery/providers/delivery.service.ts index 202c5a8..2bda857 100644 --- a/src/modules/delivery/providers/delivery.service.ts +++ b/src/modules/delivery/providers/delivery.service.ts @@ -34,7 +34,7 @@ export class DeliveryService { const data: RequiredEntityData = { restaurant, method: createDto.method, - name: createDto.name, + title: createDto.title, deliveryFee: createDto.deliveryFee, minOrderPrice: createDto.minOrderPrice, description: createDto.description, diff --git a/src/seeders/data/delivery-methods.data.ts b/src/seeders/data/delivery-methods.data.ts index dbb41c3..8e04542 100644 --- a/src/seeders/data/delivery-methods.data.ts +++ b/src/seeders/data/delivery-methods.data.ts @@ -2,7 +2,7 @@ import { DeliveryMethodEnum } from '../../modules/delivery/interface/delivery'; export interface DeliveryMethodData { method: DeliveryMethodEnum; - name: string; + title: string; description: string; deliveryFee: number; minOrderPrice: number; @@ -13,7 +13,7 @@ export interface DeliveryMethodData { export const deliveryMethodsData: DeliveryMethodData[] = [ { method: DeliveryMethodEnum.DineIn, - name: 'سرو در رستوران', + title: 'سرو در رستوران', description: 'سرو غذا در رستوران', deliveryFee: 0, minOrderPrice: 0, @@ -22,7 +22,7 @@ export const deliveryMethodsData: DeliveryMethodData[] = [ }, { method: DeliveryMethodEnum.CustomerPickup, - name: 'برداشت از رستوران', + title: 'برداشت از رستوران', description: 'برداشت غذا از رستوران', deliveryFee: 0, minOrderPrice: 0, @@ -31,8 +31,8 @@ export const deliveryMethodsData: DeliveryMethodData[] = [ }, { method: DeliveryMethodEnum.DeliveryCar, - name: 'تحویل با ماشین', - description: 'تحویل غذا با ماشین', + title: 'تحویل در خودرو', + description: 'تحویل غذا در خودرو', deliveryFee: 5000, minOrderPrice: 50000, enabled: true, @@ -40,7 +40,7 @@ export const deliveryMethodsData: DeliveryMethodData[] = [ }, { method: DeliveryMethodEnum.DeliveryCourier, - name: 'تحویل با پیک', + title: 'تحویل با پیک', description: 'تحویل غذا با پیک', deliveryFee: 10000, minOrderPrice: 100000, diff --git a/src/seeders/delivery-methods.seeder.ts b/src/seeders/delivery-methods.seeder.ts index 4f7f83a..6ab16d6 100644 --- a/src/seeders/delivery-methods.seeder.ts +++ b/src/seeders/delivery-methods.seeder.ts @@ -19,7 +19,7 @@ export class DeliveryMethodsSeeder { const delivery = em.create(Delivery, { restaurant, method: methodData.method, - name: methodData.name, + title: methodData.title, description: methodData.description, deliveryFee: methodData.deliveryFee, minOrderPrice: methodData.minOrderPrice, @@ -33,13 +33,13 @@ export class DeliveryMethodsSeeder { } else { // Update existing delivery method if needed if ( - existing.name !== methodData.name || + existing.title !== methodData.title || existing.description !== methodData.description || existing.deliveryFee !== methodData.deliveryFee || existing.minOrderPrice !== methodData.minOrderPrice || existing.order !== methodData.order ) { - existing.name = methodData.name; + existing.title = methodData.title; existing.description = methodData.description; existing.deliveryFee = methodData.deliveryFee; existing.minOrderPrice = methodData.minOrderPrice;