diff --git a/src/features/province/components/guilds-operations/GuildsOperations.js b/src/features/province/components/guilds-operations/GuildsOperations.js index 0545c00..dc557b9 100644 --- a/src/features/province/components/guilds-operations/GuildsOperations.js +++ b/src/features/province/components/guilds-operations/GuildsOperations.js @@ -11,6 +11,7 @@ import { ROUTE_PROVINCE_ROUTE_IN_PROVINCE_GUILDS_REQUESTS, ROUTE_PROVINCE_ROUTE_IN_PROVINCE_GUILDS, ROUTE_PROVINCE_ROUTE_MANAGE_GUILDS, + ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS, ROUTE_PROVINCE_ROUTE_OUT_PROVINCE_GUILDS, // ROUTE_SUPER_ADMIN_ROUTE_GUILDS, ROUTE_SUPER_ADMIN_ROUTE_IN_PROVINCE_GUILDS_REQUESTS, @@ -40,15 +41,7 @@ export const GuildsOperations = () => { return ( <> - {[ - ROUTE_SUPER_ADMIN_ROUTE_IN_PROVINCE_GUILDS, - ROUTE_ADMINX_ROUTE_IN_PROVINCE_GUILDS, - ROUTE_PROVINCE_ROUTE_IN_PROVINCE_GUILDS, - ROUTE_SUPER_ADMIN_ROUTE_OUT_PROVINCE_GUILDS, - ROUTE_ADMINX_ROUTE_OUT_PROVINCE_GUILDS, - ROUTE_PROVINCE_ROUTE_OUT_PROVINCE_GUILDS, - ].includes(pathname) && } - + { ROUTE_SUPER_ADMIN_ROUTE_MANAGE_GUILDS, ROUTE_ADMINX_ROUTE_MANAGE_GUILDS, ROUTE_PROVINCE_ROUTE_MANAGE_GUILDS, + ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS, ].includes(pathname) && ( <> { const IS_STEWARD = userType === "steward"; @@ -109,6 +111,31 @@ export const ProvinceLegalGuildsOutProvince = ({ userType }) => { alignItems="center" gap={2} > +
{ const IS_STEWARD = userType === "steward"; @@ -109,6 +112,36 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => { > + { const [cargoInformation, setCargoInformation] = useState(null); @@ -511,6 +514,26 @@ export const TotalCargoInformation = () => { > + + + + + diff --git a/src/features/slaughter-house/components/slaughter-sell-carcass-in-province/ProvinceSellCarcassInProvince.js b/src/features/slaughter-house/components/slaughter-sell-carcass-in-province/ProvinceSellCarcassInProvince.js index 26fd975..f8c8081 100644 --- a/src/features/slaughter-house/components/slaughter-sell-carcass-in-province/ProvinceSellCarcassInProvince.js +++ b/src/features/slaughter-house/components/slaughter-sell-carcass-in-province/ProvinceSellCarcassInProvince.js @@ -159,7 +159,9 @@ export const ProvinceSellCarcassInProvince = ({ updateTable, priceInfo }) => { "تایید شده" ) : item?.loggedRegistrationCode ? ( item.loggedRegistrationCode - ) : item?.registrationCode ? ( + ) : item?.registrationCode && + item?.allocationType !== "ColdHouse" && + item?.activeExpireDateTime ? ( + {"استعلام "} {formik2.values.personType === "legal" diff --git a/src/features/vet-farm/components/vet-farm-deleted-bars/VetFarmDeletedBars.js b/src/features/vet-farm/components/vet-farm-deleted-bars/VetFarmDeletedBars.js index 6b943c0..b4b16ff 100644 --- a/src/features/vet-farm/components/vet-farm-deleted-bars/VetFarmDeletedBars.js +++ b/src/features/vet-farm/components/vet-farm-deleted-bars/VetFarmDeletedBars.js @@ -8,7 +8,6 @@ import { RiFileExcel2Fill, RiSearchLine } from "react-icons/ri"; import { AppContext } from "../../../../contexts/AppContext"; import ResponsiveTable from "../../../../components/responsive-table/ResponsiveTable"; import { getRoleFromUrl } from "../../../../utils/getRoleFromUrl"; -import { getFaUserRole } from "../../../../utils/getFaUserRole"; import { LOADING_END, LOADING_START, @@ -19,6 +18,7 @@ import { Grid } from "../../../../components/grid/Grid"; import { format } from "date-fns-jalali"; import { SPACING } from "../../../../data/spacing"; import { checkPathStartsWith } from "../../../../utils/checkPathStartsWith"; +import { formatTime } from "../../../../utils/formatTime"; export const VetFarmDeletedBars = () => { const [data, setData] = useState([]); @@ -327,27 +327,10 @@ export const VetFarmDeletedBars = () => { item?.trafficCode || "", item?.amount ? item.amount.toLocaleString() + " ﷼" : "0 ﷼", item?.clearanceCode || "-", - - item?.barRemover - ? `${item.barRemover?.fullName || ""} (${getFaUserRole( - item.barRemover?.role - )}) (${ - item.barRemover?.date - ? (() => { - try { - const date = new Date(item.barRemover.date); - return isNaN(date.getTime()) - ? "-" - : format(date, "yyyy/MM/dd"); - } catch (error) { - console.error("Error formatting barRemover date:", error); - return "-"; - } - })() - : "-" - })` - : "-", - item?.nonReceipt ? `(عدم وصول) ${item?.message || ""}` : "-", + (item?.nonReceipt && item?.mainNonReceipt ? `کاربر` : "سیستم") + + " " + + formatTime(item?.modifyDate), + item?.nonReceiptMessage || "-", ]; }); @@ -509,8 +492,8 @@ export const VetFarmDeletedBars = () => { "کد بهداشتی حمل و نقل", "قیمت مرغ زنده‌ی بار", "کدرهگیری سامانه قرنطینه", - "حذف کننده", - "دلیل حذف", + "نوع برگشت", + "پیام عدم دریافت", ]} handlePageChange={handlePageChange} totalRows={totalRows} diff --git a/src/pages/Guilds.js b/src/pages/Guilds.js index 5eacd18..93f7098 100644 --- a/src/pages/Guilds.js +++ b/src/pages/Guilds.js @@ -56,13 +56,13 @@ import { ROUTE_SUPER_ADMIN_ROUTE_OUT_PROVINCE_LEGAL_GUILDS, ROUTE_ADMINX_ROUTE_OUT_PROVINCE_LEGAL_GUILDS, ROUTE_PROVINCE_ROUTE_OUT_PROVINCE_LEGAL_GUILDS, + ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS, } from "../routes/routes"; import { BackButton } from "../components/back-button/BackButton"; import { GuildsOperations } from "../features/province/components/guilds-operations/GuildsOperations"; import { ManageStewards } from "../features/province/components/manage-stewards/ManageStewards"; import { GuildsSettings } from "../features/province/components/guilds-settings/GuildsSettings"; import { GuildsOperationsCommerce } from "../features/commerce/components/guilds-operations-commerce/GuildsOperationsCommerce"; -import { getRoleFromUrl } from "../utils/getRoleFromUrl"; import { ManageGuildsRequests } from "../features/province/components/manage-guilds-requests/ManageGuildsRequests"; import { GuildsOperationsCityJihad } from "../features/city-jihad/components/guilds-operations-city-jihad/GuildsOperationsCityJihad"; import { GuildRoomOperations } from "../features/guild-room/components/guild-room-operations/GuildRoomOperations"; @@ -75,6 +75,7 @@ import { ProvinceLegalGuildsOutProvince } from "../features/province/components/ const MANAGE_ROUTES = [ ROUTE_PROVINCE_ROUTE_MANAGE_GUILDS, ROUTE_COMMERCE_ROUTE_MANAGE_GUILDS, + ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS, ROUTE_PROVINCE_SUPERVISOR_ROUTE_MANAGE_GUILDS, ROUTE_GUILD_ROOM_ROUTE_MANAGE_GUILDS, ROUTE_CITY_JIHAD_ROUTE_MANAGE_GUILDS, @@ -93,6 +94,7 @@ const GUILDS_OPERATIONS_ROUTES = [ ROUTE_PROVINCE_ROUTE_MANAGE_GUILDS, ROUTE_SUPER_ADMIN_ROUTE_MANAGE_GUILDS, ROUTE_ADMINX_ROUTE_MANAGE_GUILDS, + ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS, ROUTE_SUPER_ADMIN_ROUTE_IN_PROVINCE_GUILDS, ROUTE_ADMINX_ROUTE_IN_PROVINCE_GUILDS, ROUTE_PROVINCE_ROUTE_IN_PROVINCE_GUILDS, @@ -181,78 +183,70 @@ const isPathnameIncludes = (pathname, routes) => const Guilds = () => { const { pathname } = useLocation(); - const role = getRoleFromUrl(); - const isKillHouse = role === "KillHouse"; return ( - <> - - - {isPathnameIn(pathname, MANAGE_ROUTES) ? ( - - {isPathnameIn(pathname, GUILDS_OPERATIONS_ROUTES) && ( - - )} - {isPathnameIn(pathname, GUILDS_OPERATIONS_COMMERCE_ROUTES) && ( - - )} - {isPathnameIn(pathname, GUILDS_OPERATIONS_CITY_JIHAD_ROUTES) && ( - - )} - {pathname === ROUTE_GUILD_ROOM_ROUTE_MANAGE_GUILDS && ( - - )} - - ) : ( - - )} + + + {isPathnameIn(pathname, MANAGE_ROUTES) ? ( + + {isPathnameIn(pathname, GUILDS_OPERATIONS_ROUTES) && ( + + )} + {isPathnameIn(pathname, GUILDS_OPERATIONS_COMMERCE_ROUTES) && ( + + )} + {isPathnameIn(pathname, GUILDS_OPERATIONS_CITY_JIHAD_ROUTES) && ( + + )} + {pathname === ROUTE_GUILD_ROOM_ROUTE_MANAGE_GUILDS && ( + + )} + + ) : ( + + )} - - - {(isPathnameIn(pathname, MANAGE_TAB_ROUTES) || isKillHouse) && ( - - )} + + + {isPathnameIn(pathname, MANAGE_TAB_ROUTES) && } - {isPathnameIncludes(pathname, STEWARDS_ROUTES) && ( - - )} + {isPathnameIncludes(pathname, STEWARDS_ROUTES) && ( + + )} - {isPathnameIn(pathname, GUILDS_SETTINGS_ROUTES) && ( - - )} + {isPathnameIn(pathname, GUILDS_SETTINGS_ROUTES) && ( + + )} - {isPathnameIn(pathname, GUILDS_REQUESTS_ROUTES) && ( - - )} + {isPathnameIn(pathname, GUILDS_REQUESTS_ROUTES) && ( + + )} - {isPathnameIn(pathname, GUILDS_DISTRIBUTIONS_ROUTES) && ( - - )} + {isPathnameIn(pathname, GUILDS_DISTRIBUTIONS_ROUTES) && ( + + )} - {isPathnameIn(pathname, TRUE_GUILDS_OUT_PROVINCE_ROUTES) && ( - - )} + {isPathnameIn(pathname, TRUE_GUILDS_OUT_PROVINCE_ROUTES) && ( + + )} - {isPathnameIn(pathname, LEGAL_GUILDS_IN_PROVINCE_ROUTES) && ( - - )} + {isPathnameIn(pathname, LEGAL_GUILDS_IN_PROVINCE_ROUTES) && ( + + )} - {isPathnameIn(pathname, LEGAL_GUILDS_OUT_PROVINCE_ROUTES) && ( - - )} - + {isPathnameIn(pathname, LEGAL_GUILDS_OUT_PROVINCE_ROUTES) && ( + + )} - - + + ); }; diff --git a/src/routes/routes.js b/src/routes/routes.js index df81f2a..e898475 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -217,8 +217,7 @@ export const ROUTE_SLAUGHTER_FACTORS = ROUTE_SLAUGHTER_BASE + "/requests/factors"; export const ROUTE_SLAUGHTER_FINAL_FACTORS = ROUTE_SLAUGHTER_BASE + "/requests/final-factors"; -export const ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS = - ROUTE_SLAUGHTER_BASE + "/manage-guilds/"; + export const ROUTE_SLAUGHTER_MANAGE_STEWARDS = ROUTE_SLAUGHTER_BASE + "/manage-stewards/"; export const ROUTE_SLAUGHTER_MANAGE_STEWARDS_IN_PROVINCE = @@ -235,6 +234,24 @@ export const ROUTE_SLAUGHTER_MANAGE_STEWARDS_OUT_PROVINCE_TRUE = ROUTE_SLAUGHTER_BASE + "/manage-stewards/out-province/true"; export const ROUTE_SLAUGHTER_MANAGE_STEWARDS_OUT_PROVINCE_LEGAL = ROUTE_SLAUGHTER_BASE + "/manage-stewards/out-province/legal"; + +export const ROUTE_SLAUGHTER_ROUTE_MANAGE_GUILDS = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_IN_PROVINCE = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/in-province"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_IN_PROVINCE_GUILDS_REQUESTS = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/in-province/guilds-requests"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_IN_PROVINCE_TRUE = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/in-province/true"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_IN_PROVINCE_LEGAL = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/in-province/legal"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_OUT_PROVINCE = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/out-province"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_OUT_PROVINCE_TRUE = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/out-province/true"; +export const ROUTE_SLAUGHTER_MANAGE_GUILDS_OUT_PROVINCE_LEGAL = + ROUTE_SLAUGHTER_BASE + "/manage-guilds/out-province/legal"; + export const ROUTE_SLAUGHTER_ROUTE_MANAGE_BARS = ROUTE_SLAUGHTER_BASE + "/manage-bars/"; export const ROUTE_SLAUGHTER_FINANCIAL_TRANSACTIONS = @@ -356,6 +373,8 @@ export const ROUTE_PROVINCE_ROUTE_OUT_PROVINCE_TRUE_GUILDS = ROUTE_PROVINCE_BASE + "/manage-guilds/out-province/true-guilds"; export const ROUTE_PROVINCE_ROUTE_IN_PROVINCE_LEGAL_GUILDS = ROUTE_PROVINCE_BASE + "/manage-guilds/in-province/legal-guilds"; +export const ROUTE_PROVINCE_ROUTE_IN_PROVINCE_GUILDS_REQUESTS = + ROUTE_PROVINCE_BASE + "/manage-guilds/in-province/guilds-requests"; export const ROUTE_PROVINCE_ROUTE_IN_PROVINCE_TRUE_GUILDS = ROUTE_PROVINCE_BASE + "/manage-guilds/in-province/true-guilds"; export const ROUTE_PROVINCE_ROUTE_GUILDS = @@ -370,8 +389,7 @@ export const ROUTE_PROVINCE_ROUTE_STEWARD_SHARE = ROUTE_PROVINCE_BASE + "/steward-share"; export const ROUTE_PROVINCE_ROUTE_AGENT_SHARE_ID = ROUTE_PROVINCE_BASE + "/agent-share/:id/:date"; -export const ROUTE_PROVINCE_ROUTE_IN_PROVINCE_GUILDS_REQUESTS = - ROUTE_PROVINCE_BASE + "/manage-guilds/in-province/guilds-requests"; + export const ROUTE_PROVINCE_ROUTE_MANAGE_PROCESS = ROUTE_PROVINCE_BASE + "/manage-process/"; export const ROUTE_PROVINCE_ROUTE_MANAGE_PROCESS_SLAUGHTER =