MNPC/Rasadyar_FrontEnd
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: create guilds fix some

Browse Source
This commit is contained in:
Reza Ashrafi
2026-02-02 17:06:25 +03:30
parent 4b651f51c6
commit 199ffa7163
10 changed files with 282 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/features/steward/components/steward-add-buyer/StewardAddBuyer.js
View File

@@ -14,14 +14,14 @@ import {
ROUTE_ADMINX_ROUTE_OUT_PROVINCE_TRUE_GUILDS,
ROUTE_SLAUGHTER_INVENTORY_SELL_CARCASS_OUT_PROVINCE,
ROUTE_SLAUGHTER_MANAGE_GUILDS_OUT_PROVINCE_TRUE,
ROUTE_STEWARD_SALE_OUT_PROVINCE,
ROUTE_STEWARD_SALE_OUT_PROVINCE
} from "../../../../routes/routes";
import {
handleSetFormDataFromTableDataForStewardAddBuyer,
handleSubmitForStewardAddBuyer,
InquiryForStewardAddBuyer,
StewardAddBuyerForm,
validationSchemaForStewardAddBuyer,
validationSchemaForStewardAddBuyer
} from "./InquiryForStewardAddBuyer";
import { useAddBuyer } from "./hooks/useAddBuyer";
import { slaughterGetCitiesService } from "../../../slaughter-house/services/slaughter-get-provinces";
@@ -30,7 +30,7 @@ import {
handleSubmitForSlaughterAddBuyer,
InquiryForSlaughterAddBuyer,
SlaughterAddBuyerForm,
validationSchemaForSlaughterAddBuyer,
validationSchemaForSlaughterAddBuyer
} from "./InquiryForSlaughterAddBuyer";
import { useFormik } from "formik";
import {
@@ -38,7 +38,7 @@ import {
handleSetFormDataFromTableDataForAdminAddBuyer,
handleSubmitForAdminAddBuyer,
InquiryForAdminAddBuyer,
validationSchemaForAdminAddBuyer,
validationSchemaForAdminAddBuyer
} from "./InquiryForAdminAddBuyer";
import { inspectorGetKillHousesService } from "../../../inspector/services/inspector-get-kill-houses";
import { slaughterGetStewardsForAllocateService } from "../../../slaughter-house/services/slaughter-get-guilds-for-allocate";
@@ -64,7 +64,7 @@ const getCurrentPage = (role, pathname) => {
ROUTE_ADMINX_ROUTE_OUT_PROVINCE_TRUE_GUILDS,
ROUTE_ADMINX_ROUTE_OUT_PROVINCE_LEGAL_GUILDS,
ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_LEGAL,
ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_TRUE,
ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_TRUE
];
if (routes.some((r) => r === pathname)) {
return "admin_add_buyer";
@@ -79,20 +79,20 @@ const getInitialValues = (page) => {
lastName: "",
unit_name: "",
province: "",
city: "",
city: ""
};
if (page === "steward_add_buyer" || page === "slaughter_manage_add_buyer") {
return initialValues;
} else if (page === "slaughter_add_buyer") {
return {
...initialValues,
nationalId: "",
nationalId: ""
};
} else if (page === "admin_add_buyer") {
return {
...initialValues,
role_key: "",
type: "",
type: ""
};
}
return initialValues;
@@ -103,7 +103,7 @@ export const StewardAddBuyer = ({
isEdit = false,
data,
isRealPerson,
buyerType = "",
buyerType = ""
// buyerYype => "Guilds" | "Steward"
}) => {
const role = getRoleFromUrl();
@@ -124,7 +124,7 @@ export const StewardAddBuyer = ({
cityData,
setCityData,
userData,
setUserData,
setUserData
} = useAddBuyer(page);
const { selectedSubUser } = useSelector((state) => state.userSlice);
@@ -141,7 +141,7 @@ export const StewardAddBuyer = ({
? validationSchemaForSlaughterAddBuyer(isRealPerson, isEdit)
: IS_ADMIN_ADD_BUYER
? validationSchemaForAdminAddBuyer(isRealPerson, isEdit)
: Yup.object({}),
: Yup.object({})
});
useEffect(() => {
@@ -157,7 +157,7 @@ export const StewardAddBuyer = ({
} else {
dispatch(
slaughterGetStewardsForAllocateService({
free: true,
free: true
})
).then((r) => {
setStewards(r.payload.data || []);

40
src/features/steward/components/steward-purchase-out-province-add-buyer/StewardSellOutOfProvinceAddBuyer.js
View File

@@ -6,19 +6,19 @@ import {
Button,
IconButton,
TextField,
Typography,
Typography
} from "@mui/material";
import SearchIcon from "@mui/icons-material/Search";
import { Yup } from "../../../../lib/yup/yup";
import {
slaughterGetCitiesService,
slaughterGetProvinceService,
slaughterGetProvinceService
} from "../../../slaughter-house/services/slaughter-get-provinces";
import { Grid } from "../../../../components/grid/Grid";
import { SPACING } from "../../../../data/spacing";
import {
stewardSellOutGetBuyers,
stewatdSubmitBuyerDataService,
stewatdSubmitBuyerDataService
} from "../../../guild/services/steward-sell-out-get-buyers";
import { DRAWER, LOADING_END } from "../../../../lib/redux/slices/appSlice";
import { slaughterEditBuyerDataService } from "../../../slaughter-house/services/slaughter-house-submit-buyer";
@@ -29,7 +29,7 @@ import { checkPathStartsWith } from "../../../../utils/checkPathStartsWith";
export const StewardSellOutOfProvinceAddBuyer = ({
updateTable,
isEdit,
data,
data
}) => {
const [openNotif] = useContext(AppContext);
const [userData, setUserData] = useState(null);
@@ -48,7 +48,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
lastName: "",
unitName: "",
province: "",
city: "",
city: ""
},
validationSchema: Yup.object({
mobile: Yup.string()
@@ -70,22 +70,22 @@ export const StewardSellOutOfProvinceAddBuyer = ({
.typeError("لطفا فیلد را به درستی وارد کنید!"),
city: Yup.string()
.required("این فیلد اجباری است!")
.typeError("لطفا فیلد را به درستی وارد کنید!"),
}),
.typeError("لطفا فیلد را به درستی وارد کنید!")
})
});
const formik2 = useFormik({
initialValues: {
userInfoCheck: "",
userInfoCheck: ""
},
validationSchema: Yup.object({
userInfoCheck: Yup.string()
.required("این فیلد اجباری است!")
.min(11, "شماره موبایل باید 11 رقم باشد")
.max(11, "شماره موبایل باید 11 رقم باشد")
.matches(/^09\d{9}$/, "شماره موبایل باید با 09 شروع شود و 11 رقم باشد"),
.matches(/^09\d{9}$/, "شماره موبایل باید با 09 شروع شود و 11 رقم باشد")
}),
validateOnMount: true,
validateOnMount: true
});
useEffect(() => {
@@ -100,7 +100,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
lastName: userData.lastName || "",
unitName: userData.unitName || "",
province: userData.province || "",
city: userData.city || "",
city: userData.city || ""
});
setTimeout(() => {
formik.validateForm();
@@ -116,7 +116,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
lastName: data.lastName || "",
unitName: data.unitName || "",
province: data.province || "",
city: data.city || "",
city: data.city || ""
});
setTimeout(() => {
formik.validateForm();
@@ -194,7 +194,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
mobile: formik2.values.userInfoCheck,
role_key: checkPathStartsWith("steward")
? selectedSubUser?.key || ""
: "",
: ""
})
).then((r) => {
dispatch(LOADING_END());
@@ -205,7 +205,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
vertical: "top",
horizontal: "center",
msg: "خریدار یافت نشد، یک خریدار جدید ثبت کنید!",
severity: "error",
severity: "error"
});
} else {
const responseData = r.payload?.data;
@@ -351,7 +351,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
last_name: formik.values.lastName,
unit_name: formik.values.unitName,
city: formik.values.city,
province: formik.values.province,
province: formik.values.province
})
).then((r) => {
updateTable();
@@ -360,7 +360,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
vertical: "top",
horizontal: "center",
msg: r.payload.error,
severity: "error",
severity: "error"
});
} else {
dispatch(
@@ -371,7 +371,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
vertical: "top",
horizontal: "center",
msg: "عملیات با موفقیت انجام شد.",
severity: "success",
severity: "success"
});
}
});
@@ -384,7 +384,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
last_name: formik.values.lastName,
unit_name: formik.values.unitName,
city: formik.values.city,
province: formik.values.province,
province: formik.values.province
})
).then((r) => {
updateTable();
@@ -393,7 +393,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
vertical: "top",
horizontal: "center",
msg: r.payload.error,
severity: "error",
severity: "error"
});
} else {
dispatch(
@@ -404,7 +404,7 @@ export const StewardSellOutOfProvinceAddBuyer = ({
vertical: "top",
horizontal: "center",
msg: "عملیات با موفقیت انجام شد.",
severity: "success",
severity: "success"
});
}
});

38
src/features/steward/components/steward-sell-out-of-province-buyers-edit-buyer/StewardSellOutOfProvinceBuyersEditBuyer.js
View File

@@ -6,21 +6,21 @@ import {
Button,
IconButton,
TextField,
Typography,
Typography
} from "@mui/material";
import SearchIcon from "@mui/icons-material/Search";
import { AppContext } from "../../../../contexts/AppContext";
import { Yup } from "../../../../lib/yup/yup";
import {
slaughterGetCitiesService,
slaughterGetProvinceService,
slaughterGetProvinceService
} from "../../../slaughter-house/services/slaughter-get-provinces";
import { Grid } from "../../../../components/grid/Grid";
import { SPACING } from "../../../../data/spacing";
import {
slaughterEditBuyerDataService,
slaughterGetBuyerDataService,
slaughterSubmitBuyerDataService,
slaughterSubmitBuyerDataService
} from "../../../slaughter-house/services/slaughter-house-submit-buyer";
import { DRAWER, LOADING_END } from "../../../../lib/redux/slices/appSlice";
import { fetchStewardBroadcastAndProducts } from "../../services/handle-fetch-steward-products";
@@ -28,7 +28,7 @@ import { fetchStewardBroadcastAndProducts } from "../../services/handle-fetch-st
export const StewardSellOutOfProvinceBuyersEditBuyer = ({
updateTable,
isEdit,
data,
data
}) => {
const [openNotif] = useContext(AppContext);
const [userData, setUserData] = useState(null);
@@ -44,7 +44,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
lastName: "",
unitName: "",
province: "",
city: "",
city: ""
},
validationSchema: Yup.object({
mobile: Yup.string()
@@ -66,22 +66,22 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
.typeError("لطفا فیلد را به درستی وارد کنید!"),
city: Yup.string()
.required("این فیلد اجباری است!")
.typeError("لطفا فیلد را به درستی وارد کنید!"),
}),
.typeError("لطفا فیلد را به درستی وارد کنید!")
})
});
const formik2 = useFormik({
initialValues: {
userInfoCheck: "",
userInfoCheck: ""
},
validationSchema: Yup.object({
userInfoCheck: Yup.string()
.required("این فیلد اجباری است!")
.min(11, "شماره موبایل باید 11 رقم باشد")
.max(11, "شماره موبایل باید 11 رقم باشد")
.matches(/^09\d{9}$/, "شماره موبایل باید با 09 شروع شود و 11 رقم باشد"),
.matches(/^09\d{9}$/, "شماره موبایل باید با 09 شروع شود و 11 رقم باشد")
}),
validateOnMount: true,
validateOnMount: true
});
useEffect(() => {
@@ -96,7 +96,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
lastName: userData.lastName || "",
unitName: userData.unitName || "",
province: userData.province || "",
city: userData.city || "",
city: userData.city || ""
});
setTimeout(() => {
formik.validateForm();
@@ -112,7 +112,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
lastName: data.lastName || "",
unitName: data.unitName || "",
province: data.province || "",
city: data.city || "",
city: data.city || ""
});
setTimeout(() => {
formik.validateForm();
@@ -189,7 +189,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
vertical: "top",
horizontal: "center",
msg: "خریدار یافت نشد، یک خریدار جدید ثبت کنید!",
severity: "error",
severity: "error"
});
} else {
setUserData(r.payload.data);
@@ -317,7 +317,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
last_name: formik.values.lastName,
unit_name: formik.values.unitName,
city: formik.values.city,
province: formik.values.province,
province: formik.values.province
})
).then((r) => {
updateTable();
@@ -327,7 +327,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
vertical: "top",
horizontal: "center",
msg: r.payload.error,
severity: "error",
severity: "error"
});
} else {
dispatch(
@@ -338,7 +338,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
vertical: "top",
horizontal: "center",
msg: "عملیات با موفقیت انجام شد.",
severity: "success",
severity: "success"
});
}
});
@@ -350,7 +350,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
last_name: formik.values.lastName,
unit_name: formik.values.unitName,
city: formik.values.city,
province: formik.values.province,
province: formik.values.province
})
).then((r) => {
updateTable();
@@ -360,7 +360,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
vertical: "top",
horizontal: "center",
msg: r.payload.error,
severity: "error",
severity: "error"
});
} else {
dispatch(
@@ -371,7 +371,7 @@ export const StewardSellOutOfProvinceBuyersEditBuyer = ({
vertical: "top",
horizontal: "center",
msg: "عملیات با موفقیت انجام شد.",
severity: "success",
severity: "success"
});
}
});

34
src/features/steward/components/steward-submit-free-bar/StewardSubmitFreeBar.js
View File

@@ -8,13 +8,13 @@ import { AppContext } from "../../../../contexts/AppContext";
import { slaughterGetProductsService } from "../../../slaughter-house/services/slaughter-inventory-gets";
import {
slaughterGetCitiesService,
slaughterGetProvinceService,
slaughterGetProvinceService
} from "../../../slaughter-house/services/slaughter-get-provinces";
import { fixBase64 } from "../../../../utils/toBase64";
import { DRAWER } from "../../../../lib/redux/slices/appSlice";
import {
stewardEditFreeBarService,
stewardSubmitFreeBarService,
stewardSubmitFreeBarService
} from "../../../guild/services/steward-submit-free-bar-service";
import { Grid } from "../../../../components/grid/Grid";
import { SPACING } from "../../../../data/spacing";
@@ -32,7 +32,7 @@ const ValidationSchema = Yup.object().shape({
bar_image: Yup.string().when("$isEdit", {
is: true,
then: Yup.string(),
otherwise: Yup.string().required("عکس بار الزامی است"),
otherwise: Yup.string().required("عکس بار الزامی است")
}),
number_of_carcasses: Yup.number()
.required("حجم لاشه الزامی است")
@@ -40,7 +40,7 @@ const ValidationSchema = Yup.object().shape({
weight_of_carcasses: Yup.number()
.required("وزن لاشه الزامی است")
.min(0.01, "وزن باید بیشتر از 0 باشد"),
product_key: Yup.string().required("انتخاب محصول الزامی است"),
product_key: Yup.string().required("انتخاب محصول الزامی است")
});
export const StewardSubmitFreeBar = ({ updateTable, item }) => {
@@ -59,7 +59,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
slaughterGetProductsService({
role_key: checkPathStartsWith("steward")
? selectedSubUser?.key || ""
: "",
: ""
})
).then((r) => {
// Handle both direct array response and nested data response
@@ -90,7 +90,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
role_key: checkPathStartsWith("steward")
? selectedSubUser?.key || ""
: "",
...(item?.key && { key: item.key }),
...(item?.key && { key: item.key })
},
validationSchema: ValidationSchema,
onSubmit: (values) => {
@@ -107,7 +107,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
vertical: "top",
horizontal: "center",
msg: r.payload.error,
severity: "error",
severity: "error"
});
} else {
updateTable();
@@ -118,7 +118,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
msg: item?.key
? "اطلاعات خرید با موفقیت ویرایش شد"
: "اطلاعات خرید جدید با موفقیت ثبت شد",
severity: "success",
severity: "success"
});
}
};
@@ -128,7 +128,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
} else {
dispatch(stewardSubmitFreeBarService(values)).then(thenCallback);
}
},
}
});
const factorPaymentHandler = (imageList) => {
@@ -164,7 +164,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
Array.isArray(productData) && productData.length > 0
? productData.map((i) => ({
id: i.key,
label: i.name || "",
label: i.name || ""
}))
: []
}
@@ -199,7 +199,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
style={{
display: "flex",
flexDirection: "column",
gap: SPACING.LARGE,
gap: SPACING.LARGE
}}
>
<TextField
@@ -240,13 +240,13 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
id="province"
options={provinceData.map((i) => ({
id: i.name,
label: i.name,
label: i.name
}))}
value={
formik.values.province
? {
id: formik.values.province,
label: formik.values.province,
label: formik.values.province
}
: null
}
@@ -276,7 +276,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
formik.values.city
? {
id: formik.values.city,
label: formik.values.city,
label: formik.values.city
}
: null
}
@@ -300,9 +300,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
label="حجم لاشه"
type="number"
InputProps={{
endAdornment: (
<InputAdornment position="end">قطعه</InputAdornment>
),
endAdornment: <InputAdornment position="end">قطعه</InputAdornment>
}}
value={formik.values.number_of_carcasses}
onChange={formik.handleChange}
@@ -325,7 +323,7 @@ export const StewardSubmitFreeBar = ({ updateTable, item }) => {
InputProps={{
endAdornment: (
<InputAdornment position="end">کیلوگرم</InputAdornment>
),
)
}}
value={formik.values.weight_of_carcasses}
onChange={formik.handleChange}