fix: fix deploy errors

healthy-food-and-dietary-products · Dec 19, 2023 · ec8dada · ec8dada
1 parent 05b8fee
commit ec8dada
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/src/components/profile-components/profile-order-mobile/index.tsx b/src/components/profile-components/profile-order-mobile/index.tsx
@@ -28,6 +28,7 @@ type Product = {
 };
 
 type CommonOrder = {
+	id: number;
 	order_number?: string;
 	ordering_date?: string;
 	total_price?: string;

diff --git a/src/components/profile-components/profile-order/index.tsx b/src/components/profile-components/profile-order/index.tsx
@@ -19,9 +19,14 @@ type Product = {
 	name: string;
 	quantity: string;
 	photo: string;
+	category: {
+		category_name: string;
+		category_slug: string;
+	};
 };
 
 type CommonOrder = {
+	id: number;
 	order_number?: string;
 	ordering_date?: string;
 	total_price?: string;

diff --git a/src/pages/profile/profile-orders/index.tsx b/src/pages/profile/profile-orders/index.tsx
@@ -5,11 +5,46 @@ import ReturnBackButton from '@components/profile-components/return-back-button'
 import { useProfile } from '@hooks/use-profile';
 import styles from './profile-orders.module.scss';
 import api from '@services/api';
-import { OrderList } from '@services/generated-api/data-contracts.ts';
+// import type { Product } from '@services/generated-api/data-contracts';
+// import { OrderList } from '@services/generated-api/data-contracts.ts';
+
+type OrderStatusType =
+	| 'Ordered'
+	| 'In processing'
+	| 'Collecting'
+	| 'Gathered'
+	| 'In delivering'
+	| 'Delivered'
+	| 'Completed';
+
+type Product = {
+	amount: number;
+	final_price: number;
+	id: number;
+	measure_unit: string;
+	name: string;
+	quantity: string;
+	photo: string;
+	category: {
+		category_name: string;
+		category_slug: string;
+	};
+};
+
+type CommonOrder = {
+	id: number;
+	order_number?: string;
+	ordering_date?: string;
+	total_price?: string;
+	payment_method?: string;
+	delivery_method?: string;
+	status?: OrderStatusType;
+	products: Array<{ product: Product; quantity: string }> | Product[];
+};
 
 export default function ProfileOrders() {
 	const [isOpenDetails, setIsOpenDetails] = useState<number>();
-	const [orders, setOrders] = useState<OrderList[]>([]);
+	const [orders, setOrders] = useState<CommonOrder[]>([]);
 	const { isMobileScreen } = useProfile();
 
 	useEffect(() => {