diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index a0ea9cb..fbb6e32 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -155,6 +155,15 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => formData.append("approved_amount", values.approved_amount); formData.append("bank_facility", values.bank_facility); formData.append("government_facility", values.government_facility); + formData.append("user_facility", values.user_facility); + formData.append("repayment_period", values.repayment_period); + formData.append("participation_period", values.participation_period); + formData.append("interest_rate", values.interest_rate); + formData.append("committed_employment", values.committed_employment); + formData.append("available_jobs", values.available_jobs); + formData.append("sakht_period", values.sakht_period); + formData.append("tanafos_period", values.tanafos_period); + formData.append("history_facilities", values.history_facilities); if (values.description != "") formData.append("expert_description", values.description); if (values.physical_progress != "") formData.append("physical_progress", values.physical_progress); @@ -170,6 +179,18 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => formData.append(`attachment[${index}][file]`, attachment.file); }); } + if (values.expert_img != null) { + const attachments = [ + { + title: "فایل ضمیمه گزارش کارشناس", + file: values.expert_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', { notification: true, @@ -473,32 +494,32 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => { id: 1, value: "1", - name: "1 ماه - 30 روز" + name: "1 ماه" }, { id: 2, value: "2", - name: "2 ماه - 60 روز" + name: "2 ماه" }, { id: 3, value: "3", - name: "3 ماه - 90 روز" + name: "3 ماه" }, { id: 4, value: "4", - name: "4 ماه - 120 روز" + name: "4 ماه" }, { id: 5, value: "5", - name: "5 ماه - 150 روز" + name: "5 ماه" }, { id: 6, value: "6", - name: "6 ماه - 180 روز" + name: "6 ماه" } ]} schema={{value: 'value', name: 'name'}} @@ -697,6 +718,5 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => ) - } export default ConfirmContent \ No newline at end of file diff --git a/src/components/dashboard/passenger-boss/Form/ReserveForm/index.jsx b/src/components/dashboard/passenger-boss/Form/ReserveForm/index.jsx index 62dbc52..a1316b8 100644 --- a/src/components/dashboard/passenger-boss/Form/ReserveForm/index.jsx +++ b/src/components/dashboard/passenger-boss/Form/ReserveForm/index.jsx @@ -12,7 +12,7 @@ import {useState} from "react"; import RepartitionIcon from '@mui/icons-material/Repartition'; import useRequest from "@/lib/app/hooks/useRequest"; import useNotification from "@/lib/app/hooks/useNotification"; -import {RESERVE_MACHINARY_LOAN} from "@/core/data/apiRoutes"; +import {RESERVE_PASSENGER_BOSS} from "@/core/data/apiRoutes"; const ReserveForm = ({rowId, mutate}) => { const t = useTranslations(); @@ -23,7 +23,7 @@ const ReserveForm = ({rowId, mutate}) => { const handleSubmit = () => { setIsSubmitting(true) - requestServer(`${RESERVE_MACHINARY_LOAN}/${rowId}`, 'post').then((response) => { + requestServer(`${RESERVE_PASSENGER_BOSS}/${rowId}`, 'post').then((response) => { setOpenConfirmDialog(false) mutate() update_notification() diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js index e860a13..f0d4774 100644 --- a/src/core/data/apiRoutes.js +++ b/src/core/data/apiRoutes.js @@ -39,7 +39,8 @@ export const REJECT_PASSENGER_BOSS = BASE_URL + "/dashboard/province_working_group/reject"; export const EXPORT_PASSENGER_BOSS = BASE_URL + "/dashboard/province_working_group/export"; - +export const RESERVE_PASSENGER_BOSS = + BASE_URL + "/dashboard/province_working_group/reserve"; export const EXPORT_PASSENGER_BOSS_DETAILS = BASE_URL + "/dashboard/province_working_group"; //passenger boss @@ -77,8 +78,6 @@ export const EXPORT_MACHINARY_OFFICE = export const GET_RESERVE_MACHINARY_LOAN = BASE_URL + "/dashboard/reserved_loan/show"; -export const RESERVE_MACHINARY_LOAN = - BASE_URL + "/dashboard/machinery_expert/reserve"; export const CANSEL_RESERVE_MACHINARY_LOAN = BASE_URL + "/dashboard/reserved_loan/unreserve";