Merge branch 'develop' into 'feature/refahi_province_manager'
# Conflicts: # public/locales/fa/app.json # src/core/data/apiRoutes.js
This commit is contained in:
@@ -67,16 +67,27 @@ export const REJECT_COMMERCIAL_CHIEF =
|
||||
BASE_URL + "/dashboard/commercial_chief/reject";
|
||||
//commercial chief
|
||||
|
||||
//province manager
|
||||
export const GET_PROVINCE_MANAGER =
|
||||
//navgan province manager
|
||||
export const GET_NAVGAN_PROVINCE_MANAGER =
|
||||
BASE_URL + "/dashboard/province_manager/show";
|
||||
|
||||
export const CONFIRM_PROVINCE_MANAGER =
|
||||
export const CONFIRM_NAVGAN_PROVINCE_MANAGER =
|
||||
BASE_URL + "/dashboard/province_manager/confirm";
|
||||
|
||||
export const REJECT_PROVINCE_MANAGER =
|
||||
export const REJECT_NAVGAN_PROVINCE_MANAGER =
|
||||
BASE_URL + "/dashboard/province_manager/reject";
|
||||
//province manager
|
||||
//navgan province manager
|
||||
|
||||
// refahi province manager
|
||||
export const GET_REFAHI_PROVINCE_MANAGER =
|
||||
BASE_URL + "/dashboard/refahi_province_manager/show";
|
||||
|
||||
export const CONFIRM_REFAHI_PROVINCE_MANAGER =
|
||||
BASE_URL + "/dashboard/refahi_province_manager/confirm";
|
||||
|
||||
export const REJECT_REFAHI_PROVINCE_MANAGER =
|
||||
BASE_URL + "/dashboard/refahi_province_manager/reject";
|
||||
//refahi province manager
|
||||
|
||||
// development assistant
|
||||
export const GET_DEVELOPMENT_ASSISTANT =
|
||||
|
||||
@@ -58,9 +58,19 @@ const sidebarMenu = [
|
||||
role: "transportation_assistant",
|
||||
},
|
||||
{
|
||||
key: "sidebar.province-manager",
|
||||
key: "sidebar.navgan-province-manager",
|
||||
secondary: "secondary.navgan-province-manager",
|
||||
type: "page",
|
||||
route: "/dashboard/province-manager",
|
||||
route: "/dashboard/navgan-province-manager",
|
||||
icon: <DesktopWindowsIcon/>,
|
||||
selected: false,
|
||||
role: "province_manager",
|
||||
},
|
||||
{
|
||||
key: "sidebar.refahi-province-manager",
|
||||
secondary: "secondary.refahi-province-manager",
|
||||
type: "page",
|
||||
route: "/dashboard/refahi-province-manager",
|
||||
icon: <DesktopWindowsIcon/>,
|
||||
selected: false,
|
||||
role: "province_manager",
|
||||
|
||||
Reference in New Issue
Block a user