Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ui/src/pages/OrderList.vue

ui/src/router/routes.js

@@ -85,6 +85,20 @@ const routes = [
       {
         path: 'role-dept-permissions',
         name: 'role-dept-permissions',
+        component: () => import('pages/RoleDepartmentPermissionGateway.vue'),
+        meta: { permission: 'user:update' }
+      },
+
+      {
+        path: 'role-dept-permissions/list',
+        name: 'role-dept-permissions-list',
+        component: () => import('pages/RoleDepartmentPermissionList.vue'),
+        meta: { permission: 'user:update' }
+      },
+
+      {
+        path: 'role-dept-permissions/editor',
+        name: 'role-dept-permissions-editor',
         component: () => import('pages/RoleDepartmentPermissionPage.vue'),
         meta: { permission: 'user:update' }
       },
@@ -228,6 +242,13 @@ const routes = [
         meta: { permission: 'order:view' }
       },
 
+      {
+        path: 'order-bulk-close',
+        name: 'order-bulk-close',
+        component: () => import('pages/OrderBulkClose.vue'),
+        meta: { permission: 'order:update' }
+      },
+
       {
         path: 'order-pdf/:id',
         name: 'order-pdf',