From c450d4f8046bc2c2a5e2883f408aac12bc26a0fa Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Apr 2025 09:55:30 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Revisando=20roles=20y=20a=C3=B1adido=20clas?= =?UTF-8?q?e=20beta=20al=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci4/app/Config/Routes.php | 15 +- ci4/app/Config/Routing.php | 2 +- .../Clientes/Clienteplantillaprecios.php | 4 +- ci4/app/Controllers/Presupuestos/Buscador.php | 4 +- .../Presupuestos/Presupuestoadmin.php | 4 + .../Presupuestos/Presupuestocliente.php | 6 + .../Views/themes/vuexy/main/defaultlayout.php | 2 +- .../themes/vuexy/main/menu_digitalizacion.php | 2 +- .../themes/vuexy/main/menu_maquetacion.php | 2 +- .../themes/vuexy/main/menus/catalogo_menu.php | 10 +- .../themes/vuexy/main/menus/clientes_menu.php | 2 +- .../themes/vuexy/main/menus/compras_menu.php | 6 +- .../vuexy/main/menus/importacion_menu.php | 2 +- .../vuexy/main/menus/presupuesto_menu.php | 145 +++++++++--------- .../themes/vuexy/main/presupuestos_layout.php | 2 +- .../safekat/pages/cliente/tarifasCliente.js | 2 +- .../pages/plantillasTarifasCliente/list.js | 2 +- httpdocs/themes/vuexy/css/safekat.css | 27 +++- 18 files changed, 135 insertions(+), 104 deletions(-) diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 63aa1623..0b31c0ad 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -59,16 +59,14 @@ $routes->group('tarifas', ['namespace' => 'App\Controllers\Tarifas'], function ( $routes->get('encuadernacion/select', 'TarifaMaquinas::get_select_maquina_manipulado'); $routes->get('tareas/select', 'TarifaMaquinas::get_select_maquina_tareas'); - - - $routes->get('acabado/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_acabado_maquina/$1'); $routes->get('manipulado/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_manipulado_maquina/$1'); $routes->get('preimpresion/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_preimpresion_maquina/$1'); $routes->get('encuadernacion/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_encuadernacion_maquina/$1'); $routes->get('extra/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_extra_maquina/$1'); }); - /* Cliente */ + + /* Acabados */ $routes->group('acabados', ['namespace' => 'App\Controllers\Tarifas\Acabados'], function ($routes) { $routes->get('', 'TarifaAcabados::index', ['as' => 'tarifaAcabadoList']); @@ -109,7 +107,7 @@ $routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion'] $routes->post('menuitemsFacturas', 'SeriesFacturas::menuItemsFacturas', ['as' => 'menuItemsOfSeriesFacturas']); }); - + /* Variables del sistema */ $routes->group("variables", ["namespace" => 'App\Controllers\Configuracion'], function ($routes) { $routes->get('', 'ConfigVariables::index', ['as' => 'variablesIndex']); $routes->get('find/(:num)', 'ConfigVariables::get/$1', ['as' => 'variablesFind']); @@ -117,6 +115,8 @@ $routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion'] $routes->delete('delete/(:num)', 'ConfigVariables::delete/$1', ['as' => 'deleteVariable']); $routes->get('datatable', 'ConfigVariables::datatable', ['as' => 'datatableVariables']); }); + + /* Errores en presupuestos */ $routes->group("errores-presupuesto", ["namespace" => 'App\Controllers\Configuracion'], function ($routes) { $routes->get('', 'ConfigErrores::index', ['as' => 'erroresPresupuestoIndex']); $routes->get('edit/(:num)', 'ConfigErrores::viewForm/$1', ['as' => 'erroresPresupuestoViewForm']); @@ -124,6 +124,7 @@ $routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion'] $routes->get('datatable', 'ConfigErrores::datatable', ['as' => 'erroresPresupuestoDatatable']); $routes->post('edit/(:num)', 'ConfigErrores::update_error_presupuesto/$1', ['as' => 'erroresPresupuestoUpdate']); }); + $routes->group("maquina-tareas", ["namespace" => 'App\Controllers\Configuracion'], function ($routes) { $routes->get('', 'MaquinaTarea::index', ['as' => 'maquinaTareaList']); $routes->get('(:num)', 'MaquinaTarea::show/$1', ['as' => 'maquinaTareaShow']); @@ -850,10 +851,10 @@ $routes->group( ); $routes->group( - 'buscadorpresupuestos', + 'presupuestos', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) { - $routes->get('', 'Buscador::list', ['as' => 'buscadorPresupuestosList']); + $routes->get('buscador', 'Buscador::index', ['as' => 'buscadorPresupuestosList']); $routes->post('datatable', 'Buscador::datatable', ['as' => 'dataTableOfBuscador']); } ); diff --git a/ci4/app/Config/Routing.php b/ci4/app/Config/Routing.php index 97fd5b8d..220d2074 100644 --- a/ci4/app/Config/Routing.php +++ b/ci4/app/Config/Routing.php @@ -88,7 +88,7 @@ class Routing extends BaseRouting * * If FALSE, will stop searching and do NO automatic routing. */ - public bool $autoRoute = true; + public bool $autoRoute = false; /** * If TRUE, will enable the use of the 'prioritize' option diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php index ae43ffee..c1348586 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php @@ -43,7 +43,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController // Breadcrumbs (IMN) $this->viewData['breadcrumb'] = [ ['title' => lang("App.menu_clientes"), 'route' => "javascript:void(0);", 'active' => false], - ['title' => lang("App.menu_plantillas_tarifas_clientes"), 'route' => site_url('clientes/clienteplantillaprecios'), 'active' => true] + ['title' => lang("App.menu_plantillas_tarifas_clientes"), 'route' => route_to("clienteplantillapreciosList"), 'active' => true] ]; parent::initController($request, $response, $logger); @@ -146,7 +146,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController if ($thenRedirect): if (!empty($this->indexRoute)): //return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message); - return redirect()->to(site_url('/clientes/clienteplantillaprecios/edit/' . $id))->with('message', $message); + return redirect()->to(site_url('/clienteplantillaprecios/edit/' . $id))->with('message', $message); else: return $this->redirect2listView('sweet-success', $message); endif; diff --git a/ci4/app/Controllers/Presupuestos/Buscador.php b/ci4/app/Controllers/Presupuestos/Buscador.php index edfe067d..8fbf545b 100644 --- a/ci4/app/Controllers/Presupuestos/Buscador.php +++ b/ci4/app/Controllers/Presupuestos/Buscador.php @@ -52,7 +52,7 @@ class Buscador extends \App\Controllers\BaseResourceController // Breadcrumbs (IMN) $this->viewData['breadcrumb'] = [ ['title' => lang("App.menu_presupuestos"), 'route' => "javascript:void(0);", 'active' => false], - ['title' => lang("App.menu_presupuesto_buscador"), 'route' => site_url('presupuestos/buscador'), 'active' => true] + ['title' => lang("App.menu_presupuesto_buscador"), 'route' => route_to("buscadorPresupuestosList"), 'active' => true] ]; parent::initController($request, $response, $logger); @@ -62,6 +62,8 @@ class Buscador extends \App\Controllers\BaseResourceController public function index() { + checkPermission('presupuesto.menu'); + $viewData = [ 'currentModule' => static::$controllerSlug, 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Presupuestos.presupuesto')]), diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoadmin.php b/ci4/app/Controllers/Presupuestos/Presupuestoadmin.php index d554c1f0..f93084a0 100644 --- a/ci4/app/Controllers/Presupuestos/Presupuestoadmin.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoadmin.php @@ -63,6 +63,8 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController public function list($tipo_impresion_id = 4) { + checkPermission('presupuesto.menu'); + $viewData = [ 'currentModule' => static::$controllerSlug, 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Presupuestos.presupuesto')]), @@ -82,6 +84,7 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController public function add($tipo_impresion_id = null) { + checkPermission('presupuesto.create'); if ($this->request->getPost()): @@ -211,6 +214,7 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { + checkPermission('presupuesto.edit'); if ($requestedId == null): return $this->redirect2listView(); diff --git a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php b/ci4/app/Controllers/Presupuestos/Presupuestocliente.php index 56c32604..ed40c37b 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestocliente.php @@ -71,6 +71,8 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController public function list() { + checkPermission('presupuesto-cliente.menu'); + $viewData = [ 'currentModule' => static::$controllerSlug, 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Presupuestos.presupuesto')]), @@ -95,6 +97,8 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController public function add() { + checkPermission('presupuesto-cliente.create'); + $this->viewData['breadcrumb'] = [ ['title' => lang("App.menu_presupuestos"), 'route' => "javascript:void(0);", 'active' => false], ['title' => "Listado", 'route' => site_url('presupuestocliente/list'), 'active' => true] @@ -140,6 +144,8 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { + checkPermission('presupuesto-cliente.edit'); + if ($requestedId == null): return $this->redirect2listView(); endif; diff --git a/ci4/app/Views/themes/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/vuexy/main/defaultlayout.php index 63230311..6ac882cd 100644 --- a/ci4/app/Views/themes/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/vuexy/main/defaultlayout.php @@ -157,7 +157,7 @@ $picture = "/assets/img/default-user.png";
  • " title="Acceso directo a buscador de presupuestos"> diff --git a/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php b/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php index af211791..c74826a6 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php @@ -46,7 +46,7 @@
  • - " 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 359caef1..28a2b140 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php @@ -46,7 +46,7 @@
  • - " class="menu-link"> + " class="menu-link">
    ">
    • diff --git a/ci4/app/Views/themes/vuexy/main/menus/catalogo_menu.php b/ci4/app/Views/themes/vuexy/main/menus/catalogo_menu.php index 71f21f68..1a06ab34 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/catalogo_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/catalogo_menu.php @@ -6,28 +6,28 @@ if (auth()->user()->inGroup('beta')) { ?>
  • - + -
    • - -
  • - - - -
    • + user()->inGroup('beta')) { ?>