From df05f4b5b4e1a547965e4921fe13fe26137ba7b9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Apr 2025 23:49:35 +0200 Subject: [PATCH] Revisados roles de pedidos y corregidos bugs de poner autoroute = false --- ci4/app/Config/Routes.php | 8 +- ci4/app/Controllers/Configuracion/Users.php | 2 +- .../themes/vuexy/main/menu_digitalizacion.php | 8 +- .../themes/vuexy/main/menu_maquetacion.php | 647 +++++++++--------- .../vuexy/main/menus/configuracion_menu.php | 2 +- .../themes/vuexy/main/menus/pedidos_menu.php | 10 +- 6 files changed, 350 insertions(+), 327 deletions(-) diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 0c318d4d..02543965 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -162,6 +162,7 @@ $routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], functi $routes->post('datatable', 'Users::datatable', ['as' => 'datatableOfUsers']); $routes->get('getMenuComerciales', 'Users::getMenuComerciales', ['as' => 'menuItemsComerciales']); }); + $routes->resource('users', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Users', 'except' => 'show,new,create,update']); @@ -747,9 +748,9 @@ $routes->group('presupuestotiradasalternativas', ['namespace' => 'App\Controller $routes->group('pedidos', ['namespace' => 'App\Controllers\Pedidos'], function ($routes) { $routes->get('list', 'Pedido::todos', ['as' => 'listaPedidos']); - $routes->get('listActivos', 'Pedido::activos', ['as' => 'listaPedidosActivos']); - $routes->get('listFinalizados', 'Pedido::finalizados', ['as' => 'listaFinalizados']); - $routes->get('listCancelados', 'Pedido::cancelados', ['as' => 'listaCancelados']); + $routes->get('activos', 'Pedido::activos', ['as' => 'listaPedidosActivos']); + $routes->get('finalizados', 'Pedido::finalizados', ['as' => 'listaPedidosFinalizados']); + $routes->get('cancelados', 'Pedido::cancelados', ['as' => 'listaPedidosCancelados']); $routes->post('datatable', 'Pedido::datatable', ['as' => 'dataTableOfPedidos']); $routes->get('add', 'Pedido::add', ['as' => 'nuevoPedido']); $routes->post('add', 'Pedido::add', ['as' => 'crearPedido']); @@ -762,6 +763,7 @@ $routes->group('pedidos', ['namespace' => 'App\Controllers\Pedidos'], function ( $routes->post('produccion/(:num)', 'Pedido::to_produccion/$1', ['as' => 'toProduccion']); $routes->get('pedidosCliente', 'Pedido::tablaClienteForm'); $routes->get('getSumCliente/(:num)', 'Pedido::obtenerTotalPedidosCliente/$1'); + $routes->get('validacion', 'Pedido::validacion', ['as' => 'validacionView']); }); $routes->resource('pedidos', ['namespace' => 'App\Controllers\Pedidos', 'controller' => 'Pedido', 'except' => 'show,new,create,update']); diff --git a/ci4/app/Controllers/Configuracion/Users.php b/ci4/app/Controllers/Configuracion/Users.php index c207006e..3d3127b4 100755 --- a/ci4/app/Controllers/Configuracion/Users.php +++ b/ci4/app/Controllers/Configuracion/Users.php @@ -50,7 +50,7 @@ class Users extends \App\Controllers\GoBaseController // Breadcrumbs (IMN) $this->viewData['breadcrumb'] = [ ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], - ['title' => lang("App.menu_users"), 'route' => site_url('configuracion/users'), 'active' => true] + ['title' => lang("App.menu_users"), 'route' => route_to('userList'), 'active' => true] ]; parent::initController($request, $response, $logger); diff --git a/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php b/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php index a1883e16..b84bc0a0 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_digitalizacion.php @@ -98,28 +98,28 @@ 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • 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 28780264..cdd87889 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_maquetacion.php @@ -1,114 +1,119 @@ - - - \ No newline at end of file + + + +
  • + + +
    ">
    +     + +
    • + + + + +
  • + + +
    ">
    +     + +
    • + + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + + +
  • + Sistema +
    • + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + + + + \ No newline at end of file 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 f926b5df..bb7582a5 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php @@ -72,7 +72,7 @@ if ( user()->can('usuarios.menu')) { ?>
  • - " class="menu-link"> +
    • diff --git a/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php b/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php index e3960862..38c03027 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php @@ -18,35 +18,35 @@ if (