Merge branch 'mod/permisos' into 'main'

Añadidos permisos para logistica e importadores

See merge request jjimenez/safekat!824

ci4/app/Controllers/Importadores/ImportadorBubok.php

@@ -40,6 +40,7 @@ class ImportadorBubok extends BaseResourceController
 
     public function index()
     {
+        checkPermission('importadores.bubok');
 
         $viewData = [
             'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Importador.importadorCatalogoTitle')]),
@@ -53,6 +54,8 @@ class ImportadorBubok extends BaseResourceController
 
     public function validarFila()
     {
+        checkPermission('importadores.bubok');
+
         $json = $this->request->getJSON();
 
         if (!$json || empty($json->producto) || empty($json->pedido)) {
@@ -121,6 +124,9 @@ class ImportadorBubok extends BaseResourceController
 
     public function importarFila()
     {
+
+        checkPermission('importadores.bubok');
+
         $json = $this->request->getJSON();
 
         // Validación mínima de datos comunes

ci4/app/Controllers/Importadores/ImportadorCatalogo.php

@@ -43,6 +43,7 @@ class ImportadorCatalogo extends BaseResourceController
 
     public function index()
     {
+        checkPermission('importadores.catalogo');
 
         $viewData = [
             'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Importador.importadorCatalogoTitle')]),
@@ -57,6 +58,8 @@ class ImportadorCatalogo extends BaseResourceController
 
     public function validarFila()
     {
+        checkPermission('importadores.catalogo');
+
         $json = $this->request->getJSON();
 
         // Validación inicial del JSON y del ISBN
@@ -119,10 +122,10 @@ class ImportadorCatalogo extends BaseResourceController
     }
 
 
-
-
     public function importarFila()
     {
+        checkPermission('importadores.catalogo');
+
         $json = $this->request->getJSON();
 
         if (!$json || !isset($json->fila[0])) {
@@ -376,6 +379,7 @@ class ImportadorCatalogo extends BaseResourceController
 
     }
 
+    
     private function calcularPrecioDesdeTarifa($isColor, $encuadernacionId, $ancho, $alto, $paginas, $tarifas)
     {
         // Solo aplicamos tarifa si la encuadernación es Rústica Fresada (id = 2)

ci4/app/Controllers/Logistica/LogisticaController.php

@@ -44,6 +44,8 @@ class LogisticaController extends BaseController
 
     public function panel()
     {
+        checkPermission('logistica.logistica');
+
         $viewData = [
             'currentModule' => static::$controllerSlug,
             'boxTitle' => lang('Logistica.panel'),
@@ -58,6 +60,8 @@ class LogisticaController extends BaseController
 
     public function gestionEnvios()
     {
+        checkPermission('logistica.logistica');
+
         $viewData = [
             'currentModule' => static::$controllerSlug,
             'boxTitle' => lang('Logistica.gestionEnvios'),
@@ -73,6 +77,8 @@ class LogisticaController extends BaseController
 
     public function gestionEnviosFerros()
     {
+        checkPermission('logistica.logistica');
+
         $viewData = [
             'currentModule' => static::$controllerSlug,
             'boxTitle' => lang('Logistica.envioFerros'),
@@ -87,6 +93,8 @@ class LogisticaController extends BaseController
 
     public function etiquetasLogistica()
     {
+        checkPermission('logistica.logistica');
+
         $viewData = [
             'currentModule' => static::$controllerSlug,
             'boxTitle' => lang('Logistica.etiquetasTitulos'),
@@ -100,6 +108,8 @@ class LogisticaController extends BaseController
 
     public function listAlbaranes()
     {
+        checkPermission('logistica.logistica');
+        
         $viewData = [
             'currentModule' => static::$controllerSlug,
             'boxTitle' => lang('Albaran.albaranes'),

ci4/app/Language/es/RolesPermisos.php

@@ -63,6 +63,7 @@ return [
     'ajustesSection' => 'Ajustes',
     'actividadSection' => 'Accesos',
     'facturasSection' => 'Facturas',
+    'logisticaSection' => 'Logística',
     'albaranesPermission' => 'Albaranes',
     'vencimientosPermission' => 'Vencimientos',
     "ticketsSection" => "Tickets",
@@ -71,6 +72,7 @@ return [
     'importadoresSection' => 'Importadores',
     'catalogoPermission' => 'Desde catálogo',
     'bubokPermission' => 'Bubok',
+    'logisticaPermission' => 'Logística',    
     
     
 

ci4/app/Views/themes/vuexy/main/menus/logistica_menu.php

@@ -3,14 +3,12 @@
 /**
  * MENU LOGISTICA
  */
-if (auth()->user()->inGroup('beta')) {
+if (auth()->user()->can('logistica.menu')) {
 ?>
-    <!-- Logistic -->
     <li class="menu-item">
         <a href="<?= route_to("LogisticaPanel") ?>" class="menu-link">
             <i class="menu-icon tf-icons ti ti-truck"></i>
             <div> <?= lang("App.menu_logistica") ?></div>
         </a>
-
     </li>
 <?php } ?>