diff --git a/src/pages/request/MyRequests.tsx b/src/pages/request/MyRequests.tsx
index a2decec..e316c63 100644
--- a/src/pages/request/MyRequests.tsx
+++ b/src/pages/request/MyRequests.tsx
@@ -58,7 +58,7 @@ const MyRequests: FC = () => {
{item.items.map((requestItem) => (
- {requestItem.product.title} {requestItem.quantity} عدد
+ {requestItem.product.title}
))}
diff --git a/src/pages/request/RequestDetail.tsx b/src/pages/request/RequestDetail.tsx
index 04755b0..c0958d4 100644
--- a/src/pages/request/RequestDetail.tsx
+++ b/src/pages/request/RequestDetail.tsx
@@ -49,10 +49,6 @@ const RequestDetail: FC = () => {
عنوان:
{item.product.title}
-
-
تعداد:
-
{item.quantity}
-
diff --git a/src/pages/request/components/Request.tsx b/src/pages/request/components/Request.tsx
index 51a2fac..190bdc5 100644
--- a/src/pages/request/components/Request.tsx
+++ b/src/pages/request/components/Request.tsx
@@ -1,7 +1,5 @@
import { useEffect, useMemo, useState, type ChangeEvent, type FC } from 'react'
import Button from '@/components/Button'
-import Input from '@/components/Input'
-import Select from '@/components/Select'
import UploadBox from '@/components/UploadBox'
import VoiceRecorder from '@/components/VoiceRecorder'
import { COLORS } from '@/constants/colors'
@@ -19,7 +17,6 @@ import { clx } from '@/helpers/utils'
const emptyValues: RequestType = {
productId: undefined,
attachments: [],
- quantity: undefined,
description: '',
attributes: [],
}
@@ -37,7 +34,6 @@ const Request: FC = ({ editIndex, initialItem, onSaved, onCancelEdit }) =
const { data } = useGetProducts()
const { setItems, items } = useRequestStore()
const [productSelected, setProductSelected] = useState()
- const [quantitySelect, setQuantitySelect] = useState('')
const [voiceFile, setVoiceFile] = useState()
const [files, setFiles] = useState([])
const singleUpload = useSingleUpload()
@@ -48,7 +44,6 @@ const Request: FC = ({ editIndex, initialItem, onSaved, onCancelEdit }) =
enableReinitialize: true,
validationSchema: Yup.object({
productId: Yup.string().required('این فیلد اجباری می باشد'),
- quantity: Yup.number().required('این فیلد اجباری می باشد'),
}),
onSubmit: async (values) => {
const attachments: AttachmentsType[] = [...(values.attachments ?? [])]
@@ -97,11 +92,7 @@ const Request: FC = ({ editIndex, initialItem, onSaved, onCancelEdit }) =
const resolvedProduct = useMemo(() => {
if (productSelected) return productSelected
if (!activeProductId || !data?.data) return undefined
- const product = data.data.find((p) => p.id === activeProductId)
- if (!product) return undefined
- const quantities = [...product.quantities]
- if (quantities[0] !== 0) quantities.unshift(0)
- return { ...product, quantities }
+ return data.data.find((p) => p.id === activeProductId)
}, [productSelected, activeProductId, data])
const { data: attributes } = useGetAttributes(resolvedProduct?.id)
@@ -112,17 +103,7 @@ const Request: FC = ({ editIndex, initialItem, onSaved, onCancelEdit }) =
const product = data.data.find((p) => p.id === initialItem.productId)
if (!product) return
- const quantities = [...product.quantities]
- if (quantities[0] !== 0) quantities.unshift(0)
-
- setProductSelected({ ...product, quantities })
-
- const qty = initialItem.quantity
- if (qty !== undefined && quantities.includes(qty)) {
- setQuantitySelect(String(qty))
- } else {
- setQuantitySelect('0')
- }
+ setProductSelected(product)
}, [initialItem, data])
const handleProductChange = (e: ChangeEvent) => {
@@ -130,12 +111,9 @@ const Request: FC = ({ editIndex, initialItem, onSaved, onCancelEdit }) =
const product = data?.data?.find((o) => o.id === productId)
if (product) {
- const quantities = [...product.quantities]
- if (quantities[0] !== 0) quantities.unshift(0)
- setProductSelected({ ...product, quantities })
+ setProductSelected(product)
formik.setFieldValue('productId', productId)
formik.setFieldValue('attributes', [])
- setQuantitySelect('')
}
}
@@ -179,46 +157,6 @@ const Request: FC = ({ editIndex, initialItem, onSaved, onCancelEdit }) =
/>
-
-
-
= ({
{getProductTitle(item.productId)}
-
- تعداد: {item.quantity}
- {item.attachments.length > 0 && (
-
- · {item.attachments.length} پیوست
-
- )}
-
+ {item.attachments.length > 0 && (
+
+ {item.attachments.length} پیوست
+
+ )}