LFFE-25 merging

src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx

@@ -9,7 +9,11 @@ import {useState} from "react";
 import PriceField from "@/core/components/PriceField";
 import * as Yup from "yup";
 
-const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
+const vehicle_amount = {
+    "اتوبوس": 7000,
+    "مینی بوس": 2000,
+}
+const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type}) => {
     const t = useTranslations();
     const [selectedImage, setSelectedImage] = useState("");
     const [fileType, setfileType] = useState(null);
@@ -17,23 +21,22 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
     const [showAddIcon, setShowAddIcon] = useState(true);
     const requestServer = useRequest({auth: true})
     const {update_notification} = useNotification()
-
     const validationSchema = Yup.object().shape({
         proposed_amount: Yup.mixed().test(
             "is-number",
             `${t("ConfirmDialog.proposed_amount_number")}`,
             (value) => !isNaN(value)
-        ).test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0)
+        ).test("max-amount", `${t("MachinaryOffice.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`,
+            (value) => value <= vehicle_amount[vehicle_type])
+            .test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0)
             .required(t("ConfirmDialog.proposed_amount_error")),
         confirm_img: Yup.mixed()
             .required(t("MachinaryOffice.upload_file_required"))
             .test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => {
-                // if (!value) return true; // Skip if no file is provided
-                return value.size <= 2 * 1024 * 1024; // 100KB limit (adjust as needed)
+                return value.size <= 2 * 1024 * 1024;
             })
             .test('fileType', `${t("MachinaryOffice.upload_file_format")}`, (value) => {
-                // if (!value) return true; // Skip if no file is provided
-                const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']; // Define your allowed file types
+                const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf'];
                 return allowedTypes.includes(value.type);
             })
     });
@@ -49,7 +52,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
             formData.append("proposed_amount", values.proposed_amount);
             if (values.description != "") formData.append("expert_description", values.description);
             if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
-
             requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', {
                 data: formData,
             }).then((response) => {

src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx

@@ -3,7 +3,8 @@ import {useTranslations} from "next-intl";
 import {useState} from "react";
 import ConfirmContent from "./ConfirmContent";
 import CallMadeIcon from '@mui/icons-material/CallMade';
-const Confirm = ({rowId, mutate}) => {
+
+const Confirm = ({rowId, mutate, vehicle_type}) => {
     const t = useTranslations();
     const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
     return (
@@ -21,7 +22,8 @@ const Confirm = ({rowId, mutate}) => {
             <Dialog fullWidth open={openConfirmDialog}
                     PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>
                 <DialogTitle>{t("MachinaryOffice.confirm")}</DialogTitle>
-                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}/>
+                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}
+                                vehicle_type={vehicle_type}/>
             </Dialog>
         </>
     )

src/components/dashboard/machinary-office/TableRowActions.jsx

@@ -3,11 +3,11 @@ import Confirm from "./Form/ConfirmForm";
 import Reject from "./Form/RejectForm";
 
 const TableRow = ({row, mutate}) => {
-
     return (
         <Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
             <Confirm
                 rowId={row.getValue("id")}
+                vehicle_type={row.original.vehicle_type}
                 mutate={mutate}
             />
             <Reject

src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx

@@ -9,7 +9,11 @@ import {useState} from "react";
 import PriceField from "@/core/components/PriceField";
 import * as Yup from "yup";
 
-const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
+const vehicle_amount = {
+    "اتوبوس": 7000,
+    "مینی بوس": 2000,
+}
+const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => {
     const t = useTranslations();
     const [selectedImage, setSelectedImage] = useState("");
     const [fileType, setfileType] = useState(null);
@@ -23,7 +27,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
             "is-number",
             `${t("ConfirmDialog.approved_amount_number")}`,
             (value) => !isNaN(value)
-        ).test("positive", `${t("ConfirmDialog.approved_amount_positive")}`, (value) => value >= 0)
+        ).test("max-amount", `${t("PassengerBoss.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`,
+            (value) => value <= vehicle_amount[vehicle_type])
+            .test("positive", `${t("ConfirmDialog.approved_amount_positive")}`, (value) => value >= 0)
             .required(t("ConfirmDialog.approved_amount_error")),
         confirm_img: Yup.mixed()
             .required(t("PassengerBoss.upload_file_required"))

src/components/dashboard/passenger-boss/Form/ConfirmForm/index.jsx

@@ -3,7 +3,8 @@ import {useTranslations} from "next-intl";
 import {useState} from "react";
 import ConfirmContent from "./ConfirmContent";
 import CallMadeIcon from '@mui/icons-material/CallMade';
-const Confirm = ({rowId, mutate}) => {
+
+const Confirm = ({rowId, mutate, vehicle_type}) => {
     const t = useTranslations();
     const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
     return (
@@ -21,7 +22,8 @@ const Confirm = ({rowId, mutate}) => {
             <Dialog fullWidth open={openConfirmDialog}
                     PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>
                 <DialogTitle>{t("PassengerBoss.confirm")}</DialogTitle>
-                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}/>
+                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}
+                                vehicle_type={vehicle_type}/>
             </Dialog>
         </>
     )

src/components/dashboard/passenger-boss/TableRowActions.jsx

@@ -8,6 +8,7 @@ const TableRow = ({row, mutate}) => {
         <Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
             <Confirm
                 rowId={row.getValue("id")}
+                vehicle_type={row.original.vehicle_type}
                 mutate={mutate}
             />
             <Reject

src/components/layouts/Dashboard/Sidebar/SidebarList.jsx

@@ -87,7 +87,7 @@ export default function SidebarList({handleDrawerToggle}) {
     }, [selectedKey]);
 
     return (
-        <List sx={{overflow: "scroll"}}>
+        <List dense={true} sx={{overflow: "scroll"}}>
             {itemMenu.map((itemArr, index) => (
                 <Fragment key={index}>
                     {itemArr.map((item) =>