diff --git a/.env b/.env index 468fb44..be049e5 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ # VITE_API_BASE_URL = 'https://negareh-api.dev.danakcorp.com' -VITE_API_BASE_URL = 'http://10.164.213.88:4000' +VITE_API_BASE_URL = 'http://10.56.147.88:4000' VITE_TOKEN_NAME = 'negareh_at' VITE_REFRESH_TOKEN_NAME = 'negareh_art' diff --git a/src/pages/order/ConvertToOrders.tsx b/src/pages/order/ConvertToOrders.tsx index 257c261..7b77334 100644 --- a/src/pages/order/ConvertToOrders.tsx +++ b/src/pages/order/ConvertToOrders.tsx @@ -2,6 +2,7 @@ import { useState, type FC } from 'react' import { useFormik } from 'formik' import * as Yup from 'yup' import Input from '@/components/Input' +import Textarea from '@/components/Textarea' import Select from '@/components/Select' import UploadBox from '@/components/UploadBox' import Button from '@/components/Button' @@ -10,7 +11,10 @@ import type { ConvertToOrderItemType } from './types/Types' import { useConverToOrder, useGetProducts } from './hooks/useOrderData' import { useGetCategory } from '@/pages/product/hooks/useProductData' import { useGetUsers } from '@/pages/user/hooks/useUserData' -import { useSearchParams } from 'react-router-dom' +import { useNavigate, useSearchParams } from 'react-router-dom' +import { toast } from 'react-toastify' +import { Paths } from '@/config/Paths' +import { extractErrorMessage } from '@/config/func' const getInitialValues = (invoiceItemId: string | null): ConvertToOrderItemType => ({ invoiceItemId: invoiceItemId ?? '', @@ -19,6 +23,7 @@ const getInitialValues = (invoiceItemId: string | null): ConvertToOrderItemType typeId: '', estimatedDays: 0, title: '', + description: '', attachments: [], }) @@ -30,10 +35,12 @@ const getValidationSchema = (invoiceItemId: string | null) => typeId: Yup.string().required('انتخاب نوع اجباری است.'), estimatedDays: Yup.number().required('تخمین روز اجباری است.').min(0, 'باید عدد مثبت باشد'), title: Yup.string().required('عنوان اجباری است.'), + description: Yup.string(), }) const ConvertToOrders: FC = () => { + const navigate = useNavigate() const [searchParams] = useSearchParams() const invoiceItemId = searchParams.get('invoiceItemId') const multiUpload = useMultiUpload() @@ -64,10 +71,19 @@ const ConvertToOrders: FC = () => { productId: invoiceItemId ? undefined : values.productId, userId: invoiceItemId ? undefined : values.userId, estimatedDays: Number(values.estimatedDays), + description: values.description || undefined, attachments, } - await converToOrder(payload) + converToOrder(payload, { + onSuccess: () => { + toast.success('سفارش با موفقیت ثبت شد') + navigate(Paths.order.list) + }, + onError: (error) => { + toast.error(extractErrorMessage(error)) + } + }) }, }) @@ -154,6 +170,19 @@ const ConvertToOrders: FC = () => { /> +
+