From 8dbfcdad53d713076293f1df4e6b0dbffa40f34f Mon Sep 17 00:00:00 2001
From: hamid zarghami <hamid.zarghami1@gmail.com>
Date: Sat, 31 Jan 2026 09:29:58 +0330
Subject: [PATCH] change submit order

---
 src/pages/order/components/ManageAttribute.tsx |  6 +++---
 src/pages/order/components/Order.tsx           |  5 +++--
 src/pages/order/hooks/useOrderData.ts          |  8 ++++++++
 src/pages/order/service/OrderService.ts        | 16 ++++++++++++----
 src/pages/order/type/Types.ts                  |  5 +++--
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/pages/order/components/ManageAttribute.tsx b/src/pages/order/components/ManageAttribute.tsx
index 785da50..a3f595f 100644
--- a/src/pages/order/components/ManageAttribute.tsx
+++ b/src/pages/order/components/ManageAttribute.tsx
@@ -43,7 +43,7 @@ const ManageAttribute: FC<Props> = (props) => {
                                 <Select
                                     placeholder={`انتخاب ${item.isRequired ? '(اجباری)' : '(اختاری)'}`}
                                     label={item.name}
-                                    items={item.values?.map((value) => {
+                                    items={item.options?.map((value) => {
                                         return {
                                             label: value.value,
                                             value: value.value
@@ -59,7 +59,7 @@ const ManageAttribute: FC<Props> = (props) => {
                                 <div className='text-sm mb-3'>{item.name}</div>
                                 <div className='flex gap-5 flex-wrap'>
                                     {
-                                        item.values?.map((value) => {
+                                        item.options?.map((value) => {
                                             const object = formik.values.attributes.find(o => o.attributeId === item.id)
                                             return (
                                                 <div key={value.id} className='flex gap-2 items-center'>
@@ -82,7 +82,7 @@ const ManageAttribute: FC<Props> = (props) => {
                             <div key={item.id} className='mt-6'>
                                 <div className='text-sm mb-3'>{item.name}</div>
                                 <RadioGroup
-                                    items={item.values?.map((value) => {
+                                    items={item.options?.map((value) => {
                                         return {
                                             label: value.value,
                                             value: value.value
diff --git a/src/pages/order/components/Order.tsx b/src/pages/order/components/Order.tsx
index 10e41bf..0977062 100644
--- a/src/pages/order/components/Order.tsx
+++ b/src/pages/order/components/Order.tsx
@@ -10,7 +10,7 @@ import ProductsSelect from './ProductsSelect'
 import { useFormik } from 'formik'
 import * as Yup from 'yup'
 import type { AttachmentsType, OrderType, ProductType } from '../type/Types'
-import { useGetProducts } from '../hooks/useOrderData'
+import { useGetAttributes, useGetProducts } from '../hooks/useOrderData'
 import ManageAttribute from './ManageAttribute'
 import { useMultiUpload, useSingleUpload } from '@/pages/uploader/hooks/useUploader'
 import { useOrderStore } from '../store/OrderStore'
@@ -29,6 +29,7 @@ const Order: FC<Props> = ({ addNewItem }) => {
     const [productSelected, setProductSelected] = useState<ProductType>()
     const [voiceFile, setVoiceFile] = useState<File>()
     const [files, setFiles] = useState<File[]>([])
+    const { data: attributes } = useGetAttributes(productSelected?.id)
     const singleUpload = useSingleUpload()
     const multiUpload = useMultiUpload()
 
@@ -112,7 +113,7 @@ const Order: FC<Props> = ({ addNewItem }) => {
 
             <div>
                 <ManageAttribute
-                    attributes={productSelected?.attributes}
+                    attributes={attributes?.data}
                     formik={formik}
                 />
             </div>
diff --git a/src/pages/order/hooks/useOrderData.ts b/src/pages/order/hooks/useOrderData.ts
index cde0d81..c438064 100644
--- a/src/pages/order/hooks/useOrderData.ts
+++ b/src/pages/order/hooks/useOrderData.ts
@@ -10,6 +10,14 @@ export const useGetProducts = () => {
   });
 };
 
+export const useGetAttributes = (id?: number) => {
+  return useQuery({
+    queryKey: ["products-attributes", id],
+    queryFn: () => api.getAttributes(id),
+    enabled: !!id,
+  });
+};
+
 export const useSubmitOrder = () => {
   return useMutation({
     mutationFn: api.submitOrder,
diff --git a/src/pages/order/service/OrderService.ts b/src/pages/order/service/OrderService.ts
index 5336994..89b8be5 100644
--- a/src/pages/order/service/OrderService.ts
+++ b/src/pages/order/service/OrderService.ts
@@ -1,6 +1,7 @@
 import axios from "@/config/axios";
 import type {
   AddTicketType,
+  AttributeResponseType,
   MyOrdersResponseType,
   OrderDetailResponseType,
   OrderType,
@@ -14,6 +15,13 @@ export const getProducts = async () => {
   return data;
 };
 
+export const getAttributes = async (productId?: number) => {
+  const { data } = await axios.get<AttributeResponseType>(
+    `/public/entity/${productId}/field`
+  );
+  return data;
+};
+
 export const submitOrder = async (params: OrderType[]) => {
   const { data } = await axios.post(`/public/orders`, { items: params });
   return data;
@@ -21,7 +29,7 @@ export const submitOrder = async (params: OrderType[]) => {
 
 export const getMyOrders = async (
   page: number = 1,
-  active: TabMyOrdersEnum,
+  active: TabMyOrdersEnum
 ) => {
   const statuses =
     active === TabMyOrdersEnum.IN_PROGRESS
@@ -47,21 +55,21 @@ export const getMyOrders = async (
     query += `&statuses=${statuses}`;
   }
   const { data } = await axios.get<MyOrdersResponseType>(
-    `/public/orders${query}`,
+    `/public/orders${query}`
   );
   return data;
 };
 
 export const getOrderDetails = async (id: string) => {
   const { data } = await axios.get<OrderDetailResponseType>(
-    `/public/orders/${id}`,
+    `/public/orders/${id}`
   );
   return data;
 };
 
 export const getTickets = async (orderId: string) => {
   const { data } = await axios.get<TicketsResponseType>(
-    `/public/ticket/order/${orderId}`,
+    `/public/ticket/order/${orderId}`
   );
   return data;
 };
diff --git a/src/pages/order/type/Types.ts b/src/pages/order/type/Types.ts
index 267a99c..d3ae7d9 100644
--- a/src/pages/order/type/Types.ts
+++ b/src/pages/order/type/Types.ts
@@ -44,7 +44,7 @@ export type AttributeType = {
   order: number;
   product: number;
   type: FieldTypeEnum;
-  values: AttributeValueType[];
+  options: AttributeValueType[];
 };
 
 export type ProductType = {
@@ -58,7 +58,6 @@ export type ProductType = {
   order: number;
   quantities: number[];
   title: string;
-  attributes: AttributeType[];
 };
 
 export type ProductsResponseType = BaseResponse<ProductType[]>;
@@ -120,3 +119,5 @@ export type TicketType = {
 };
 
 export type TicketsResponseType = BaseResponse<TicketType[]>;
+
+export type AttributeResponseType = BaseResponse<AttributeType[]>;