Merge branch 'develop' into 'feature/inspector_expert'

# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx
This commit is contained in:
AmirHossein Mahmoodi
2023-08-12 12:22:17 +00:00
16 changed files with 1312 additions and 0 deletions

View File

@@ -56,6 +56,17 @@ export const REJECT_MACHINARY_OFFICE =
BASE_URL + "/dashboard/machinery_expert/reject";
//passenger office
//commercial chief
export const GET_COMMERCIAL_CHIEF =
BASE_URL + "/dashboard/commercial_chief/show";
export const CONFIRM_COMMERCIAL_CHIEF =
BASE_URL + "/dashboard/commercial_chief/confirm";
export const REJECT_COMMERCIAL_CHIEF =
BASE_URL + "/dashboard/commercial_chief/reject";
//commercial chief
//province manager
export const GET_PROVINCE_MANAGER =
BASE_URL + "/dashboard/province_manager/show";
@@ -80,3 +91,18 @@ export const REJECT_INSPECTOR_EXPERT =
export const REVISE_INSPECTOR_EXPERT =
BASE_URL + "/dashboard/inspector_expert/revise"
//inspector expert
// province head expert
export const GET_PROVINCE_HEAD_EXPERT =
BASE_URL + "/dashboard/province_head_expert/show";
export const CONFIRM_PROVINCE_HEAD_EXPERT =
BASE_URL + "/dashboard/province_head_expert/confirm";
export const REJECT_PROVINCE_HEAD_EXPERT =
BASE_URL + "/dashboard/province_head_expert/reject";
export const REVISE_PROVINCE_HEAD_EXPERT =
BASE_URL + "/dashboard/province_head_expert/edit";
//province head expert

View File

@@ -41,6 +41,14 @@ const sidebarMenu = [
selected: false,
role: "passenger_office_chief",
},
{
key: "sidebar.commercial-chief",
type: "page",
route: "/dashboard/commercial-chief",
icon: <AssignmentIndIcon/>,
selected: false,
role: "commercial_chief",
},
{
key: "sidebar.transportation-assistant",
type: "page",
@@ -65,6 +73,14 @@ const sidebarMenu = [
selected: false,
role: "inspector_expert",
},
{
key: "sidebar.province-head-expert",
type: "page",
route: "/dashboard/province-head-expert",
icon: <DesktopWindowsIcon/>,
selected: false,
role: "province_head_expert",
},
],
];