From a6f07a15b5e184ac6042759982704ea409ab1e46 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Apr 2025 23:20:07 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adidos=20permisos=20para=20Produccion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci4/app/Config/Routes.php | 21 ++++++++------- ci4/app/Controllers/Configuracion/Group.php | 2 +- ci4/app/Language/es/RolesPermisos.php | 4 +++ .../themes/vuexy/main/menu_digitalizacion.php | 3 ++- .../themes/vuexy/main/menu_maquetacion.php | 4 ++- .../vuexy/main/menus/configuracion_menu.php | 2 +- .../vuexy/main/menus/produccion_menu.php | 27 ++++++++++--------- 7 files changed, 37 insertions(+), 26 deletions(-) diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 6102eccc..0c318d4d 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -95,6 +95,17 @@ $routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion'] $routes->post('datatable', 'Ubicaciones::datatable', ['as' => 'ubicacionesDT']); }); + /* Permisos y roles */ + $routes->group('group', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { + $routes->get('', 'Group::index', ['as' => 'userGroupList']); + $routes->get('index', 'Group::index', ['as' => 'groupIndex']); + $routes->post('edit/(:num)', 'Group::edit/$1', ['as' => 'updateGroup']); + $routes->get('edit/(:num)', 'Group::edit/$1', ['as' => 'editGroup']); + $routes->get('delete/(:num)', 'Group::delete/$1', ['as' => 'deleteGroup']); + $routes->get('add', 'Group::add', ['as' => 'newGroup']); + $routes->post('add', 'Group::add', ['as' => 'createGroup']); + }); + /* Series Factura */ $routes->group('series-facturas', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { $routes->get('', 'SeriesFacturas::index', ['as' => 'seriesFacturasList']); @@ -154,16 +165,6 @@ $routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], functi $routes->resource('users', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Users', 'except' => 'show,new,create,update']); -$routes->group('group', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { - $routes->get('', 'Group::index', ['as' => 'userGroupList']); - $routes->get('index', 'Group::index', ['as' => 'groupIndex']); - $routes->post('edit/(:num)', 'Group::edit/$1', ['as' => 'updateGroup']); - $routes->get('edit/(:num)', 'Group::edit/$1', ['as' => 'editGroup']); - $routes->get('delete/(:num)', 'Group::delete/$1', ['as' => 'deleteGroup']); - $routes->get('add', 'Group::add', ['as' => 'newGroup']); - $routes->post('add', 'Group::add', ['as' => 'createGroup']); -}); - $routes->group('tarifapreimpresion', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { $routes->get('', 'Tarifapreimpresion::index', ['as' => 'tarifapreimpresionList']); $routes->get('index', 'Tarifapreimpresion::index', ['as' => 'tarifapreimpresionIndex']); diff --git a/ci4/app/Controllers/Configuracion/Group.php b/ci4/app/Controllers/Configuracion/Group.php index b2a11bad..68b6d694 100755 --- a/ci4/app/Controllers/Configuracion/Group.php +++ b/ci4/app/Controllers/Configuracion/Group.php @@ -28,7 +28,7 @@ class Group extends \App\Controllers\GoBaseController // Breadcrumbs $this->viewData['breadcrumb'] = [ ['title' => "Home", 'route' => "javascript:void(0);", 'active' => false], - ['title' => lang("App.menu_permission_group"), 'route' => site_url("configuracion/group"), 'active' => true] + ['title' => lang("App.menu_permission_group"), 'route' => route_to("userGroupList"), 'active' => true] ]; parent::initController($request, $response, $logger); diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php index 788287c3..0bcc7616 100644 --- a/ci4/app/Language/es/RolesPermisos.php +++ b/ci4/app/Language/es/RolesPermisos.php @@ -26,6 +26,9 @@ return [ 'toprodPermission' => 'Pasar a Producción', + 'otsPermission' => 'Órdenes de trabajo', + 'planningsPermission' => 'Plannings', + // System sections 'clientesSection' => 'Clientes', 'plantillaTarifaSection' => 'Plantilla de tarifas', @@ -63,6 +66,7 @@ return [ 'albaranesPermission' => 'Albaranes', 'vencimientosPermission' => 'Vencimientos', "ticketsSection" => "Tickets", + 'produccionSection' => 'Producción', 'validation' => [ 'id' => [ diff --git a/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php b/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php index 2d0a64af..a1883e16 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php @@ -271,10 +271,11 @@ + 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • diff --git a/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php b/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php index deddfe18..28780264 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php @@ -285,6 +285,7 @@ + 0): ?> 0): ?>
  • @@ -294,10 +295,11 @@
    • + 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • 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 169ae9c3..f926b5df 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php @@ -79,7 +79,7 @@ if ( user()->can('roles-permisos.menu')) { ?>
  • - " class="menu-link"> + " class="menu-link">
    • diff --git a/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php b/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php index 2041399c..810712e6 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php @@ -3,8 +3,7 @@ * MENU PRODUCCION */ if ( - auth()->user()->can('produccion.ots') || - auth()->user()->can('produccion.plannings') + auth()->user()->can('produccion.menu') ) { ?> @@ -14,11 +13,13 @@ if ( \ No newline at end of file