detail_order

src/pages/orders/components/OrderItemsDetails.tsx

@@ -26,8 +26,8 @@ const OrderItemsDetails: FC<OrderItemsDetailsProps> = ({ order, getStatusColor }
 
     const orderItems: OrderItemTable[] = order.items.map((item: OrderItemType) => ({
         id: item.id,
-        image: item.food?.images?.[0] || '',
-        title: item.food?.title || '-',
+        image: '',
+        title: item.variant?.value?.trim() ? item.variant.value : 'محصول',
         quantity: item.quantity,
         unitPrice: item.unitPrice,
         discount: item.discount,

src/pages/orders/types/Types.ts

@@ -22,7 +22,7 @@ export interface ServiceArea {
   coordinates: number[][][];
 }
 
-export interface RestaurantScore {
+export interface OrderShopScore {
   scoreAmount: string;
   scoreCredit: string;
   birthdayScore: string;
@@ -33,7 +33,7 @@ export interface RestaurantScore {
   marriageDateScore: string;
 }
 
-export interface OrderRestaurant {
+export interface OrderShop {
   id: string;
   createdAt: string;
   updatedAt: string;
@@ -45,7 +45,7 @@ export interface OrderRestaurant {
   menuColor: string | null;
   latitude: number | null;
   longitude: number | null;
-  serviceArea: ServiceArea;
+  serviceArea: ServiceArea | null;
   isActive: boolean;
   establishedYear: number | null;
   phone: string;
@@ -59,9 +59,10 @@ export interface OrderRestaurant {
   images: string[] | null;
   vat: number;
   domain: string;
-  score: RestaurantScore;
-  plan: string;
-  subscriptionId: string;
+  score: OrderShopScore;
+  subscriptionId: string | null;
+  subscriptionEndDate: string | null;
+  subscriptionStartDate: string | null;
 }
 
 export interface OrderDeliveryMethod {
@@ -70,7 +71,7 @@ export interface OrderDeliveryMethod {
   updatedAt: string;
   deletedAt: string | null;
   method: string;
-  restaurant: string;
+  shop: string;
   deliveryFee: number;
   deliveryFeeType: string;
   perKilometerFee: number | null;
@@ -104,7 +105,7 @@ export interface OrderPaymentMethod {
   createdAt: string;
   updatedAt: string;
   deletedAt: string | null;
-  restaurant: string;
+  shop: string;
   method: string;
   gateway: string | null;
   description: string;
@@ -113,28 +114,14 @@ export interface OrderPaymentMethod {
   merchantId: string | null;
 }
 
-export interface OrderFood {
+export interface OrderVariant {
   id: string;
-  createdAt: string;
-  updatedAt: string;
-  deletedAt: string | null;
-  restaurant: string;
-  category: string;
-  title: string;
-  desc: string;
-  content: string[];
+  createdAt?: string;
+  updatedAt?: string;
+  deletedAt?: string | null;
+  product: string;
+  value: string;
   price: number;
-  order: number | null;
-  prepareTime: number | null;
-  weekDays: number[];
-  mealTypes: string[];
-  isActive: boolean;
-  images: string[];
-  inPlaceServe: boolean;
-  pickupServe: boolean;
-  score: number;
-  discount: number;
-  isSpecialOffer: boolean;
 }
 
 export interface OrderItem {
@@ -143,7 +130,7 @@ export interface OrderItem {
   updatedAt: string;
   deletedAt: string | null;
   order: string;
-  food: OrderFood;
+  variant: OrderVariant;
   quantity: number;
   unitPrice: number;
   discount: number;
@@ -153,6 +140,25 @@ export interface OrderItem {
 export interface OrderHistory {
   status: string;
   changedAt: string;
+  desc?: string | null;
+}
+
+export interface PaymentVerifyResponseData {
+  fee?: number;
+  code?: number;
+  wages?: unknown;
+  ref_id?: number;
+  message?: string;
+  card_pan?: string;
+  fee_type?: string;
+  order_id?: string;
+  card_hash?: string;
+  shaparak_fee?: number;
+}
+
+export interface OrderPaymentVerifyResponse {
+  data?: PaymentVerifyResponseData;
+  errors?: unknown[];
 }
 
 export interface OrderPayment {
@@ -168,7 +174,7 @@ export interface OrderPayment {
   transactionId: string | null;
   status: string;
   cardPan: string | null;
-  verifyResponse: unknown | null;
+  verifyResponse: OrderPaymentVerifyResponse | null;
   paidAt: string | null;
   failedAt: string | null;
   description: string | null;
@@ -189,7 +195,7 @@ export interface Order extends RowDataType {
   updatedAt: string;
   deletedAt: string | null;
   user: OrderUser;
-  restaurant: OrderRestaurant;
+  shop: OrderShop;
   deliveryMethod: OrderDeliveryMethod;
   userAddress: UserAddress | null;
   carAddress: CarAddress | null;
@@ -206,7 +212,7 @@ export interface Order extends RowDataType {
   total: number;
   totalItems: number;
   description: string;
-  tableNumber: string | null;
+  tableNumber?: string | null;
   status: string;
   paymentStatus?: string;
   history: OrderHistory[];