diff --git a/src/pages/food/components/FoodTableColumns.tsx b/src/pages/food/components/FoodTableColumns.tsx index f2e9ff1..35b35ae 100644 --- a/src/pages/food/components/FoodTableColumns.tsx +++ b/src/pages/food/components/FoodTableColumns.tsx @@ -41,8 +41,8 @@ export const getFoodTableColumns = ({ onDelete, isDeleting }: GetFoodTableColumn key: 'categories', title: 'دسته بندی', render: (item: Food) => { - return item.categories && item.categories.length > 0 - ? item.categories.map(cat => cat.title).join(', ') + return item.category?.title + ? item.category.title : '-' } }, @@ -57,7 +57,7 @@ export const getFoodTableColumns = ({ onDelete, isDeleting }: GetFoodTableColumn key: 'prepareTime', title: 'زمان آماده سازی', render: (item: Food) => { - return formatTime(item.prepareTime) + return formatTime(item.prepareTime || 0) } }, { diff --git a/src/pages/food/types/Types.ts b/src/pages/food/types/Types.ts index 1404261..6315a6e 100644 --- a/src/pages/food/types/Types.ts +++ b/src/pages/food/types/Types.ts @@ -45,31 +45,24 @@ export type Food = { createdAt: string; updatedAt: string; deletedAt: string | null; + restaurant: string; + category: FoodDetailsCategory; + inventory: string | null; title: string; - desc: string | null; + desc: string; content: string[]; price: number; order: number | null; - prepareTime: number; - sat: boolean; - sun: boolean; - mon: boolean; - tue: boolean; - wed: boolean; - thu: boolean; - fri: boolean; - breakfast: boolean; - noon: boolean; - dinner: boolean; - stock: number; - stockDefault: number; + prepareTime: number | null; + weekDays: number[]; + mealTypes: string[]; isActive: boolean; images: string[]; inPlaceServe: boolean; pickupServe: boolean; - rate: number; + score: number | null; discount: number; - categories: Category[]; + isSpecialOffer: boolean; }; export type GetFoodsParams = { @@ -89,13 +82,13 @@ export type FoodDetails = { deletedAt: string | null; restaurant: string; category: FoodDetailsCategory; - inventory: number | null; + inventory: string | null; title: string; - desc: string | null; + desc: string; content: string[]; price: number; order: number | null; - prepareTime: number; + prepareTime: number | null; weekDays: number[]; mealTypes: string[]; isActive: boolean;