Merge branch 'main' into feat/tipo_papel_presup_cliente

trabajando2
2025-07-25 22:52:08 +00:00 · 2025-07-18 17:57:19 +02:00 · 2025-07-18 17:56:39 +02:00
35 changed files with 418 additions and 371 deletions
--- a/ci4/app/Config/Routes/ConfiguracionRoutes.php
+++ b/ci4/app/Config/Routes/ConfiguracionRoutes.php
@ -37,6 +37,7 @@ $routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion']
        $routes->post('menuitems', 'Papelesgenericos::menuItems', ['as' => 'menuItemsOfPapelesGenericos']);
        $routes->get('getpapelcliente', 'Papelesgenericos::getPapelCliente', ['as' => 'getPapelCliente']);
        $routes->get('selectpapelespecial', 'Papelesgenericos::selectPapelEspecial', ['as' => 'selectPapelEspecial']);
+        $routes->get('gettipopapel', 'Papelesgenericos::getTipoPapelCliente');
    });

    /* Papeles impresion */
--- a/ci4/app/Controllers/BaseResourceController.php
+++ b/ci4/app/Controllers/BaseResourceController.php
@ -77,14 +77,6 @@ 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
@ -230,13 +222,6 @@ 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 {
@ -251,10 +236,8 @@ 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'),
-                    'is_deleted' => $this->delete_flag
-                ])
+                ->set(['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]));
@ -287,8 +270,7 @@ 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;
        }
@ -384,12 +366,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;
--- a/ci4/app/Controllers/Compras/Proveedores.php
+++ b/ci4/app/Controllers/Compras/Proveedores.php
@ -25,7 +25,6 @@ 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) {
--- a/ci4/app/Controllers/Configuracion/ConfigVariables.php
+++ b/ci4/app/Controllers/Configuracion/ConfigVariables.php
@ -38,7 +38,6 @@ class ConfigVariables extends BaseResourceController

    public function index()
    {
-        checkPermission('variables-sistema.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -61,8 +60,6 @@ class ConfigVariables extends BaseResourceController
    }
    public function updateVariable(int $config_variable_id)
    {
-        checkPermission('variables-sistema.edit');
-
        $reqData = [];
        if ($this->request->isAJAX()) {
            $reqData = $this->request->getPost();
--- a/ci4/app/Controllers/Configuracion/FestivoController.php
+++ b/ci4/app/Controllers/Configuracion/FestivoController.php
@ -42,16 +42,11 @@ 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();
--- a/ci4/app/Controllers/Configuracion/FormasPago.php
+++ b/ci4/app/Controllers/Configuracion/FormasPago.php
@ -26,8 +26,6 @@ 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)
    {
@ -46,7 +44,6 @@ class FormasPago extends \App\Controllers\BaseResourceController

    public function index()
    {
-        checkPermission('formas-pago.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -64,7 +61,6 @@ class FormasPago extends \App\Controllers\BaseResourceController

    public function add()
    {
-        checkPermission('formas-pago.create');

        if ($this->request->getPost()) :

@ -119,7 +115,6 @@ class FormasPago extends \App\Controllers\BaseResourceController

    public function edit($requestedId = null)
    {
-        checkPermission('formas-pago.edit');

        if ($requestedId == null) :
            return $this->redirect2listView();
--- a/ci4/app/Controllers/Configuracion/Group.php
+++ b/ci4/app/Controllers/Configuracion/Group.php
@ -21,8 +21,6 @@ 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/';
@ -39,8 +37,6 @@ 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
@ -52,12 +48,11 @@ 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'];

@ -129,7 +124,6 @@ class Group extends \App\Controllers\GoBaseController

    public function edit($requestedId = null)
    {
-        checkPermission('roles-permisos.edit');

        helper('general');

@ -249,4 +243,30 @@ 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);
+        }
+    }
 }
--- a/ci4/app/Controllers/Configuracion/Maquinas.php
+++ b/ci4/app/Controllers/Configuracion/Maquinas.php
@ -28,7 +28,6 @@ class Maquinas extends \App\Controllers\BaseResourceController
    protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/';

    protected $indexRoute = 'maquinaList';
-
    protected MaquinaService $maquinaService;
    protected Validation $validation;

@ -56,7 +55,6 @@ class Maquinas extends \App\Controllers\BaseResourceController

    public function index()
    {
-        checkPermission('maquinas.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -114,8 +112,6 @@ class Maquinas extends \App\Controllers\BaseResourceController

    public function add()
    {
-        checkPermission('maquinas.create');
-
        if ($this->request->getPost()):

            $nullIfEmpty = true; // !(phpversion() >= '8.1');
@ -180,7 +176,7 @@ class Maquinas extends \App\Controllers\BaseResourceController

    public function edit($requestedId = null)
    {
-        checkPermission('maquinas.edit');
+

        if ($requestedId == null):
            return $this->redirect2listView();
--- a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php
+++ b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php
@ -28,8 +28,6 @@ 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)
    {
@ -47,7 +45,6 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController

    public function index()
    {
-        checkPermission('maquinas-defecto.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -66,7 +63,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController
    public function add()
    {

-        checkPermission('maquinas-defecto.create');
+
        

        if ($this->request->getPost()) :
@ -141,7 +138,6 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController
    public function edit($requestedId = null)
    {

-        checkPermission('maquinas-defecto.edit');

        if ($requestedId == null) :
            return $this->redirect2listView();
--- a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
+++ b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
@ -100,7 +100,6 @@ 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(),
--- a/ci4/app/Controllers/Configuracion/Paises.php
+++ b/ci4/app/Controllers/Configuracion/Paises.php
@ -29,7 +29,6 @@ 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)
    {
@ -48,7 +47,6 @@ class Paises extends \App\Controllers\BaseResourceController

    public function index()
    {
-        checkPermission('paises.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -67,8 +65,6 @@ class Paises extends \App\Controllers\BaseResourceController
    public function add()
    {

-        checkPermission('paises.create');
-
        if ($this->request->getPost()):

            $postData = $this->request->getPost();
@ -123,7 +119,6 @@ class Paises extends \App\Controllers\BaseResourceController

    public function edit($requestedId = null)
    {
-        checkPermission('paises.edit');

        if ($requestedId == null):
            return $this->redirect2listView();
--- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php
+++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php
@ -28,7 +28,6 @@ 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)
@ -55,7 +54,6 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController

    public function index()
    {
-        checkPermission('papel-generico.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -73,7 +71,6 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController

    public function add()
    {
-        checkPermission('papel-generico.create');

        if ($this->request->getPost()):

@ -135,7 +132,6 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController

    public function edit($requestedId = null)
    {
-        checkPermission('papel-generico.edit');

        if ($requestedId == null):
            return $this->redirect2listView();
@ -305,6 +301,53 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
        }
    }

+    
+    public function getTipoPapelCliente(){
+
+        if($this->request->isAJAX()) {
+
+            $data_input = $this->request->getGet();
+            $result = $this->papelService->getTiposPalelGenerico((object)$data_input);
+            /*
+
+            $tirada = goSanitize($this->request->getGet('tirada'))[0] ?? null;
+            $POD = null;
+            if ($tirada != null) {
+                $POD_value = model('App\Models\Configuracion\ConfigVariableModel')->getVariable('POD')->value;
+                if (intval($tirada) <= intval($POD_value)) {
+                    $POD = true;
+                } else {
+                    $POD = false;
+                }
+            }
+            $tipo = goSanitize($this->request->getGet('tipo'))[0];
+            $selected_papel = goSanitize($this->request->getGet('papel'))[0] ?? null;
+            $cubierta = goSanitize($this->request->getGet('cubierta'))[0] ?? 0;
+            $tapa_dura = goSanitize($this->request->getGet('tapa_dura'))[0] ?? null;
+            $sobrecubierta = goSanitize($this->request->getGet('sobrecubierta'))[0] ?? 0;
+            $guardas = goSanitize($this->request->getGet('guardas'))[0] ?? 0;
+
+            $ancho = floatval($this->request->getGet('ancho') ?? 0);
+            $alto = floatval($this->request->getGet('alto') ?? 0);
+            $solapas = floatval($this->request->getGet('solapas') ?? 0);
+            $lomo = floatval($this->request->getGet('lomo') ?? 0);
+
+            $anchoLibro = $ancho;
+
+            if(intval($cubierta) == 1 || intval($sobrecubierta) == 1){
+                $anchoLibro = 2 * $ancho + 2 * $solapas + $lomo;
+            }
+
+            $menu = $this->model->getPapelCliente($tipo, $cubierta, $sobrecubierta, $guardas, $selected_papel, $tapa_dura, false, $POD, $anchoLibro, $alto, $tirada);
+*/
+
+            return $this->respond($result);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+
+    }
+    
    public function getPapelCliente()
    {
        if ($this->request->isAJAX()) {
--- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php
+++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php
@ -52,9 +52,6 @@ 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)
@ -84,7 +81,6 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController

    public function index()
    {
-        checkPermission('papel-impresion.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -102,7 +98,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController

    public function add()
    {
-        checkPermission('papel-impresion.create');        
+        

        if ($this->request->getPost()) :

@ -165,7 +161,6 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController

    public function edit($requestedId = null)
    {
-        checkPermission('papel-impresion.edit');

        if ($requestedId == null) :
            return $this->redirect2listView();
--- a/ci4/app/Controllers/Configuracion/SeriesFacturas.php
+++ b/ci4/app/Controllers/Configuracion/SeriesFacturas.php
@ -22,8 +22,6 @@ 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)
    {
@ -42,7 +40,6 @@ class SeriesFacturas extends BaseResourceController

    public function index()
    {
-        checkPermission('series-facturas.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -60,8 +57,6 @@ class SeriesFacturas extends BaseResourceController

    public function add()
    {
-        checkPermission('series-facturas.create');
-
        if ($this->request->getPost()) :

            $postData = $this->request->getPost();
@ -115,8 +110,6 @@ class SeriesFacturas extends BaseResourceController
    public function edit($requestedId = null)
    {

-        checkPermission('series-facturas.edit');
-
        if ($requestedId == null) :
            return $this->redirect2listView();
        endif;
--- a/ci4/app/Controllers/Configuracion/Ubicaciones.php
+++ b/ci4/app/Controllers/Configuracion/Ubicaciones.php
@ -22,8 +22,6 @@ 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)
    {
@ -42,7 +40,6 @@ class Ubicaciones extends BaseResourceController

    public function index()
    {
-        checkPermission('ubicaciones.menu');

        $viewData = [
            'currentModule' => static::$controllerSlug,
@ -60,8 +57,6 @@ class Ubicaciones extends BaseResourceController

    public function add()
    {
-        checkPermission('ubicaciones.create');
-
        if ($this->request->getPost()) :

            $postData = $this->request->getPost();
@ -116,7 +111,6 @@ class Ubicaciones extends BaseResourceController

    public function edit($requestedId = null)
    {
-        checkPermission('ubicaciones.edit');

        if ($requestedId == null) :
            return $this->redirect2listView();
--- a/ci4/app/Controllers/Configuracion/Users.php
+++ b/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 ($this->canValidate()):
+            if ($successfulResult = $this->canValidate()) :
+                if ($this->canValidate()) :
                    try {

                        // The Email is unique
@ -134,12 +134,17 @@ 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();
-                // Asignar los grupos de usuarios a los que pertenece el usuario editado
-                $this->saveUserGroupsSafely($id, $currentGroups);
-
+                $this->group_user_model->where('user_id', $id)->delete();
+                foreach ($currentGroups as $group) {
+                    $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([
@ -151,8 +156,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 (!empty($this->indexRoute)):
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
                        return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message);
                    else:
                        return $this->redirect2listView('successMessage', $message);
@ -168,7 +173,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')->where('id >', 0)->findAll();
+        $this->viewData['groups'] = $this->group_model->select('keyword, title')->findAll();
        $this->viewData['chatDepartments'] = $this->chat_department_model->findAll();
        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Users.user') . ' ' . lang('Basic.global.addNewSuffix');

@ -186,12 +191,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();

@ -213,9 +218,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)) {
@ -244,11 +249,16 @@ class Users extends \App\Controllers\GoBaseController
                $thenRedirect = false;

            endif;
-            if ($noException && $successfulResult):
-
-                // Asignar los grupos de usuarios a los que pertenece el usuario editado
-                $this->saveUserGroupsSafely($user->id, $currentGroups);
+            if ($noException && $successfulResult) :

+                $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([
@ -260,8 +270,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 (!empty($this->indexRoute)):
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
                        return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message);
                    else:
                        return $this->redirect2listView('successMessage', $message);
@ -277,7 +287,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')->where('id >', 0)->findAll();
+        $this->viewData['groups'] = $this->group_model->select('keyword, title')->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');
@ -289,22 +299,18 @@ 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();
@ -427,11 +433,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;
@ -444,7 +450,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;
@ -461,50 +467,4 @@ 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'),
-            ]);
-        }
-    }
-
-
-
 }
--- a/ci4/app/Controllers/Presupuestos/Buscador.php
+++ b/ci4/app/Controllers/Presupuestos/Buscador.php
@ -36,8 +36,6 @@ 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)
    {
--- a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php
+++ b/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']);
                        }
-
-                        $this->calcular_coste_linea(
-                            $linea,
-                            $totalPapel,
-                            $margenPapel,
-                            $sumForFactor,
-                            $totalImpresion,
-                            $margenImpresion
-                        );
-
+                        if ($extra_info) {
+                            $this->calcular_coste_linea(
+                                $linea,
+                                $totalPapel,
+                                $margenPapel,
+                                $sumForFactor,
+                                $totalImpresion,
+                                $margenImpresion
+                            );
+                        }
                    }
                }

@ -2251,12 +2251,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                    $costeInterior = 0.0;
                    $peso_interior = 0.0;
                    $lomo = 0;
-                    $totalPapel = 0.0;
-                    $margenPapel = 0.0;
-                    $sumForFactor = 0.0;
-                    $totalImpresion = 0.0;
-                    $margenImpresion = 0.0;
-
+                    if ($extra_info) {
+                        $totalPapel = 0.0;
+                        $margenPapel = 0.0;
+                        $sumForFactor = 0.0;
+                        $totalImpresion = 0.0;
+                        $margenImpresion = 0.0;
+                    }
                    foreach ($interior as $linea) {
                        if (count($linea) > 0) {
                            $costeInterior += round(floatval($linea['total_impresion']), 2);
@ -2265,16 +2266,17 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                                $lomo += floatval($linea['mano']);
                            }
                            $peso_interior += floatval($linea['peso']);
+                            if ($extra_info) {

-                            $this->calcular_coste_linea(
-                                $linea,
-                                $totalPapel,
-                                $margenPapel,
-                                $sumForFactor,
-                                $totalImpresion,
-                                $margenImpresion
-                            );
-
+                                $this->calcular_coste_linea(
+                                    $linea,
+                                    $totalPapel,
+                                    $margenPapel,
+                                    $sumForFactor,
+                                    $totalImpresion,
+                                    $margenImpresion
+                                );
+                            }
                        }
                    }
                }
@ -2319,14 +2321,17 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                        $lomo += floatval($cubierta['mano']);
                    }

-                    $this->calcular_coste_linea(
-                        $cubierta,
-                        $totalPapel,
-                        $margenPapel,
-                        $sumForFactor,
-                        $totalImpresion,
-                        $margenImpresion
-                    );
+                    if ($extra_info) {
+
+                        $this->calcular_coste_linea(
+                            $cubierta,
+                            $totalPapel,
+                            $margenPapel,
+                            $sumForFactor,
+                            $totalImpresion,
+                            $margenImpresion
+                        );
+                    }
                }
                if ($coste_cubierta <= 0) {

@ -2377,12 +2382,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                                return $return_data;
                            }
                            $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
-                            $margenServicios += round(floatval($acabadoCubierta[0]->total - $base), 2);
+                            if ($extra_info) {
+                                //$totalServicios += round(floatval($acabadoCubierta[0]->total), 2);
+                                $base = round(floatval($acabadoCubierta[0]->total / (1 + $acabadoCubierta[0]->margen / 100.0)), 2);
+                                $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                                $totalServicios += $base;
+                                $margenServicios += round(floatval($acabadoCubierta[0]->total - $base), 2);
+                            }
                        }
                    }

@ -2416,12 +2422,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                            return $return_data;
                        }
                        $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        if ($extra_info) {
+                            //$totalServicios += round(floatval($resultado[0]->total), 2);
+                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $totalServicios += $base;
+                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        }

                    }
                }
@ -2451,16 +2458,17 @@ 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(
-                            $linea_sobrecubierta,
-                            $totalPapel,
-                            $margenPapel,
-                            $sumForFactor,
-                            $totalImpresion,
-                            $margenImpresion
-                        );
-
+                            $this->calcular_coste_linea(
+                                $linea_sobrecubierta,
+                                $totalPapel,
+                                $margenPapel,
+                                $sumForFactor,
+                                $totalImpresion,
+                                $margenImpresion
+                            );
+                        }
                    }
                    if ($coste_sobrecubierta <= 0) {

@ -2511,12 +2519,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                                }

                                $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                                $totalServicios += $base;
-                                $margenServicios += round(floatval($acabadoSobrecubierta[0]->total - $base), 2);
+                                if ($extra_info) {
+                                    //$totalServicios += round(floatval($acabadoSobrecubierta[0]->total), 2);
+                                    $base = round(floatval($acabadoSobrecubierta[0]->total / (1 + $acabadoSobrecubierta[0]->margen / 100.0)), 2);
+                                    $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                                    $totalServicios += $base;
+                                    $margenServicios += round(floatval($acabadoSobrecubierta[0]->total - $base), 2);
+                                }
                            }
                        }
                    }
@ -2558,15 +2567,17 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                            if (intval($tirada[$t]) == intval($selected_tirada)) {
                                $lomo += floatval($guardas['mano']);
                            }
+                            if ($extra_info) {

-                            $this->calcular_coste_linea(
-                                $guardas,
-                                $totalPapel,
-                                $margenPapel,
-                                $sumForFactor,
-                                $totalImpresion,
-                                $margenImpresion
-                            );
+                                $this->calcular_coste_linea(
+                                    $guardas,
+                                    $totalPapel,
+                                    $margenPapel,
+                                    $sumForFactor,
+                                    $totalImpresion,
+                                    $margenImpresion
+                                );
+                            }
                        }
                        if ($coste_guardas <= 0) {
                            $errorModel = new ErrorPresupuesto();
@ -2610,15 +2621,17 @@ 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(
-                            $linea_faja,
-                            $totalPapel,
-                            $margenPapel,
-                            $sumForFactor,
-                            $totalImpresion,
-                            $margenImpresion
-                        );
+                            $this->calcular_coste_linea(
+                                $linea_faja,
+                                $totalPapel,
+                                $margenPapel,
+                                $sumForFactor,
+                                $totalImpresion,
+                                $margenImpresion
+                            );
+                        }
                    }
                    if ($coste_faja <= 0) {

@ -2668,13 +2681,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                            }

                            $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                            $totalServicios += $base;
-                            $margenServicios += round(floatval($acabadoFaja[0]->total - $base), 2);
-
+                            if ($extra_info) {
+                                //$totalServicios += round(floatval($acabadoFaja[0]->total), 2);
+                                $base = round(floatval($acabadoFaja[0]->total / (1 + $acabadoFaja[0]->margen / 100.0)), 2);
+                                $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                                $totalServicios += $base;
+                                $margenServicios += round(floatval($acabadoFaja[0]->total - $base), 2);
+                            }
                        }
                    }
                }
@ -2723,13 +2736,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController


                    $costeServiciosDefecto += 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($base / $cantidad_total), 2) * $cantidad_total;
-                    $totalServicios += $base;
-                    $margenServicios += round(floatval($servicio->total - $base), 2);
-
+                    if ($extra_info) {
+                        //$totalServicios += round(floatval($servicio->total), 2);
+                        $base = round(floatval($servicio->total / (1 + $servicio->margen / 100.0)), 2);
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $totalServicios += $base;
+                        $margenServicios += round(floatval($servicio->total - $base), 2);
+                    }
                }

                $servDefectoMan = PresupuestoCLienteService::getServiciosManipuladoDefault([
@ -2761,12 +2774,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController


                    $costeServiciosDefecto += 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($base / $cantidad_total), 2) * $cantidad_total;
-                    $totalServicios += $base;
-                    $margenServicios += round(floatval($servicio->total - $base), 2);
+                    if ($extra_info) {
+                        //$totalServicios += round(floatval($servicio->total), 2);
+                        $base = round(floatval($servicio->total / (1 + $servicio->margen / 100.0)), 2);
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $totalServicios += $base;
+                        $margenServicios += round(floatval($servicio->total - $base), 2);
+                    }
                }

                if ($extra_info) {
@ -2866,13 +2880,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                        }

                        $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-
+                        if ($extra_info) {
+                            //$totalServicios += round(floatval($resultado[0]->total), 2);
+                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $totalServicios += $base;
+                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        }
                    } else if ($servicio->nombre == "ferro" || $servicio->nombre == "prototipo") {
                        // Extra
                        $resultado = PresupuestoCLienteService::getServiciosExtra([
@ -2899,13 +2913,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                        array_push($serviciosAutomaticos, $resultado[0]);

                        $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
-
+                        if ($extra_info) {
+                            //$totalServicios += round(floatval($resultado[0]->precio), 2);
+                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $totalServicios += $base;
+                            $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([
@ -2934,12 +2948,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                        }

                        $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        if ($extra_info) {
+                            //$totalServicios += round(floatval($resultado[0]->total), 2);
+                            $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $totalServicios += $base;
+                            $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                        }
                    }
                }

@ -2975,12 +2990,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                        array_push($serviciosExtra, $resultado[0]);

                        $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                        $totalServicios += $base;
-                        $margenServicios += round(floatval($resultado[0]->precio - $base), 2);
+                        if ($extra_info) {
+                            //$totalServicios += round(floatval($resultado[0]->precio), 2);
+                            $base = round(floatval($resultado[0]->precio / (1 + $resultado[0]->margen / 100.0)), 2);
+                            $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                            $totalServicios += $base;
+                            $margenServicios += round(floatval($resultado[0]->precio - $base), 2);
+                        }
                    }

                }
@ -3014,12 +3030,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                    }

                    $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                    $totalServicios += $base;
-                    $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    if ($extra_info) {
+                        //$totalServicios += round(floatval($resultado[0]->total), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $totalServicios += $base;
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    }
                }

                if (is_array($sobreCubierta) && ($sobreCubierta['solapas'] > 0 && intval($linea_sobrecubierta['dimension_desarrollo']['ancho']) > 630)) {
@ -3051,12 +3068,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                    }

                    $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                    $totalServicios += $base;
-                    $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    if ($extra_info) {
+                        //$totalServicios += round(floatval($resultado[0]->total), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $totalServicios += $base;
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    }
                }

                if (is_array($faja) && $faja !== [] && ($faja['solapas'] > 0 && intval($linea_faja['dimension_desarrollo']['ancho']) > 630)) {
@ -3088,12 +3106,13 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
                    }

                    $coste_servicios += 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($base / $cantidad_total), 2) * $cantidad_total;
-                    $totalServicios += $base;
-                    $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    if ($extra_info) {
+                        //$totalServicios += round(floatval($resultado[0]->total), 2);
+                        $base = round(floatval($resultado[0]->total / (1 + $resultado[0]->margen / 100.0)), 2);
+                        $base = round(floatval($base / $cantidad_total), 2) * $cantidad_total;
+                        $totalServicios += $base;
+                        $margenServicios += round(floatval($resultado[0]->total - $base), 2);
+                    }
                }

                /*$total_por_tirada = $costeInterior +
--- a/ci4/app/Controllers/Tarifas/Acabados/ServiciosAcabado.php
+++ b/ci4/app/Controllers/Tarifas/Acabados/ServiciosAcabado.php
@ -25,8 +25,6 @@ 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)
    {
--- a/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php
+++ b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php
@ -28,8 +28,6 @@ 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)
    {
--- a/ci4/app/Controllers/Tarifas/Tarifaextra.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaextra.php
@ -19,8 +19,6 @@ 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)
    {
--- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
+++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
@ -19,8 +19,6 @@ 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)
    {
--- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
@ -32,8 +32,6 @@ 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)
    {
--- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
@ -28,8 +28,6 @@ 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)
    {
--- a/ci4/app/Helpers/rbac_helper.php
+++ b/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', lang('Basic.global.permissionDenied'));
+            $session->setFlashdata('errorMessage', "No tiene permisos de acceso");

            $route = $redirectRoute ?? 'home';
            return $response->redirect(route_to($route));
--- a/ci4/app/Language/en/Basic.php
+++ b/ci4/app/Language/en/Basic.php
@ -90,7 +90,6 @@ return [
 			'wait' => 'Wait',
 			'yes' => 'Yes',
 			'back' => 'Back',
-			'permissionDenied' => 'You do not have permission for this action'			
 		],


--- a/ci4/app/Language/es/Basic.php
+++ b/ci4/app/Language/es/Basic.php
@ -94,7 +94,6 @@ return [
 			'yes' => 'Si',
 			'no' => 'No',
 			'back' => 'Volver',
-			'permissionDenied' => 'No tiene permisos de acceso'

 		],

--- a/ci4/app/Language/es/PapelGenerico.php
+++ b/ci4/app/Language/es/PapelGenerico.php
@ -30,7 +30,7 @@ return [
 		'especiales' => 'Especiales',
 		'reciclados' => 'Reciclados',
 		'cartulinas' => 'Cartulinas',
-		'verjurados' => 'Verjurados',
+		'verdujados' => 'Verdujados',

 		'validation' =>  [
 			'code' =>  [
--- a/ci4/app/Language/es/RolesPermisos.php
+++ b/ci4/app/Language/es/RolesPermisos.php
@ -58,12 +58,8 @@ 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',
--- a/ci4/app/Models/Configuracion/TipoPapelGenericoModel.php
+++ b/ci4/app/Models/Configuracion/TipoPapelGenericoModel.php
@ -18,5 +18,57 @@ class TipoPapelGenericoModel extends \App\Models\BaseModel
    ];
    protected $returnType = "App\Entities\Configuracion\TipoPapelGenerico";

+    public function getTiposPapel($data)
+    {
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->select(
+                "t1.id as id, t1.clave AS nombre",
+                // for debug, t2.nombre AS nombre_papel_impresion, t4.nombre AS maquina_nombre, t5.uso AS tarifa_uso, t5.tipo AS tarifa_tipo"
+            )
+            ->join("lg_papel_generico t2", "t2.tipo_papel_generico_id = t1.id", "inner")
+            ->join("lg_papel_impresion t3", "t3.papel_generico_id = t2.id", "inner")
+            ->join("lg_maquina_papel_impresion t4", "t4.papel_impresion_id = t3.id", "inner")
+            ->join("lg_maquinas t5", "t4.maquina_id = t5.id", "inner")
+            ->join("lg_maquinas_tarifas_impresion t6", "t6.maquina_id = t5.id", "inner")
+
+            ->where("t2.is_deleted", 0)
+            ->where("t2.show_in_client", 1)
+            ->where("t3.is_deleted", 0)
+            ->where("t3.isActivo", 1)
+            ->where("t3.use_in_client", 1)
+            ->where("t4.active", 1)
+            ->where("t5.is_deleted", 0)
+            ->where("t5.min <= ", $data['tirada'] ?? 0)
+            ->where("t5.max >= ", $data['tirada'] ?? 0)
+            ->where("t5.tipo", "impresion")
+            ->where("t6.is_deleted", 0)
+            ->where("t6.tipo", $data['tipo'] ?? null)
+            ->distinct('t1.id');
+
+        // Validación adicional para asegurar que t1.id esté presente en las combinaciones con t3.active = 1
+        $builder->whereIn("t2.id", function ($subQuery) {
+            $subQuery->select("t1_inner.id")
+                ->from("lg_papel_generico t1_inner")
+                ->join("lg_papel_impresion t2_inner", "t2_inner.papel_generico_id = t1_inner.id", "inner")
+                ->join("lg_maquina_papel_impresion t3_inner", "t3_inner.papel_impresion_id = t2_inner.id", "inner")
+                ->where("t3_inner.active", 1);
+        });
+
+        $builder->groupStart()
+            ->groupStart()
+            ->where("t5.ancho_impresion >", $data['ancho'] ?? 0)
+            ->where("t5.alto_impresion >", $data['alto'] ?? 0)
+            ->groupEnd()
+            ->orGroupStart()
+            ->where("t5.ancho_impresion >", $data['alto'] ?? 0)
+            ->where("t5.alto_impresion >", $data['ancho'] ?? 0)
+            ->groupEnd()
+            ->orGroupStart()
+            ->where("t5.ancho_impresion >", $data['alto'] ?? 0)
+            ->where("t5.is_rotativa", 1)
+            ->groupEnd()
+            ->groupEnd();
+    }

 }
--- a/ci4/app/Services/PapelService.php
+++ b/ci4/app/Services/PapelService.php
@ -4,14 +4,17 @@ namespace App\Services;

 use CodeIgniter\Config\BaseService;
 use App\Models\Configuracion\TipoPapelGenericoModel;
+use App\Models\Configuracion\PapelGenericoModel;

 class PapelService extends BaseService
 {
    protected TipoPapelGenericoModel $tipoPapelGenericoModel;
+    protected PapelGenericoModel $papelGenericoModel;

    public function __construct()
    {
        $this->tipoPapelGenericoModel = model(TipoPapelGenericoModel::class);
+        $this->papelGenericoModel = model(PapelGenericoModel::class);
    }

    public function getTipoPapelGenerico()
@ -24,4 +27,27 @@ class PapelService extends BaseService

        return $tipoPapelGenericoList;
    }
+
+    /**
+     * Obtencion de los tipos de papel genérico dependiendo del uso
+     * @param object $data
+     * @return array
+     */
+    public function getTiposPalelGenerico($data){
+
+        if(!isset($data) || empty($data)){
+            return [];
+        }
+
+        return $this->papelGenericoModel->where('tipo_papel_generico_id !=', null)->findAll();
+        /*
+        $values = $this->papelGenericoModel->where('uso', $uso)->findAll();
+        $tipoPapelGenericoList = [];
+        foreach ($values as $value) {
+            $tipoPapelGenericoList[$value->id] = lang('PapelGenerico.' . $value->clave);
+        }
+
+        return $tipoPapelGenericoList;
+        */
+    }
 }
--- a/ci4/app/Views/themes/vuexy/form/group/viewUserGroupForm.php
+++ b/ci4/app/Views/themes/vuexy/form/group/viewUserGroupForm.php
@ -113,7 +113,6 @@
            </div><!-- //.card -->
        </div><!--//.col -->
    </div><!--//.row -->
-
 <?= $this->endSection() ?>

 <?= $this->section('additionalInlineJs') ?>
--- a/ci4/app/Views/themes/vuexy/form/group/viewUserGroupList.php
+++ b/ci4/app/Views/themes/vuexy/form/group/viewUserGroupList.php
@ -11,29 +11,27 @@
                <div class="container-xxl flex-grow-1 container-p-y">
                    <!-- Role cards -->
                    <div class="row g-4">
-                        <?php if (auth()->user()->can('roles-permisos.create')): ?>
-                            <div class="col-xl-4 col-lg-6 col-md-6">
-                                <div class="card h-100">
-                                    <div class="row h-100">
-                                        <div class="col-sm-5">
-                                            <div class="d-flex align-items-end h-100 justify-content-center mt-sm-0 mt-3">
-                                                <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 class="col-xl-4 col-lg-6 col-md-6">
+                            <div class="card h-100">
+                                <div class="row h-100">
+                                    <div class="col-sm-5">
+                                        <div class="d-flex align-items-end h-100 justify-content-center mt-sm-0 mt-3">
+                                            <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 class="col-sm-7">
-                                            <div class="card-body text-sm-end text-center ps-sm-0">
-                                                <button onclick="window.location='<?= route_to('newGroup') ?>'"
-                                                    class="btn btn-primary mb-2 text-nowrap add-new-role">
-                                                    <?= lang('Basic.global.addNew') ?>
-                                                </button>
-                                                <p class="mb-0 mt-1"><?= lang("RolesPermisos.addRol") ?></p>
-                                            </div>
+                                    </div>
+                                    <div class="col-sm-7">
+                                        <div class="card-body text-sm-end text-center ps-sm-0">
+                                            <button onclick="window.location='<?= route_to('newGroup') ?>'"
+                                                class="btn btn-primary mb-2 text-nowrap add-new-role">
+                                                <?= lang('Basic.global.addNew') ?>
+                                            </button>
+                                            <p class="mb-0 mt-1"><?= lang("RolesPermisos.addRol") ?></p>
                                        </div>
                                    </div>
                                </div>
                            </div>
-                        <?php endif; ?>
+                        </div>

                        <?php foreach ($userGroupList as $item): ?>
                            <?php $item->users = $model->getUsersByRol($item->keyword); ?>
@ -46,29 +44,25 @@
                                                <?= lang("RolesPermisos.totalUsers") ?>
                                            </h6>
                                            <ul class="list-unstyled d-flex align-items-center avatar-group mb-0">
-                                                <?php foreach ($item->users as $user): ?>
-                                                    <li data-bs-toggle="tooltip" data-popup="tooltip-custom"
-                                                        data-bs-placement="top"
-                                                        title="<?= esc($user->first_name . ' ' . $user->last_name) ?>"
-                                                        class="avatar avatar-sm pull-up">
-                                                        <img class="rounded-circle" src="<?= gravatar_url($user->email, 30) ?>"
-                                                            alt="<?= esc($user->email) ?>" />
-                                                    </li>
-                                                <?php endforeach; ?>
+                                            <?php foreach ($item->users as $user): ?>
+                                                <li data-bs-toggle="tooltip" data-popup="tooltip-custom" data-bs-placement="top"
+                                                    title="<?= esc($user->first_name . ' ' . $user->last_name) ?>"
+                                                    class="avatar avatar-sm pull-up">
+                                                    <img class="rounded-circle" src="<?= gravatar_url($user->email, 30) ?>"
+                                                        alt="<?= esc($user->email) ?>" />
+                                                </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>
-                                                <?php if (auth()->user()->can('roles-permisos.edit')): ?>
-                                                    <a href="<?= route_to('editGroup', $item->id) ?>">
-                                                        <span><?= lang('Basic.global.edit') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
+                                                <a href="<?= route_to('editGroup', $item->id) ?>">
+                                                    <span><?= lang('Basic.global.edit') ?></span>
+                                                </a>
                                            </div>
-                                            <?php
-                                            if (auth()->user()->can('roles-permisos.delete')) {
-                                                echo anchor(
+                                            <?=
+                                                anchor(
                                                    '#confirm2delete',
                                                    "<i class='ti ti-trash ti-md'></i>",
                                                    [
@ -78,7 +72,6 @@
                                                        'data-bs-target' => '#confirm2delete'
                                                    ]
                                                );
-                                            }
                                            ?>
                                        </div>
                                    </div>
--- a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php
+++ b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php
@ -11,13 +11,7 @@ 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('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')
+    auth()->user()->can('roles-permisos.menu')
 ) {
 ?>
    <li class="menu-item">
@ -69,14 +63,14 @@ if (
                    </a>
                </li>
            <?php } ?>
-            <?php if (auth()->user()->can('tareas-maquina.menu')) { ?>
+            <?php if (auth()->user()->inGroup('admin')) { ?>
                <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()->can('imposiciones.menu')) { ?>
+            <?php if (auth()->user()->inGroup('admin')) { ?>
                <li class="menu-item">
                    <a href="<?= route_to("imposicionList") ?>" class="menu-link">
                        <div> <?= lang("App.menu_imposiciones") ?></div>
@ -118,28 +112,29 @@ 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()->can('variables-sistema.menu')) { ?>
+            <?php if (auth()->user()->inGroup('admin')) { ?>
                <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('root')) { ?>
+            <?php if (auth()->user()->inGroup('admin')) { ?>
                <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()->can('festivos.menu')) { ?>
+            <?php if (auth()->user()->inGroup('admin')) { ?>
                <li class="menu-item">
                    <a href="<?= route_to('festivosList') ?>" class="menu-link">
                        <div> <?= lang("App.menu_config_holidays") ?></div>
--- a/httpdocs/assets/js/safekat/pages/presupuestoCliente/disenioInterior.js
+++ b/httpdocs/assets/js/safekat/pages/presupuestoCliente/disenioInterior.js
@ -111,6 +111,29 @@ class DisenioInterior {
        this.disenioInterior.on('click', this.#handleDisenioInterior.bind(this));
        this.disenioInterior_color.on('click', this.#handleDisenioInterior.bind(this));

+        // test
+        $(document).on('keydown', function (e) {
+            if (e.ctrlKey && e.key === '.') {
+                e.preventDefault(); // Evita comportamiento por defecto si es necesario
+                console.log('Se pulsó Control + .');
+                new Ajax('/configuracion/papelesgenericos/gettipopapel',
+                    {
+                        [self.csrf_token]: self.csrf_hash,
+                        tirada: $('#tirada').val(),
+                        tipo: () => self.getTipoImpresion(),
+                        ancho: self.presupuestoCliente.datosGenerales.getDimensionLibro().ancho,
+                        alto: self.presupuestoCliente.datosGenerales.getDimensionLibro().alto,
+                        solapas: 0,
+                        lomo: 0,
+                        cubierta: 0,
+                    },
+                    {},
+                    (response) => { console.log(response); },
+                    (response) => { console.error(response); }
+                ).get();
+            }
+        });
+
    }
Author	SHA1	Message	Date
Jaime Jiménez	7bb6329783	Merge branch 'main' into feat/tipo_papel_presup_cliente	2025-07-18 17:57:19 +02:00
Jaime Jiménez	ad8e0ac75b	trabajando2	2025-07-18 17:56:39 +02:00