From c9e655ca82ac46ff0d1e2921632456462bcbe247 Mon Sep 17 00:00:00 2001
From: unknown <ignacio@iaa.es>
Date: Thu, 3 Apr 2025 21:44:58 +0200
Subject: [PATCH] Revisado roles sistema y facturas

---
 ci4/app/Controllers/Facturacion/Facturas.php  | 10 +++----
 ci4/app/Controllers/Sistema/Actividad.php     |  1 +
 ci4/app/Controllers/Sistema/Ajustes.php       |  1 +
 .../vuexy/main/menus/facturacion_menu.php     | 28 +++++++++----------
 .../themes/vuexy/main/menus/mensajes_menu.php |  4 +--
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/ci4/app/Controllers/Facturacion/Facturas.php b/ci4/app/Controllers/Facturacion/Facturas.php
index c6ed2ae1..e98e4014 100755
--- a/ci4/app/Controllers/Facturacion/Facturas.php
+++ b/ci4/app/Controllers/Facturacion/Facturas.php
@@ -41,6 +41,7 @@ class Facturas extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('facturas.menu');
 
         if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
             // Se obtiene el cliente ID a partir del usuario de la sesion
@@ -62,6 +63,7 @@ class Facturas extends \App\Controllers\BaseResourceController
 
     public function list()
     {
+        checkPermission('facturas.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -103,8 +105,8 @@ class Facturas extends \App\Controllers\BaseResourceController
 
     public function add()
     {
-        if(!auth()->user()->can('facturas.create'))
-            return $this->failForbidden(lang('Basic.global.noPermission'), 403);
+        checkPermission('facturas.create');
+
         if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -202,9 +204,7 @@ class Facturas extends \App\Controllers\BaseResourceController
 
     public function edit($id = null)
     {
-
-        if(!auth()->user()->can('facturas.edit'))
-            return $this->failForbidden(lang('Basic.global.noPermission'), 403);
+        checkPermission('facturas.edit');
 
         if ($id == null):
             return $this->redirect2listView();
diff --git a/ci4/app/Controllers/Sistema/Actividad.php b/ci4/app/Controllers/Sistema/Actividad.php
index 263bd8dd..290fb8b9 100644
--- a/ci4/app/Controllers/Sistema/Actividad.php
+++ b/ci4/app/Controllers/Sistema/Actividad.php
@@ -35,6 +35,7 @@ class Actividad extends BaseResourceController
 
     public function index()
     {
+        checkPermission('actividad.menu');
 
         $viewData = [
             
diff --git a/ci4/app/Controllers/Sistema/Ajustes.php b/ci4/app/Controllers/Sistema/Ajustes.php
index 9165bf0e..a610783f 100644
--- a/ci4/app/Controllers/Sistema/Ajustes.php
+++ b/ci4/app/Controllers/Sistema/Ajustes.php
@@ -40,6 +40,7 @@ class Ajustes extends BaseResourceController
 
     public function settings()
     {
+        checkPermission('ajustes.menu');
 
         $id = 1;
         $settingsEntity = $this->model->find($id);
diff --git a/ci4/app/Views/themes/vuexy/main/menus/facturacion_menu.php b/ci4/app/Views/themes/vuexy/main/menus/facturacion_menu.php
index c05d2aa7..5904b16c 100644
--- a/ci4/app/Views/themes/vuexy/main/menus/facturacion_menu.php
+++ b/ci4/app/Views/themes/vuexy/main/menus/facturacion_menu.php
@@ -2,33 +2,33 @@
 /**
  * MENU FACTURACION
  */
-if (auth()->user()->inGroup('beta') || auth()->user()->can('facturas.menu')) {
+if (auth()->user()->can('facturas.menu')) {
     ?>
-    <!-- Invoicing -->
+    <!-- FACTURACION -->
     <li class="menu-item">
         <a href="javascript:void(0);" class="menu-link menu-toggle">
             <i class="menu-icon tf-icons ti ti-file-dollar"></i>
             <?= lang("App.menu_facturación") ?>
         </a>
         <ul class="menu-sub">
-            <?php if(auth()->user()->can('facturas.create')): ?>
-            <li class="menu-item">
-                <a href="<?= route_to('newFactura') ?>" class="menu-link">
-                    <?= lang("App.menu_facturas_nueva") ?>
-                </a>
-            </li>
+            <?php if (auth()->user()->can('facturas.create')): ?>
+                <li class="menu-item">
+                    <a href="<?= route_to('newFactura') ?>" class="menu-link">
+                        <?= lang("App.menu_facturas_nueva") ?>
+                    </a>
+                </li>
             <?php endif; ?>
             <li class="menu-item">
                 <a href="<?= site_url("facturas/list") ?>" class="menu-link">
                     <?= lang("App.menu_facturas") ?>
                 </a>
             </li>
-            <?php if(auth()->user()->can('facturas.vencimientos')): ?>
-            <li class="menu-item">
-                <a href="<?= site_url("facturas/vencimientos") ?>" class="menu-link">
-                    <?= lang("App.menu_facturas_vencimiento") ?>
-                </a>
-            </li>
+            <?php if (auth()->user()->can('facturas.vencimientos')): ?>
+                <li class="menu-item">
+                    <a href="<?= site_url("facturas/vencimientos") ?>" class="menu-link">
+                        <?= lang("App.menu_facturas_vencimiento") ?>
+                    </a>
+                </li>
             <?php endif; ?>
             <li class="menu-item">
                 <a href="<?= site_url("facturas/albaranes") ?>" class="menu-link">
diff --git a/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php b/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php
index 7faa33da..0f82e9ca 100644
--- a/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php
+++ b/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php
@@ -2,9 +2,9 @@
 /**
  * MENU MENSAJES
  */
-if (auth()->user()->inGroup('beta') || auth()->user()->inGroup('cliente-editor')) {
+if (auth()->user()->inGroup('cliente-editor')) {
     ?>
-    <!-- Messages -->
+    <!-- Mensajeria -->
     <li class="menu-item">
         <a href="<?= route_to('mensajeriaView') ?>" class="menu-link">
             <i class="menu-icon tf-icons ti ti-message"></i>