diff --git a/ci4/app/Config/RBAC/permissionMatrix.php b/ci4/app/Config/RBAC/permissionMatrix.php index 34d9b554..0eea467b 100644 --- a/ci4/app/Config/RBAC/permissionMatrix.php +++ b/ci4/app/Config/RBAC/permissionMatrix.php @@ -41,6 +41,10 @@ const SK_PERMISSION_MATRIX = [ "tarifa-envio.edit", "tarifa-envio.delete", "tarifa-envio.menu", + "tarifa-extra.create", + "tarifa-extra.edit", + "tarifa-extra.delete", + "tarifa-extra.menu", "proveedores.create", "proveedores.edit", "proveedores.delete", diff --git a/ci4/app/Config/RBAC/permissionMatrix.php.old b/ci4/app/Config/RBAC/permissionMatrix.php.old deleted file mode 100644 index 204d15f2..00000000 --- a/ci4/app/Config/RBAC/permissionMatrix.php.old +++ /dev/null @@ -1,28 +0,0 @@ - [ - "admin.*", - "users.*", - "beta.*" - ], - "admin"=> [ - "admin.access", - "users.create", - "users.edit", - "users.delete", - "beta.access" - ], - "developer"=> [ - "admin.access", - "admin.settings", - "users.create", - "users.edit", - "beta.access" - ], - "user"=> [ - "users.list" - ], - "beta"=> [ - "beta.access" - ] -]; \ No newline at end of file diff --git a/ci4/app/Config/RBAC/permissions.php b/ci4/app/Config/RBAC/permissions.php index eb5f7f39..f1f4f727 100644 --- a/ci4/app/Config/RBAC/permissions.php +++ b/ci4/app/Config/RBAC/permissions.php @@ -41,6 +41,10 @@ const SK_PERMISSIONS = [ 'tarifa-envio.edit' => 'Can edit', 'tarifa-envio.delete' => 'Can delete', 'tarifa-envio.menu' => 'Menu shall be visualize', + 'tarifa-extra.create' => 'Can create', + 'tarifa-extra.edit' => 'Can edit', + 'tarifa-extra.delete' => 'Can delete', + 'tarifa-extra.menu' => 'Menu shall be visualize', 'proveedores.create' => 'Can create', 'proveedores.edit' => 'Can edit', 'proveedores.delete' => 'Can delete', diff --git a/ci4/app/Config/RBAC/permissions.php.old b/ci4/app/Config/RBAC/permissions.php.old deleted file mode 100644 index 7981a017..00000000 --- a/ci4/app/Config/RBAC/permissions.php.old +++ /dev/null @@ -1,11 +0,0 @@ - 'Can access the sites admin area', - 'admin.settings' => 'Can access the main site settings', - 'users.manage-admins' => 'Can manage other admins', - 'users.list' => 'Can list user stuff', - 'users.create' => 'Can create new non-admin users', - 'users.edit' => 'Can edit existing non-admin users', - 'users.delete' => 'Can delete existing non-admin users', - 'beta.access' => 'Can access beta-level features', -]; \ No newline at end of file diff --git a/ci4/app/Config/RBAC/roles.json b/ci4/app/Config/RBAC/roles.json deleted file mode 100644 index a95d9582..00000000 --- a/ci4/app/Config/RBAC/roles.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "superadmin": { - "title": "Super Admin", - "description": "Complete control of the site." - }, - "admin": { - "title": "Admin", - "description": "Day to day administrators of the site." - }, - "developer": { - "title": "Developer", - "description": "Site programmers." - }, - "user": { - "title": "User", - "description": "General users of the site. Often customers." - }, - "beta": { - "title": "Beta User", - "description": "Has access to beta-level features." - } -} \ No newline at end of file diff --git a/ci4/app/Config/RBAC/roles.php.old b/ci4/app/Config/RBAC/roles.php.old deleted file mode 100644 index 37505ff7..00000000 --- a/ci4/app/Config/RBAC/roles.php.old +++ /dev/null @@ -1,23 +0,0 @@ - [ - 'title' => 'Super Admin', - 'description' => 'Complete control of the site.', - ], - 'admin' => [ - 'title' => 'Admin', - 'description' => 'Day to day administrators of the site.', - ], - 'developer' => [ - 'title' => 'Developer', - 'description' => 'Site programmers.', - ], - 'user' => [ - 'title' => 'User', - 'description' => 'General users of the site. Often customers.', - ], - 'beta' => [ - 'title' => 'Beta User', - 'description' => 'Has access to beta-level features.', - ], -]; \ No newline at end of file diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php index 081ceba4..2da1bfc2 100755 --- a/ci4/app/Controllers/Home.php +++ b/ci4/app/Controllers/Home.php @@ -17,7 +17,7 @@ class Home extends BaseController public function index() { - echo view(getenv('theme.path') . 'main/defaultlayout'); + echo view(getenv('theme.path') . 'form/home/viewHome'); } diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php index 429bcc19..9dc5c083 100755 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -40,6 +40,10 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController public function index() { + if(!auth()->user()->can('tarifa-preimpresion.menu')){ + $message = "No tiene permisos de acceso"; + return redirect()->to(route_to('home'))->with('errorMessage', $message); + } $this->viewData['usingClientSideDataTable'] = true; @@ -51,6 +55,10 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController public function add() { + if(!auth()->user()->can('tarifa-preimpresion.create')){ + $message = "No tiene permisos de acceso"; + return redirect()->to(route_to($this->indexRoute))->with('errorMessage', $message); + } diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php index 9bb17931..d09ccf35 100644 --- a/ci4/app/Language/es/RolesPermisos.php +++ b/ci4/app/Language/es/RolesPermisos.php @@ -34,6 +34,7 @@ return [ 'tarifaAcabadoSection' => 'Tarifas de acabado', 'tarifaEncuadernacionSection' => 'Tarifas de encuadernación', 'tarifaEnvioSection' => 'Tarifas de envio', + 'tarifaExtraSection' => 'Tarifas extra', 'proveedoresSection' => 'Proveedores', 'paisesSection' => 'Países', 'maquinasSection' => 'Máquinas', diff --git a/ci4/app/Views/themes/vuexy/form/home/viewHome.php b/ci4/app/Views/themes/vuexy/form/home/viewHome.php new file mode 100644 index 00000000..bbae5840 --- /dev/null +++ b/ci4/app/Views/themes/vuexy/form/home/viewHome.php @@ -0,0 +1,41 @@ +include('themes/_commonPartialsBs/_confirm2delete') ?> +extend('themes/vuexy/main/defaultlayout') ?> + +section('content'); ?> + +
+
+ +
+
+

Inicio

+
+
+ + +
+ +
+
+
+ + +endSection() ?> + + +section('additionalInlineJs') ?> + +endSection() ?> + + +section('css') ?> + +endSection() ?> + + +section('additionalExternalJs') ?> + +endSection() ?> + diff --git a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php index 83ca3f39..c061363c 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php @@ -77,7 +77,7 @@ if ( user()->can('series-facturas.menu')) { ?> diff --git a/ci4/app/Views/themes/vuexy/main/menus/tarifas_menu.php b/ci4/app/Views/themes/vuexy/main/menus/tarifas_menu.php index d3f01f87..6bf1eb26 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/tarifas_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/tarifas_menu.php @@ -52,6 +52,13 @@ if ( + user()->can('tarifa-extra.menu')) { ?> + + \ No newline at end of file