Merge branch 'main' into 'mod/permisos_admin'

Main

See merge request jjimenez/safekat!890

ci4/app/Controllers/BaseResourceController.php

@@ -77,6 +77,14 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      */
     public $alertStyle = 'alerts';
 
+    /**
+     * Permiso requerido para borrar. Si es false/null, no se valida.
+     * Si es un string (nombre del permiso), se valida.
+     *
+     * @var string|false|null
+     */
+    protected $deletePermission = false;
+
 
     /**
      * An array of helpers to be loaded automatically upon
@@ -222,6 +230,13 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      */
     public function delete($id = null)
     {
+
+        // 🔒 Verificar permiso solo si está definido como string
+        if (is_string($this->deletePermission) && !auth()->user()->can($this->deletePermission)) {
+            $message = lang('Basic.global.permissionDenied'); // O el mensaje que uses
+            return $this->failWithNewToken($message, 403); // Estilo coherente con tu clase
+        }
+
         if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
             $objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc) . '.' . static::$singularObjectNameCc));
         } else {
@@ -236,8 +251,10 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
         } else {
             $datetime = (new \CodeIgniter\I18n\Time("now"));
             $rawResult = $this->model->where('id', $id)
-                ->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'),
+                ->set([
-                    'is_deleted' => $this->delete_flag])
+                    'deleted_at' => $datetime->format('Y-m-d H:i:s'),
+                    'is_deleted' => $this->delete_flag
+                ])
                 ->update();
             if (!$rawResult) {
                 return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
@@ -270,7 +287,8 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
         }
 
         if ($customValidationMessages == null) {
-            $validationErrorMessages = $this->model->validationMessages ?? $this->formValidationErrorMessagess ?? null;;
+            $validationErrorMessages = $this->model->validationMessages ?? $this->formValidationErrorMessagess ?? null;
+            ;
         } else {
             $validationErrorMessages = $customValidationMessages;
         }
@@ -366,12 +384,12 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
             $queryStr = !is_null($query) ? $query->getQuery() : '';
             $dbError = $this->model->db->error();
             $userFriendlyErrMsg = lang('Basic.global.persistErr1', [static::$singularObjectNameCc]);
-            if (isset($dbError['code']) && $dbError['code'] == 1062) :
+            if (isset($dbError['code']) && $dbError['code'] == 1062):
                 $userFriendlyErrMsg .= PHP_EOL . lang('Basic.global.persistDuplErr', [static::$singularObjectNameCc]);
             endif;
             // $userFriendlyErrMsg = str_replace("'", "\'", $userFriendlyErrMsg); // Uncomment if experiencing unescaped single quote errors
             log_message('error', $userFriendlyErrMsg . PHP_EOL . $e->getMessage() . PHP_EOL . $queryStr);
-            if (isset($dbError['message']) && !empty($dbError['message'])) :
+            if (isset($dbError['message']) && !empty($dbError['message'])):
                 log_message('error', $dbError['code'] . ' : ' . $dbError['message']);
             endif;
             $this->viewData['errorMessage'] = $userFriendlyErrMsg;

ci4/app/Controllers/Compras/Proveedores.php

@@ -25,6 +25,7 @@ class Proveedores extends \App\Controllers\BaseResourceController {
 
     protected $indexRoute = 'proveedorList';
 
+    protected $deletePermission = 'proveedores.delete';
     
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) {

ci4/app/Controllers/Configuracion/ConfigVariables.php

@@ -38,6 +38,7 @@ class ConfigVariables extends BaseResourceController
 
     public function index()
     {
+        checkPermission('variables-sistema.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -60,6 +61,8 @@ class ConfigVariables extends BaseResourceController
     }
     public function updateVariable(int $config_variable_id)
     {
+        checkPermission('variables-sistema.edit');
+
         $reqData = [];
         if ($this->request->isAJAX()) {
             $reqData = $this->request->getPost();

ci4/app/Controllers/Configuracion/FestivoController.php

@@ -42,11 +42,16 @@ class FestivoController extends BaseController
 
     public function index()
     {
+
+        checkPermission('festivos.menu');
+
         return view($this->viewPath . $this->indexRoute);
     }
 
     public function store_festivo_date()
     {
+        checkPermission('festivos.edit');
+
         $bodyData = $this->request->getPost();
         $date = $bodyData['date'];
         $count = $this->model->where('date',$date)->countAllResults();

ci4/app/Controllers/Configuracion/FormasPago.php

@@ -26,6 +26,8 @@ class FormasPago extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'formaDePagoList';
 
+    protected $deletePermission = 'formas-pago.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
@@ -44,6 +46,7 @@ class FormasPago extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('formas-pago.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -61,6 +64,7 @@ class FormasPago extends \App\Controllers\BaseResourceController
 
     public function add()
     {
+        checkPermission('formas-pago.create');
 
         if ($this->request->getPost()) :
 
@@ -115,6 +119,7 @@ class FormasPago extends \App\Controllers\BaseResourceController
 
     public function edit($requestedId = null)
     {
+        checkPermission('formas-pago.edit');
 
         if ($requestedId == null) :
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/Group.php

@@ -21,6 +21,8 @@ class Group extends \App\Controllers\GoBaseController
 
     protected $indexRoute = 'userGroupList';
 
+    protected $deletePermission = 'roles-permisos.delete';
+
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
         self::$viewPath = getenv('theme.path') . 'form/group/';
@@ -37,6 +39,8 @@ class Group extends \App\Controllers\GoBaseController
 
     public function index()
     {
+        checkPermission('roles-permisos.menu');
+
         $this->viewData['usingClientSideDataTable'] = true;
         $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Groups.group')]);
         // IMN
@@ -48,11 +52,12 @@ class Group extends \App\Controllers\GoBaseController
     public function add()
     {
 
+        checkPermission('roles-permisos.create');
+
         if ($this->request->getPost()) :
 
             $postData = $this->request->getPost();
 
-            $temp_data['id'] = $groupEntity->id;
             $temp_data['title'] = $postData['title'];
             $temp_data['description'] = $postData['description'];
 
@@ -124,6 +129,7 @@ class Group extends \App\Controllers\GoBaseController
 
     public function edit($requestedId = null)
     {
+        checkPermission('roles-permisos.edit');
 
         helper('general');
 
@@ -243,30 +249,4 @@ class Group extends \App\Controllers\GoBaseController
         }
     }
 
-    public function menuItems()
-    {
-        if ($this->request->isAJAX()) {
-            $searchStr = goSanitize($this->request->getPost('searchTerm'))[0];
-            $reqId = goSanitize($this->request->getPost('id'))[0];
-            $reqText = goSanitize($this->request->getPost('text'))[0];
-            $onlyActiveOnes = false;
-            $columns2select = [$reqId ?? 'id', $reqText ?? 'nombre'];
-            $onlyActiveOnes = false;
-            $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
-            $nonItem = new \stdClass;
-            $nonItem->id = '';
-            $nonItem->text = '- ' . lang('Basic.global.None') . ' -';
-            array_unshift($menu, $nonItem);
-
-            $newTokenHash = csrf_hash();
-            $csrfTokenName = csrf_token();
-            $data = [
-                'menu' => $menu,
-                $csrfTokenName => $newTokenHash
-            ];
-            return $this->respond($data);
-        } else {
-            return $this->failUnauthorized('Invalid request', 403);
-        }
-    }
 }

ci4/app/Controllers/Configuracion/Maquinas.php

@@ -28,6 +28,7 @@ class Maquinas extends \App\Controllers\BaseResourceController
     protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/';
 
     protected $indexRoute = 'maquinaList';
+
     protected MaquinaService $maquinaService;
     protected Validation $validation;
 
@@ -55,6 +56,7 @@ class Maquinas extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('maquinas.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -112,6 +114,8 @@ class Maquinas extends \App\Controllers\BaseResourceController
 
     public function add()
     {
+        checkPermission('maquinas.create');
+
         if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -176,7 +180,7 @@ class Maquinas extends \App\Controllers\BaseResourceController
 
     public function edit($requestedId = null)
     {
-
+        checkPermission('maquinas.edit');
 
         if ($requestedId == null):
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/Maquinasdefecto.php

@@ -28,6 +28,8 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'maquinaPorDefectoList';
 
+    protected $deletePermission = 'maquinas-defecto.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
@@ -45,6 +47,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('maquinas-defecto.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -63,7 +66,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController
     public function add()
     {
 
-
+        checkPermission('maquinas-defecto.create');
         
 
         if ($this->request->getPost()) :
@@ -138,6 +141,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController
     public function edit($requestedId = null)
     {
 
+        checkPermission('maquinas-defecto.edit');
 
         if ($requestedId == null) :
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php

@@ -100,6 +100,7 @@ class Maquinaspapelesimpresion extends \App\Controllers\BaseResourceController {
             $resourceData = $this->model->getResource($search, $isRotativa, $tarifas, $maquina_id)
                 ->orderBy($order, $dir)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->orderBy($order4, $dir4)->limit($length, $start)->get()->getResultObject();
 
+            $query =$this->model->getLastQuery();
             return $this->respond(Collection::datatable(
                 $resourceData,
                 $this->model->getResource("", $isRotativa, $tarifas, $maquina_id)->countAllResults(),

ci4/app/Controllers/Configuracion/Paises.php

@@ -29,6 +29,7 @@ class Paises extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'paisList';
 
+    protected $deletePermission = 'paises.delete';
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
@@ -47,6 +48,7 @@ class Paises extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('paises.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -65,6 +67,8 @@ class Paises extends \App\Controllers\BaseResourceController
     public function add()
     {
 
+        checkPermission('paises.create');
+
         if ($this->request->getPost()):
 
             $postData = $this->request->getPost();
@@ -119,6 +123,7 @@ class Paises extends \App\Controllers\BaseResourceController
 
     public function edit($requestedId = null)
     {
+        checkPermission('paises.edit');
 
         if ($requestedId == null):
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/Papelesgenericos.php

@@ -28,6 +28,7 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'papelGenericoList';
 
+    protected $deletePermission = 'papel-generico.delete';
 
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
@@ -54,6 +55,7 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('papel-generico.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -71,6 +73,7 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
 
     public function add()
     {
+        checkPermission('papel-generico.create');
 
         if ($this->request->getPost()):
 
@@ -132,6 +135,7 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
 
     public function edit($requestedId = null)
     {
+        checkPermission('papel-generico.edit');
 
         if ($requestedId == null):
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/Papelesimpresion.php

@@ -52,6 +52,9 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
     protected static $viewPath = 'themes/vuexy/form/configuracion/papel/';
 
     protected $indexRoute = 'papelImpresionList';
+
+    protected $deletePermission = 'papel-impresion.delete';
+
     protected Validation $validation;
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
@@ -81,6 +84,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        checkPermission('papel-impresion.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -98,7 +102,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
 
     public function add()
     {
-        
+        checkPermission('papel-impresion.create');        
 
         if ($this->request->getPost()) :
 
@@ -161,6 +165,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
 
     public function edit($requestedId = null)
     {
+        checkPermission('papel-impresion.edit');
 
         if ($requestedId == null) :
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/SeriesFacturas.php

@@ -22,6 +22,8 @@ class SeriesFacturas extends BaseResourceController
 
     protected $indexRoute = 'seriesFacturasList';
 
+    protected $deletePermission = 'series-facturas.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
@@ -40,6 +42,7 @@ class SeriesFacturas extends BaseResourceController
 
     public function index()
     {
+        checkPermission('series-facturas.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -57,6 +60,8 @@ class SeriesFacturas extends BaseResourceController
 
     public function add()
     {
+        checkPermission('series-facturas.create');
+
         if ($this->request->getPost()) :
 
             $postData = $this->request->getPost();
@@ -110,6 +115,8 @@ class SeriesFacturas extends BaseResourceController
     public function edit($requestedId = null)
     {
 
+        checkPermission('series-facturas.edit');
+
         if ($requestedId == null) :
             return $this->redirect2listView();
         endif;

ci4/app/Controllers/Configuracion/Ubicaciones.php

@@ -22,6 +22,8 @@ class Ubicaciones extends BaseResourceController
 
     protected $indexRoute = 'ubicacionesList';
 
+    protected $deletePermission = 'ubicaciones.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
@@ -40,6 +42,7 @@ class Ubicaciones extends BaseResourceController
 
     public function index()
     {
+        checkPermission('ubicaciones.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -57,6 +60,8 @@ class Ubicaciones extends BaseResourceController
 
     public function add()
     {
+        checkPermission('ubicaciones.create');
+
         if ($this->request->getPost()) :
 
             $postData = $this->request->getPost();
@@ -111,6 +116,7 @@ class Ubicaciones extends BaseResourceController
 
     public function edit($requestedId = null)
     {
+        checkPermission('ubicaciones.edit');
 
         if ($requestedId == null) :
             return $this->redirect2listView();

ci4/app/Controllers/Configuracion/Users.php

@@ -69,7 +69,7 @@ class Users extends \App\Controllers\GoBaseController
     public function add()
     {
 
-        if ($this->request->getPost()) :
+        if ($this->request->getPost()):
 
             $postData = $this->request->getPost();
 
@@ -94,8 +94,8 @@ class Users extends \App\Controllers\GoBaseController
             // Obtener proveedor de usuarios
             $users = auth()->getProvider();
 
-            if ($successfulResult = $this->canValidate()) :
+            if ($successfulResult = $this->canValidate()):
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
 
                         // The Email is unique
@@ -134,17 +134,12 @@ class Users extends \App\Controllers\GoBaseController
                 $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
             endif;
 
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
 
                 $id = $users->getInsertID();
-                $this->group_user_model->where('user_id', $id)->delete();
+                // Asignar los grupos de usuarios a los que pertenece el usuario editado
-                foreach ($currentGroups as $group) {
+                $this->saveUserGroupsSafely($id, $currentGroups);
-                    $group_user_data = [
+
-                        'user_id' => $id,
-                        'group' => $group
-                    ];
-                    $this->group_user_model->insert($group_user_data);
-                }
                 $this->chat_department_user_model->where("user_id", $id)->delete();
                 foreach ($chatDepartments as $chatDepartment) {
                     $this->chat_department_user_model->insert([
@@ -156,8 +151,8 @@ class Users extends \App\Controllers\GoBaseController
                 $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('Users.user'))]) . '.';
                 $message = ucfirst(str_replace("'", "\'", $message));
 
-                if ($thenRedirect) :
+                if ($thenRedirect):
-                    if (!empty($this->indexRoute)) :
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message);
                     else:
                         return $this->redirect2listView('successMessage', $message);
@@ -173,7 +168,7 @@ class Users extends \App\Controllers\GoBaseController
         $this->viewData['user'] = isset($sanitizedData) ? new UserEntity($sanitizedData) : new UserEntity();
         $this->viewData['clienteList'] = $this->getClienteListItems();
         $this->viewData['formAction'] = route_to('createUser');
-        $this->viewData['groups'] = $this->group_model->select('keyword, title')->findAll();
+        $this->viewData['groups'] = $this->group_model->select('keyword, title')->where('id >', 0)->findAll();
         $this->viewData['chatDepartments'] = $this->chat_department_model->findAll();
         $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Users.user') . ' ' . lang('Basic.global.addNewSuffix');
 
@@ -191,12 +186,12 @@ class Users extends \App\Controllers\GoBaseController
         $users = auth()->getProvider();
         $user = $users->findById($id);
 
-        if ($user == false) :
+        if ($user == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Users.user')), $id]);
             return $this->redirect2listView('errorMessage', $message);
         endif;
 
-        if ($this->request->getPost()) :
+        if ($this->request->getPost()):
 
             $postData = $this->request->getPost();
 
@@ -218,9 +213,9 @@ class Users extends \App\Controllers\GoBaseController
             }
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) :
+            if ($successfulResult = $this->canValidate()):
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
 
                         if (in_array('cliente-editor', $currentGroups) || in_array('cliente-administrador', $currentGroups)) {
@@ -249,16 +244,11 @@ class Users extends \App\Controllers\GoBaseController
                 $thenRedirect = false;
 
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
+
+                // Asignar los grupos de usuarios a los que pertenece el usuario editado
+                $this->saveUserGroupsSafely($user->id, $currentGroups);
 
-                $this->group_user_model->where('user_id', $user->id)->delete();
-                foreach ($currentGroups as $group) {
-                    $group_user_data = [
-                        'user_id' => $user->id,
-                        'group' => $group
-                    ];
-                    $this->group_user_model->insert($group_user_data);
-                }
                 $this->chat_department_user_model->where("user_id", $id)->delete();
                 foreach ($chatDepartments as $chatDepartment) {
                     $this->chat_department_user_model->insert([
@@ -270,8 +260,8 @@ class Users extends \App\Controllers\GoBaseController
                 $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('Users.user'))]) . '.';
                 $message = ucfirst(str_replace("'", "\'", $message));
 
-                if ($thenRedirect) :
+                if ($thenRedirect):
-                    if (!empty($this->indexRoute)) :
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message);
                     else:
                         return $this->redirect2listView('successMessage', $message);
@@ -287,7 +277,7 @@ class Users extends \App\Controllers\GoBaseController
         $this->viewData['clienteList'] = $this->getClienteListItems($user->cliente_id);
         $this->viewData['formAction'] = route_to('updateUser', $id);
         $this->viewData['selectedGroups'] = $this->group_model->getUsersRoles($requestedId);
-        $this->viewData['groups'] = $this->group_model->select('keyword, title')->findAll();
+        $this->viewData['groups'] = $this->group_model->select('keyword, title')->where('id >', 0)->findAll();
         $this->viewData['chatDepartments'] = $this->chat_department_model->select(["display", "name", "id as chatDepartmentId"])->findAll();
         $this->viewData['chatDepartmentUser'] = $this->chat_department_user_model->getChatDepartmentUser($user->id);
         $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Users.user') . ' ' . lang('Basic.global.edit3');
@@ -299,18 +289,22 @@ class Users extends \App\Controllers\GoBaseController
     public function delete($requestedId = null, bool $deletePermanently = true)
     {
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
 
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $user = $this->model->find($id);
 
-        if ($user == false) :
+        if ($user == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Users.user')), $id]);
             return $this->redirect2listView('errorMessage', $message);
         endif;
 
+        // Elimina todos los grupos actuales
+        $this->group_user_model->where('user_id', $id)->delete();
+        
+        // Elimina todos los grupos de chat actuales
         $this->chat_department_user_model->where("user_id", $id)->delete();
 
         $users = auth()->getProvider();
@@ -433,11 +427,11 @@ class Users extends \App\Controllers\GoBaseController
     protected function getClienteListItems($selId = null)
     {
         $data = ['' => ""];
-        if (!empty($selId)) :
+        if (!empty($selId)):
             $clienteModel = model('App\Models\Clientes\ClienteModel');
 
             $selOption = $clienteModel->where('id', $selId)->findColumn('nombre');
-            if (!empty($selOption)) :
+            if (!empty($selOption)):
                 $data[$selId] = $selOption[0];
             endif;
         endif;
@@ -450,7 +444,7 @@ class Users extends \App\Controllers\GoBaseController
             ['title' => lang("App.menu_change_session"), 'route' => route_to('maquinistaUserChangeList'), 'active' => true]
         ];
         $maquinistas = [];
-        $users = auth()->getProvider()->whereNotIn('id',[auth()->user()->id])->findAll();
+        $users = auth()->getProvider()->whereNotIn('id', [auth()->user()->id])->findAll();
         foreach ($users as $key => $user) {
             if ($user->inGroup('maquina') && !$user->inGroup('admin', 'comercial', 'cliente-editor', 'cliente-admin')) {
                 $maquinistas[] = $user;
@@ -467,4 +461,50 @@ class Users extends \App\Controllers\GoBaseController
         auth()->login($user);
         return redirect("home");
     }
+
+    /**
+     * Asigna grupos a un usuario, asegurando que no se pueda inyectar el grupo 'root',
+     * pero manteniéndolo si ya lo tenía previamente.
+     *
+     * @param int $userId ID del usuario al que se le asignarán los grupos
+     * @param array $requestedGroups Grupos solicitados desde el formulario
+     * @return void
+     */
+    private function saveUserGroupsSafely(int $userId, array $requestedGroups): void
+    {
+        // Verifica si el usuario ya tenía el grupo 'root'
+        $existingGroups = $this->group_user_model
+            ->where('user_id', $userId)
+            ->findColumn('group') ?? [];
+
+        $hasRoot = in_array('root', $existingGroups);
+
+        // Elimina todos los grupos actuales
+        $this->group_user_model->where('user_id', $userId)->delete();
+
+        // Inserta solo los grupos válidos (sin 'root')
+        foreach ($requestedGroups as $group) {
+            if (!empty($group) && $group !== 'root') {
+                $this->group_user_model->insert([
+                    'user_id' => $userId,
+                    'group' => $group,
+                    'created_at' => date('Y-m-d H:i:s'),
+                ]);
+            } elseif ($group === 'root') {
+                log_message('alert', "Intento de asignar grupo 'root' al usuario ID $userId");
+            }
+        }        
+
+        // Reasigna 'root' solo si el usuario ya lo tenía
+        if ($hasRoot) {
+            $this->group_user_model->insert([
+                'user_id' => $userId,
+                'group' => 'root',
+                'created_at' => date('Y-m-d H:i:s'),
+            ]);
+        }
+    }
+
+
+
 }

ci4/app/Controllers/Presupuestos/Buscador.php

@@ -36,6 +36,8 @@ class Buscador extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'buscadorPresupuestosList';
 
+    protected $deletePermission = 'presupuesto.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Controllers/Presupuestos/Presupuestocliente.php

@@ -2203,16 +2203,16 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                             $lomo += floatval($linea['mano']);
                             $info['lomo_interior'] += floatval($linea['mano']);
                         }
-                        if ($extra_info) {
+
-                            $this->calcular_coste_linea(
+                        $this->calcular_coste_linea(
-                                $linea,
+                            $linea,
-                                $totalPapel,
+                            $totalPapel,
-                                $margenPapel,
+                            $margenPapel,
-                                $sumForFactor,
+                            $sumForFactor,
-                                $totalImpresion,
+                            $totalImpresion,
-                                $margenImpresion
+                            $margenImpresion
-                            );
+                        );
-                        }
+
                     }
                 }
 
@@ -2251,13 +2251,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                     $costeInterior = 0.0;
                     $peso_interior = 0.0;
                     $lomo = 0;
-                    if ($extra_info) {
+                    $totalPapel = 0.0;
-                        $totalPapel = 0.0;
+                    $margenPapel = 0.0;
-                        $margenPapel = 0.0;
+                    $sumForFactor = 0.0;
-                        $sumForFactor = 0.0;
+                    $totalImpresion = 0.0;
-                        $totalImpresion = 0.0;
+                    $margenImpresion = 0.0;
-                        $margenImpresion = 0.0;
+
-                    }
                     foreach ($interior as $linea) {
                         if (count($linea) > 0) {
                             $costeInterior += round(floatval($linea['total_impresion']), 2);
@@ -2266,17 +2265,16 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                                 $lomo += floatval($linea['mano']);
                             }
                             $peso_interior += floatval($linea['peso']);
-                            if ($extra_info) {
 
-                                $this->calcular_coste_linea(
+                            $this->calcular_coste_linea(
-                                    $linea,
+                                $linea,
-                                    $totalPapel,
+                                $totalPapel,
-                                    $margenPapel,
+                                $margenPapel,
-                                    $sumForFactor,
+                                $sumForFactor,
-                                    $totalImpresion,
+                                $totalImpresion,
-                                    $margenImpresion
+                                $margenImpresion
-                                );
+                            );
-                            }
+
                         }
                     }
                 }
@@ -2321,17 +2319,14 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                         $lomo += floatval($cubierta['mano']);
                     }
 
-                    if ($extra_info) {
+                    $this->calcular_coste_linea(
-
+                        $cubierta,
-                        $this->calcular_coste_linea(
+                        $totalPapel,
-                            $cubierta,
+                        $margenPapel,
-                            $totalPapel,
+                        $sumForFactor,
-                            $margenPapel,
+                        $totalImpresion,
-                            $sumForFactor,
+                        $margenImpresion
-                            $totalImpresion,
+                    );
-                            $margenImpresion
-                        );
-                    }
                 }
                 if ($coste_cubierta <= 0) {
 
@@ -2382,13 +2377,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                                 return $return_data;
                             }
                             $coste_servicios += round(floatval($acabadoCubierta[0]->total), 2);
-                            if ($extra_info) {
+
-                                //$totalServicios += round(floatval($acabadoCubierta[0]->total), 2);
+                            //$totalServicios += round(floatval($acabadoCubierta[0]->total), 2);
-                                $base = round(floatval($acabadoCubierta[0]->total / (1 + $acabadoCubierta[0]->margen / 100.0)), 2);
+                            $base = round(floatval($acabadoCubierta[0]->total / (1 + $acabadoCubierta[0]->margen / 100.0)), 2);
-                                $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                                $totalServicios += $base;
+                            $totalServicios += $base;
-                                $margenServicios += round(floatval($acabadoCubierta[0]->total - $base), 2);
+                            $margenServicios += round(floatval($acabadoCubierta[0]->total - $base), 2);
-                            }
                         }
                     }
 
@@ -2422,13 +2416,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                             return $return_data;
                         }
                         $coste_servicios += round(floatval($resultado[0]->total), 2);
-                        if ($extra_info) {
+
-                            //$totalServicios += round(floatval($resultado[0]->total), 2);
+                        //$totalServicios += round(floatval($resultado[0]->total), 2);
-                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
+                        $totalServicios += $base;
-                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                        }
 
                     }
                 }
@@ -2458,17 +2451,16 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                     if (count($linea_sobrecubierta) > 0) {
                         $coste_sobrecubierta += round(floatval($linea_sobrecubierta['total_impresion']), 2);
                         $peso_sobrecubierta += round(floatval($linea_sobrecubierta['peso']), 2);
-                        if ($extra_info) {
 
-                            $this->calcular_coste_linea(
+                        $this->calcular_coste_linea(
-                                $linea_sobrecubierta,
+                            $linea_sobrecubierta,
-                                $totalPapel,
+                            $totalPapel,
-                                $margenPapel,
+                            $margenPapel,
-                                $sumForFactor,
+                            $sumForFactor,
-                                $totalImpresion,
+                            $totalImpresion,
-                                $margenImpresion
+                            $margenImpresion
-                            );
+                        );
-                        }
+
                     }
                     if ($coste_sobrecubierta <= 0) {
 
@@ -2519,13 +2511,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                                 }
 
                                 $coste_servicios += round(floatval($acabadoSobrecubierta[0]->total), 2);
-                                if ($extra_info) {
+
-                                    //$totalServicios += round(floatval($acabadoSobrecubierta[0]->total), 2);
+                                //$totalServicios += round(floatval($acabadoSobrecubierta[0]->total), 2);
-                                    $base = round(floatval($acabadoSobrecubierta[0]->total / (1 + $acabadoSobrecubierta[0]->margen / 100.0)), 2);
+                                $base = round(floatval($acabadoSobrecubierta[0]->total / (1 + $acabadoSobrecubierta[0]->margen / 100.0)), 2);
-                                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                                $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                                    $totalServicios += $base;
+                                $totalServicios += $base;
-                                    $margenServicios += round(floatval($acabadoSobrecubierta[0]->total - $base), 2);
+                                $margenServicios += round(floatval($acabadoSobrecubierta[0]->total - $base), 2);
-                                }
                             }
                         }
                     }
@@ -2567,17 +2558,15 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                             if (intval($tirada[$t]) == intval($selected_tirada)) {
                                 $lomo += floatval($guardas['mano']);
                             }
-                            if ($extra_info) {
 
-                                $this->calcular_coste_linea(
+                            $this->calcular_coste_linea(
-                                    $guardas,
+                                $guardas,
-                                    $totalPapel,
+                                $totalPapel,
-                                    $margenPapel,
+                                $margenPapel,
-                                    $sumForFactor,
+                                $sumForFactor,
-                                    $totalImpresion,
+                                $totalImpresion,
-                                    $margenImpresion
+                                $margenImpresion
-                                );
+                            );
-                            }
                         }
                         if ($coste_guardas <= 0) {
                             $errorModel = new ErrorPresupuesto();
@@ -2621,17 +2610,15 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                         $linea_faja['tipo_linea'] = 'lp_faja';
                         $coste_faja += round(floatval($linea_faja['total_impresion']), 2);
                         $peso_faja += floatval($linea_faja['peso']);
-                        if ($extra_info) {
 
-                            $this->calcular_coste_linea(
+                        $this->calcular_coste_linea(
-                                $linea_faja,
+                            $linea_faja,
-                                $totalPapel,
+                            $totalPapel,
-                                $margenPapel,
+                            $margenPapel,
-                                $sumForFactor,
+                            $sumForFactor,
-                                $totalImpresion,
+                            $totalImpresion,
-                                $margenImpresion
+                            $margenImpresion
-                            );
+                        );
-                        }
                     }
                     if ($coste_faja <= 0) {
 
@@ -2681,13 +2668,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                             }
 
                             $coste_servicios += round(floatval($acabadoFaja[0]->total), 2);
-                            if ($extra_info) {
+
-                                //$totalServicios += round(floatval($acabadoFaja[0]->total), 2);
+                            //$totalServicios += round(floatval($acabadoFaja[0]->total), 2);
-                                $base = round(floatval($acabadoFaja[0]->total / (1 + $acabadoFaja[0]->margen / 100.0)), 2);
+                            $base = round(floatval($acabadoFaja[0]->total / (1 + $acabadoFaja[0]->margen / 100.0)), 2);
-                                $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                                $totalServicios += $base;
+                            $totalServicios += $base;
-                                $margenServicios += round(floatval($acabadoFaja[0]->total - $base), 2);
+                            $margenServicios += round(floatval($acabadoFaja[0]->total - $base), 2);
-                            }
+
                         }
                     }
                 }
@@ -2736,13 +2723,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
 
 
                     $costeServiciosDefecto += round(floatval($servicio->total), 2);
-                    if ($extra_info) {
+
-                        //$totalServicios += round(floatval($servicio->total), 2);
+                    //$totalServicios += round(floatval($servicio->total), 2);
-                        $base = round(floatval($servicio->total / (1 + $servicio->margen / 100.0)), 2);
+                    $base = round(floatval($servicio->total / (1 + $servicio->margen / 100.0)), 2);
-                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
+                    $totalServicios += $base;
-                        $margenServicios += round(floatval($servicio->total - $base), 2);
+                    $margenServicios += round(floatval($servicio->total - $base), 2);
-                    }
+
                 }
 
                 $servDefectoMan = PresupuestoCLienteService::getServiciosManipuladoDefault([
@@ -2774,13 +2761,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
 
 
                     $costeServiciosDefecto += round(floatval($servicio->total), 2);
-                    if ($extra_info) {
+
-                        //$totalServicios += round(floatval($servicio->total), 2);
+                    //$totalServicios += round(floatval($servicio->total), 2);
-                        $base = round(floatval($servicio->total / (1 + $servicio->margen / 100.0)), 2);
+                    $base = round(floatval($servicio->total / (1 + $servicio->margen / 100.0)), 2);
-                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
+                    $totalServicios += $base;
-                        $margenServicios += round(floatval($servicio->total - $base), 2);
+                    $margenServicios += round(floatval($servicio->total - $base), 2);
-                    }
                 }
 
                 if ($extra_info) {
@@ -2880,13 +2866,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                         }
 
                         $coste_servicios += round(floatval($resultado[0]->total), 2);
-                        if ($extra_info) {
+
-                            //$totalServicios += round(floatval($resultado[0]->total), 2);
+                        //$totalServicios += round(floatval($resultado[0]->total), 2);
-                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
+                        $totalServicios += $base;
-                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                        }
+
                     } else if ($servicio->nombre == "ferro" || $servicio->nombre == "prototipo") {
                         // Extra
                         $resultado = PresupuestoCLienteService::getServiciosExtra([
@@ -2913,13 +2899,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                         array_push($serviciosAutomaticos, $resultado[0]);
 
                         $coste_servicios += round(floatval($resultado[0]->precio), 2);
-                        if ($extra_info) {
+
-                            //$totalServicios += round(floatval($resultado[0]->precio), 2);
+                        //$totalServicios += round(floatval($resultado[0]->precio), 2);
-                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
+                        $totalServicios += $base;
-                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                        }
+
                     } else if ($servicio->nombre == 'solapas_cubierta' || $servicio->nombre == 'solapas_sobrecubierta' || $servicio->nombre == 'solapas_faja') {
                         // Servicios manipulado
                         $resultado = PresupuestoCLienteService::getServiciosManipulado([
@@ -2948,13 +2934,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                         }
 
                         $coste_servicios += round(floatval($resultado[0]->total), 2);
-                        if ($extra_info) {
+
-                            //$totalServicios += round(floatval($resultado[0]->total), 2);
+                        //$totalServicios += round(floatval($resultado[0]->total), 2);
-                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
+                        $totalServicios += $base;
-                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                        }
                     }
                 }
 
@@ -2990,13 +2975,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                         array_push($serviciosExtra, $resultado[0]);
 
                         $coste_servicios += round(floatval($resultado[0]->precio), 2);
-                        if ($extra_info) {
+
-                            //$totalServicios += round(floatval($resultado[0]->precio), 2);
+                        //$totalServicios += round(floatval($resultado[0]->precio), 2);
-                            $base = round(floatval($resultado[0]->precio / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($resultado[0]->precio / (1 + $resultado[0]->margen / 100.0)), 2);
-                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
+                        $totalServicios += $base;
-                            $margenServicios += round(floatval($resultado[0]->precio - $base), 2);
+                        $margenServicios += round(floatval($resultado[0]->precio - $base), 2);
-                        }
                     }
 
                 }
@@ -3030,13 +3014,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                     }
 
                     $coste_servicios += round(floatval($resultado[0]->total), 2);
-                    if ($extra_info) {
+
-                        //$totalServicios += round(floatval($resultado[0]->total), 2);
+                    //$totalServicios += round(floatval($resultado[0]->total), 2);
-                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                    $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
+                    $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                    }
                 }
 
                 if (is_array($sobreCubierta) && ($sobreCubierta['solapas'] > 0 && intval($linea_sobrecubierta['dimension_desarrollo']['ancho']) > 630)) {
@@ -3068,13 +3051,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                     }
 
                     $coste_servicios += round(floatval($resultado[0]->total), 2);
-                    if ($extra_info) {
+
-                        //$totalServicios += round(floatval($resultado[0]->total), 2);
+                    //$totalServicios += round(floatval($resultado[0]->total), 2);
-                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                    $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
+                    $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                    }
                 }
 
                 if (is_array($faja) && $faja !== [] && ($faja['solapas'] > 0 && intval($linea_faja['dimension_desarrollo']['ancho']) > 630)) {
@@ -3106,13 +3088,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                     }
 
                     $coste_servicios += round(floatval($resultado[0]->total), 2);
-                    if ($extra_info) {
+
-                        //$totalServicios += round(floatval($resultado[0]->total), 2);
+                    //$totalServicios += round(floatval($resultado[0]->total), 2);
-                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                    $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
-                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
+                    $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-                    }
                 }
 
                 /*$total_por_tirada = $costeInterior +
@@ -3686,21 +3667,30 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
     public function download_zip()
     {
         $presupuesto_id = $this->request->getPost('presupuesto_id');
+        $ot_id = $this->request->getPost('ot_id');
+
         if (!$presupuesto_id) {
             return $this->response->setStatusCode(400)->setBody('Presupuesto ID requerido');
         }
 
+        // Definir prefijo si se recibió un ot_id válido
+        $prefijo = (!empty($ot_id) && is_numeric($ot_id)) ? "OT_{$ot_id}" : null;
+
         $ftpClient = new \App\Libraries\SafekatFtpClient();
         try {
-            $zipPath = $ftpClient->downloadZipPresupuesto((int) $presupuesto_id);
+            $zipPath = $ftpClient->downloadZipPresupuesto((int) $presupuesto_id, $prefijo);
 
             if ($zipPath === null || !file_exists($zipPath)) {
                 return $this->response->setStatusCode(404)->setBody('No se encontraron archivos');
             }
 
+            $nombreArchivo = $prefijo
+                ? "{$prefijo}_PRESUPUESTO_{$presupuesto_id}.zip"
+                : "archivos_presupuesto_{$presupuesto_id}.zip";
+
             return $this->response
-                ->download($zipPath, null)  // null = usar nombre original del archivo
+                ->download($zipPath, null)
-                ->setFileName('archivos_presupuesto_' . $presupuesto_id . '.zip');
+                ->setFileName($nombreArchivo);
         } catch (\Throwable $e) {
             log_message('error', $e->getMessage());
             return $this->response->setStatusCode(500)->setBody('Error interno');
@@ -3708,4 +3698,5 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
     }
 
 
+
 }

ci4/app/Controllers/Produccion/Ordenmaquina.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Controllers\Produccion;
-use App\Controllers\BaseController;
-
-
-class Ordenmaquina extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Orden maquina';
-    } 
-
-    public function delete()
-    {
-
-    }
-
-    public function add()
-    {
-
-    }
-
-    public function edit()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Controllers\Produccion;
-use App\Controllers\BaseController;
-
-
-class Ordentrabajomaquetacion extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Orden maquetación';
-    } 
-
-    public function delete()
-    {
-
-    }
-
-    public function add()
-    {
-
-    }
-
-    public function edit()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Produccion/Pedidoproduccion.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Controllers\Produccion;
-use App\Controllers\BaseController;
-
-
-class Pedidoproduccion extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Pedido produccion';
-    } 
-
-    public function delete()
-    {
-
-    }
-
-    public function add()
-    {
-
-    }
-
-    public function edit()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Tarifas/Acabados/ServiciosAcabado.php

@@ -25,6 +25,8 @@ class ServiciosAcabado extends BaseResourceController
 
     protected $indexRoute = 'serviciosAcabadoList';
 
+    protected $deletePermission = 'tarifa-acabado.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php

@@ -28,6 +28,8 @@ class TarifaAcabados extends BaseResourceController
 
     protected $indexRoute = 'tarifaAcabadoList';
 
+    protected $deletePermission = 'tarifa-acabado.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Controllers/Tarifas/Tarifaextra.php

@@ -19,6 +19,8 @@ class Tarifaextra extends \App\Controllers\GoBaseController
 
     protected $indexRoute = 'tarifaextraList';
 
+    protected $deletePermission = 'tarifa-extra.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Controllers/Tarifas/Tarifapreimpresion.php

@@ -19,6 +19,8 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
 
     protected $indexRoute = 'tarifapreimpresionList';
 
+    protected $deletePermission = 'tarifa-preimpresion.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php

@@ -32,6 +32,8 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'tarifaEncuadernacionList';
 
+    protected $deletePermission = 'tarifa-encuadernacion.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Controllers/Tarifas/Tarifasmanipulado.php

@@ -28,6 +28,8 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
 
     protected $indexRoute = 'tarifaManipuladoList';
 
+    protected $deletePermission = 'tarifa-manipulado.delete';
+
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {

ci4/app/Helpers/rbac_helper.php

@@ -123,7 +123,7 @@ if (!function_exists('checkPermission')) {
         $response = \Config\Services::response();
 
         if (!auth()->user()->can($sectionPermission)) {
-            $session->setFlashdata('errorMessage', "No tiene permisos de acceso");
+            $session->setFlashdata('errorMessage', lang('Basic.global.permissionDenied'));
 
             $route = $redirectRoute ?? 'home';
             return $response->redirect(route_to($route));

ci4/app/Language/en/Basic.php

@@ -90,6 +90,7 @@ return [
 			'wait' => 'Wait',
 			'yes' => 'Yes',
 			'back' => 'Back',
+			'permissionDenied' => 'You do not have permission for this action'			
 		],
 
 

ci4/app/Language/es/Basic.php

@@ -94,6 +94,7 @@ return [
 			'yes' => 'Si',
 			'no' => 'No',
 			'back' => 'Volver',
+			'permissionDenied' => 'No tiene permisos de acceso'
 
 		],
 

ci4/app/Language/es/PapelGenerico.php

@@ -30,7 +30,7 @@ return [
 		'especiales' => 'Especiales',
 		'reciclados' => 'Reciclados',
 		'cartulinas' => 'Cartulinas',
-		'verdujados' => 'Verdujados',
+		'verjurados' => 'Verjurados',
 
 		'validation' =>  [
 			'code' =>  [

ci4/app/Language/es/RolesPermisos.php

@@ -58,8 +58,12 @@ return [
     'papelImpresionSection' => 'Papel impresión',
     'usuariosSection' => 'Usuarios',
     'rolesPermisosSection' => 'Roles y permisos',
+    'tareasMaquinaSection' => 'Tareas de Máquina',
+    'imposicionesSection' => 'Imposiciones',
     'ubicacionesSection' => 'Ubicaciones',
     'seriesFacturasSection' => 'Series facturas',
+    'variablesSistemaSection' => 'Variables de sistema',
+    'festivosSection' => 'Días Festivos',
     'ajustesSection' => 'Ajustes',
     'actividadSection' => 'Accesos',
     'backupSection' => 'Backups',

ci4/app/Libraries/SafekatFtpClient.php

@@ -115,7 +115,7 @@ class SafekatFtpClient
         return implode('/', [$this->base_dir, 'pedidos_files', $rootIdExtern]);
     }
 
-    public function downloadZipPresupuesto(int $presupuesto_id): ?string
+    public function downloadZipPresupuesto(int $presupuesto_id, ?string $prefijo = null): ?string
     {
         $modelPedidoLinea = model(PedidoLineaModel::class);
         $model = model(PresupuestoFicheroModel::class);
@@ -143,8 +143,11 @@ class SafekatFtpClient
 
         foreach ($files as $file) {
             $originalName = $file->nombre ?? basename($file->file_path);
-            $localFile = $localTempDir . '/' . $originalName;
+            $prefixedName = $prefijo ? $prefijo . '_' . $originalName : $originalName;
+
+            $localFile = $localTempDir . '/' . $prefixedName;
             $remoteFile = $remotePath . '/' . basename($file->file_path);
+
             $this->ftp->get($remoteFile, $localFile);
         }
 
@@ -167,4 +170,5 @@ class SafekatFtpClient
     }
 
 
+
 }

ci4/app/Views/themes/vuexy/components/dropzone.php

@@ -12,7 +12,7 @@
             data-bs-parent="#accordionPresupuestoFiles">
             <div class="accordion-body">
                 <div class="col-12">
-                    <div class="dropzone needsclick" id="<?= $id ?>" data-id="<?= $modelId ?>">
+                    <div class="dropzone needsclick" id="<?= $id ?>" data-id="<?= $modelId ?>" data-ot-id="<?= $otId ?? '' ?>">
 
                         <div class="dz-message needsclick">
                             Arrastre aquí los ficheros o haga click

ci4/app/Views/themes/vuexy/form/group/viewUserGroupForm.php

@@ -113,6 +113,7 @@
             </div><!-- //.card -->
         </div><!--//.col -->
     </div><!--//.row -->
+
 <?= $this->endSection() ?>
 
 <?= $this->section('additionalInlineJs') ?>

ci4/app/Views/themes/vuexy/form/group/viewUserGroupList.php

@@ -11,27 +11,29 @@
                 <div class="container-xxl flex-grow-1 container-p-y">
                     <!-- Role cards -->
                     <div class="row g-4">
-                        <div class="col-xl-4 col-lg-6 col-md-6">
+                        <?php if (auth()->user()->can('roles-permisos.create')): ?>
-                            <div class="card h-100">
+                            <div class="col-xl-4 col-lg-6 col-md-6">
-                                <div class="row h-100">
+                                <div class="card h-100">
-                                    <div class="col-sm-5">
+                                    <div class="row h-100">
-                                        <div class="d-flex align-items-end h-100 justify-content-center mt-sm-0 mt-3">
+                                        <div class="col-sm-5">
-                                            <img src="<?= site_url('themes/vuexy/img/illustrations/add-new-roles.png') ?>"
+                                            <div class="d-flex align-items-end h-100 justify-content-center mt-sm-0 mt-3">
-                                                class="img-fluid mt-sm-4 mt-md-0" alt="add-new-roles" width="83" />
+                                                <img src="<?= site_url('themes/vuexy/img/illustrations/add-new-roles.png') ?>"
+                                                    class="img-fluid mt-sm-4 mt-md-0" alt="add-new-roles" width="83" />
+                                            </div>
                                         </div>
-                                    </div>
+                                        <div class="col-sm-7">
-                                    <div class="col-sm-7">
+                                            <div class="card-body text-sm-end text-center ps-sm-0">
-                                        <div class="card-body text-sm-end text-center ps-sm-0">
+                                                <button onclick="window.location='<?= route_to('newGroup') ?>'"
-                                            <button onclick="window.location='<?= route_to('newGroup') ?>'"
+                                                    class="btn btn-primary mb-2 text-nowrap add-new-role">
-                                                class="btn btn-primary mb-2 text-nowrap add-new-role">
+                                                    <?= lang('Basic.global.addNew') ?>
-                                                <?= lang('Basic.global.addNew') ?>
+                                                </button>
-                                            </button>
+                                                <p class="mb-0 mt-1"><?= lang("RolesPermisos.addRol") ?></p>
-                                            <p class="mb-0 mt-1"><?= lang("RolesPermisos.addRol") ?></p>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                        <?php endif; ?>
 
                         <?php foreach ($userGroupList as $item): ?>
                             <?php $item->users = $model->getUsersByRol($item->keyword); ?>
@@ -44,25 +46,29 @@
                                                 <?= lang("RolesPermisos.totalUsers") ?>
                                             </h6>
                                             <ul class="list-unstyled d-flex align-items-center avatar-group mb-0">
-                                            <?php foreach ($item->users as $user): ?>
+                                                <?php foreach ($item->users as $user): ?>
-                                                <li data-bs-toggle="tooltip" data-popup="tooltip-custom" data-bs-placement="top"
+                                                    <li data-bs-toggle="tooltip" data-popup="tooltip-custom"
-                                                    title="<?= esc($user->first_name . ' ' . $user->last_name) ?>"
+                                                        data-bs-placement="top"
-                                                    class="avatar avatar-sm pull-up">
+                                                        title="<?= esc($user->first_name . ' ' . $user->last_name) ?>"
-                                                    <img class="rounded-circle" src="<?= gravatar_url($user->email, 30) ?>"
+                                                        class="avatar avatar-sm pull-up">
-                                                        alt="<?= esc($user->email) ?>" />
+                                                        <img class="rounded-circle" src="<?= gravatar_url($user->email, 30) ?>"
-                                                </li>
+                                                            alt="<?= esc($user->email) ?>" />
-                                            <?php endforeach; ?>
+                                                    </li>
+                                                <?php endforeach; ?>
                                             </ul>
                                         </div>
                                         <div class="d-flex justify-content-between align-items-end mt-1">
                                             <div class="role-heading">
                                                 <h4 class="mb-1"><?= esc($item->title) ?></h4>
-                                                <a href="<?= route_to('editGroup', $item->id) ?>">
+                                                <?php if (auth()->user()->can('roles-permisos.edit')): ?>
-                                                    <span><?= lang('Basic.global.edit') ?></span>
+                                                    <a href="<?= route_to('editGroup', $item->id) ?>">
-                                                </a>
+                                                        <span><?= lang('Basic.global.edit') ?></span>
+                                                    </a>
+                                                <?php endif; ?>
                                             </div>
-                                            <?=
+                                            <?php
-                                                anchor(
+                                            if (auth()->user()->can('roles-permisos.delete')) {
+                                                echo anchor(
                                                     '#confirm2delete',
                                                     "<i class='ti ti-trash ti-md'></i>",
                                                     [
@@ -72,6 +78,7 @@
                                                         'data-bs-target' => '#confirm2delete'
                                                     ]
                                                 );
+                                            }
                                             ?>
                                         </div>
                                     </div>

ci4/app/Views/themes/vuexy/form/presupuestos/admin/_resumenPresupuestoItems.php

@@ -13,92 +13,110 @@
                 <div class="col-xl-12">
                     <div class="border rounded p-4 mb-3 pb-3">
 
-                        <!-- Price Details -->
+                        <div class="d-flex justify-content-between align-items-center mb-4">
-                        <dl class="row mb-0">
+                            <h5 class="mb-0">Costes detallados</h5>
-                            <dt class="col-5 py-1 fw-normal text-end">Coste papel</dt>
+                            <button class="btn btn-sm btn-link p-0" type="button" data-bs-toggle="collapse"
-                            <dd class="py-1 col-6 text-end"><span id="totalCostePapel"
+                                data-bs-target="#detallesCostes" aria-expanded="true"
-                                    class="autonumeric-resumen-currency"></span></dd>
+                                aria-controls="detallesCostes" title="Mostrar/ocultar detalle de precios">
-                            <dt class="col-5 py-1 fw-normal text-end">Margen papel</dt>
+                                <i class="ti ti-chevron-down"></i>
-                            <dd class="col-3 text-end py-1"><span id="porcentajeMargenPapel"
+                            </button>
-                                    class="autonumeric-resumen-percent"></span></dd>
+                        </div>
-                            <dd class="col-3 text-end py-1"><span id="margenPapel"
-                                    class="autonumeric-resumen-currency"></span></dd>
 
-                            <dt class="col-5 fw-normal text-end">
+                        <div id="detallesCostes" class="collapse">
-                                <a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".costes-impresion" aria-expanded="false" aria-controls="costes-impresion">
+                            <!-- Price Details -->
-                                    <i class="ti ti-list ti-sm mx-2"></i>
+                            <dl class="row mb-0">
-                                </a>
+                                <dt class="col-5 py-1 fw-normal text-end">Coste papel</dt>
-                                Coste impresión
+                                <dd class="py-1 col-6 text-end"><span id="totalCostePapel"
-                            </dt>
+                                        class="autonumeric-resumen-currency"></span></dd>
-                            <dd class="col-6 text-end py-1"><span id="totalCosteImpresion"
+                                <dt class="col-5 py-1 fw-normal text-end">Margen papel</dt>
-                                    class="autonumeric-resumen-currency"></span></dd>
+                                <dd class="col-3 text-end py-1"><span id="porcentajeMargenPapel"
-                            <!-- Bloque colapsable, sin <div>, solo usando clases -->
+                                        class="autonumeric-resumen-percent"></span></dd>
-                            <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste clicks</dt>
+                                <dd class="col-3 text-end py-1"><span id="margenPapel"
-                            <dd class="col-6 text-end py-1 collapse costes-impresion">
+                                        class="autonumeric-resumen-currency"></span></dd>
-                                <span id="totalCosteClicks" class="autonumeric-resumen-currency"></span>
-                            </dd>
 
-                            <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste horas</dt>
+                                <dt class="col-5 fw-normal text-end">
-                            <dd class="col-6 text-end py-1 collapse costes-impresion">
+                                    <a href="javascript:void(0);" data-bs-toggle="collapse"
-                                <span id="totalCosteHoras" class="autonumeric-resumen-currency"></span>
+                                        data-bs-target=".costes-impresion" aria-expanded="false"
-                            </dd>
+                                        aria-controls="costes-impresion">
+                                        <i class="ti ti-list ti-sm mx-2"></i>
+                                    </a>
+                                    Coste impresión
+                                </dt>
+                                <dd class="col-6 text-end py-1"><span id="totalCosteImpresion"
+                                        class="autonumeric-resumen-currency"></span></dd>
+                                <!-- Bloque colapsable, sin <div>, solo usando clases -->
+                                <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste clicks</dt>
+                                <dd class="col-6 text-end py-1 collapse costes-impresion">
+                                    <span id="totalCosteClicks" class="autonumeric-resumen-currency"></span>
+                                </dd>
 
-                            <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste tinta</dt>
+                                <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste horas</dt>
-                            <dd class="col-6 text-end py-1 collapse costes-impresion">
+                                <dd class="col-6 text-end py-1 collapse costes-impresion">
-                                <span id="totalCosteTinta" class="autonumeric-resumen-currency" ></span>
+                                    <span id="totalCosteHoras" class="autonumeric-resumen-currency"></span>
-                            </dd>
+                                </dd>
 
-                            <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste corte</dt>
+                                <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste tinta</dt>
-                            <dd class="col-6 text-end py-1 collapse costes-impresion">
+                                <dd class="col-6 text-end py-1 collapse costes-impresion">
-                                <span id="totalCosteCorte" class="autonumeric-resumen-currency"></span>
+                                    <span id="totalCosteTinta" class="autonumeric-resumen-currency"></span>
-                            </dd>
+                                </dd>
-                            <dt class="col-5 py-1 fw-normal text-end">
-                                <a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".margen-impresion" aria-expanded="false" aria-controls="margen-impresion">
-                                    <i class="ti ti-list ti-sm mx-2"></i>
-                                </a>
-                                Margen impresión
-                            </dt>
-                            <dd class="col-3 text-end py-1"><span id="porcentajeMargenImpresion"
-                                    class="autonumeric-resumen-percent"></span></dd>
-                            <dd class="col-3 text-end py-1"><span id="margenImpresion"
-                                    class="autonumeric-resumen-currency"></span></dd>
-                            <!-- Bloque colapsable, sin <div>, solo usando clases -->
-                            <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen clicks</dt>
-                            <dd class="col-6 text-end py-1 collapse margen-impresion">
-                                <span id="totalMargenClicks" class="autonumeric-resumen-currency"></span>
-                            </dd>
 
-                            <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen horas</dt>
+                                <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste corte</dt>
-                            <dd class="col-6 text-end py-1 collapse margen-impresion">
+                                <dd class="col-6 text-end py-1 collapse costes-impresion">
-                                <span id="totalMargenHoras" class="autonumeric-resumen-currency"></span>
+                                    <span id="totalCosteCorte" class="autonumeric-resumen-currency"></span>
-                            </dd>
+                                </dd>
+                                <dt class="col-5 py-1 fw-normal text-end">
+                                    <a href="javascript:void(0);" data-bs-toggle="collapse"
+                                        data-bs-target=".margen-impresion" aria-expanded="false"
+                                        aria-controls="margen-impresion">
+                                        <i class="ti ti-list ti-sm mx-2"></i>
+                                    </a>
+                                    Margen impresión
+                                </dt>
+                                <dd class="col-3 text-end py-1"><span id="porcentajeMargenImpresion"
+                                        class="autonumeric-resumen-percent"></span></dd>
+                                <dd class="col-3 text-end py-1"><span id="margenImpresion"
+                                        class="autonumeric-resumen-currency"></span></dd>
+                                <!-- Bloque colapsable, sin <div>, solo usando clases -->
+                                <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen clicks</dt>
+                                <dd class="col-6 text-end py-1 collapse margen-impresion">
+                                    <span id="totalMargenClicks" class="autonumeric-resumen-currency"></span>
+                                </dd>
 
-                            <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen tinta</dt>
+                                <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen horas</dt>
-                            <dd class="col-6 text-end py-1 collapse margen-impresion">
+                                <dd class="col-6 text-end py-1 collapse margen-impresion">
-                                <span id="totalMargenTinta" class="autonumeric-resumen-currency" ></span>
+                                    <span id="totalMargenHoras" class="autonumeric-resumen-currency"></span>
-                            </dd>
+                                </dd>
 
-                            <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen corte</dt>
+                                <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen tinta</dt>
-                            <dd class="col-6 text-end py-1 collapse margen-impresion">
+                                <dd class="col-6 text-end py-1 collapse margen-impresion">
-                                <span id="totalMargenCorte" class="autonumeric-resumen-currency"></span>
+                                    <span id="totalMargenTinta" class="autonumeric-resumen-currency"></span>
-                            </dd>
+                                </dd>
+
+                                <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen corte</dt>
+                                <dd class="col-6 text-end py-1 collapse margen-impresion">
+                                    <span id="totalMargenCorte" class="autonumeric-resumen-currency"></span>
+                                </dd>
+
+                                <dt class="col-5 fw-normal text-end">Coste servicios</dt>
+                                <dd class="col-6 text-end py-1 "><span id="totalServicios"
+                                        class="autonumeric-resumen-currency"></span></dd>
+                                <dt class="col-5 fw-normal text-end">Margen servicios</dt>
+                                <dd class="col-3 text-end py-1 "><span id="porcentajeMargenServicios"
+                                        class="autonumeric-resumen-percent"></span></dd>
+                                <dd class="col-3 text-end py-1 "><span id="margenServicios"
+                                        class="autonumeric-resumen-currency"></span></dd>
+
+                                <dt class="col-5 fw-normal text-end">Coste de envío</dt>
+                                <dd class="col-6 text-end py-1 "><span id="costeEnvios"
+                                        class="autonumeric-resumen-currency"></span></dd>
+                                <dt class="col-5 fw-normal text-end">Margen envío</dt>
+                                <dd class="col-6 text-end py-1 "><span id="margenEnvios"
+                                        class="autonumeric-resumen-currency"></span></dd>
+                            </dl>
+
+                        </div>
 
-                            <dt class="col-5 fw-normal text-end">Coste servicios</dt>
-                            <dd class="col-6 text-end py-1 "><span id="totalServicios"
-                                    class="autonumeric-resumen-currency"></span></dd>
-                            <dt class="col-5 fw-normal text-end">Margen servicios</dt>
-                            <dd class="col-3 text-end py-1 "><span id="porcentajeMargenServicios"
-                                    class="autonumeric-resumen-percent"></span></dd>
-                            <dd class="col-3 text-end py-1 "><span id="margenServicios"
-                                    class="autonumeric-resumen-currency"></span></dd>
 
-                            <dt class="col-5 fw-normal text-end">Coste de envío</dt>
-                            <dd class="col-6 text-end py-1 "><span id="costeEnvios"
-                                    class="autonumeric-resumen-currency"></span></dd>
-                            <dt class="col-5 fw-normal text-end">Margen envío</dt>
-                            <dd class="col-6 text-end py-1 "><span id="margenEnvios"
-                                    class="autonumeric-resumen-currency"></span></dd>
-                        </dl>
 
                         <hr class="mx-n4">
 
@@ -111,7 +129,7 @@
                                     class="autonumeric-resumen-percent"></span></dd>
                             <dd class="col-3 text-end py-1"><span id="totalMargenes"
                                     class="autonumeric-resumen-currency"></span></dd>
-                                    <dt class="col-5 fw-normal text-end">Total envío base</dt>
+                            <dt class="col-5 fw-normal text-end">Total envío base</dt>
                             <dd class="col-6 text-end py-1 "><span id="precioEnvios"
                                     class="autonumeric-resumen-currency"></span></dd>
                         </dl>
@@ -168,7 +186,8 @@
                 <div class="col-xl-12 mt-3">
                     <div class="card border border-secondary-subtle rounded-3">
                         <div class="card-body">
-                            <div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none" role="alert">
+                            <div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none"
+                                role="alert">
                                 <span class="alert-icon alert-icon-lg text-primary me-2">
                                     <i class="ti ti-ban ti-sm"></i>
                                 </span>
@@ -194,15 +213,15 @@
                                 </div>
                             </div>
                             <?php /*if ($presupuestoEntity->estado_id == 2): ?>
-                                <div class="row">
+                      <div class="row">
-                                    <div class="col-sm-6 mb-1">
+                          <div class="col-sm-6 mb-1">
-                                        <label for="totalAceptado"
+                              <label for="totalAceptado"
-                                            class="form-label"><?= lang('Presupuestos.totalAceptado') ?></label>
+                                  class="form-label"><?= lang('Presupuestos.totalAceptado') ?></label>
-                                        <input disabled type="text" id="totalAceptado" name="totalAceptado"
+                              <input disabled type="text" id="totalAceptado" name="totalAceptado"
-                                            class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
+                                  class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
-                                    </div>
+                          </div>
-                                </div>
+                      </div>
-                            <?php endif; */ ?>
+                  <?php endif; */ ?>
                             <div class="row">
                                 <p>
                                     <span id="aprobado_by_at"></span>

ci4/app/Views/themes/vuexy/form/produccion/ot/otFiles.php

@@ -1,5 +1,9 @@
 <div class="row">
     <div class="col-md-12">
-    <?= view("themes/vuexy/components/dropzone",data: ['id' => 'dropzone-ot-files','modelId' => $presupuesto->id]) ?>
+        <?= view("themes/vuexy/components/dropzone", data: [
+            'id' => 'dropzone-ot-files', 
+            'modelId' => $presupuesto->id,
+            'otId' => $ot->id
+            ]) ?>
     </div><!--//.col -->
 </div><!--//.row -->

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

@@ -11,7 +11,13 @@ if (
     auth()->user()->can('maquinas.menu') ||
     auth()->user()->can('maquinas-defecto.menu') ||
     auth()->user()->can('usuarios.menu') ||
-    auth()->user()->can('roles-permisos.menu')
+    auth()->user()->can('roles-permisos.menu') ||
+    auth()->user()->can('proveedores.menu') ||
+    auth()->user()->can('ubicaciones.menu') ||
+    auth()->user()->can('series-facturas.menu') ||
+    auth()->user()->can('tareas-maquina.menu') ||
+    auth()->user()->can('festivos.menu') ||
+    auth()->user()->can('variables-sistema.menu')
 ) {
 ?>
     <li class="menu-item">
@@ -63,14 +69,14 @@ if (
                     </a>
                 </li>
             <?php } ?>
-            <?php if (auth()->user()->inGroup('admin')) { ?>
+            <?php if (auth()->user()->can('tareas-maquina.menu')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to("maquinaTareaList") ?>" class="menu-link">
                         <div> <?= lang("App.menu_maquina_tareas") ?></div>
                     </a>
                 </li>
             <?php } ?>
-            <?php if (auth()->user()->inGroup('admin')) { ?>
+            <?php if (auth()->user()->can('imposiciones.menu')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to("imposicionList") ?>" class="menu-link">
                         <div> <?= lang("App.menu_imposiciones") ?></div>
@@ -112,29 +118,28 @@ if (
                     </a>
                 </li>
             <?php } ?>
-
+            <?php if (auth()->user()->inGroup('root')) { ?>
-            <?php if (auth()->user()->inGroup('admin')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to('erroresPresupuestoIndex') ?>" class="menu-link">
                         <div> <?= lang("App.menu_error_presupuesto") ?></div>
                     </a>
                 </li>
             <?php } ?>
-            <?php if (auth()->user()->inGroup('admin')) { ?>
+            <?php if (auth()->user()->can('variables-sistema.menu')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to('variablesIndex') ?>" class="menu-link">
                         <div> <?= lang("App.menu_variables") ?></div>
                     </a>
                 </li>
             <?php } ?>
-            <?php if (auth()->user()->inGroup('admin')) { ?>
+            <?php if (auth()->user()->inGroup('root')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to('configMessagesIndex') ?>" class="menu-link">
                         <div> <?= lang("App.menu_config_messages") ?></div>
                     </a>
                 </li>
             <?php } ?>
-            <?php if (auth()->user()->inGroup('admin')) { ?>
+            <?php if (auth()->user()->can('festivos.menu')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to('festivosList') ?>" class="menu-link">
                         <div> <?= lang("App.menu_config_holidays") ?></div>

httpdocs/assets/js/safekat/components/forms/fileUploadDropzone.js

@@ -1,6 +1,6 @@
 
 import Ajax from '../ajax.js';
-import { alertSuccessMessage } from '../alerts/sweetAlert.js'
+import { alertSuccessMessage, alertWarningMessage } from '../alerts/sweetAlert.js'
 
 const PREVIEW_TEMPLATE = `
 <div class="dz-preview dz-file-preview">
@@ -25,7 +25,7 @@ const PREVIEW_TEMPLATE = `
 class FileUploadDropzone {
 
 
-    constructor({ domElement, nameId = "presupuesto_id", getUri = null, postUri = null, resourcePath = "presupuestos" }) {
+    constructor({ domElement, nameId = "presupuesto_id", getUri = null, postUri = null, resourcePath = "presupuestos", otId = null }) {
         Dropzone.autoDiscover = false;
         this.domElement = domElement
         this.jqElement = $(domElement)
@@ -35,6 +35,7 @@ class FileUploadDropzone {
         this.btnDownloadFiles = $(`#${domElement.replace('#', '')}_btnDownloadFiles`);
         this.dataPost = {}
         this.nameId = nameId;
+        this.otId = otId;
         this.getUri = getUri
         this.postUri = postUri
         this.dataPost[nameId] = this.modelId;
@@ -160,7 +161,8 @@ class FileUploadDropzone {
             url: `/presupuestoadmin/download_zip`,
             type: 'POST',
             data: {
-                [this.nameId]: this.modelId
+                [this.nameId]: this.modelId,
+                'ot_id': this.otId
             },
             xhrFields: {
                 responseType: 'blob'
@@ -185,7 +187,7 @@ class FileUploadDropzone {
                 window.URL.revokeObjectURL(url);
             },
             error: () => {
-                alertWarningMessage("Error al descargar el archivo ZIP.");
+                alertWarningMessage("Error", "Error al descargar el archivo ZIP.");
             },
             complete: () => {
                 $("#loader").modal('hide');

httpdocs/assets/js/safekat/pages/produccion/ot.js

@@ -10,6 +10,7 @@ class OrdenTrabajo {
         this.otForm = this.item.find("#ot-edit-form")
         this.block = document.querySelector('.section-block');
         this.modelId = this.item.data("id");
+        this.otId = parseInt($("#dropzone-ot-files").data("ot-id")) || null;
         this.tareasTableItem = this.item.find("#ot-task-table");
         this.tareasId = []
         this.summaryData = {}
@@ -70,6 +71,7 @@ class OrdenTrabajo {
         this.configUploadDropzone = {
             domElement: '#dropzone-ot-files',
             nameId: "presupuesto_id",
+            otId: this.otId,
             getUri: '/presupuestos/presupuestocliente/get_files',
             postUri: '/presupuestos/presupuestocliente/upload_files'
         }