Merge branch 'develop' into 'feature/refahi_province_manager'

# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
This commit is contained in:
Amirhossein Mahmoodi
2023-08-12 16:27:25 +03:30
parent 83747201d7
commit 11dedbb616
15 changed files with 635 additions and 29 deletions

View File

@@ -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",