servicio cliente tareas

Mod/plantillas cliente

See merge request jjimenez/safekat!426

.gitignore

@@ -1,4 +1,4 @@
 ci4/.env
 .vscode/
 
-./xdebug.log
+*xdebug*.log*

.idea/codeception.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Codeception">
+    <option name="configurations">
+      <list>
+        <Configuration>
+          <option name="path" value="$PROJECT_DIR$/tests" />
+        </Configuration>
+        <Configuration>
+          <option name="path" value="$PROJECT_DIR$/ci4/tests" />
+        </Configuration>
+      </list>
+    </option>
+  </component>
+</project>

.idea/php.xml

@@ -55,6 +55,13 @@
       <path value="$PROJECT_DIR$/ci4/vendor/codeigniter4/shield" />
       <path value="$PROJECT_DIR$/ci4/vendor/codeigniter4/settings" />
       <path value="$PROJECT_DIR$/ci4/vendor/codeigniter4/framework" />
+      <path value="$PROJECT_DIR$/ci4/vendor/nicolab/php-ftp-client" />
+      <path value="$PROJECT_DIR$/ci4/vendor/hermawan/codeigniter4-datatables" />
+      <path value="$PROJECT_DIR$/ci4/vendor/firebase/php-jwt" />
+      <path value="$PROJECT_DIR$/ci4/vendor/greenlion/php-sql-parser" />
+      <path value="$PROJECT_DIR$/ci4/vendor/paragonie/random_compat" />
+      <path value="$PROJECT_DIR$/ci4/vendor/paragonie/constant_time_encoding" />
+      <path value="$PROJECT_DIR$/ci4/vendor/phpseclib/phpseclib" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.2">

.idea/phpspec.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPSpec">
+    <suites>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$/ci4" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$/ci4" />
+      </PhpSpecSuiteConfiguration>
+    </suites>
+  </component>
+</project>

.idea/safekat.iml

@@ -7,6 +7,13 @@
       <sourceFolder url="file://$MODULE_DIR$/ci4/app/ThirdParty/DatatablesEditor/" isTestSource="false" packagePrefix="DataTables\" />
       <sourceFolder url="file://$MODULE_DIR$/ci4/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/ci4/tests/_support" isTestSource="true" packagePrefix="Tests\Support\" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/firebase/php-jwt" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/greenlion/php-sql-parser" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/hermawan/codeigniter4-datatables" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/nicolab/php-ftp-client" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/paragonie/constant_time_encoding" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/paragonie/random_compat" />
+      <excludeFolder url="file://$MODULE_DIR$/ci4/vendor/phpseclib/phpseclib" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

ci4/app/Config/Auth.php

@@ -13,7 +13,9 @@ declare(strict_types=1);
 
 namespace Config;
 
+use App\Entities\Usuarios\UsersEntity;
 use App\Models\UserModel;
+use CodeIgniter\Shield\Authentication\Authenticators\JWT;
 use CodeIgniter\Shield\Authentication\Passwords\ValidationRules;
 use CodeIgniter\Shield\Config\Auth as ShieldAuth;
 use CodeIgniter\Shield\Authentication\Actions\ActionInterface;
@@ -117,7 +119,7 @@ class Auth extends ShieldAuth
         'tokens'  => AccessTokens::class,
         'session' => Session::class,
         'hmac'    => HmacSha256::class,
-        // 'jwt'     => JWT::class,
+        'jwt'     => JWT::class,
     ];
 
     /**
@@ -144,7 +146,7 @@ class Auth extends ShieldAuth
         'session',
         'tokens',
         'hmac',
-        // 'jwt',
+        'jwt',
     ];
 
     /**

ci4/app/Config/AuthJWT.php

@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter Shield.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Config;
+
+use CodeIgniter\Shield\Config\AuthJWT as ShieldAuthJWT;
+
+/**
+ * JWT Authenticator Configuration
+ */
+class AuthJWT extends ShieldAuthJWT
+{
+    /**
+     * --------------------------------------------------------------------
+     * Name of Authenticator Header
+     * --------------------------------------------------------------------
+     * The name of Header that the Authorization token should be found.
+     * According to the specs, this should be `Authorization`, but rare
+     * circumstances might need a different header.
+     */
+    public string $authenticatorHeader = 'Authorization';
+
+    /**
+     * --------------------------------------------------------------------
+     * The Default Payload Items
+     * --------------------------------------------------------------------
+     * All JWTs will have these claims in the payload.
+     *
+     * @var array<string, string>
+     */
+    public array $defaultClaims = [
+        'iss' => 'https://safekat.com',
+    ];
+
+    /**
+     * --------------------------------------------------------------------
+     * The Keys
+     * --------------------------------------------------------------------
+     * The key of the array is the key group name.
+     * The first key of the group is used for signing.
+     *
+     * @var array<string, array<int, array<string, string>>>
+     * @phpstan-var array<string, list<array<string, string>>>
+     */
+    public array $keys = [
+        'default' => [
+            // Symmetric Key
+            [
+                'kid' => '',      // Key ID. Optional if you have only one key.
+                'alg' => 'HS256', // algorithm.
+                // Set secret random string. Needs at least 256 bits for HS256 algorithm.
+                // E.g., $ php -r 'echo base64_encode(random_bytes(32));'
+                'secret' => 'ZAfosrIVWDaKEhBhicTKCpW8T5ZxC3GYAxFgCkUQjlU=',
+            ],
+            // Asymmetric Key
+            // [
+            //     'kid'        => '',      // Key ID. Optional if you have only one key.
+            //     'alg'        => 'RS256', // algorithm.
+            //     'public'     => '',      // Public Key
+            //     'private'    => '',      // Private Key
+            //     'passphrase' => ''       // Passphrase
+            // ],
+        ],
+    ];
+
+    /**
+     * --------------------------------------------------------------------
+     * Time To Live (in seconds)
+     * --------------------------------------------------------------------
+     * Specifies the amount of time, in seconds, that a token is valid.
+     */
+    public int $timeToLive = HOUR;
+
+    /**
+     * --------------------------------------------------------------------
+     * Record Login Attempts
+     * --------------------------------------------------------------------
+     * Whether login attempts are recorded in the database.
+     *
+     * Valid values are:
+     * - Auth::RECORD_LOGIN_ATTEMPT_NONE
+     * - Auth::RECORD_LOGIN_ATTEMPT_FAILURE
+     * - Auth::RECORD_LOGIN_ATTEMPT_ALL
+     */
+    public int $recordLoginAttempt = Auth::RECORD_LOGIN_ATTEMPT_FAILURE;
+}

ci4/app/Config/Autoload.php

@@ -46,6 +46,7 @@ class Autoload extends AutoloadConfig
     public $psr4 = [
         APP_NAMESPACE => APPPATH, // For custom app namespace
         'Config'      => APPPATH . 'Config',
+        'Libraries'      => APPPATH . 'Libraries',
         'Dompdf'      => APPPATH . 'ThirdParty/dompdf/src',
     ];
 

ci4/app/Config/Filters.php

@@ -8,6 +8,7 @@ use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\Filters\Honeypot;
 use CodeIgniter\Filters\InvalidChars;
 use CodeIgniter\Filters\SecureHeaders;
+use CodeIgniter\Shield\Authentication\Authenticators\JWT;
 
 
 class Filters extends BaseConfig
@@ -43,6 +44,8 @@ class Filters extends BaseConfig
                     'login*',
                     'register',
                     'auth/a/*',
+                    'auth/jwt',
+                    'api/*',
                     'logout']
             ],
         ],
@@ -73,5 +76,9 @@ class Filters extends BaseConfig
      * Example:
      * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
      */
-    public array $filters = [];
+    public array $filters = [
+        /*'jwt' => [
+            'before' => ['api', 'api/*']
+        ],*/
+    ];
 }

ci4/app/Config/PedidoXML.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class PedidoXML extends BaseConfig
+{
+
+    public string $host;
+    public int $port;
+    public string $username;
+    public string $password;
+    public string $base_dir; # FTP server directory
+    public bool $xml_enabled;
+    
+    public function __construct() {
+        parent::__construct();
+        $this->host = env("HIDRIVE_HOST","10.5.0.6");
+        $this->port = env("HIDRIVE_PORT",21);
+        $this->username = env("HIDRIVE_USER","admin");
+        $this->password = env("HIDRIVE_PASS","A77h3b0X4OA2rOYAf4w2");
+        $this->base_dir = env("HIDRIVE_PATH_ROOT","/home/admin/safekat"); # FTP server directory
+        $this->xml_enabled = env("FTP_XML_ENABLED",false); 
+
+    }
+}

ci4/app/Config/RBAC/permissionMatrix.php

@@ -9,10 +9,18 @@ const SK_PERMISSION_MATRIX = [
 		"plantilla-tarifa.edit",
 		"plantilla-tarifa.delete",
 		"plantilla-tarifa.menu",
+		"perfil.create",
+		"perfil.edit",
+		"perfil.delete",
+		"perfil.menu",
 		"presupuesto.create",
 		"presupuesto.edit",
 		"presupuesto.delete",
 		"presupuesto.menu",
+		"presupuesto-cliente.create",
+		"presupuesto-cliente.edit",
+		"presupuesto-cliente.delete",
+		"presupuesto-cliente.menu",
 		"tarifa-preimpresion.create",
 		"tarifa-preimpresion.edit",
 		"tarifa-preimpresion.delete",
@@ -33,6 +41,10 @@ const SK_PERMISSION_MATRIX = [
 		"tarifa-envio.edit",
 		"tarifa-envio.delete",
 		"tarifa-envio.menu",
+		"tarifa-extra.create",
+		"tarifa-extra.edit",
+		"tarifa-extra.delete",
+		"tarifa-extra.menu",
 		"proveedores.create",
 		"proveedores.edit",
 		"proveedores.delete",
@@ -49,6 +61,10 @@ const SK_PERMISSION_MATRIX = [
 		"paises.edit",
 		"paises.delete",
 		"paises.menu",
+		"formas-pago.create",
+		"formas-pago.edit",
+		"formas-pago.delete",
+		"formas-pago.menu",
 		"maquinas.create",
 		"maquinas.edit",
 		"maquinas.delete",
@@ -73,62 +89,40 @@ const SK_PERMISSION_MATRIX = [
 		"roles-permisos.edit",
 		"roles-permisos.delete",
 		"roles-permisos.menu",
+		"ubicaciones.create",
+		"ubicaciones.edit",
+		"ubicaciones.delete",
+		"ubicaciones.menu",
+		"series-facturas.create",
+		"series-facturas.edit",
+		"series-facturas.delete",
+		"series-facturas.menu",
 	],
 	"cliente-admin" => [
-		"clientes.create",
-		"clientes.edit",
-		"clientes.delete",
-		"clientes.menu",
-		"presupuesto.create",
-		"presupuesto.edit",
-		"presupuesto.delete",
-		"presupuesto.menu",
+		"perfil.edit",
+		"perfil.menu",
+		"direcciones.create",
+		"direcciones.edit",
+		"direcciones.delete",
+		"direcciones.menu",
+		"presupuesto-cliente.create",
+		"presupuesto-cliente.edit",
+		"presupuesto-cliente.delete",
+		"presupuesto-cliente.menu",
 	],
 	"cliente-editor" => [
-		"clientes.create",
-		"clientes.edit",
-		"clientes.delete",
-		"clientes.menu",
-		"plantilla-tarifa.create",
-		"plantilla-tarifa.edit",
-		"plantilla-tarifa.delete",
-		"plantilla-tarifa.menu",
-		"presupuesto.create",
-		"presupuesto.edit",
-		"presupuesto.delete",
-		"presupuesto.menu",
-		"tarifa-preimpresion.create",
-		"tarifa-preimpresion.edit",
-		"tarifa-preimpresion.delete",
-		"tarifa-preimpresion.menu",
-		"tarifa-manipulado.create",
-		"tarifa-manipulado.edit",
-		"tarifa-manipulado.delete",
-		"tarifa-manipulado.menu",
-		"tarifa-acabado.create",
-		"tarifa-acabado.edit",
-		"tarifa-acabado.delete",
-		"tarifa-acabado.menu",
-		"tarifa-encuadernacion.create",
-		"tarifa-encuadernacion.edit",
-		"tarifa-encuadernacion.delete",
-		"tarifa-encuadernacion.menu",
-		"tarifa-envio.create",
-		"tarifa-envio.edit",
-		"tarifa-envio.delete",
-		"tarifa-envio.menu",
-		"proveedores.create",
-		"proveedores.edit",
-		"proveedores.delete",
-		"proveedores.menu",
-		"ajustes.create",
-		"ajustes.edit",
-		"ajustes.delete",
-		"ajustes.menu",
-		"actividad.create",
-		"actividad.edit",
-		"actividad.delete",
-		"actividad.menu",
+		"perfil.create",
+		"perfil.edit",
+		"perfil.delete",
+		"perfil.menu",
+		"direcciones.create",
+		"direcciones.edit",
+		"direcciones.delete",
+		"direcciones.menu",
+		"presupuesto-cliente.create",
+		"presupuesto-cliente.edit",
+		"presupuesto-cliente.delete",
+		"presupuesto-cliente.menu",
 	],
 	"comercial" => [
 		"token.token",
@@ -169,10 +163,18 @@ const SK_PERMISSION_MATRIX = [
 		"plantilla-tarifa.edit",
 		"plantilla-tarifa.delete",
 		"plantilla-tarifa.menu",
+		"perfil.create",
+		"perfil.edit",
+		"perfil.delete",
+		"perfil.menu",
 		"presupuesto.create",
 		"presupuesto.edit",
 		"presupuesto.delete",
 		"presupuesto.menu",
+		"presupuesto-cliente.create",
+		"presupuesto-cliente.edit",
+		"presupuesto-cliente.delete",
+		"presupuesto-cliente.menu",
 		"tarifa-preimpresion.create",
 		"tarifa-preimpresion.edit",
 		"tarifa-preimpresion.delete",
@@ -193,6 +195,10 @@ const SK_PERMISSION_MATRIX = [
 		"tarifa-envio.edit",
 		"tarifa-envio.delete",
 		"tarifa-envio.menu",
+		"tarifa-extra.create",
+		"tarifa-extra.edit",
+		"tarifa-extra.delete",
+		"tarifa-extra.menu",
 		"proveedores.create",
 		"proveedores.edit",
 		"proveedores.delete",
@@ -205,5 +211,41 @@ const SK_PERMISSION_MATRIX = [
 		"actividad.edit",
 		"actividad.delete",
 		"actividad.menu",
+		"paises.create",
+		"paises.edit",
+		"paises.delete",
+		"paises.menu",
+		"maquinas.create",
+		"maquinas.edit",
+		"maquinas.delete",
+		"maquinas.menu",
+		"maquinas-defecto.create",
+		"maquinas-defecto.edit",
+		"maquinas-defecto.delete",
+		"maquinas-defecto.menu",
+		"papel-generico.create",
+		"papel-generico.edit",
+		"papel-generico.delete",
+		"papel-generico.menu",
+		"papel-impresion.create",
+		"papel-impresion.edit",
+		"papel-impresion.delete",
+		"papel-impresion.menu",
+		"usuarios.create",
+		"usuarios.edit",
+		"usuarios.delete",
+		"usuarios.menu",
+		"roles-permisos.create",
+		"roles-permisos.edit",
+		"roles-permisos.delete",
+		"roles-permisos.menu",
+		"ubicaciones.create",
+		"ubicaciones.edit",
+		"ubicaciones.delete",
+		"ubicaciones.menu",
+		"series-facturas.create",
+		"series-facturas.edit",
+		"series-facturas.delete",
+		"series-facturas.menu",
 	],
 ];

ci4/app/Config/RBAC/permissionMatrix.php.old

@@ -1,28 +0,0 @@
-<?php
-const SK_PERMISSION_MATRIX = [
-    "superadmin"=> [
-        "admin.*",
-        "users.*",
-        "beta.*"
-    ],
-    "admin"=> [
-        "admin.access",
-        "users.create",
-        "users.edit",
-        "users.delete",
-        "beta.access"
-    ],
-    "developer"=> [
-        "admin.access",
-        "admin.settings",
-        "users.create",
-        "users.edit",
-        "beta.access"
-    ],
-    "user"=> [
-        "users.list"
-    ],
-    "beta"=> [
-        "beta.access"
-    ]
-];

ci4/app/Config/RBAC/permissions.php

@@ -9,10 +9,22 @@ const SK_PERMISSIONS = [
 	'plantilla-tarifa.edit' => 'Can edit',
 	'plantilla-tarifa.delete' => 'Can delete',
 	'plantilla-tarifa.menu' => 'Menu shall be visualize',
+	'perfil.create' => 'Can create',
+	'perfil.edit' => 'Can edit',
+	'perfil.delete' => 'Can delete',
+	'perfil.menu' => 'Menu shall be visualize',
+	'direcciones.create' => 'Can create',
+	'direcciones.edit' => 'Can edit',
+	'direcciones.delete' => 'Can delete',
+	'direcciones.menu' => 'Menu shall be visualize',
 	'presupuesto.create' => 'Can create',
 	'presupuesto.edit' => 'Can edit',
 	'presupuesto.delete' => 'Can delete',
 	'presupuesto.menu' => 'Menu shall be visualize',
+	'presupuesto-cliente.create' => 'Can create',
+	'presupuesto-cliente.edit' => 'Can edit',
+	'presupuesto-cliente.delete' => 'Can delete',
+	'presupuesto-cliente.menu' => 'Menu shall be visualize',
 	'tarifa-preimpresion.create' => 'Can create',
 	'tarifa-preimpresion.edit' => 'Can edit',
 	'tarifa-preimpresion.delete' => 'Can delete',
@@ -33,6 +45,10 @@ const SK_PERMISSIONS = [
 	'tarifa-envio.edit' => 'Can edit',
 	'tarifa-envio.delete' => 'Can delete',
 	'tarifa-envio.menu' => 'Menu shall be visualize',
+	'tarifa-extra.create' => 'Can create',
+	'tarifa-extra.edit' => 'Can edit',
+	'tarifa-extra.delete' => 'Can delete',
+	'tarifa-extra.menu' => 'Menu shall be visualize',
 	'proveedores.create' => 'Can create',
 	'proveedores.edit' => 'Can edit',
 	'proveedores.delete' => 'Can delete',
@@ -49,6 +65,10 @@ const SK_PERMISSIONS = [
 	'paises.edit' => 'Can edit',
 	'paises.delete' => 'Can delete',
 	'paises.menu' => 'Menu shall be visualize',
+	'formas-pago.create' => 'Can create',
+	'formas-pago.edit' => 'Can edit',
+	'formas-pago.delete' => 'Can delete',
+	'formas-pago.menu' => 'Menu shall be visualize',
 	'maquinas.create' => 'Can create',
 	'maquinas.edit' => 'Can edit',
 	'maquinas.delete' => 'Can delete',
@@ -73,4 +93,12 @@ const SK_PERMISSIONS = [
 	'roles-permisos.edit' => 'Can edit',
 	'roles-permisos.delete' => 'Can delete',
 	'roles-permisos.menu' => 'Menu shall be visualize',
+	'ubicaciones.create' => 'Can create',
+	'ubicaciones.edit' => 'Can edit',
+	'ubicaciones.delete' => 'Can delete',
+	'ubicaciones.menu' => 'Menu shall be visualize',
+	'series-facturas.create' => 'Can create',
+	'series-facturas.edit' => 'Can edit',
+	'series-facturas.delete' => 'Can delete',
+	'series-facturas.menu' => 'Menu shall be visualize',
 ];

ci4/app/Config/RBAC/permissions.php.old

@@ -1,11 +0,0 @@
-<?php
-const SK_PERMISSIONS = [
-    'admin.access' => 'Can access the sites admin area',
-    'admin.settings' => 'Can access the main site settings',
-    'users.manage-admins' => 'Can manage other admins',
-    'users.list' => 'Can list user stuff',
-    'users.create' => 'Can create new non-admin users',
-    'users.edit' => 'Can edit existing non-admin users',
-    'users.delete' => 'Can delete existing non-admin users',
-    'beta.access' => 'Can access beta-level features',
-];

ci4/app/Config/RBAC/roles.php

@@ -3,7 +3,7 @@
 const SK_ROLES = [
     'admin' => [
         'title' => 'Administrador',
-        'description' => '',
+        'description' => 'Administrador del ERP',
     ],
     'cliente-admin' => [
         'title' => 'Cliente administrador',

ci4/app/Config/RBAC/roles.php.old

@@ -1,23 +0,0 @@
-<?php
-const SK_ROLES = [
-    'superadmin' => [
-        'title' => 'Super Admin',
-        'description' => 'Complete control of the site.',
-    ],
-    'admin' => [
-        'title' => 'Admin',
-        'description' => 'Day to day administrators of the site.',
-    ],
-    'developer' => [
-        'title' => 'Developer',
-        'description' => 'Site programmers.',
-    ],
-    'user' => [
-        'title' => 'User',
-        'description' => 'General users of the site. Often customers.',
-    ],
-    'beta' => [
-        'title' => 'Beta User',
-        'description' => 'Has access to beta-level features.',
-    ],
-];

ci4/app/Config/Routes.php

@@ -9,6 +9,7 @@ use CodeIgniter\Router\RouteCollection;
 //service('auth')->routes($routes, ['except' => ['login', 'register']]);
 service('auth')->routes($routes);
 
+
 //WEB ROUTER ------------------------------------------------------
 //------------------------------------------------------------------
 $routes->get('/', 'Home::index', ['as' => 'home']);
@@ -33,31 +34,77 @@ $routes->group('settings', ['namespace' => 'App\Controllers\Sistema'], function
  * --------------------------------------------------------------------
  */
 
-/* Rutas para configuraciones */
+/* Rutas para tarifas */
 $routes->group('tarifas', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) {
 
     /* Cliente */
     $routes->group('acabados', ['namespace' => 'App\Controllers\Tarifas\Acabados'], function ($routes) {
-
+        
         $routes->get('', 'TarifaAcabados::index', ['as' => 'tarifaAcabadoList']);
         $routes->match(['get', 'post'], 'add', 'TarifaAcabados::add', ['as' => 'tarifaAcabadoAdd']);
         $routes->match(['get', 'post'], 'edit/(:num)', 'TarifaAcabados::edit/$1', ['as' => 'tarifaAcabadoEdit']);
         $routes->get('delete/(:num)', 'TarifaAcabados::delete/$1', ['as' => 'tarifaAcabadoDelete']);
         $routes->post('datatable', 'TarifaAcabados::datatable', ['as' => 'tarifaAcabadoDT']);
-
+        $routes->get('select','TarifaAcabados::show_select',["as" => "showSelectTarifaAcabado"]);
         $routes->group('lineas', ['namespace' => 'App\Controllers\Tarifas\Acabados'], function ($routes) {
             $routes->post('datatable', 'TarifaAcabadosLineas::datatable', ['as' => 'tarifaAcabadoLineasDT']);
             $routes->post('datatable_editor', 'TarifaAcabadosLineas::datatable_editor', ['as' => 'tarifaAcabadoLineasDTE']);
             $routes->get('delete/(:num)', 'TarifaAcabadosLineas::delete/$1', ['as' => 'tarifaAcabadoLineasDelete']);
         });
     });
+});
 
+/* Rutas para configuraciones */
+$routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
+
+    /* Ubicaciones */
+    $routes->group('ubicaciones', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
+
+        $routes->get('', 'Ubicaciones::index', ['as' => 'ubicacionesList']);
+        $routes->match(['get', 'post'], 'add', 'Ubicaciones::add', ['as' => 'ubicacionesAdd']);
+        $routes->match(['get', 'post'], 'edit/(:num)', 'Ubicaciones::edit/$1', ['as' => 'ubicacionesEdit']);
+        $routes->get('delete/(:num)', 'Ubicaciones::delete/$1', ['as' => 'ubicacionesDelete']);
+        $routes->post('datatable', 'Ubicaciones::datatable', ['as' => 'ubicacionesDT']);
+    });
+
+    /* Series Factura */
+    $routes->group('series-facturas', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
+        $routes->get('', 'SeriesFacturas::index', ['as' => 'seriesFacturasList']);
+        $routes->match(['get', 'post'], 'add', 'SeriesFacturas::add', ['as' => 'seriesFacturasAdd']);
+        $routes->match(['get', 'post'], 'edit/(:num)', 'SeriesFacturas::edit/$1', ['as' => 'seriesFacturasEdit']);
+        $routes->get('delete/(:num)', 'SeriesFacturas::delete/$1', ['as' => 'seriesFacturasDelete']);
+        $routes->post('datatable', 'SeriesFacturas::datatable', ['as' => 'seriesFacturasDT']);
+        $routes->post('menuitemsFacturas', 'SeriesFacturas::menuItemsFacturas', ['as' => 'menuItemsOfSeriesFacturas']);
+    });
+
+    
+    $routes->group("variables", ["namespace" => 'App\Controllers\Configuracion'], function ($routes) {
+        $routes->get('', 'ConfigVariables::index', ['as' => 'variablesIndex']);
+        $routes->get('find/(:num)', 'ConfigVariables::get/$1', ['as' => 'variablesFind']);
+        $routes->post('edit/(:num)', 'ConfigVariables::updateVariable/$1', ['as' => 'updateVariable']);
+        $routes->delete('delete/(:num)', 'ConfigVariables::delete/$1', ['as' => 'deleteVariable']);
+        $routes->get('datatable', 'ConfigVariables::datatable', ['as' => 'datatableVariables']);
+    });
+    $routes->group("errores-presupuesto", ["namespace" => 'App\Controllers\Configuracion'], function ($routes) {
+        $routes->get('', 'ConfigErrores::index', ['as' => 'erroresPresupuestoIndex']);
+        $routes->get('edit/(:num)', 'ConfigErrores::viewForm/$1', ['as' => 'erroresPresupuestoViewForm']);
+        $routes->get('get/(:num)', 'ConfigErrores::get_error_presupuesto/$1', ['as' => 'erroresPresupuestoGetErrorPresupuesto']);
+        $routes->get('datatable', 'ConfigErrores::datatable', ['as' => 'erroresPresupuestoDatatable']);
+        $routes->post('edit/(:num)', 'ConfigErrores::update_error_presupuesto/$1', ['as' => 'erroresPresupuestoUpdate']);
+    });
+    $routes->group("servicios", ["namespace" => 'App\Controllers\Configuracion'], function ($routes) {
+        $routes->get('', 'ServicioCliente::index', ['as' => 'servicioClienteList']);
+        $routes->get('(:num)', 'ServicioCliente::show/$1', ['as' => 'servicioClienteShow']);
+        $routes->post('(:num)', 'ServicioCliente::store/$1', ['as' => 'servicioClienteStore']);
+        $routes->post('update/(:num)', 'ServicioCliente::update_servicio_cliente/$1', ['as' => 'updateServicioCliente']);
+        $routes->get('edit/(:num)', 'ServicioCliente::viewForm/$1', ['as' => 'servicioClienteViewForm']);
+        $routes->get('datatable', 'ServicioCliente::datatable', ['as' => 'servicioClienteDatatable']);
+    });
 });
 
 
 $routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
     $routes->get('', 'Users::index', ['as' => 'userList']);
-    $routes->get('index', 'Users::index', ['as' => 'userIndex']);
     $routes->get('list', 'Users::index', ['as' => 'userList2']);
     $routes->get('add', 'Users::add', ['as' => 'newUser']);
     $routes->post('add', 'Users::add', ['as' => 'createUser']);
@@ -66,7 +113,10 @@ $routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], functi
     $routes->get('delete/(:num)', 'Users::delete/$1', ['as' => 'deleteUser']);
     $routes->post('allmenuitems', 'Users::allItemsSelect', ['as' => 'select2ItemsOfUsers']);
     $routes->post('menuitems', 'Users::menuItems', ['as' => 'menuItemsOfUsers']);
+    $routes->get('getMenuComerciales', 'Users::getMenuComerciales', ['as' => 'menuItemsComerciales']);
 });
+$routes->resource('users', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Users', 'except' => 'show,new,create,update']);
+
 
 $routes->group('group', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
     $routes->get('', 'Group::index', ['as' => 'userGroupList']);
@@ -117,6 +167,8 @@ $routes->group('tarifasmanipulado', ['namespace' => 'App\Controllers\Tarifas'],
     $routes->post('datatable', 'Tarifasmanipulado::datatable', ['as' => 'dataTableOfTarifasManipulado']);
     $routes->post('allmenuitems', 'Tarifasmanipulado::allItemsSelect', ['as' => 'select2ItemsOfTarifasManipulado']);
     $routes->post('menuitems', 'Tarifasmanipulado::menuItems', ['as' => 'menuItemsOfTarifasManipulado']);
+    $routes->get('select','Tarifasmanipulado::show_select',["as" => "showSelectTarifaManipulado"]);
+
 });
 $routes->resource('tarifasmanipulado', ['namespace' => 'App\Controllers\Tarifas', 'controller' => 'Tarifasmanipulado', 'except' => 'show,new,create,update']);
 
@@ -173,6 +225,8 @@ $routes->group('papelesgenericos', ['namespace' => 'App\Controllers\Configuracio
     $routes->post('datatable', 'Papelesgenericos::datatable', ['as' => 'dataTableOfPapelesGenericos']);
     $routes->post('allmenuitems', 'Papelesgenericos::allItemsSelect', ['as' => 'select2ItemsOfPapelesGenericos']);
     $routes->post('menuitems', 'Papelesgenericos::menuItems', ['as' => 'menuItemsOfPapelesGenericos']);
+    $routes->get('getpapelcliente', 'Papelesgenericos::getPapelCliente', ['as' => 'getPapelCliente']);
+    $routes->get('selectpapelespecial', 'Papelesgenericos::selectPapelEspecial', ['as' => 'selectPapelEspecial']);
 });
 $routes->resource('papelesgenericos', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Papelesgenericos', 'except' => 'show,new,create,update']);
 
@@ -284,10 +338,22 @@ $routes->group('comunidades-autonomas', ['namespace' => 'App\Controllers\Configu
     $routes->post('datatable', 'Comunidadesautonomas::datatable', ['as' => 'dataTableOfComunidadesAutonomas']);
     $routes->post('allmenuitems', 'Comunidadesautonomas::allItemsSelect', ['as' => 'select2ItemsOfComunidadesAutonomas']);
     $routes->post('menuitems', 'Comunidadesautonomas::menuItems', ['as' => 'menuItemsOfComunidadesAutonomas']);
+    $routes->get('menuitems2', 'Comunidadesautonomas::menuItems2', ['as' => 'menuItemsOfComunidadesAutonomas2']);
 });
 $routes->resource('comunidades-autonomas', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Comunidadesautonomas', 'except' => 'show,new,create,update']);
 
 
+$routes->group('formas-pago', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
+    $routes->get('', 'FormasPago::index', ['as' => 'formasPagoList']);
+    $routes->match(['get', 'post'], 'add', 'FormasPago::add', ['as' => 'formasPagoAdd']);
+    $routes->match(['get', 'post'], 'edit/(:num)', 'FormasPago::edit/$1', ['as' => 'formasPagoEdit']);
+    $routes->get('delete/(:num)', 'FormasPago::delete/$1', ['as' => 'formasPagoDelete']);
+    $routes->post('datatable', 'FormasPago::datatable', ['as' => 'formasPagoDT']);
+    $routes->get('menuitems', 'FormasPago::menuItems', ['as' => 'menuItemsOfFormasDePagos']);
+});
+$routes->resource('formas-pago', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'FormasPago', 'except' => 'show,new,create,update']);
+
+
 $routes->group('paises', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
     $routes->get('', 'Paises::index', ['as' => 'paisList']);
     $routes->get('add', 'Paises::add', ['as' => 'newPais']);
@@ -298,6 +364,7 @@ $routes->group('paises', ['namespace' => 'App\Controllers\Configuracion'], funct
     $routes->post('datatable', 'Paises::datatable', ['as' => 'dataTableOfPaises']);
     $routes->post('allmenuitems', 'Paises::allItemsSelect', ['as' => 'select2ItemsOfPaises']);
     $routes->post('menuitems', 'Paises::menuItems', ['as' => 'menuItemsOfPaises']);
+    $routes->get('menuitems2', 'Paises::menuItems2', ['as' => 'menuItemsOfPaises2']);
 });
 $routes->resource('paises', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Paises', 'except' => 'show,new,create,update']);
 
@@ -312,6 +379,7 @@ $routes->group('provincias', ['namespace' => 'App\Controllers\Configuracion'], f
     $routes->post('datatable', 'Provincias::datatable', ['as' => 'dataTableOfProvincias']);
     $routes->post('allmenuitems', 'Provincias::allItemsSelect', ['as' => 'select2ItemsOfProvincias']);
     $routes->post('menuitems', 'Provincias::menuItems', ['as' => 'menuItemsOfProvincias']);
+    $routes->get('menuitems2', 'Provincias::menuItems2', ['as' => 'menuItemsOfProvincias2']);
 });
 $routes->resource('provincias', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Provincias', 'except' => 'show,new,create,update']);
 
@@ -322,42 +390,25 @@ $routes->group('clientes', ['namespace' => 'App\Controllers\Clientes'], function
     /* Cliente */
     $routes->group('cliente', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
         $routes->get('', 'Cliente::index', ['as' => 'clienteList']);
+        $routes->get('edit/(:num)', 'Cliente::edit/$1', ['as' => 'editarCliente']);
         $routes->match(['get', 'post'], 'add', 'Cliente::add', ['as' => 'clienteAdd']);
         $routes->match(['get', 'post'], 'edit/(:num)', 'Cliente::edit/$1', ['as' => 'clienteEdit']);
         $routes->get('delete/(:num)', 'Cliente::delete/$1', ['as' => 'clienteDelete']);
         $routes->post('datatable', 'Cliente::datatable', ['as' => 'clienteDT']);
         $routes->post('menuitems', 'Cliente::menuItems', ['as' => 'menuItemsOfClientes']);
+        $routes->get('getSelect2', 'Cliente::getSelect2', ['as' => 'getListaSelect2']);
     });
-
-    /* Precios */
-    /*$routes->group('precios', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
-        $routes->post('datatable', 'ClientePrecios::datatable', ['as' => 'clientePreciosDT']);
-        $routes->post('datatable_editor', 'ClientePrecios::datatable_editor', ['as' => 'clientePreciosDTE']);
-    });*/
-
-
 });
 
 
-/*$routes->group('cliente', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
-    $routes->get('', 'Cliente::index', ['as' => 'clienteList']);
-    $routes->get('add', 'Cliente::add', ['as' => 'newCliente']);
-    $routes->post('add', 'Cliente::add', ['as' => 'createCliente']);
-    $routes->post('create', 'Cliente::create', ['as' => 'ajaxCreateCliente']);
-    $routes->put('(:num)/update', 'Cliente::update/$1', ['as' => 'ajaxUpdateCliente']);
-    $routes->post('edit/(:num)', 'Cliente::edit/$1', ['as' => 'updateCliente']);
-    $routes->get('delete/(:num)', 'Cliente::delete/$1', ['as' => 'deleteCliente']);
-    $routes->post('datatable', 'Cliente::datatable', ['as' => 'dataTableOfClientes']);
-    $routes->post('allmenuitems', 'Cliente::allItemsSelect', ['as' => 'select2ItemsOfClientes']);
-    
-});
-$routes->resource('cliente', ['namespace' => 'App\Controllers\Clientes', 'controller' => 'Cliente', 'except' => 'show,new,create,update']);*/
-
 $routes->group('clienteprecios', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
-    $routes->post('datatable', 'Clienteprecios::datatable', ['as' => 'dataTableOfClienteprecios']);
-    $routes->post('datatable_editor', 'Clienteprecios::datatable_editor', ['as' => 'editorOfClienteprecios']);
+    $routes->post('datatable', 'ClientePrecios::datatable', ['as' => 'dataTableOfClienteprecios']);
+    $routes->post('datatable_editor', 'ClientePrecios::datatable_editor', ['as' => 'editorOfClienteprecios']);
+    $routes->post('changeplantilla', 'ClientePrecios::updatePlantilla', ['as' => 'changePlantillaOfClienteprecios']);
+    $routes->get('getplantilla', 'ClientePrecios::getCurrentPlantilla', ['as' => 'getPlantillaOfClienteprecios']);
+    $routes->post('update', 'ClientePrecios::updatePlantilla', ['as' => 'updateClienteprecios']);
 });
-$routes->resource('clienteprecios', ['namespace' => 'App\Controllers\Clientes', 'controller' => 'Clienteprecios', 'except' => 'show,new,create,update']);
+$routes->resource('clienteprecios', ['namespace' => 'App\Controllers\Clientes', 'controller' => 'ClientePrecios', 'except' => 'show,new,create,update']);
 
 
 $routes->group('clienteplantillaprecios', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
@@ -365,11 +416,13 @@ $routes->group('clienteplantillaprecios', ['namespace' => 'App\Controllers\Clien
     $routes->get('add', 'Clienteplantillaprecios::add', ['as' => 'newClienteplantillaprecios']);
     $routes->post('add', 'Clienteplantillaprecios::add', ['as' => 'createClienteplantillaprecios']);
     $routes->post('edit/(:num)', 'Clienteplantillaprecios::edit/$1', ['as' => 'updateClienteplantillaprecios']);
+    $routes->get('edit/(:num)', 'Clienteplantillaprecios::edit/$1', ['as' => 'updateClienteplantillaprecios']);
     $routes->get('delete/(:num)', 'Clienteplantillaprecios::delete/$1', ['as' => 'deleteClienteplantillaprecios']);
     $routes->post('datatable', 'Clienteplantillaprecios::datatable', ['as' => 'dataTableOfClientesplantillaprecios']);
-    $routes->post('menuitems', 'Clienteplantillaprecios::menuItems', ['as' => 'menuItemsOfClienteplantillaprecios']);
+    $routes->get('menuitems', 'Clienteplantillaprecios::menuItems', ['as' => 'menuItemsOfClienteplantillaprecios']);
+    $routes->post('update/(:num)', 'Clienteplantillaprecios::update/$1', ['as' => 'updateClienteplantillaprecios']);
 });
-$routes->resource('clienteplantillaprecios', ['namespace' => 'App\Controllers\Clientes', 'controller' => 'Clienteplantillaprecios', 'except' => 'show,new,create,update']);
+$routes->resource('clienteplantillaprecios', ['namespace' => 'App\Controllers\Clientes', 'controller' => 'Clienteplantillaprecios', 'except' => 'show,new,create']);
 
 
 $routes->group('clienteplantillaprecioslineas', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
@@ -383,18 +436,15 @@ $routes->group('clienteusuarios', ['namespace' => 'App\Controllers\Clientes'], f
 });
 
 
-$routes->group('formas-pagos', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
-    $routes->get('', 'Formaspagos::index', ['as' => 'formaDePagoList']);
-    $routes->get('add', 'Formaspagos::add', ['as' => 'newFormaDePago']);
-    $routes->post('add', 'Formaspagos::add', ['as' => 'createFormaDePago']);
-    $routes->post('create', 'Formaspagos::create', ['as' => 'ajaxCreateFormaDePago']);
-    $routes->put('(:num)/update', 'Formaspagos::update/$1', ['as' => 'ajaxUpdateFormaDePago']);
-    $routes->post('(:num)/edit', 'Formaspagos::edit/$1', ['as' => 'updateFormaDePago']);
-    $routes->post('datatable', 'Formaspagos::datatable', ['as' => 'dataTableOfFormasDePagos']);
-    $routes->post('allmenuitems', 'Formaspagos::allItemsSelect', ['as' => 'select2ItemsOfFormasDePagos']);
-    $routes->post('menuitems', 'Formaspagos::menuItems', ['as' => 'menuItemsOfFormasDePagos']);
+$routes->group('misdirecciones', ['namespace' => 'App\Controllers\Clientes'], function ($routes) {
+    $routes->get('', 'Clientedirecciones::index', ['as' => 'clientedireccionesIndex']);
+    $routes->get('get/(:num)', 'Clientedirecciones::get/$1', ['as' => 'get']);
+    $routes->get('getDireccionPresupuesto/(:num)', 'Clientedirecciones::getDireccionPresupuesto/$1', ['as' => 'getDireccionPresupuesto']);
+    $routes->post('add', 'Clientedirecciones::add', ['as' => 'newClientedirecciones']);
+    $routes->get('getSelect2', 'Clientedirecciones::getSelect2', ['as' => 'listaClientedirecciones']);
 });
-$routes->resource('formas-pagos', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Formaspagos', 'except' => 'show,new,create,update']);
+
+
 
 $routes->group('tarifasencuadernacion', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) {
     $routes->get('', 'Tarifasencuadernacion::index', ['as' => 'tarifaEncuadernacionList']);
@@ -519,36 +569,43 @@ $routes->group('clientedirecciones', ['namespace' => 'App\Controllers\Clientes']
 $routes->resource('clientedirecciones', ['namespace' => 'App\Controllers\Clientes', 'controller' => 'Clientedirecciones', 'except' => 'show,new,create,update']);
 
 
-$routes->group('cosidotapablanda', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
-    $routes->get('list/(:num)', 'Cosidotapablanda::list/$1', ['as' => 'cosidotapablandaList']);  // HOMOGENIZAR CON ARGS DINAMICOS!!!
-    $routes->get('add/(:num)', 'Cosidotapablanda::add/$1', ['as' => 'newCosidotapablanda']);
-    $routes->post('add/(:num)', 'Cosidotapablanda::add/$1', ['as' => 'createCosidotapablanda']);
-    $routes->post('create', 'Cosidotapablanda::create', ['as' => 'ajaxCreateCosidotapablanda']);
-    $routes->put('(:num)/update', 'Cosidotapablanda::update/$1', ['as' => 'ajaxUpdateCosidotapablanda']);
-    $routes->post('edit/(:num)', 'Cosidotapablanda::edit/$1', ['as' => 'updateCosidotapablanda']);
-    $routes->post('datatable', 'Cosidotapablanda::datatable', ['as' => 'dataTableOfCosidotapablanda']);
-    $routes->post('datatable_2', 'Cosidotapablanda::datatable_2', ['as' => 'updateDataOfCosidotapablanda']);
-    $routes->post('allmenuitems', 'Cosidotapablanda::allItemsSelect', ['as' => 'select2ItemsOfCosidotapablanda']);
-    $routes->post('menuitems', 'Cosidotapablanda::menuItems', ['as' => 'menuItemsOfCosidotapablanda']);
+$routes->group('presupuestoadmin', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
+    $routes->get('list/(:num)', 'Presupuestoadmin::list/$1', ['as' => 'presupuestoAdminList']);  // HOMOGENIZAR CON ARGS DINAMICOS!!!
+    $routes->get('add/(:num)', 'Presupuestoadmin::add/$1', ['as' => 'newPresupuestoAdmin']);
+    $routes->get('edit/(:any)', 'Presupuestoadmin::edit/$1', ['as' => 'editarPresupuestoAdmin']);
+    $routes->post('add/(:num)', 'Presupuestoadmin::add/$1', ['as' => 'createPresupuestoAdmin']);
+    $routes->post('create', 'Presupuestoadmin::create', ['as' => 'ajaxCreatePresupuestoAdmin']);
+    $routes->put('(:num)/update', 'Presupuestoadmin::update/$1', ['as' => 'ajaxUpdatePresupuestoAdmin']);
+    $routes->post('edit/(:num)', 'Presupuestoadmin::edit/$1', ['as' => 'updatePresupuestoAdmin']);
+    $routes->post('datatable', 'Presupuestoadmin::datatable', ['as' => 'dataTableOfPresupuestoAdmin']);
+    $routes->post('datatable_2', 'Presupuestoadmin::datatable_2', ['as' => 'updateDataOfPresupuestoAdmin']);
+    $routes->post('allmenuitems', 'Presupuestoadmin::allItemsSelect', ['as' => 'select2ItemsOfPresupuestoAdmin']);
+    $routes->post('menuitems', 'Presupuestoadmin::menuItems', ['as' => 'menuItemsOfPresupuestoAdmin']);
 });
-$routes->resource('cosidotapablanda', ['namespace' => 'App\Controllers\Presupuestos', 'controller' => 'Cosidotapablanda', 'except' => 'show,new,create,update']);
+$routes->resource('presupuestoadmin', ['namespace' => 'App\Controllers\Presupuestos', 'controller' => 'Presupuestoadmin', 'except' => 'show,new,create,update']);
 
 $routes->group('presupuestocliente', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
-    $routes->get('list/(:num)', 'Presupuestocliente::list/$1', ['as' => 'listarPresupuestoCliente']);  // HOMOGENIZAR CON ARGS DINAMICOS!!!
+    $routes->get('list', 'Presupuestocliente::list', ['as' => 'listaPresupuestos']);
+    $routes->post('datatable', 'Presupuestocliente::datatable', ['as' => 'datatableOfPresupuestos']);
     $routes->get('add', 'Presupuestocliente::add', ['as' => 'nuevoPresupuestoCliente']);
     $routes->post('add', 'Presupuestocliente::add', ['as' => 'crearPresupuestoCliente']);
     $routes->post('edit/(:num)', 'Presupuestocliente::edit/$1', ['as' => 'editarPresupuestoCliente']);
-    $routes->post('datatable', 'Cosidotapablanda::datatable', ['as' => 'tablaPresupuestosCliente']);
+    $routes->get('edit/(:any)', 'Presupuestocliente::edit/$1', ['as' => 'editarPresupuestoCliente2']);
     $routes->post('getgramaje', 'Presupuestocliente::getGramaje', ['as' => 'obtenerGramaje']);
     $routes->post('presupuesto', 'Presupuestocliente::presupuesto', ['as' => 'presupuestoCliente']);
     $routes->post('getDireccionesCliente', 'Presupuestocliente::getDireccionesCliente', ['as' => 'getDirecciones']);
-    $routes->post('getDatosDireccion', 'Presupuestocliente::getDatosDireccion', ['as' => 'getDatosDireccion']);
     $routes->post('getNuevaDireccion', 'Presupuestocliente::getNuevaDireccion', ['as' => 'nuevaDireccion']);
+    $routes->post('guardar', 'Presupuestocliente::guardar', ['as' => 'guardar']);
+    $routes->get('cargar/(:num)', 'Presupuestocliente::cargar/$1', ['as' => 'cargarPresupuesto']);
+    $routes->post('duplicarPresupuesto', 'Presupuestocliente::duplicarPresupuesto', ['as' => 'duplicarPresupuesto']);
+    $routes->post('calcular', 'Presupuestocliente::calcular', ['as' => 'calcularPresupuesto']);
+    $routes->post('calcularsolapas', 'Presupuestocliente::calcularMaxSolapas', ['as' => 'calcularSolapas']);
 });
 $routes->resource('presupuestocliente', ['namespace' => 'App\Controllers\Presupuestos', 'controller' => 'Presupuestocliente', 'except' => 'show,new,create,update']);
 
 $routes->group('serviciosacabados', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
     $routes->post('datatable', 'Presupuestoacabados::datatable', ['as' => 'dataTableOfPresupuestoAcabados']);
+    $routes->post('menuitems', 'Presupuestoacabados::menuItems', ['as' => 'menuItemsOfPresupuestoAcabados']);
     $routes->post('edit/(:num)', 'Presupuestoacabados::edit/$1', ['as' => 'updatePresupuestoacabados']);
 });
 
@@ -557,7 +614,6 @@ $routes->group('serviciosencuadernaciones', ['namespace' => 'App\Controllers\Pre
     $routes->post('menuitems', 'Presupuestoencuadernaciones::menuItems', ['as' => 'menuItemsOfPresupuestoEncuadernaciones']);
     $routes->get('delete/(:num)', 'Presupuestoencuadernaciones::delete/$1', ['as' => 'deletePresupuestoencuadernaciones']);
     $routes->post('edit/(:num)', 'Presupuestoencuadernaciones::edit/$1', ['as' => 'updatePresupuestoencuadernaciones']);
-
 });
 
 $routes->group('serviciosmanipulados', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
@@ -583,8 +639,62 @@ $routes->group('presupuestodirecciones', ['namespace' => 'App\Controllers\Presup
 $routes->group('presupuestotiradasalternativas', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
     $routes->post('datatable', 'Presupuestotiradasalternativas::datatable', ['as' => 'dataTableOfPresupuestoTiradasAlternativas']);
     $routes->post('datatable_2', 'Presupuestotiradasalternativas::datatable_2', ['as' => 'getTiradaData']);
-}); 
+});
 
+$routes->group('pedidos', ['namespace' => 'App\Controllers\Pedidos'], function ($routes) {
+    $routes->get('list', 'Pedido::todos', ['as' => 'listaPresupuestos']);
+    $routes->get('listActivos', 'Pedido::activos', ['as' => 'listaPresupuestosActivos']);
+    $routes->get('listFinalizados', 'Pedido::finalizados', ['as' => 'listaFinalizados']);
+    $routes->get('listCancelados', 'Pedido::cancelados', ['as' => 'listaCancelados']);
+    $routes->post('datatable', 'Pedido::datatable', ['as' => 'dataTableOfPedidos']);
+    $routes->get('add', 'Pedido::add', ['as' => 'nuevoPedido']);
+    $routes->post('add', 'Pedido::add', ['as' => 'crearPedido']);
+    $routes->get('edit/(:any)', 'Pedido::edit/$1', ['as' => 'editarPedido']);
+    $routes->post('getlineas', 'Pedido::getLineas', ['as' => 'tablaLineasPedido']);
+    $routes->post('cambiarestado', 'Pedido::cambiarEstado', ['as' => 'cambiarEstadoPedido']);
+    $routes->post('update/(:any)', 'Pedido::update/$1', ['as' => 'actualizarPedido']);
+    $routes->get('xml/(:num)', 'Pedido::get_xml_pedido/$1', ['as' => 'getXMLPedido']);
+});
+$routes->resource('pedidos', ['namespace' => 'App\Controllers\Pedidos', 'controller' => 'Pedido', 'except' => 'show,new,create,update']);
+
+
+$routes->group('albaranes', ['namespace' => 'App\Controllers\Pedidos'], function ($routes) {
+    $routes->post('add', 'Albaran::add', ['as' => 'crearAlbaranesPedido']);
+    $routes->post('update/(:any)', 'Albaran::update/$1', ['as' => 'actualizarAlbaran']);
+    $routes->post('updateLinea/(:any)', 'Albaran::updateLinea/$1', ['as' => 'actualizarLineaAlbaran']);
+    $routes->post('deletelinea', 'Albaran::borrarlinea', ['as' => 'borrarAlbaranLinea']);
+    $routes->get('delete/(:any)', 'Albaran::delete/$1', ['as' => 'borrarAlbaran']);
+    $routes->get('getalbaranes/(:any)', 'Albaran::getAlbaranes/$1', ['as' => 'getAlbaranes']);
+    $routes->get('nuevalinea/(:any)', 'Albaran::addLinea/$1', ['as' => 'addAlbaranLinea']);
+    $routes->post('nuevalinea/(:any)', 'Albaran::addLinea/$1', ['as' => 'addIVA']);
+});
+$routes->resource('albaranes', ['namespace' => 'App\Controllers\Pedidos', 'controller' => 'Albaran', 'except' => 'show,new,create,update']);
+
+
+$routes->group('facturas', ['namespace' => 'App\Controllers\Facturacion'], function ($routes) {
+
+    $routes->get('list', 'Facturas::list', ['as' => 'facturasList']);
+    $routes->post('datatable', 'Facturas::datatable', ['as' => 'dataTableOfFacturas']);
+    $routes->get('add', 'Facturas::add', ['as' => 'newFactura']);
+    $routes->post('add', 'Facturas::add', ['as' => 'createFactura']);
+    $routes->get('edit/(:any)', 'Facturas::edit/$1', ['as' => 'editarFactura']);
+    $routes->get('validar/(:any)', 'Facturas::validar/$1', ['as' => 'validarFactura']);
+    $routes->post('update/(:any)', 'Facturas::update/$1', ['as' => 'actualizarFactura']);
+    $routes->post('duplicate/(:any)', 'Facturas::duplicate/$1', ['as' => 'duplicarFactura']);
+    $routes->post('datatable/(:any)', 'FacturasLineas::datatable/$1', ['as' => 'dataTableOfLineasFacturas']);
+    $routes->post('menuPedidosPendientes/(:num)', 'Facturas::menuPedidosPendientes/$1', ['as' => 'menuPedidosPendientesImpresion']);
+    $routes->post('addLineaPedidoImpresion/(:num)', 'Facturas::addLineaPedidoImpresion/$1', ['as' => 'addLineaPedidoImpresion2Factura']);
+    $routes->post('addExcedentes/(:any)', 'Facturas::addExcedentes/$1', ['as' => 'addLineaExcedentes']);
+    $routes->get('deleteLinea/(:any)', 'FacturasLineas::deleteLinea/$1', ['as' => 'deleteLineaFactura']);
+    $routes->get('delete/(:any)', 'Facturas::delete/$1', ['as' => 'borrarFactura']);
+    $routes->post('deleteFacturaLineaPedido', 'Facturas::deleteLineaPedidoImpresion', ['as' => 'deleteLineaPedidoImpresion']);
+    $routes->post('editorLineas', 'FacturasLineas::datatable_editor', ['as' => 'editorOfLineasFacturas']);
+    $routes->post('updateTotales/(:any)', 'Facturas::updateTotales/$1', ['as' => 'updateFacturaTotales']);
+    $routes->post('updateCabecera/(:any)', 'Facturas::updateCabecera/$1', ['as' => 'updateCabecera']);
+    $routes->post('datatablePagos/(:any)', 'FacturasPagos::datatable/$1', ['as' => 'dataTableOfPagosFacturas']);
+    $routes->post('editorPagos', 'FacturasPagos::datatable_editor', ['as' => 'editorOfPagosFacturas']);
+    $routes->post('datatablePedidos', 'Facturas::datatablePedidos', ['as' => 'dataTableOfFacturasPedido']);
+});
 
 
 $routes->group(
@@ -596,6 +706,40 @@ $routes->group(
     }
 );
 
+$routes->group(
+    'print-albaran',
+    ['namespace' => 'App\Controllers\Pdf'],
+    function ($routes) {
+        $routes->get('index/(:num)', 'PrintAlbaranes::index/$1', ['as' => 'viewAlbaranPDF']);
+        $routes->get('generar/(:num)', 'PrintAlbaranes::generar/$1', ['as' => 'albaranToPdf']);
+    }
+);
+
+$routes->group(
+    'print-factura',
+    ['namespace' => 'App\Controllers\Pdf'],
+    function ($routes) {
+        $routes->get('index/(:num)', 'PrintFacturas::index/$1', ['as' => 'viewFacturaPDF']);
+        $routes->get('generar/(:num)', 'PrintFacturas::generar/$1', ['as' => 'facturaToPdf']);
+    }
+);
+
+$routes->group(
+    'export-giros',
+    ['namespace' => 'App\Controllers\Excel'],
+    function ($routes) {
+        $routes->get('generar/(:num)', 'PrintGiros::generateExcel/$1', ['as' => 'girosToExcel']);
+    }
+);
+
+$routes->group(
+    'export-lineas',
+    ['namespace' => 'App\Controllers\Excel'],
+    function ($routes) {
+        $routes->get('generar/(:num)', 'PrintLineas::generateExcel/$1', ['as' => 'lineasToExcel']);
+    }
+);
+
 $routes->group(
     'buscadorpresupuestos',
     ['namespace' => 'App\Controllers\Presupuestos'],
@@ -607,6 +751,120 @@ $routes->group(
 $routes->resource('buscadorpresupuestos', ['namespace' => 'App\Controllers\Presupuestos', 'controller' => 'Buscador', 'except' => 'show,new,create,update']);
 
 
+$routes->group(
+    'papel-formato',
+    ['namespace' => 'App\Controllers\Configuracion'],
+    function ($routes) {
+        $routes->post('menuitems', 'Papelformato::menuitems', ['as' => 'menuitems']);
+        $routes->get('getSelect2', 'Papelformato::getSelect2', ['as' => 'getSelect2']);
+    }
+);
+$routes->resource('papel-formato', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Papelformato', 'except' => 'show,new,create,update']);
+
+
+
+/* Rutas para mensajeria */
+$routes->group('mensajes', ['namespace' => 'App\Controllers\Mensajeria'], function ($routes) {
+
+    /* Interna */
+    $routes->group('internos', ['namespace' => 'App\Controllers\Mensajeria'], function ($routes) {
+
+        $routes->get('', 'MensajesDirectos::index', ['as' => 'mensajeriaView']);
+        $routes->get('chat/(:num)', 'MensajesDirectos::getChatInfo/$1', ['as' => 'getChatInfo']);
+        /*$routes->match(['get', 'post'], 'add', 'TarifaAcabados::add', ['as' => 'tarifaAcabadoAdd']);
+        $routes->match(['get', 'post'], 'edit/(:num)', 'TarifaAcabados::edit/$1', ['as' => 'tarifaAcabadoEdit']);
+        $routes->get('delete/(:num)', 'TarifaAcabados::delete/$1', ['as' => 'tarifaAcabadoDelete']);
+        $routes->post('datatable', 'TarifaAcabados::datatable', ['as' => 'tarifaAcabadoDT']);*/
+    });
+});
+$routes->group('messages', ['namespace' => 'App\Controllers\Chat'], function ($routes) {
+    $routes->get('datatable', 'ChatController::datatable_messages', ['as' => 'getDatatableMessages']);
+    $routes->get('datatable/presupuesto', 'ChatController::datatable_presupuesto_messages', ['as' => 'getDatatablePresupuestoMessages']);
+    $routes->get('datatable/pedido', 'ChatController::datatable_pedido_messages', ['as' => 'getDatatablePedidoMessages']);
+    $routes->get('datatable/factura', 'ChatController::datatable_factura_messages', ['as' => 'getDatatableFacturaMessages']);
+
+    $routes->post('direct', 'ChatController::store_new_direct_message', ['as' => 'storeNewDirectMessage']);
+    $routes->post('direct/client', 'ChatController::store_new_direct_message_client', ['as' => 'storeNewDirectMessageClient']);
+
+
+});
+$routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($routes) {
+    
+    $routes->get('direct/(:num)', 'ChatController::get_chat_direct_view/$1', ['as' => 'getChatDirectView']);
+    $routes->get('presupuesto/(:num)', 'ChatController::get_chat_presupuesto_view/$1', ['as' => 'getChatPresupuestoView']);
+    $routes->get('pedido/(:num)', 'ChatController::get_chat_pedido_view/$1', ['as' => 'getChatPedidoView']);
+    $routes->get('factura/(:num)', 'ChatController::get_chat_factura_view/$1', ['as' => 'getChatFacturaView']);
+
+    $routes->get('direct/conversation/(:num)', 'ChatController::get_chat_direct/$1', ['as' => 'getChatDirect']);
+    $routes->get('direct/users/select/(:num)', 'ChatController::get_chat_direct_select_users/$1', ['as' => 'getChatDirectSelectUsers']);
+    $routes->get('direct/users/(:num)', 'ChatController::get_chat_direct_users', ['as' => 'getChatDirectUsers']);
+    $routes->post('direct/users/(:num)', 'ChatController::store_chat_direct_users/$1', ['as' => 'storeChatDirectUsers']);
+    $routes->get('direct/messages/(:num)', 'ChatController::get_chat_direct_messages/$1', ['as' => 'getChatDirectMessages']);
+    $routes->post('direct/messages/(:num)', 'ChatController::store_chat_direct_message/$1', ['as' => 'storeChatDirectMessages']);
+    $routes->post('direct/messages/unread/(:num)', 'ChatController::update_chat_direct_message_unread/$1', ['as' => 'updateChatDirectMessageUnread']);
+
+
+    $routes->get('departments', 'ChatController::get_chat_departments', ['as' => 'getChatDepartments']);
+    $routes->get('departments/select', 'ChatController::get_chat_department_select', ['as' => 'getChatDepartmentSelect']);
+    $routes->get('department/presupuesto/(:num)/(:num)', 'ChatController::get_chat_presupuesto/$1/$2', ['as' => 'getChatPresupuesto']);
+    $routes->get('department/pedido/(:num)/(:num)', 'ChatController::get_chat_pedido/$1/$2', ['as' => 'getChatPedido']);
+    $routes->get('department/factura/(:num)/(:num)', 'ChatController::get_chat_factura/$1/$2', ['as' => 'getChatFactura']);
+    $routes->get('department/(:num)/users', 'ChatController::get_chat_department_users/$1', ['as' => 'getChatDepartmentUsers']);
+
+
+    $routes->get('(:num)', 'ChatController::get_chat/$1', ['as' => 'getChat']);
+    $routes->post('message/presupuesto', 'ChatController::store_chat_message_presupuesto', ['as' => 'storeChatMessagePresupuesto']);
+    $routes->post('message/pedido', 'ChatController::store_chat_message_pedido', ['as' => 'storeChatMessagePedido']);
+    $routes->post('message/factura', 'ChatController::store_chat_message_factura', ['as' => 'storeChatMessageFactura']);
+    $routes->post('message/internal', 'ChatController::store_chat_message_single', ['as' => 'storeChatMessageSingle']);
+    $routes->get('contacts', 'ChatController::get_chat_internal_contacts', ['as' => 'getChatInternalContacts']);
+    $routes->get('contacts/(:num)', 'ChatController::get_chat_internal_contact/$1', ['as' => 'getChatInternalContact']);
+    $routes->get('contact/(:num)/messages', 'ChatController::get_chat_internal_messages/$1', ['as' => 'getChatInternalMessages']);
+    $routes->get('notifications', 'ChatController::get_chat_cliente/$1', ['as' => 'getChatCliente']);
+    $routes->get('users/internal', 'ChatController::get_chat_users_internal', ['as' => 'getChatUsersInternal']);
+    $routes->get('users/all', 'ChatController::get_chat_users_all', ['as' => 'getChatUsersAll']);
+
+    $routes->post('hebra/presupuesto', 'ChatController::store_hebra_presupuesto', ['as' => 'storeHebraPresupuesto']);
+    $routes->post('hebra/pedido', 'ChatController::store_hebra_pedido', ['as' => 'storeHebraPedido']);
+    $routes->post('hebra/factura', 'ChatController::store_hebra_factura', ['as' => 'storeHebraFactura']);
+    $routes->post('hebra/(:num)', 'ChatController::update_hebra/$1', ['as' => 'updateHebra']);
+    $routes->get('hebra/presupuesto/(:num)', "ChatController::get_hebra_presupuesto/$1", ["as" => "getHebraPresupuesto"]);
+    $routes->get('hebra/pedido/(:num)', "ChatController::get_hebra_pedido/$1", ["as" => "getHebraPedido"]);
+    $routes->get('hebra/factura/(:num)', "ChatController::get_hebra_factura/$1", ["as" => "getHebraFactura"]);
+});
+
+
+
+$routes->group('produccion', ['namespace' => 'App\Controllers\Produccion'], function ($routes) {
+    $routes->group('ordentrabajo', ['namespace' => 'App\Controllers\Produccion'], function ($routes) {
+        $routes->get('', 'Ordentrabajo::index', ['as' => 'viewOrdenTrabajoIndex']);
+        $routes->get('edit/$1', 'Ordentrabajo::edit/$1', ['as' => 'viewOrdenTrabajoEdit']);
+
+    });
+});
+/*
+ * --------------------------------------------------------------------
+ * APIs Route Definitions
+ * --------------------------------------------------------------------
+ */
+$routes->post('auth/jwt', '\App\Controllers\Sistema\AuthAPIController::jwtLogin');
+
+$routes->group('api', ['filter' => 'jwt'], static function ($routes) {
+    $routes->get('test', 'Test::echo');
+    // ...
+});
+
+/*
+ * --------------------------------------------------------------------
+ * Translation 
+ * --------------------------------------------------------------------
+ */
+$routes->group('translate', ['namespace' => 'App\Controllers'], function ($routes) {
+    $routes->post('getTranslation', 'Language::getTranslation', ['as' => 'getKeys']);
+});
+$routes->resource('translate', ['namespace' => 'App\Controllers', 'controller' => 'Language', 'except' => '']);
+
+
 /*
  * --------------------------------------------------------------------
  * Additional Routing
@@ -622,4 +880,4 @@ $routes->resource('buscadorpresupuestos', ['namespace' => 'App\Controllers\Presu
  */
 if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php')) {
     require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
-}
+}

ci4/app/Config/Services.php

@@ -2,6 +2,7 @@
 
 namespace Config;
 
+use App\Services\FTPService;
 use CodeIgniter\Config\BaseService;
 
 /**

ci4/app/Config/Validation.php

@@ -34,7 +34,7 @@ class Validation extends BaseConfig
      * @var array<string, string>
      */
     public array $templates = [
-        'list'   => 'CodeIgniter\Validation\Views\list',
+        'list' => 'CodeIgniter\Validation\Views\list',
         'single' => 'CodeIgniter\Validation\Views\single',
         'bootstrap_style' => 'themes/_commonPartialsBs/_form_validation_errors',
     ];
@@ -42,4 +42,6 @@ class Validation extends BaseConfig
     // --------------------------------------------------------------------
     // Rules
     // --------------------------------------------------------------------
+
+
 }

ci4/app/Controllers/BaseController.php

@@ -37,7 +37,7 @@ class BaseController extends Controller
      *
      * @var array
      */
-    protected $helpers = ['general', 'go_common'];
+    protected $helpers = ['general', 'go_common', 'rbac'];
 
     /**
      * Constructor.

ci4/app/Controllers/BaseResourceController.php

@@ -43,23 +43,23 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      */
     protected static $pluralObjectName;
 
-     /**
+    /**
      * Path for the views directory for the extending view controller
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected static $viewPath;
 
-    
+
     /**
      * JJO: Variable para indicar si el controlador hace soft_delete o no
-     * 
+     *
      * @var bool
      */
     public $soft_delete = false;
     /**
      * JJO: Variable quién puede ver los registros borrados
-     * 
+     *
      *  0 -> Not Deleted
      *  1 -> Soft Deleted, shows up in lists of deleted items for management users
      *  2 -> Soft Deleted, does not show up for any user except admin users
@@ -85,7 +85,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      *
      * @var array
      */
-    protected $helpers = ['session', 'go_common', 'form', 'text', 'general']; //JJO
+    protected $helpers = ['session', 'go_common', 'form', 'text', 'general', 'rbac']; //JJO
 
     /**
      * Initializer method.
@@ -123,7 +123,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
         $this->viewData['usingSweetAlert'] = true;
 
         $this->viewData['viewPath'] = static::$viewPath;
-        
+
         $this->viewData['currentLocale'] = $this->request->getLocale();
 
         /* IMN */
@@ -159,7 +159,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
         }
 
         if (!isset($this->viewData['formAction'])) {
-            $this->viewData['formAction'] = base_url(strtolower($this->viewData['currentModule']) . '/' . $formActionSuffix . '/' . $action );
+            $this->viewData['formAction'] = base_url(strtolower($this->viewData['currentModule']) . '/' . $formActionSuffix . '/' . $action);
         }
 
         if ((!isset($this->viewData['boxTitle']) || empty($this->viewData['boxTitle'])) && isset(static::$singularObjectName) && !empty(static::$singularObjectName)) {
@@ -223,29 +223,28 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
     public function delete($id = null)
     {
         if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
-            $objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc));
+            $objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc) . '.' . static::$singularObjectNameCc));
         } else {
             $objName = lang('Basic.global.record');
         }
-        
-        if (!$this->soft_delete){
+
+        if (!$this->soft_delete) {
 
             if (!$this->model->delete($id)) {
                 return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
             }
-        }
-        else{
+        } 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])
+            $rawResult = $this->model->where('id', $id)
+                ->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]));
             }
 
         }
-        
+
         // $message = lang('Basic.global.deleteSuccess', [$objName]); IMN commented
         $message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]);
         $response = $this->respondDeleted(['id' => $id, 'msg' => $message]);
@@ -261,20 +260,18 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
     protected function canValidate($customValidationRules = null, $customValidationMessages = null)
     {
 
-        if($customValidationRules == null){
+        if ($customValidationRules == null) {
             $validationRules = $this->model->validationRules ?? $this->formValidationRules ?? null;
-        }
-        else{
+        } else {
             $validationRules = $customValidationRules;
         }
         if ($validationRules == null) {
             return true;
         }
 
-        if($customValidationMessages == null){
-            $validationErrorMessages = $this->model->validationMessages ??  $this->formValidationErrorMessagess ?? null;;
-        }
-        else{
+        if ($customValidationMessages == null) {
+            $validationErrorMessages = $this->model->validationMessages ?? $this->formValidationErrorMessagess ?? null;;
+        } else {
             $validationErrorMessages = $customValidationMessages;
         }
 
@@ -283,7 +280,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
         } else {
             $valid = $this->validate($validationRules);
         }
-        
+
         $this->validationErrors = $valid ? '' : $this->validator->getErrors();
 
         /*
@@ -303,7 +300,8 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      * @param array|null $postData
      * @return array
      */
-    protected function sanitized(array $postData = null, bool $nullIfEmpty = false) {
+    protected function sanitized(array $postData = null, bool $nullIfEmpty = false)
+    {
         if ($postData == null) {
             $postData = $this->request->getPost();
         }
@@ -317,7 +315,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
         }
         return $sanitizedData;
     }
-    
+
     /**
      * Custom fail method needed when CSRF token regeneration is on in security settings
      * @param string|array $messages
@@ -326,15 +324,15 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      * @param string $customMessage
      * @return mixed
      */
-    protected function failWithNewToken($messages, int $status = 400, string $code = null, string $customMessage = '') {
+    protected function failWithNewToken($messages, int $status = 400, string $code = null, string $customMessage = '')
+    {
 
-        if (! is_array($messages))
-        {
+        if (!is_array($messages)) {
             $messages = ['error' => $messages];
         }
         $response = [
-            'status'   => $status,
-            'error'    => $status,
+            'status' => $status,
+            'error' => $status,
             'messages' => $messages,
             csrf_token() => csrf_hash()
         ];
@@ -360,7 +358,8 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
      * Convenience method for common exception handling
      * @param \Exception $e
      */
-    protected function dealWithException(\Exception $e) {
+    protected function dealWithException(\Exception $e)
+    {
         // using another try / catch block to prevent to avoid CodeIgniter bug throwing trivial exceptions for querying DB errors
         try {
             $query = $this->model->db->getLastQuery();
@@ -368,16 +367,16 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
             $dbError = $this->model->db->error();
             $userFriendlyErrMsg = lang('Basic.global.persistErr1', [static::$singularObjectNameCc]);
             if (isset($dbError['code']) && $dbError['code'] == 1062) :
-                $userFriendlyErrMsg .= PHP_EOL.lang('Basic.global.persistDuplErr', [static::$singularObjectNameCc]);
+                $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);
+            log_message('error', $userFriendlyErrMsg . PHP_EOL . $e->getMessage() . PHP_EOL . $queryStr);
             if (isset($dbError['message']) && !empty($dbError['message'])) :
-                log_message('error', $dbError['code'].' : '.$dbError['message']);
+                log_message('error', $dbError['code'] . ' : ' . $dbError['message']);
             endif;
             $this->viewData['errorMessage'] = $userFriendlyErrMsg;
         } catch (\Exception $e2) {
-            log_message('debug', 'You can probably safely ignore this: In attempt to check DB errors, CodeIgniter threw: '.PHP_EOL.$e2->getMessage());
+            log_message('debug', 'You can probably safely ignore this: In attempt to check DB errors, CodeIgniter threw: ' . PHP_EOL . $e2->getMessage());
         }
     }
 }

ci4/app/Controllers/Chat/ChatController.php

@@ -0,0 +1,700 @@
+<?php
+
+namespace App\Controllers\Chat;
+
+use App\Controllers\BaseController;
+use App\Models\Chat\ChatDeparmentModel;
+use App\Models\Chat\ChatDeparmentUserModel;
+use App\Models\Chat\ChatMessageModel;
+use App\Models\Chat\ChatModel;
+use App\Models\ChatNotification;
+use App\Models\ChatUser;
+use App\Models\Clientes\ClienteModel;
+use App\Models\Usuarios\UserModel;
+use App\Services\MessageService;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Log\Logger;
+use Psr\Log\LoggerInterface;
+use Hermawan\DataTables\DataTable;
+use CodeIgniter\I18n\Time;
+
+class ChatController extends BaseController
+{
+    protected ChatDeparmentModel $chatDeparmentModel;
+    protected ChatDeparmentUserModel $chatDeparmentUserModel;
+    protected ChatModel $chatModel;
+    protected ChatMessageModel $chatMessageModel;
+    protected UserModel $userModel;
+    protected ClienteModel $clienteModel;
+    protected ChatUser $chatUserModel;
+    protected ChatNotification $chatNotificationModel;
+    protected array $viewData;
+    protected static $viewPath = 'themes/vuexy/form/mensajes/';
+
+
+    public function initController(
+        RequestInterface $request,
+        ResponseInterface $response,
+        LoggerInterface $logger
+    ) {
+        parent::initController($request, $response, $logger);
+
+        // Add your code here.
+        $this->chatDeparmentModel = model(ChatDeparmentModel::class);
+        $this->chatDeparmentUserModel = model(ChatDeparmentUserModel::class);
+        $this->chatModel = model(ChatModel::class);
+        $this->chatMessageModel = model(ChatMessageModel::class);
+        $this->userModel = model(UserModel::class);
+        $this->clienteModel = model(ClienteModel::class);
+        $this->chatUserModel = model(ChatUser::class);
+        $this->chatNotificationModel = model(ChatNotification::class);
+    }
+    public function index() {}
+    public function get_chat_departments()
+    {
+
+        $data = $this->chatDeparmentModel->getChatDepartments();
+        return $this->response->setJSON($data);
+    }
+    public function get_chat_department_select(){
+        $query = $this->chatDeparmentModel->getChatDepartmentSelect($this->request->getGet("q"));
+        return $this->response->setJSON($query->get()->getResultObject());
+    }
+    public function get_chat_presupuesto(int $chat_department_id, int $presupuesto_id)
+    {
+
+        $data = [
+            "chat" => null,
+            "messages" => null,
+            "count" => 0,
+        ];
+        $chat = $this->chatModel->getChatPresupuesto($chat_department_id, $presupuesto_id);
+        if ($chat) {
+            $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id);
+            $this->chatMessageModel->set_chat_department_messages_as_read($chat->id);
+            $data["count"] = count($data["messages"]);
+        }
+        $data["chat"] = $chat;
+        return $this->response->setJSON($data);
+    }
+    public function get_chat_pedido(int $chat_department_id, int $pedido_id)
+    {
+
+        $data = [
+            "chat" => null,
+            "messages" => null,
+            "count" => 0,
+        ];
+        $chat = $this->chatModel->getChatPedido($chat_department_id, $pedido_id);
+        if ($chat) {
+            $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id);
+            $this->chatMessageModel->set_chat_department_messages_as_read($chat->id);
+            $data["count"] = count($data["messages"]);
+        }
+        $data["chat"] = $chat;
+        return $this->response->setJSON($data);
+    }
+    public function get_chat_factura(int $chat_department_id, int $factura_id)
+    {
+
+        $data = [
+            "chat" => null,
+            "messages" => null,
+            "count" => 0,
+        ];
+        $chat = $this->chatModel->getChatFactura($chat_department_id, $factura_id);
+        if ($chat) {
+            $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id);
+            $this->chatMessageModel->set_chat_department_messages_as_read($chat->id);
+            $data["count"] = count($data["messages"]);
+        }
+        $data["chat"] = $chat;
+        return $this->response->setJSON($data);
+    }
+    public function get_chat_direct_view($chat_id)
+    {
+        $chat = $this->chatModel->find($chat_id);
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Chat.chat"), 'route' => route_to("mensajeriaView"), 'active' => false],
+            ['title' => $chat->title, 'route' => 'javascript:void(0);', 'active' => true]
+        ];
+        $this->viewData["chatId"] = $chat_id;
+        $auth_user = auth()->user();
+        $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
+        $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
+
+        return view(static::$viewPath . 'messageChat', $this->viewData);
+    }
+    public function get_chat_presupuesto_view($chat_id)
+    {
+        $chat = $this->chatModel->find($chat_id);
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Chat.chat"), 'route' => route_to("mensajeriaView"), 'active' => false],
+            ['title' => $chat->title, 'route' => 'javascript:void(0);', 'active' => true]
+        ];
+        $this->viewData["modelId"] = $chat->presupuesto_id;
+        $this->viewData["type"] = "presupuesto";
+        $auth_user = auth()->user();
+        $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
+        $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
+
+        if($chat->chat_department_id){
+            return view(static::$viewPath . 'messageChatPresupuesto', $this->viewData);
+        }else{
+            return view(static::$viewPath . 'messageChatInternal', $this->viewData);
+        }
+    }
+    public function get_chat_pedido_view($chat_id)
+    {
+        $chat = $this->chatModel->find($chat_id);
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Chat.chat"), 'route' => route_to("mensajeriaView"), 'active' => false],
+            ['title' => $chat->title, 'route' => 'javascript:void(0);', 'active' => true]
+        ];
+        $this->viewData["modelId"] = $chat->pedido_id;
+        $this->viewData["type"] = "pedido";
+        $auth_user = auth()->user();
+        $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
+        $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
+        if($chat->chat_department_id ){
+            return view(static::$viewPath . 'messageChatPedido', $this->viewData);
+        }else{
+            return view(static::$viewPath . 'messageChatInternal', $this->viewData);
+        }
+    }
+    public function get_chat_factura_view($chat_id)
+    {
+        $chat = $this->chatModel->find($chat_id);
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Chat.chat"), 'route' => route_to("mensajeriaView"), 'active' => false],
+            ['title' => $chat->title, 'route' => 'javascript:void(0);', 'active' => true]
+        ];
+        $this->viewData["modelId"] = $chat->factura_id;
+        $this->viewData["type"] = "factura";
+        $auth_user = auth()->user();
+        $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
+        $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
+
+        if($chat->chat_department_id){
+            return view(static::$viewPath . 'messageChatFactura', $this->viewData);
+        }else{
+            return view(static::$viewPath . 'messageChatInternal', $this->viewData);
+        }
+    }
+    public function get_chat(int $chat_id)
+    {
+
+        $data = $this->chatModel->getChat($chat_id);
+        return $this->response->setJSON($data);
+    }
+    public function store_chat_message_presupuesto()
+    {
+
+        $data = $this->request->getPost();
+        // $data = $this->chatModel->createChatPresupuesto();
+        $existChat = $this->chatModel->existChatPresupuesto($data["chat_department_id"], $data["model_id"]);
+        if ($existChat == false) {
+            $chatId = $this->chatModel->createChatPresupuesto($data["chat_department_id"], $data["model_id"]);
+        } else {
+            $chat = $this->chatModel->getChatPresupuesto($data["chat_department_id"], $data["model_id"]);
+            $chatId =  $chat->id;
+        }
+        $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]);
+        $dataResponse = $this->chatMessageModel->find($chat_message_id);
+        $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]);
+        foreach ($chatDepartmentUsers as  $user) {
+            if ($user->id != auth()->user()->id) {
+                $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]);
+            }
+        }
+        return $this->response->setJSON($dataResponse);
+    }
+    public function store_chat_message_pedido()
+    {
+
+        $data = $this->request->getPost();
+        $existChat = $this->chatModel->existChatPedido($data["chat_department_id"], $data["model_id"]);
+        if ($existChat == false) {
+            $chatId = $this->chatModel->createChatPedido($data["chat_department_id"], $data["model_id"]);
+        } else {
+            $chat = $this->chatModel->getChatPedido($data["chat_department_id"], $data["model_id"]);
+            $chatId =  $chat->id;
+        }
+        $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]);
+        $dataResponse = $this->chatMessageModel->find($chat_message_id);
+        $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]);
+        foreach ($chatDepartmentUsers as  $user) {
+            if ($user->id != auth()->user()->id) {
+                $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]);
+            }
+        }
+        return $this->response->setJSON($dataResponse);
+    }
+    public function store_chat_message_factura()
+    {
+
+        $data = $this->request->getPost();
+        $existChat = $this->chatModel->existChatFactura($data["chat_department_id"], $data["model_id"]);
+        if ($existChat == false) {
+            $chatId = $this->chatModel->createChatFactura($data["chat_department_id"], $data["model_id"]);
+        } else {
+            $chat = $this->chatModel->getChatFactura($data["chat_department_id"], $data["model_id"]);
+            $chatId =  $chat->id;
+        }
+        $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]);
+        $dataResponse = $this->chatMessageModel->find($chat_message_id);
+        $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]);
+        foreach ($chatDepartmentUsers as  $user) {
+            if ($user->id != auth()->user()->id) {
+                $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]);
+            }
+        }
+        return $this->response->setJSON($dataResponse);
+    }
+    public function store_chat_message_single()
+    {
+        $data = $this->request->getPost();
+
+        $existChat = $this->chatMessageModel->get_chat_contact_messages($data["receiver_id"]);
+        if (count($existChat) > 0) {
+            $chatId = $existChat[0]->chat_id;
+        } else {
+            $chatId = $this->chatModel->createChatSingle();
+        }
+        $chat_message_id = $this->chatMessageModel->insert(
+            [
+                "chat_id" => $chatId,
+                "sender_id" => auth()->user()->id,
+                "message" => $data["message"],
+                "receiver_id" => $data["receiver_id"],
+            ]
+        );
+        $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data["receiver_id"]]);
+        $dataResponse = $this->chatMessageModel->find($chat_message_id);
+        return $this->response->setJSON($dataResponse);
+    }
+    public function get_chat_internal_contacts()
+    {
+        $auth_user = auth()->user();
+        if ($auth_user->cliente_id) {
+            $users = $this->chatModel->getOpenChatCliente($auth_user->id);
+        } else {
+            $users = $this->userModel->builder()
+                ->whereNotIn("id", [$auth_user->id])
+                ->where("deleted_at", null)
+                ->get()->getResultObject();
+        }
+        foreach ($users as $user) {
+            $user->unreadMessages = $this->chatMessageModel->get_chat_messages_count($user->id);
+        }
+        usort($users, fn($a, $b) => $a->unreadMessages < $b->unreadMessages);
+        return $this->response->setJSON($users);
+    }
+    public function get_chat_internal_contact(int $user_id)
+    {
+        $auth_user = auth()->user();
+        // if ($auth_user->cliente_id) {
+        //     return $this->response->setJSON([]);
+        // }
+        $users = $this->userModel->builder()
+            ->where("deleted_at", null)
+            ->where("id", $user_id)
+            ->get()->getFirstRow();
+        return $this->response->setJSON($users);
+    }
+    public function get_chat_internal_messages(int $user_id)
+    {
+        $conversation = $this->chatMessageModel->get_chat_contact_messages($user_id);
+
+        return $this->response->setJSON($conversation);
+    }
+    public function get_chat_cliente()
+    {
+        $cliente_id = auth()->user()->cliente_id;
+        $response = [];
+        if ($cliente_id) {
+            $data = $this->clienteModel->getClienteDataPresupuestoPedidoFactura($cliente_id);
+            $response["totalMessages"] = 0;
+            $response["chatFacturas"] = $this->chatModel->getClienteChatFacturas($data["facturas"]);
+            $mensajes_directos = $this->chatModel->getChatDirectMessageNotifications();
+
+            foreach ($response["chatFacturas"] as $key => $value) {
+                $response["totalMessages"] += $value->unreadMessages;
+            }
+            $response["chatPresupuestos"] = $this->chatModel->getClienteChatPresupuestos($data["presupuestos"]);
+            foreach ($response["chatPresupuestos"] as $key => $value) {
+                $response["totalMessages"] += $value->unreadMessages;
+            }
+            foreach ($mensajes_directos as $value) {
+                $response["internals"][] = $value;
+                $response["totalMessages"] += $value->unreadMessages;
+            }
+            $response["chatPedidos"] = $this->chatModel->getClienteChatPedidos($data["pedidos"]);
+            foreach ($response["chatPedidos"] as $key => $value) {
+                $response["totalMessages"] += $value->unreadMessages;
+            }
+            $response["data"] = $data;
+        } else {
+            $response["internals"] = $this->chatModel->getChatDepartmentNotifications();
+            $internal_notifications = $this->chatModel->getChatInternalNotifications();
+            $mensajes_directos = $this->chatModel->getChatDirectMessageNotifications();
+            foreach ($internal_notifications as $value) {
+                $response["internals"][] = $value;
+            }
+            foreach ($mensajes_directos as $value) {
+                $response["internals"][] = $value;
+            }
+            $response["totalMessages"] = 0;
+            foreach ($response["internals"] as $key => $value) {
+                $response["totalMessages"] += $value->unreadMessages;
+            }
+        }
+        return $this->response->setJSON($response);
+    }
+
+    public function get_chat_department_users(int $chat_department_id)
+    {
+        $data = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id);
+        return $this->response->setJSON($data);
+    }
+    public function get_chat_users_internal()
+    {
+        $query = $this->userModel->builder()->select(
+            [
+                "id",
+                "CONCAT(first_name,' ',last_name,'(',username,')') as name"
+            ]
+        )->where("cliente_id", null)
+            ->where("deleted_at", null)
+            ->whereNotIn("id", [auth()->user()->id]);
+        if ($this->request->getGet("q")) {
+            $query->groupStart()
+                ->orLike("users.username", $this->request->getGet("q"))
+                ->orLike("CONCAT(first_name,' ',last_name)", $this->request->getGet("q"))
+                ->groupEnd();
+        }
+
+        return $this->response->setJSON($query->get()->getResultObject());
+    }
+    public function get_chat_users_all()
+    {
+        $query = $this->userModel->builder()->select(
+            [
+                "id",
+                "CONCAT(first_name,' ',last_name,'(',username,')') as name"
+            ]
+        )
+            ->where("deleted_at", null)
+            ->whereNotIn("id", [auth()->user()->id]);
+        if ($this->request->getGet("q")) {
+            $query->groupStart()
+                ->orLike("users.username", $this->request->getGet("q"))
+                ->orLike("CONCAT(first_name,' ',last_name)", $this->request->getGet("q"))
+                ->groupEnd();
+        }
+
+        return $this->response->setJSON($query->get()->getResultObject());
+    }
+    public function store_hebra_presupuesto()
+    {
+        $auth_user = auth()->user();
+        $bodyData = $this->request->getPost();
+        $chat_id = $this->chatModel->insert([
+            "presupuesto_id" => $bodyData["modelId"],
+            "title" => $bodyData["title"]
+        ]);
+        $chatMessageId = $this->chatMessageModel->insert([
+            "chat_id" => $chat_id,
+            "message" => $bodyData["message"],
+            "sender_id" => $auth_user->id
+        ]);
+        if (isset($bodyData["users"])) {
+            $bodyData["users"][] = $auth_user->id;
+            $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chat_id], $bodyData["users"]);
+            $this->chatUserModel->insertBatch($chatUserData);
+            foreach ($bodyData["users"] as $userId) {
+                $this->chatNotificationModel->insert(
+                    ["chat_message_id" => $chatMessageId, "user_id" => $userId]
+                );
+            }
+        }
+        return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => true]);
+    }
+
+    public function store_hebra_pedido()
+    {
+        $bodyData = $this->request->getPost();
+        $chat_id = $this->chatModel->insert([
+            "pedido_id" => $bodyData["modelId"],
+            "title" => $bodyData["title"]
+
+        ]);
+        $chatMessageId = $this->chatMessageModel->insert([
+            "chat_id" => $chat_id,
+            "message" => $bodyData["message"],
+            "sender_id" => auth()->user()->id
+        ]);
+        if (isset($bodyData["users"])) {
+            $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chat_id], $bodyData["users"]);
+            $this->chatUserModel->insertBatch($chatUserData);
+            foreach ($bodyData["users"] as $userId) {
+                $this->chatNotificationModel->insert(
+                    ["chat_message_id" => $chatMessageId, "user_id" => $userId]
+                );
+            }
+        }
+        return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => true]);
+    }
+
+    public function store_hebra_factura()
+    {
+        $bodyData = $this->request->getPost();
+        $chat_id = $this->chatModel->insert([
+            "factura_id" => $bodyData["modelId"],
+            "title" => $bodyData["title"]
+        ]);
+        $chatMessageId = $this->chatMessageModel->insert([
+            "chat_id" => $chat_id,
+            "message" => $bodyData["message"],
+            "sender_id" => auth()->user()->id
+        ]);
+        if (isset($bodyData["users"])) {
+            $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chat_id], $bodyData["users"]);
+            $this->chatUserModel->insertBatch($chatUserData);
+            foreach ($bodyData["users"] as $userId) {
+                $this->chatNotificationModel->insert(
+                    ["chat_message_id" => $chatMessageId, "user_id" => $userId]
+                );
+            }
+        }
+        return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => true]);
+    }
+    public function update_hebra($chat_id)
+    {
+        $bodyData = $this->request->getPost();
+        $chatMessageId =  $this->chatMessageModel->insert([
+            "chat_id" => $chat_id,
+            "message" => $bodyData["message"],
+            "sender_id" => auth()->user()->id
+        ]);
+        $actualUsers = $this->chatUserModel->builder()->select("user_id")->where("chat_id", $chat_id)->get()->getResultArray();
+        $actualUsersArray = array_map(fn($x) => $x["user_id"], $actualUsers);
+        foreach ($actualUsersArray as $key => $user_id) {
+            $this->chatNotificationModel->insert(
+                ["chat_message_id" => $chatMessageId, "user_id" => $user_id]
+            );
+        }
+        if (isset($bodyData["users"])) {
+            foreach ($bodyData["users"] as $userId) {
+                if (in_array($userId, $actualUsersArray) == false) {
+                    $chatUserData = ["user_id" => $userId, "chat_id" => $chat_id];
+                    $this->chatUserModel->insert($chatUserData);
+                }
+                $this->chatNotificationModel->insert(
+                    ["chat_message_id" => $chatMessageId, "user_id" => $userId]
+                );
+            }
+        }
+        return $this->response->setJSON(["message" => "Hebra actualizada correctamente", "status" => true]);
+    }
+    public function get_hebra_presupuesto($presupuesto_id)
+    {
+        $data = $this->chatModel->getPresupuestoHebras($presupuesto_id);
+        $notifications = $this->chatModel->builder()->select([
+            "chat_notifications.id"
+        ])
+            ->join("chat_messages", "chat_messages.chat_id = chats.id", "left")
+            ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left")
+            ->where("chats.presupuesto_id", $presupuesto_id)
+            ->where("chat_notifications.user_id", auth()->user()->id)
+            ->get()->getResultArray();
+        foreach ($notifications as $notification) {
+            $this->chatNotificationModel->update($notification["id"], ["viewed" => true]);
+        }
+        return $this->response->setJSON($data);
+    }
+    public function get_hebra_pedido($pedido_id)
+    {
+        $data = $this->chatModel->getPedidoHebras($pedido_id);
+        $notifications = $this->chatModel->builder()->select([
+            "chat_notifications.id"
+        ])
+            ->join("chat_messages", "chat_messages.chat_id = chats.id", "left")
+            ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left")
+            ->where("chats.pedido_id", $pedido_id)
+            ->where("chat_notifications.user_id", auth()->user()->id)
+            ->get()->getResultArray();
+        foreach ($notifications as $notification) {
+            $this->chatNotificationModel->update($notification["id"], ["viewed" => true]);
+        }
+        return $this->response->setJSON($data);
+    }
+    public function get_hebra_factura($factura_id)
+    {
+        $data = $this->chatModel->getFacturaHebras($factura_id);
+        $notifications = $this->chatModel->builder()->select([
+            "chat_notifications.id"
+        ])
+            ->join("chat_messages", "chat_messages.chat_id = chats.id", "left")
+            ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left")
+            ->where("chats.factura_id", $factura_id)
+            ->where("chat_notifications.user_id", auth()->user()->id)
+            ->get()->getResultArray();
+        foreach ($notifications as $notification) {
+            $this->chatNotificationModel->update($notification["id"], ["viewed" => true]);
+        }
+        return $this->response->setJSON($data);
+    }
+
+    public function datatable_messages()
+    {
+        $auth_user_id = auth()->user()->id;
+        $query = $this->chatModel->getQueryDatatable($auth_user_id);
+        return DataTable::of($query)
+            ->edit('created_at', fn($q) => Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i"))
+            ->edit('updated_at', fn($q) => Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i"))
+            ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
+            ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
+            ->add("action", fn($q) => ["type" => "direct","modelId" => $q->id])
+            ->toJson(true);
+    }
+    public function datatable_presupuesto_messages()
+    {
+        $auth_user_id = auth()->user()->id;
+        $query = $this->chatModel->getQueryDatatableMessagePresupuesto($auth_user_id);
+        return DataTable::of($query)
+            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
+            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
+            ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
+            ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
+            ->add("action", fn($q) => ["type" => "presupuesto","modelId" => $q->id])
+            ->toJson(true);
+    }
+    public function datatable_pedido_messages()
+    {
+        $auth_user_id = auth()->user()->id;
+        $query = $this->chatModel->getQueryDatatableMessagePedido($auth_user_id);
+        return DataTable::of($query)
+            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
+            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
+            ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
+            ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
+            ->add("action", fn($q) => ["type" => "pedido","modelId" => $q->id])
+
+            ->toJson(true);
+    }
+    public function datatable_factura_messages()
+    {
+        $auth_user_id = auth()->user()->id;
+        $query = $this->chatModel->getQueryDatatableMessageFactura($auth_user_id);
+        return DataTable::of($query)
+            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
+            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
+            ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
+            ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
+            ->add("action", fn($q) => ["type" => "factura","modelId" => $q->id])
+
+            ->toJson(true);
+    }
+    public function store_new_direct_message()
+    {
+        $bodyData = $this->request->getPost();
+        $rules = [
+            "title" => "required|string",
+            "message" => "required|string",
+            "users" => "required",
+
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'message' => lang('App.global_alert_save_error'),
+                'status' => 'error',
+                'errors' => $this->validator->getErrors(),
+            ]);
+        }
+        $this->chatModel->createNewDirectChat(...$bodyData);
+        return $this->response->setJSON(["message" => lang("Chat.new_message_ok"), "status" => true]);
+    }
+    public function store_new_direct_message_client()
+    {
+        $bodyData = $this->request->getPost();
+        $rules = [
+            "title" => "required|string",
+            "message" => "required|string",
+            "chat_department_id" => "required",
+
+        ];
+        if (!$this->validate($rules)) {
+            return $this->response->setStatusCode(400)->setJSON([
+                'message' => lang('App.global_alert_save_error'),
+                'status' => 'error',
+                'errors' => $this->validator->getErrors(),
+            ]);
+        }
+        $users = $this->chatDeparmentModel->getChatDepartmentUsers($bodyData["chat_department_id"]);
+        $bodyData["users"] = array_map(fn($q) => $q->id,$users);
+        dd(1);
+        $this->chatModel->createNewDirectChat(...$bodyData);
+        return $this->response->setJSON(["message" => lang("Chat.new_message_ok"), "status" => true]);
+    }
+    public function get_chat_direct($chat_id)
+    {
+        $chatData = $this->chatModel->getChatDirect($chat_id);
+        return $this->response->setJSON($chatData);
+    }
+    public function get_chat_direct_select_users($chat_id)
+    {
+        $chat_users_id = $this->chatUserModel->getChatUserArrayId($chat_id);
+
+        $query = $this->userModel->builder()->select(
+            [
+                "id",
+                "CONCAT(first_name,' ',last_name,'(',username,')') as name"
+            ]
+        )
+            ->where("deleted_at", null)
+            ->whereNotIn("id", $chat_users_id);
+        if ($this->request->getGet("q")) {
+            $query->groupStart()
+                ->orLike("users.username", $this->request->getGet("q"))
+                ->orLike("CONCAT(first_name,' ',last_name)", $this->request->getGet("q"))
+                ->groupEnd();
+        }
+
+        return $this->response->setJSON($query->get()->getResultObject());
+    }
+    public function store_chat_direct_users($chat_id)
+    {
+        $bodyData = $this->request->getPost();
+        $chat_users = [];
+        foreach ($bodyData["users"] as $user_id) {
+            $chat_users[] = ["chat_id" => $chat_id, "user_id" => $user_id];
+            if ($bodyData["notification"]) {
+                $this->chatModel->createNotificationsToNewChatUser($chat_id, $user_id);
+            }
+        }
+        $this->chatUserModel->insertBatch($chat_users);
+        return $this->response->setJSON(["message" => "ok", "status" => true]);
+    }
+    public function store_chat_direct_message(int $chat_id)
+    {
+        $bodyData = $this->request->getPost();
+        $auth_user = auth()->user();
+        $bodyData["sender_id"] =  $auth_user->id;
+        $chat_message_id = $this->chatMessageModel->insert($bodyData);
+        $users_id = $this->chatUserModel->getChatUserArrayId($chat_id);
+        foreach ($users_id as $user_id) {
+            if ($user_id != $auth_user->id) {
+                $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user_id]);
+            }
+        };
+        $message = $this->chatMessageModel->get_chat_message($chat_message_id);
+        return $this->response->setJSON($message);
+    }
+    public function update_chat_direct_message_unread($chat_id)
+    {
+        $this->chatModel->setAsUnviewedChatUserNotifications($chat_id, auth()->user()->id);
+        return $this->response->setJSON(["message" => "ok", "status" => true]);
+    }
+}

ci4/app/Controllers/Clientes/Cliente.php

@@ -1,4 +1,6 @@
-<?php namespace App\Controllers\Clientes;
+<?php
+
+namespace App\Controllers\Clientes;
 
 
 
@@ -152,7 +154,7 @@ class Cliente extends \App\Controllers\BaseResourceController
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
+
 
         if ($this->request->getPost()) :
 
@@ -310,14 +312,9 @@ class Cliente extends \App\Controllers\BaseResourceController
             $onlyActiveOnes = false;
             $columns2select = [$reqId ?? 'id', $reqText ?? 'nombre'];
             $onlyActiveOnes = false;
-            try{
+            try {
                 $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
-                $nonItem = new \stdClass;
-                $nonItem->id = '';
-                $nonItem->text = '- ' . lang('Basic.global.None') . ' -';
-                array_unshift($menu, $nonItem);
-            }
-            catch(Exception $e){
+            } catch (Exception $e) {
                 $menu = [];
             }
 
@@ -334,6 +331,28 @@ class Cliente extends \App\Controllers\BaseResourceController
     }
 
 
+    public function getSelect2()
+    {
+        if ($this->request->isAJAX()) {
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "nombre as name"
+                ]
+            )->where("deleted_at", null);
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("clientes.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
+            }
+
+            return $this->response->setJSON($query->get()->getResultObject());
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
     protected function getPaisListItems($selId = null)
     {
         $paisModel = model('App\Models\Configuracion\PaisModel');
@@ -399,7 +418,7 @@ class Cliente extends \App\Controllers\BaseResourceController
 
     protected function getFormaDePagoListItems($selId = null)
     {
-        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('FormasPagoes.formaDePago'))])];
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('FormasPago.formaDePago'))])];
         if (!empty($selId)) :
             $formaPagoModel = model('App\Models\Configuracion\FormaPagoModel');
 
@@ -427,24 +446,23 @@ class Cliente extends \App\Controllers\BaseResourceController
     }
 
 
-    protected function getPrecioTemplate($cliente_id){
+    protected function getPrecioTemplate($cliente_id)
+    {
 
         $modelPreciosCliente = model('App\Models\Clientes\ClientePreciosModel');
         $plantilla_id = $modelPreciosCliente->get_plantilla_precios($cliente_id);
-        if (is_null($plantilla_id)){
+        if (is_null($plantilla_id)) {
             return null;
         }
         $modelPlantillaPreciosCliente = model('App\Models\Clientes\ClientePlantillaPreciosModel');
         $plantilla = $modelPlantillaPreciosCliente->where("id", $plantilla_id)->where("is_deleted", 0)->first();
-        if ($plantilla == false){
+        if ($plantilla == false) {
             return null;
-        }
-        else{
+        } else {
             return (object)array(
                 "value" => $plantilla_id,
                 "label" => $plantilla->nombre
             );
         }
-        
     }
 }

ci4/app/Controllers/Clientes/ClientePrecios.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Clientes;
+<?php
+namespace App\Controllers\Clientes;
 
 
 use App\Controllers\BaseResourceController;
@@ -45,40 +46,36 @@ class ClientePrecios extends \App\Controllers\BaseResourceController
         parent::initController($request, $response, $logger);
     }
 
-    public function update($requestedId = null)
+    public function updatePlantilla()
     {
-        
 
-        if ($this->request->getPost()) :
-            
-            if ($requestedId == null) :
-                return;
-            endif;
+        if ($this->request->isAJAX()) {
 
-            $postData = $this->request->getJSON();
+            $postData = $this->request->getPost();
+
+            $cliente_id = $postData['cliente_id'] ?? -1;
+            $plantilla_id = $postData['plantilla_id'] ?? -1;
 
-            $plantilla_id = $postData->plantilla_id ?? -1;
-            
             // Se ha actualizado un registro por lo que no es una plantilla
-            if($plantilla_id == -1){
-                $this->model->clean_plantilla_id($requestedId);
-            }
-            else if($requestedId== -1){ // actualizar todos los clientes que usan una plantilla
+            if ($plantilla_id == -1) {
+                $this->model->clean_plantilla_id($cliente_id);
+            } else if ($cliente_id == -1) { // actualizar todos los clientes que usan una plantilla
                 $this->model->update_from_plantilla($plantilla_id);
+            } else {
+                $this->model->copy_from_plantilla($cliente_id, $plantilla_id);
             }
-            else{
-                $this->model->copy_from_plantilla($requestedId, $plantilla_id);
-            }
-            
+
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
             $data = [
                 $csrfTokenName => $newTokenHash
             ];
-            
+
             return $this->respond($data);
 
-        endif; // ($requestMethod === 'post')
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
     }
 
 
@@ -93,92 +90,114 @@ class ClientePrecios extends \App\Controllers\BaseResourceController
             }
             $start = $reqData['start'] ?? 0;
             $length = $reqData['length'] ?? 5;
-            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
-            $requestedOrder2 = $reqData['order']['1']['column'] ?? $requestedOrder;
-            $requestedOrder3 = $reqData['order']['2']['column'] ?? $requestedOrder;
-            $requestedOrder4 = $reqData['order']['3']['column'] ?? $requestedOrder;
-            $requestedOrder5 = $reqData['order']['4']['column'] ?? $requestedOrder;
-            $order = ClientePreciosModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 0];
-            $order2 = ClientePreciosModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : $requestedOrder];
-            $order3 = ClientePreciosModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : $requestedOrder];
-            $order4 = ClientePreciosModel::SORTABLE[$requestedOrder4 >= 0 ? $requestedOrder4 : $requestedOrder];
-            $order5 = ClientePreciosModel::SORTABLE[$requestedOrder4 >= 0 ? $requestedOrder5 : $requestedOrder];
-            $dir = $reqData['order']['0']['dir'] ?? 'asc';
-            $dir2 = $reqData['order']['1']['dir'] ?? $dir;
-            $dir3 = $reqData['order']['2']['dir'] ?? $dir;
-            $dir4= $reqData['order']['3']['dir'] ?? $dir;
-            $dir5= $reqData['order']['4']['dir'] ?? $dir;
-            
+
+            $requestedOrder = $reqData['order'] ?? [];
+
+            $searchValues = get_filter_datatables_columns($reqData);
+
             $cliente_id = $reqData['cliente_id'] ?? 0;
 
-            $resourceData = $this->model->getResource($cliente_id)
-                ->orderBy($order, $dir)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->orderBy($order4, $dir4)->orderBy($order5, $dir5)
-                ->limit($length, $start)->get()->getResultObject();
+            $resourceData = $this->model->getResource($searchValues, $cliente_id);
+            foreach ($requestedOrder as $order) {
+                $column = $order['column'] ?? 0;
+                $dir = $order['dir'] ?? 'asc';
+                $orderColumn = ClientePreciosModel::SORTABLE[$column] ?? null;
+                if ($orderColumn) {
+                    $resourceData->orderBy($orderColumn, $dir);
+                }
+            }
+            $resourceData = $resourceData->limit($length, $start)->get()->getResultObject();
+            
             return $this->respond(Collection::datatable(
                 $resourceData,
-                $this->model->getResource($cliente_id)->countAllResults(),
-                $this->model->getResource($cliente_id)->countAllResults()
+                $this->model->getResource($searchValues, $cliente_id)->countAllResults(),
+                $this->model->getResource($searchValues, $cliente_id)->countAllResults()
             ));
         } else {
             return $this->failUnauthorized('Invalid request', 403);
         }
     }
 
-    public function datatable_editor() {
+    public function datatable_editor()
+    {
         if ($this->request->isAJAX()) {
 
             include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php");
 
 
             // Build our Editor instance and process the data coming from _POST
-            $response = Editor::inst( $db, 'cliente_precios' )
+            $response = Editor::inst($db, 'cliente_precios')
                 ->fields(
-                    Field::inst( 'plantilla_id' ),
-                    Field::inst( 'cliente_id' ),
-                    Field::inst( 'tipo' ),
-                    Field::inst( 'tipo_maquina' ),
-                    Field::inst( 'tipo_impresion' ),
-                    Field::inst( 'user_updated_id' ),
-                    Field::inst( 'updated_at' ),
-                    Field::inst( 'is_deleted' ),
-                    Field::inst( 'tiempo_min' )
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator( 'Validate::notEmpty',array(
-                                'message' => lang('ClientePrecios.validation.required'))
+                    Field::inst('plantilla_id'),
+                    Field::inst('cliente_id'),
+                    Field::inst('tipo'),
+                    Field::inst('tipo_maquina'),
+                    Field::inst('tipo_impresion'),
+                    Field::inst('user_updated_id'),
+                    Field::inst('updated_at'),
+                    Field::inst('is_deleted'),
+                    Field::inst('tiempo_min')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClientePrecios.validation.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('ClientePrecios.validation.decimal'))
+                                'message' => lang('ClientePrecios.validation.decimal')
+                            )
                         ),
-                    
-                    Field::inst( 'tiempo_max' )
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator( 'Validate::notEmpty',array(
-                                'message' => lang('ClientePrecios.validation.required'))
+
+                    Field::inst('tiempo_max')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClientePrecios.validation.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
-                            "decimal" => ',',
-                            'message' => lang('ClientePrecios.validation.decimal'))
-                        ),
-                    
-                    Field::inst( 'precio_hora' )
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')                        
-                        ->validator( 'Validate::notEmpty',array(
-                                'message' => lang('ClientePrecios.validation.required'))
-                        )
-                        ->validator('Validate::numeric', array(
-                            "decimal" => ',',
-                            'message' => lang('ClientePrecios.validation.decimal'))
-                        ),
-                    
-                    Field::inst( 'margen' )
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator( 'Validate::notEmpty',array(
-                                'message' => lang('ClientePrecios.validation.required'))
-                        )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('ClientePrecios.validation.decimal'))
+                                'message' => lang('ClientePrecios.validation.decimal')
+                            )
+                        ),
+
+                    Field::inst('precio_hora')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClientePrecios.validation.required')
+                            )
+                        )
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('ClientePrecios.validation.decimal')
+                            )
+                        ),
+
+                    Field::inst('margen')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClientePrecios.validation.required')
+                            )
+                        )
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('ClientePrecios.validation.decimal')
+                            )
                         ),
 
                 )
@@ -203,21 +222,19 @@ class ClientePrecios extends \App\Controllers\BaseResourceController
                     }
                 })
                 ->on('preCreate', function ($editor, &$values) {
-                    $session = session();
                     $datetime = (new \CodeIgniter\I18n\Time("now"));
                     $editor
                         ->field('user_updated_id')
-                        ->setValue($session->id_user);
+                        ->setValue(auth()->user()->id);
                     $editor
                         ->field('updated_at')
                         ->setValue($datetime->format('Y-m-d H:i:s'));
                 })
                 ->on('preEdit', function ($editor, &$values) {
-                    $session = session();
                     $datetime = (new \CodeIgniter\I18n\Time("now"));
                     $editor
                         ->field('user_updated_id')
-                        ->setValue($session->id_user);
+                        ->setValue(auth()->user()->id);
                     $editor
                         ->field('updated_at')
                         ->setValue($datetime->format('Y-m-d H:i:s'));
@@ -238,4 +255,16 @@ class ClientePrecios extends \App\Controllers\BaseResourceController
         }
     }
 
+    public function getCurrentPlantilla()
+    {
+
+        if ($this->request->isAJAX()) {
+            $cliente_id = $this->request->getGet('cliente_id');
+            $plantilla = $this->model->getPlantilla($cliente_id);
+            return $this->respond($plantilla);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
 }

ci4/app/Controllers/Clientes/Clientedirecciones.php

@@ -1,4 +1,6 @@
-<?php namespace App\Controllers\Clientes;
+<?php
+
+namespace App\Controllers\Clientes;
 
 use App\Models\Collection;
 
@@ -6,6 +8,8 @@ use App\Entities\Clientes\ClienteDireccionesEntity;
 
 use App\Models\Clientes\ClienteDireccionesModel;
 
+use App\Models\Usuarios\UserModel;
+
 use DataTables\Editor;
 use DataTables\Editor\Field;
 use DataTables\Editor\Validate;
@@ -22,21 +26,69 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
 
     protected static $controllerSlug = 'clientedirecciones';
 
-    public function add(){
+    protected static $viewPath = 'themes/vuexy/form/clientes/direcciones/';
+
+    protected $indexRoute = 'clienteDireccionesList';
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('Clientes.direccionesEnvio');
+        $this->viewData['usingSweetAlert'] = true;
+
+        $this->viewData = ['usingServerSideDataTable' => true]; // JJO
+
+        // Breadcrumbs (IMN)
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Clientes.direccionesEnvio"), 'route' => "javascript:void(0);", 'active' => false],
+
+        ];
+
+        $this->viewData['comunidadAutonomaList'] = $this->getComunidadAutonomaListItems($clienteEntity->comunidad_autonoma_id ?? null);
+        $this->viewData['provinciaList'] = $this->getProvinciaListItems($clienteEntity->provincia_id ?? null);
+        $this->viewData['paisList'] = $this->getPaisListItems($clienteEntity->pais_id ?? null);
+
+        parent::initController($request, $response, $logger);
+    }
+
+
+    public function index()
+    {
+
+        $id = auth()->user()->id;
+        $user_model = new UserModel();
+        $user = $user_model->find($id);
+        $cliente_id = $user->cliente_id;
+
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Clientes.cliente')]),
+            'cliente_id' => $cliente_id,
+            "user_id" => $id,
+            'usingServerSideDataTable' => true,
+
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . 'viewClienteDireccionesList', $viewData);
+    }
+
+    public function add()
+    {
         if ($this->request->isAJAX()) {
-            
+
             $reqData = $this->request->getPost();
             $cliente_id = $reqData['cliente_id'] ?? -1;
             $att = $reqData['att'] ?? "";
             $email = $reqData['email'] ?? "";
             $direccion = $reqData['direccion'] ?? "";
-            $pais_id = $reqData['paisId'] ?? -1;
+            $pais_id = $reqData['pais_id'] ?? -1;
             $provincia = $reqData['provincia'] ?? "";
             $municipio = $reqData['municipio'] ?? "";
             $cp = $reqData['cp'] ?? "";
             $telefono = $reqData['telefono'] ?? "";
             $alias = $reqData['alias'] ?? "";
-        
+
             $data = [
                 "cliente_id" => $cliente_id,
                 "att" => $att,
@@ -50,15 +102,11 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
                 "alias" => $alias,
             ];
             $response = $this->model->insert($data);
-            
-            $newTokenHash = csrf_hash();
-            $csrfTokenName = csrf_token();
+
             $data_ret = [
                 'data' => $response,
-                $csrfTokenName => $newTokenHash
             ];
             return $this->respond($data_ret);
-
         } else {
             return $this->failUnauthorized('Invalid request', 403);
         }
@@ -68,14 +116,14 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
     public function menuItems()
     {
         if ($this->request->isAJAX()) {
-            
+
             $reqData = $this->request->getPost();
             $cliente_id = $reqData['cliente_id'] ?? -1;
-            
+
             $clienteDireccionesModel = model('App\Models\Clientes\ClienteDireccionesModel');
             $menu = $clienteDireccionesModel->getMenuDirecciones($cliente_id);
             //$menu = $this->model->getMenuItems($cliente_id);
-            
+
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
             $data = [
@@ -89,6 +137,34 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
     }
 
 
+    public function getSelect2()
+    {
+        if ($this->request->isAJAX()) {
+
+            $cliente_id = $this->request->getGet('cliente_id');
+
+
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "alias as name"
+                ]
+            )
+                ->where("cliente_id", $cliente_id)
+                ->orderBy("alias", "asc");
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("clientes.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
+            }
+
+            return $this->response->setJSON($query->get()->getResultObject());
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
     public function datatable()
     {
         if ($this->request->isAJAX()) {
@@ -96,7 +172,7 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
 
             $tipo = $reqData['tipo'] ?? null;
 
-            if(is_null($tipo)){
+            if (is_null($tipo)) {
                 if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
                     $errstr = 'No data available in response to this specific request.';
                     $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
@@ -111,22 +187,21 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
 
                 $id_C = $reqData['cliente_id'] ?? -1;
 
-                
+
                 $resourceData = $this->model->getResource($search, $id_C)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
-                
+
 
                 return $this->respond(Collection::datatable(
                     $resourceData,
                     $this->model->getResource()->countAllResults(),
                     $this->model->getResource("", $id_C)->countAllResults()
                 ));
-            }
-            else{
+            } else {
 
                 $id = $reqData['id'] ?? -1;
 
                 $resourceData = $this->model->getDireccion($id);
-                
+
 
                 return $this->respond($resourceData);
             }
@@ -135,6 +210,48 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
         }
     }
 
+
+    public function get($id)
+    {
+        try {
+            $resourceData = $this->model->getDireccion($id);
+            $response = (object)[
+                'error' => false,
+                'data' => $resourceData
+            ];
+            return $this->respond($response);
+        } catch (\Exception $e) {
+            $response = (object)[
+                'error' => true,
+                'message' => $e->getMessage()
+            ];
+            return $this->fail($response);
+        }
+    }
+
+    public function getDireccionPresupuesto($id)
+    {
+        try {
+            $model = model('App\Models\Presupuestos\PresupuestoDireccionesModel');
+            $resourceData = $model->getDireccion($id);
+            if(count($resourceData) > 0){
+                $resourceData[0]->direccionId = $id;
+            }
+            
+            $response = (object)[
+                'error' => false,
+                'data' => $resourceData
+            ];
+            return $this->respond($response);
+        } catch (\Exception $e) {
+            $response = (object)[
+                'error' => true,
+                'message' => $e->getMessage()
+            ];
+            return $this->fail($response);
+        }
+    }
+
     public function datatable_editor()
     {
         if ($this->request->isAJAX()) {
@@ -145,72 +262,116 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
             $response = Editor::inst($db, 'cliente_direcciones')
                 ->fields(
                     Field::inst('att')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 100 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(100),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('alias')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 100 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(100),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('email')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 100 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(100),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('direccion')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 255 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(255),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('municipio')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 100 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(100),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('cp')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 20 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(20),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('telefono')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('ClienteDirecciones.validation.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.required')
+                            )
                         )
-                        ->validator( Validate::maxLen( 40 ) , array(
-                            'message' => lang('ClienteDirecciones.validation.max_length'))
-                    ),
+                        ->validator(
+                            Validate::maxLen(40),
+                            array(
+                                'message' => lang('ClienteDirecciones.validation.max_length')
+                            )
+                        ),
                     Field::inst('provincia')
-                        ->validator( function ( $val, $data, $field, $host ) {
-                            if ($data['pais_id'] == 1) { // Si es españa provincia y CCAA es obligatorio
-                                if (strlen( $val ) > 100)
-                                    return lang('ClienteDirecciones.validation.max_length');
-                                else if (strlen( $val ) == 0)
-                                    lang('ClienteDirecciones.validation.required');
-                                else
-                                    return true;
+                        ->validator(
+                            function ($val, $data, $field, $host) {
+                                if ($data['pais_id'] == 1) { // Si es españa provincia y CCAA es obligatorio
+                                    if (strlen($val) > 100)
+                                        return lang('ClienteDirecciones.validation.max_length');
+                                    else if (strlen($val) == 0)
+                                        lang('ClienteDirecciones.validation.required');
+                                    else
+                                        return true;
+                                }
+                                return true;
                             }
-                            return true;
-                        }
-                    ),
+                        ),
                     Field::inst('pais_id')->validator('Validate::notEmpty', array(
-                        'message' => lang('ClienteDirecciones.validation.required'))),
+                        'message' => lang('ClienteDirecciones.validation.required')
+                    )),
                     Field::inst('cliente_id'),
                 )
-                
+
                 ->debug(true)
                 ->process($_POST)
                 ->data();
@@ -221,9 +382,46 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
             $response[$csrfTokenName] = $newTokenHash;
 
             echo json_encode($response);
-
         } else {
             return $this->failUnauthorized('Invalid request', 403);
         }
     }
+
+
+    protected function getPaisListItems($selId = null)
+    {
+        $paisModel = model('App\Models\Configuracion\PaisModel');
+        $onlyActiveOnes = true;
+        $data = $paisModel->getAllForMenu('id, nombre', 'nombre', $onlyActiveOnes);
+
+        return $data;
+    }
+
+    protected function getComunidadAutonomaListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('ComunidadesAutonomas.comunidadAutonoma'))])];
+        if (!is_null($selId)) :
+            $comunidadAutonomaModel = model('App\Models\Configuracion\ComunidadAutonomaModel');
+
+            $selOption = $comunidadAutonomaModel->where('id', $selId)->findColumn('nombre');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
+    protected function getProvinciaListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Provincias.provincia'))])];
+        if (!empty($selId)) :
+            $provinciaModel = model('App\Models\Configuracion\ProvinciaModel');
+
+            $selOption = $provinciaModel->where('id', $selId)->findColumn('nombre');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
 }

ci4/app/Controllers/Clientes/Clienteplantillaprecios.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Clientes;
+<?php
+namespace App\Controllers\Clientes;
 
 
 use App\Controllers\BaseResourceController;
@@ -70,51 +71,48 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
     // plantilla desde la lista
     public function update($requestedId = null)
     {
-        
 
-        if ($this->request->getPost()) :
-            
-            if ($requestedId == null) :
-                return;
-            endif;
-            $model = model('App\Models\Clientes\ClientePlantillaPreciosLineasModel');
-            $model->delete_values($requestedId);
-                        
-            $newTokenHash = csrf_hash();
-            $csrfTokenName = csrf_token();
-            $data = [
-                $csrfTokenName => $newTokenHash
-            ];
-            
-            return $this->respond($data);
+        if ($requestedId == null):
+            return;
+        endif;
+        $model = model('App\Models\Clientes\ClientePlantillaPreciosLineasModel');
+        $model->delete_values($requestedId);
+
+        $newTokenHash = csrf_hash();
+        $csrfTokenName = csrf_token();
+        $data = [
+            $csrfTokenName => $newTokenHash
+        ];
+
+        return $this->respond($data);
 
-        endif; // ($requestMethod === 'post')
     }
 
 
     public function add()
     {
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
             $postData = $this->request->getPost();
 
             $cliente_id = $postData['cliente_id'] ?? -1;
-            
+            $from_client_data = $postData['from_client_data'] ?? 0;
+
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             // JJO
             $sanitizedData['user_created_id'] = auth()->user()->id;
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
                     } catch (\Exception $e) {
@@ -126,24 +124,27 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
                     $this->session->setFlashdata('formErrors', $this->model->errors());
                 endif;
 
-                $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
+                if ($from_client_data == 1) {
+                    $thenRedirect = false;
+                } else {
+                    $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 = $this->model->db->insertID();
 
                 $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
 
-                if($cliente_id != -1){
+                if ($cliente_id != -1) {
                     $modelLineas = model('App\Models\Clientes\ClientePlantillaPreciosLineasModel');
                     $modelLineas->copy_from_cliente($cliente_id, $id);
                     $modelClientePrecios = model('App\Models\Clientes\ClientePreciosModel');
                     $modelClientePrecios->set_plantilla_id($cliente_id, $id);
-                    return ;
-                }
-                else{
-                    if ($thenRedirect) :
-                        if (!empty($this->indexRoute)) :
+                    return $this->respond(['status' => 'success', 'id' => $id]);
+                } else {
+                    if ($thenRedirect):
+                        if (!empty($this->indexRoute)):
                             //return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                             return redirect()->to(site_url('/clientes/clienteplantillaprecios/edit/' . $id))->with('message', $message);
                         else:
@@ -171,35 +172,35 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
     {
 
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $clientePlantillaPreciosEntity = $this->model->find($id);
 
-        if ($clientePlantillaPreciosEntity == false) :
+        if ($clientePlantillaPreciosEntity == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Clientes.cliente')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
             $postData = $this->request->getPost();
 
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
-           
+
             // JJO
             $sanitizedData['user_updated_id'] = auth()->user()->id;
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
                     } catch (\Exception $e) {
@@ -216,12 +217,12 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
 
                 $thenRedirect = false;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $clientePlantillaPreciosEntity->id ?? $id;
                 $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -236,7 +237,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
         //var_dump($clientePlantillaPreciosEntity); dd();
 
         $this->viewData['clienteplantillapreciosEntity'] = $clientePlantillaPreciosEntity;
-        
+
         $this->viewData['formAction'] = route_to('updateClienteplantillaprecios', $id);
 
         $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Clientes.moduleTitle') . ' ' . lang('Basic.global.edit3');
@@ -246,6 +247,23 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
     } // end function edit(...)
 
 
+    public function updatePlantillaEnCliente(){
+
+        if ($this->request->isAJAX()) {
+
+            $reqData = $this->request->getPost();
+            $plantilla_id = $reqData['plantilla_id'] ?? -1;
+
+            $model = model('App\Models\Clientes\ClientePreciosModel');
+            $model->update_plantilla_id($plantilla_id);
+            
+
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
     public function datatable()
     {
         if ($this->request->isAJAX()) {
@@ -257,16 +275,16 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
             }
             $start = $reqData['start'] ?? 0;
             $length = $reqData['length'] ?? 5;
-            $search = $reqData['search']['value'];
+            $searchValues = get_filter_datatables_columns($reqData);
             $requestedOrder = $reqData['order']['0']['column'] ?? 1;
             $order = ClientePlantillaPreciosModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 0];
             $dir = $reqData['order']['0']['dir'] ?? 'asc';
 
-            $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+            $resourceData = $this->model->getResource($searchValues)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
             return $this->respond(Collection::datatable(
                 $resourceData,
                 $this->model->getResource()->countAllResults(),
-                $this->model->getResource($search)->countAllResults()
+                $this->model->getResource($searchValues)->countAllResults()
             ));
         } else {
             return $this->failUnauthorized('Invalid request', 403);
@@ -275,34 +293,32 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
 
     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;
-            try{
-                $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr, true);
-                $nonItem = new \stdClass;
-                $nonItem->id = '';
-                $nonItem->text = '- ' . lang('Basic.global.None') . ' -';
-                array_unshift($menu, $nonItem);
-            }
-            catch(Exception $e){
-                $menu = [];
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "nombre as name"
+                ]
+            )->where("deleted_at", null);
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("cliente_plantilla_precios.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
             }
 
-            $newTokenHash = csrf_hash();
-            $csrfTokenName = csrf_token();
-            $data = [
-                'menu' => $menu,
-                $csrfTokenName => $newTokenHash
-            ];
-            return $this->respond($data);
+            $items = $query->get()->getResultObject();
+            // add a custom item at the beginning
+            $customItem = new \stdClass;
+            $customItem->id = 0;
+            $customItem->name = "Personalizado";
+            array_unshift($items, $customItem);
+
+            return $this->response->setJSON($items);
         } else {
             return $this->failUnauthorized('Invalid request', 403);
         }
+
     }
 
 }

ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php

@@ -93,31 +93,27 @@ class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceControl
             }
             $start = $reqData['start'] ?? 0;
             $length = $reqData['length'] ?? 5;
-            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
-            $requestedOrder2 = $reqData['order']['1']['column'] ?? $requestedOrder;
-            $requestedOrder3 = $reqData['order']['2']['column'] ?? $requestedOrder;
-            $requestedOrder4 = $reqData['order']['3']['column'] ?? $requestedOrder;
-            $requestedOrder5 = $reqData['order']['4']['column'] ?? $requestedOrder;
-            $order = ClientePlantillaPreciosLineasModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 0];
-            $order2 = ClientePlantillaPreciosLineasModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : $requestedOrder];
-            $order3 = ClientePlantillaPreciosLineasModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : $requestedOrder];
-            $order4 = ClientePlantillaPreciosLineasModel::SORTABLE[$requestedOrder4 >= 0 ? $requestedOrder4 : $requestedOrder];
-            $order5 = ClientePlantillaPreciosLineasModel::SORTABLE[$requestedOrder4 >= 0 ? $requestedOrder5 : $requestedOrder];
-            $dir = $reqData['order']['0']['dir'] ?? 'asc';
-            $dir2 = $reqData['order']['1']['dir'] ?? $dir;
-            $dir3 = $reqData['order']['2']['dir'] ?? $dir;
-            $dir4= $reqData['order']['3']['dir'] ?? $dir;
-            $dir5= $reqData['order']['4']['dir'] ?? $dir;
-            
+
+            $requestedOrder = $reqData['order'] ?? [];
+            $searchValues = get_filter_datatables_columns($reqData);
+
             $plantilla_id = $reqData['plantilla_id'] ?? 0;
 
-            $resourceData = $this->model->getResource($plantilla_id)
-                ->orderBy($order, $dir)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->orderBy($order4, $dir4)->orderBy($order5, $dir5)
-                ->limit($length, $start)->get()->getResultObject();
+            $resourceData = $this->model->getResource($searchValues, $plantilla_id);
+            foreach ($requestedOrder as $order) {
+                $column = $order['column'] ?? 0;
+                $dir = $order['dir'] ?? 'asc';
+                $orderColumn = ClientePlantillaPreciosLineasModel::SORTABLE[$column] ?? null;
+                if ($orderColumn) {
+                    $resourceData->orderBy($orderColumn, $dir);
+                }
+            }
+            $resourceData = $resourceData->limit($length, $start)->get()->getResultObject();
+
             return $this->respond(Collection::datatable(
                 $resourceData,
-                $this->model->getResource($plantilla_id)->countAllResults(),
-                $this->model->getResource($plantilla_id)->countAllResults()
+                $this->model->getResource([], $plantilla_id)->countAllResults(),
+                $this->model->getResource($searchValues, $plantilla_id)->countAllResults()
             ));
         } else {
             return $this->failUnauthorized('Invalid request', 403);
@@ -138,6 +134,8 @@ class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceControl
                     Field::inst( 'tipo_maquina' ),
                     Field::inst( 'tipo_impresion' ),
                     Field::inst( 'user_updated_id' ),
+                    Field::inst( 'deleted_at' ),
+                    Field::inst( 'is_deleted' ),
                     Field::inst( 'updated_at' ),
                     Field::inst( 'tiempo_min' )
                         ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
@@ -201,21 +199,20 @@ class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceControl
                     }
                 })
                 ->on('preCreate', function ($editor, &$values) {
-                    $session = session();
                     $datetime = (new \CodeIgniter\I18n\Time("now"));
                     $editor
                         ->field('user_updated_id')
-                        ->setValue($session->id_user);
+                        ->setValue(auth()->user()->id);
                     $editor
                         ->field('updated_at')
                         ->setValue($datetime->format('Y-m-d H:i:s'));
                 })
                 ->on('preEdit', function ($editor, &$values) {
-                    $session = session();
+                    
                     $datetime = (new \CodeIgniter\I18n\Time("now"));
                     $editor
                         ->field('user_updated_id')
-                        ->setValue($session->id_user);
+                        ->setValue(auth()->user()->id);
                     $editor
                         ->field('updated_at')
                         ->setValue($datetime->format('Y-m-d H:i:s'));

ci4/app/Controllers/Configuracion/Comunidadesautonomas.php

@@ -271,6 +271,27 @@ class Comunidadesautonomas extends \App\Controllers\BaseResourceController
         }
     }
 
+    public function menuItems2()
+    {
+        if ($this->request->isAJAX()) {
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "nombre as name"
+                ]
+                )->orderBy("nombre", "asc");
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("lg_comunidades_autonomas.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
+            }
+
+            return $this->response->setJSON($query->get()->getResultObject());
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
 
     protected function getPaisListItems($selId = null)
     {

ci4/app/Controllers/Configuracion/ConfigErrores.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+
+use App\Controllers\BaseResourceController;
+use App\Models\Collection;
+use App\Models\Presupuestos\ErrorPresupuesto as ErrorPresupuestoModel;
+use CodeIgniter\HTTP\Response;
+use Hermawan\DataTables\DataTable;
+
+class ConfigErrores extends BaseResourceController
+{
+
+    protected ErrorPresupuestoModel $errorPresupuestoModel;
+    protected $format = 'json';
+    protected array $viewData = [];
+
+
+    protected static $viewPath = 'themes/vuexy/form/configuracion/error_presupuesto/';
+    protected static $controllerSlug = "errores-presupuesto";
+    protected $indexRoute = 'viewErrorPresupuestoList';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+        $this->errorPresupuestoModel = model(ErrorPresupuestoModel::class);
+    }
+
+
+    public function index()
+    {
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_error_presupuesto"), 'route' => site_url('configuracion/errores-presupuesto'), 'active' => true]
+        ];
+        return view(static::$viewPath . $this->indexRoute, $this->viewData);
+    }
+    public function viewForm(int $error_presupuesto_id)
+    {
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_error_presupuesto"), 'route' => site_url('configuracion/errores-presupuesto'), 'active' => true]
+        ];
+        $this->viewData["error_presupuesto_id"] = $error_presupuesto_id;
+        $this->errorPresupuestoModel->update($error_presupuesto_id, [
+            "last_user_id" => auth()->user()->id,
+            "visto" => true,
+        ]);
+        return view(static::$viewPath . 'viewErrorPresupuestoForm', $this->viewData);
+    }
+    public function store()
+    {
+        $data = [];
+        $variableCreated = $this->errorPresupuestoModel->store($data);
+        return $this->response->setJSON($variableCreated);
+    }
+    public function get_error_presupuesto(int $error_presupuesto_id)
+    {
+        $data = $this->errorPresupuestoModel->getErrorPresupuestoForm($error_presupuesto_id);
+        if (isset($data[0])) {
+            return $this->response->setJSON(["data" => $data[0]]);
+        } else {
+            return $this->response->setJSON(["data" => []]);
+        }
+    }
+    public function update_error_presupuesto(int $error_presupuesto_id)
+    {
+        $bodyData = $this->request->getPost();
+        $this->errorPresupuestoModel->updateComment($error_presupuesto_id, $bodyData["comments"]);
+        return $this->response->setJSON(["message" => "Comentario actualizado", "status" => true]);
+    }
+
+    public function datatable()
+    {
+        $query = $this->errorPresupuestoModel->getQueryDatatable()->orderBy("created_at", "DESC");
+        return DataTable::of($query)
+            ->add("action", fn($q) => $q->id)
+            ->toJson(true);
+    }
+}

ci4/app/Controllers/Configuracion/ConfigVariables.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+
+use App\Controllers\BaseResourceController;
+use App\Models\Collection;
+use App\Models\Configuracion\ConfigVariableModel;
+use CodeIgniter\HTTP\Response;
+use Hermawan\DataTables\DataTable;
+
+class ConfigVariables extends BaseResourceController
+{
+
+    protected $modelName = ConfigVariableModel::class;
+    protected ConfigVariableModel $configVariableModel;
+    protected $format = 'json';
+
+    protected static $singularObjectName = 'Variables';
+    protected static $singularObjectNameCc = 'variables';
+    protected static $pluralObjectName = 'Variables';
+    protected static $pluralObjectNameCc = 'variables';
+
+    protected static $controllerSlug = 'variables';
+
+    protected static $viewPath = 'themes/vuexy/form/configuracion/variables/';
+
+    protected $indexRoute = 'viewVariablesList';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+
+
+        parent::initController($request, $response, $logger);
+        $this->configVariableModel = model(ConfigVariableModel::class);
+    }
+
+
+    public function index()
+    {
+
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . $this->indexRoute, $viewData);
+    }
+    public function store()
+    {
+        $data = [];
+        $variableCreated = $this->configVariableModel->store($data);
+        return $this->response->setJSON($variableCreated);
+    }
+    public function get(int $config_variable_id)
+    {
+        $data = $this->configVariableModel->find($config_variable_id);
+        return $this->response->setJSON($data);
+    }
+    public function updateVariable(int $config_variable_id)
+    {
+        $reqData = [];
+        if ($this->request->isAJAX()) {
+            $reqData = $this->request->getPost();
+            $status = $this->configVariableModel->update($config_variable_id, $reqData);
+            return $this->response->setJSON([
+                "message" => "Variable actualizada correctamente",
+                "status" => $status
+            ]);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+    public function deleteVariable(int $config_variable_id): Response
+    {
+        return $this->response->setJSON([]);
+    }
+    public function datatable()
+    {
+
+        $query = $this->configVariableModel->builder()->select([
+            "id",
+            "name",
+            "value",
+            "description"
+        ])->orderBy("name", "asc");
+        return DataTable::of($query)
+            ->add("action", fn($q) => $q->id)
+            ->toJson(true);
+    }
+}

ci4/app/Controllers/Configuracion/FormasPago.php

@@ -9,7 +9,7 @@ use App\Entities\Configuracion\FormaPagoEntity;
 
 use App\Models\Configuracion\FormaPagoModel;
 
-class Formaspagos extends \App\Controllers\BaseResourceController
+class FormasPago extends \App\Controllers\BaseResourceController
 {
 
     protected $modelName = FormaPagoModel::class;
@@ -22,15 +22,22 @@ class Formaspagos extends \App\Controllers\BaseResourceController
 
     protected static $controllerSlug = 'formas-pagos';
 
-    protected static $viewPath = 'themes/vuexy/form/configuracion/formasPagoViews/';
+    protected static $viewPath = 'themes/vuexy/form/configuracion/formas-pago/';
 
     protected $indexRoute = 'formaDePagoList';
 
 
     public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
     {
-        $this->viewData['pageTitle'] = lang('FormasPagoes.moduleTitle');
+        $this->viewData['pageTitle'] = lang('FormasPago.moduleTitle');
         $this->viewData['usingSweetAlert'] = true;
+
+        // Breadcrumbs (IMN)
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_formas_pago"), 'route' => route_to('formasPagoList'), 'active' => true]
+        ];
+
         parent::initController($request, $response, $logger);
     }
 
@@ -40,7 +47,7 @@ class Formaspagos extends \App\Controllers\BaseResourceController
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
-            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('FormasPagoes.formaDePago')]),
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('FormasPago.formaDePago')]),
             'formaPagoEntity' => new FormaPagoEntity(),
             'usingServerSideDataTable' => true,
 
@@ -55,22 +62,15 @@ class Formaspagos extends \App\Controllers\BaseResourceController
     public function add()
     {
 
-
-        
-
         if ($this->request->getPost()) :
 
-            $nullIfEmpty = true; // !(phpversion() >= '8.1');
-
             $postData = $this->request->getPost();
 
-            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
-
+            $sanitizedData = $this->sanitized($postData, true);
 
             $noException = true;
             if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
-
                 if ($this->canValidate()) :
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
@@ -93,7 +93,8 @@ class Formaspagos extends \App\Controllers\BaseResourceController
 
                 if ($thenRedirect) :
                     if (!empty($this->indexRoute)) :
-                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                        return redirect()->to(site_url('/configuracion/formas-pago/edit/' . $id))->with('sweet-success', $message);
+                        //return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
                     endif;
@@ -106,11 +107,8 @@ class Formaspagos extends \App\Controllers\BaseResourceController
         endif; // ($requestMethod === 'post')
 
         $this->viewData['formaPagoEntity'] = isset($sanitizedData) ? new FormaPagoEntity($sanitizedData) : new FormaPagoEntity();
-
-        $this->viewData['formAction'] = route_to('createFormaDePago');
-
-        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('FormasPagoes.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
-
+        $this->viewData['formAction'] = route_to('formasPagoAdd');
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('FormasPago.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
 
         return $this->displayForm(__METHOD__);
     } // end function add()
@@ -125,25 +123,18 @@ class Formaspagos extends \App\Controllers\BaseResourceController
         $formaPagoEntity = $this->model->find($id);
 
         if ($formaPagoEntity == false) :
-            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('FormasPagoes.formaDePago')), $id]);
+            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('FormasPago.formaDePago')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
-
         if ($this->request->getPost()) :
 
-            $nullIfEmpty = true; // !(phpversion() >= '8.1');
-
             $postData = $this->request->getPost();
-
-            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
-
+            $sanitizedData = $this->sanitized($postData, true);
 
             $noException = true;
             if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
-
                 if ($this->canValidate()) :
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
@@ -152,13 +143,12 @@ class Formaspagos extends \App\Controllers\BaseResourceController
                         $this->dealWithException($e);
                     }
                 else:
-                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('FormasPagoes.formaDePago'))]);
+                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('FormasPago.formaDePago'))]);
                     $this->session->setFlashdata('formErrors', $this->model->errors());
 
                 endif;
 
                 $formaPagoEntity->fill($sanitizedData);
-
                 $thenRedirect = false;
             endif;
             if ($noException && $successfulResult) :
@@ -179,11 +169,8 @@ class Formaspagos extends \App\Controllers\BaseResourceController
         endif; // ($requestMethod === 'post')
 
         $this->viewData['formaPagoEntity'] = $formaPagoEntity;
-
-        $this->viewData['formAction'] = route_to('updateFormaDePago', $id);
-
-        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('FormasPagoes.moduleTitle') . ' ' . lang('Basic.global.edit3');
-
+        $this->viewData['formAction'] = route_to('formasPagoEdit', $id);
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('FormasPago.moduleTitle') . ' ' . lang('Basic.global.edit3');
 
         return $this->displayForm(__METHOD__, $id);
     } // end function edit(...)
@@ -243,25 +230,19 @@ class Formaspagos extends \App\Controllers\BaseResourceController
     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);
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "nombre as name"
+                ]
+                )->orderBy("nombre", "asc");
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("formas_pago.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
+            }
 
-            $newTokenHash = csrf_hash();
-            $csrfTokenName = csrf_token();
-            $data = [
-                'menu' => $menu,
-                $csrfTokenName => $newTokenHash
-            ];
-            return $this->respond($data);
+            return $this->response->setJSON($query->get()->getResultObject());
         } else {
             return $this->failUnauthorized('Invalid request', 403);
         }

ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Configuracion;
+<?php
+namespace App\Controllers\Configuracion;
 
 
 use App\Controllers\BaseResourceController;
@@ -12,8 +13,8 @@ use App\Models\Configuracion\MaquinasTarifasImpresionModel;
 use App\Models\Configuracion\MaquinaModel;
 
 use
-    DataTables\Editor,
-    DataTables\Editor\Field;
+DataTables\Editor,
+DataTables\Editor\Field;
 
 class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
 {
@@ -69,9 +70,9 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
     {
 
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -81,10 +82,10 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
 
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
                     } catch (\Exception $e) {
@@ -98,14 +99,14 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
 
                 $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 = $this->model->db->insertID();
 
                 $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -129,25 +130,25 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
 
         return $this->displayForm(__METHOD__);
     } // end function add()
-    
+
 
     public function edit($requestedId = null)
     {
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $maquinasTarifasImpresion = $this->model->find($id);
 
-        if ($maquinasTarifasImpresion == false) :
+        if ($maquinasTarifasImpresion == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('MaquinasTarifasImpresions.maquinasTarifaImpresion')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -160,10 +161,10 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
 
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
                     } catch (\Exception $e) {
@@ -180,12 +181,12 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
 
                 $thenRedirect = false;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $maquinasTarifasImpresion->id ?? $id;
                 $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -220,30 +221,48 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
             $response = Editor::inst($db, 'lg_maquinas_tarifas_impresion')
                 ->fields(
                     Field::inst('uso')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('MaquinasTarifasImpresions.validation.uso.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('MaquinasTarifasImpresions.validation.uso.required')
+                            )
                         ),
                     Field::inst('tipo')
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('MaquinasTarifasImpresions.validation.tipo.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('MaquinasTarifasImpresions.validation.tipo.required')
+                            )
                         ),
                     Field::inst('precio')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('MaquinasTarifasImpresions.validation.precio.decimal'))
+                                'message' => lang('MaquinasTarifasImpresions.validation.precio.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('MaquinasTarifasImpresions.validation.tipo.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('MaquinasTarifasImpresions.validation.tipo.required')
+                            )
                         ),
                     Field::inst('margen')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('MaquinasTarifasImpresions.validation.precio.decimal'))
+                                'message' => lang('MaquinasTarifasImpresions.validation.precio.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('MaquinasTarifasImpresions.validation.tipo.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('MaquinasTarifasImpresions.validation.tipo.required')
+                            )
                         ),
                     Field::inst('maquina_id'),
                     Field::inst('user_created_id'),
@@ -269,16 +288,21 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
                                         'maquina_id' => $values['maquina_id'],
                                         'tipo' => $values['tipo'],
                                         'uso' => $values['uso'],
-                                        'is_deleted' => 0));
+                                        'is_deleted' => 0
+                                    ));
 
-                                        $id = $builder->get()->getFirstRow()->id;
+                                $id = $builder->get()->getFirstRow();
+                                if ($id) {
+                                    $id = $id->id;
+                                    // No se pueden duplicar valores al crear o al editar
+                                    if ($builder->countAllResults() >= 1) {
+                                        if (
+                                            ($action === Editor::ACTION_EDIT && $id != $pkey)
+                                            || $action === Editor::ACTION_CREATE
+                                        ) {
 
-                                // No se pueden duplicar valores al crear o al editar
-                                if ($builder->countAllResults() >= 1) {
-                                    if (($action === Editor::ACTION_EDIT && $id != $pkey)
-                                        || $action === Editor::ACTION_CREATE) {
-
-                                        return lang('MaquinasTarifasImpresions.validation.duplicated_uso_tipo');
+                                            return lang('MaquinasTarifasImpresions.validation.duplicated_uso_tipo');
+                                        }
                                     }
                                 }
                             }
@@ -413,11 +437,11 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
     protected function getMaquinaListItems($selId = null)
     {
         $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Maquinas.maquina'))])];
-        if (!empty($selId)) :
+        if (!empty($selId)):
             $maquinaModel = model('App\Models\Configuracion\MaquinaModel');
 
             $selOption = $maquinaModel->where('id', $selId)->findColumn('nombre');
-            if (!empty($selOption)) :
+            if (!empty($selOption)):
                 $data[$selId] = $selOption[0];
             endif;
         endif;

ci4/app/Controllers/Configuracion/Paises.php

@@ -269,4 +269,25 @@ class Paises extends \App\Controllers\BaseResourceController
         }
     }
 
+    public function menuItems2()
+    {
+        if ($this->request->isAJAX()) {
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "nombre as name"
+                ]
+                )->orderBy("nombre", "asc");
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("lg_paises.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
+            }
+
+            return $this->response->setJSON($query->get()->getResultObject());
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
 }

ci4/app/Controllers/Configuracion/Papelesgenericos.php

@@ -156,8 +156,13 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
             if ($this->request->getPost('show_in_client') == null) {
                 $sanitizedData['show_in_client'] = false;
             }
-
-
+            if ($this->request->getPost('show_in_client_special') == null) {
+                $sanitizedData['show_in_client_special'] = false;
+            }
+            
+            if($sanitizedData['show_in_client_special']){
+                $sanitizedData['show_in_client'] = true;
+            }
 
             $noException = true;
             if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@@ -288,4 +293,74 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController
             return $this->failUnauthorized('Invalid request', 403);
         }
     }
+
+    public function getPapelCliente()
+    {
+        if ($this->request->isAJAX()) {
+            
+            $tirada = goSanitize($this->request->getGet('tirada'))[0] ?? null;
+            $POD = null;
+            if($tirada != null){
+                $POD_value = model('App\Models\Configuracion\ConfiguracionSistemaModel')->getPOD();
+                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;
+            
+            $menu = $this->model->getPapelCliente($tipo, $cubierta, $selected_papel, $tapa_dura, false, $POD);
+            $menu2 = $this->model->getPapelCliente($tipo, $cubierta, $selected_papel, $tapa_dura, true, $POD);
+            
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                'papeles' => $menu,
+                'papeles_especiales' => $menu2,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function selectPapelEspecial()
+    {
+        
+        if ($this->request->isAJAX()) {
+            
+            $tirada = goSanitize($this->request->getGet('tirada'))[0] ?? null;
+            $POD = null;
+            if($tirada != null){
+                $POD_value = model('App\Models\Configuracion\ConfiguracionSistemaModel')->getPOD();
+                if(intval($tirada) <= intval($POD_value)){
+                    $POD = true;
+                }
+                else{
+                    $POD = false;
+                }
+            }
+            $tipo = goSanitize($this->request->getGet('tipo'))[0];
+            $cubierta = goSanitize($this->request->getGet('cubierta'))[0] ?? 0;
+
+            $items = $this->model->getPapelCliente($tipo, $cubierta, null, true, $POD);
+            $items = array_map(function ($item) {
+                return [
+                    'id' => $item->id,
+                    'name' => $item->nombre
+                ];
+            }, $items);
+            return $this->response->setJSON($items);
+
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
 }

ci4/app/Controllers/Configuracion/Papelesimpresion.php

@@ -175,7 +175,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
 
         if ($this->request->getPost()) :
 
-            $nullIfEmpty = true; // !(phpversion() >= '8.1');
+            $nullIfEmpty = false; // !(phpversion() >= '8.1');
 
             $postData = $this->request->getPost();
 
@@ -188,6 +188,9 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
             if ($this->request->getPost('defecto') == null) {
                 $sanitizedData['defecto'] = false;
             }
+            if ($this->request->getPost('interior') == null) {
+                $sanitizedData['interior'] = false;
+            }
             if ($this->request->getPost('bn') == null) {
                 $sanitizedData['bn'] = false;
             }
@@ -197,6 +200,9 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
             if ($this->request->getPost('cubierta') == null) {
                 $sanitizedData['cubierta'] = false;
             }
+            if ($this->request->getPost('use_for_tapa_dura') == null) {
+                $sanitizedData['use_for_tapa_dura'] = false;
+            }
             if ($this->request->getPost('sobrecubierta') == null) {
                 $sanitizedData['sobrecubierta'] = false;
             }
@@ -209,6 +215,12 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
             if ($this->request->getPost('inkjet') == null) {
                 $sanitizedData['inkjet'] = false;
             }
+            if ($this->request->getPost('isActivo') == null) {
+                $sanitizedData['isActivo'] = false;
+            }
+            if ($this->request->getPost('use_in_client') == null) {
+                $sanitizedData['use_in_client'] = false;
+            }
 
             // Hay que asegurarse de que se quitan los consumos de tintas de rotativa 
             // en caso de que se haya deseleccionado la opción rotativa 

ci4/app/Controllers/Configuracion/Papelformato.php

@@ -244,23 +244,15 @@ class Papelformato extends \App\Controllers\BaseResourceController {
 
     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 ?? 'ancho'];
-            $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();
+            $papelFormatoModel = model('App\Models\Configuracion\PapelFormatoModel');
+            $searchStr = goSanitize($this->request->getPfgost('searchTerm'))[0];
+            $menu = $papelFormatoModel->getElementsForMenu2($searchStr);
+            if(empty(($searchStr)))
+                array_shift($menu);
+        
             $data = [
                 'menu' => $menu,
-                $csrfTokenName => $newTokenHash
+        
             ];
             return $this->respond($data);
         } else {
@@ -268,4 +260,15 @@ class Papelformato extends \App\Controllers\BaseResourceController {
         }
     }
 
+
+    public function getSelect2()
+    {
+        if ($this->request->isAJAX()) {
+            $data = $this->model->getElementsForMenu2($this->request->getGet("q"));
+            
+            return $this->response->setJSON($data);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
 }

ci4/app/Controllers/Configuracion/Provincias.php

@@ -271,6 +271,27 @@ class Provincias extends \App\Controllers\BaseResourceController
         }
     }
 
+    public function menuItems2()
+    {
+        if ($this->request->isAJAX()) {
+            $query = $this->model->builder()->select(
+                [
+                    "id",
+                    "nombre as name"
+                ]
+                )->orderBy("nombre", "asc");
+            if ($this->request->getGet("q")) {
+                $query->groupStart()
+                    ->orLike("lg_provincias.nombre", $this->request->getGet("q"))
+                    ->groupEnd();
+            }
+
+            return $this->response->setJSON($query->get()->getResultObject());
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
 
     protected function getPaisListItems($selId = null)
     {

ci4/app/Controllers/Configuracion/SeriesFacturas.php

@@ -0,0 +1,268 @@
+<?php namespace App\Controllers\Configuracion;
+
+use App\Controllers\BaseResourceController;
+use App\Models\Collection;
+use App\Entities\Configuracion\SeriesFacturasEntity;
+use App\Models\Configuracion\SeriesFacturasModel;
+
+class SeriesFacturas extends BaseResourceController
+{
+
+    protected $modelName = SeriesFacturasModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectName = 'Series Facturas';
+    protected static $singularObjectNameCc = 'seriesFacturas';
+    protected static $pluralObjectName = 'Series Facturas';
+    protected static $pluralObjectNameCc = 'seriesFacturas';
+
+    protected static $controllerSlug = 'ubicaciones';
+
+    protected static $viewPath = 'themes/vuexy/form/configuracion/series-facturas/';
+
+    protected $indexRoute = 'seriesFacturasList';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('SeriesFacturas.moduleTitle');
+        $this->viewData['usingSweetAlert'] = true;
+
+        // Breadcrumbs (IMN)
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_series_facturas"), 'route' => route_to('seriesFacturasList'), 'active' => true]
+        ];
+
+        parent::initController($request, $response, $logger);
+    }
+
+
+    public function index()
+    {
+
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('SeriesFacturas.moduleTitle')]),
+            'seriesFacturasEntity' => new SeriesFacturasEntity(),
+            'usingServerSideDataTable' => true,
+
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . 'viewSeriesFacturasList', $viewData);
+    }
+
+
+    public function add()
+    {
+        if ($this->request->getPost()) :
+
+            $postData = $this->request->getPost();
+
+            $sanitizedData = $this->sanitized($postData, true);
+
+            $noException = true;
+            if ($successfulResult = $this->canValidate()) :
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [lang('Basic.global.record')]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+                endif;
+
+                $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
+            endif;
+            if ($noException && $successfulResult) :
+
+                $id = $this->model->db->insertID();
+
+                $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
+
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                    else:
+                        return $this->redirect2listView('sweet-success', $message);
+                    endif;
+                else:
+                    $this->session->setFlashData('sweet-success', $message);
+                endif;
+
+            endif; // $noException && $successfulResult
+
+        endif; // ($requestMethod === 'post')
+
+        $this->viewData['seriesFacturasEntity'] = isset($sanitizedData) ? new SeriesFacturasEntity($sanitizedData) : new SeriesFacturasEntity();
+        $this->viewData['formAction'] = route_to('seriesFacturasAdd');
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('SeriesFacturas.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
+
+        return $this->displayForm(__METHOD__);
+    } // end function add()
+
+    public function edit($requestedId = null)
+    {
+
+        if ($requestedId == null) :
+            return $this->redirect2listView();
+        endif;
+        $id = filter_var($requestedId, FILTER_SANITIZE_URL);
+        $seriesFacturasEntity = $this->model->find($id);
+
+        if ($seriesFacturasEntity == false) :
+            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('SeriesFacturas.moduleTitle')), $id]);
+            return $this->redirect2listView('sweet-error', $message);
+        endif;
+
+        if ($this->request->getPost()) :
+
+            $postData = $this->request->getPost();
+            $sanitizedData = $this->sanitized($postData, true);
+            if ($this->request->getPost('show_erp') == null) {
+                $sanitizedData['show_erp'] = false;
+            }
+
+            $noException = true;
+            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('SeriesFacturas.moduleTitle'))]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                endif;
+
+                $seriesFacturasEntity->fill($sanitizedData);
+                $thenRedirect = false;
+            endif;
+            if ($noException && $successfulResult) :
+                $id = $seriesFacturasEntity->id ?? $id;
+                $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                    else:
+                        return $this->redirect2listView('sweet-success', $message);
+                    endif;
+                else:
+                    $this->session->setFlashData('sweet-success', $message);
+                endif;
+
+            endif; // $noException && $successfulResult
+        endif; // ($requestMethod === 'post')
+
+        $this->viewData['seriesFacturasEntity'] = $seriesFacturasEntity;
+        $this->viewData['formAction'] = route_to('seriesFacturasEdit', $id);
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('SeriesFacturas.moduleTitle') . ' ' . lang('Basic.global.edit3');
+
+        return $this->displayForm(__METHOD__, $id);
+    } // end function edit(...)
+
+
+    public function datatable()
+    {
+        if ($this->request->isAJAX()) {
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 1;
+            $order = SeriesFacturasModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+            $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResource()->countAllResults(),
+                $this->model->getResource($search)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function allItemsSelect()
+    {
+        if ($this->request->isAJAX()) {
+            $onlyActiveOnes = true;
+            $reqVal = $this->request->getPost('val') ?? 'id';
+            $menu = $this->model->getAllForMenu($reqVal . ', nombre', 'nombre', $onlyActiveOnes, false);
+            $nonItem = new \stdClass;
+            $nonItem->id = '';
+            $nonItem->nombre = '- ' . 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);
+        }
+    }
+
+    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;
+            
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                'menu' => $menu,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function menuItemsFacturas()
+    {
+        if ($this->request->isAJAX()) {
+            $menu = $this->model->getMenuItemsFacturas();
+            
+            $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/ServicioCliente.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+
+use App\Controllers\BaseController;
+use App\Models\Configuracion\ServicioClienteModel;
+use CodeIgniter\HTTP\Response;
+use Hermawan\DataTables\DataTable;
+use CodeIgniter\I18n\Time;
+
+class ServicioCliente extends BaseController
+{
+
+    protected ServicioClienteModel $servicioClienteModel;
+    protected $format = 'json';
+    protected array $viewData = [];
+
+
+    protected static $viewPath = 'themes/vuexy/form/configuracion/servicios_cliente/';
+    protected static $controllerSlug = "servicios";
+    protected $indexRoute = 'viewServicioCliente';
+    protected $editRoute = 'ServicioClienteEdit';
+
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+        $this->servicioClienteModel = model(ServicioClienteModel::class);
+    }
+
+
+    public function index()
+    {
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_servicios_cliente"), 'route' => site_url('configuracion/servicios'), 'active' => true]
+        ];
+        return view(static::$viewPath . $this->indexRoute, $this->viewData);
+    }
+    public function viewForm(int $servicio_cliente_id)
+    {
+        $servicioCliente = $this->servicioClienteModel->find($servicio_cliente_id);
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_servicios_cliente"), 'route' => site_url('configuracion/servicios'), 'active' => false],
+            ['title' => $servicioCliente->nombre, 'route' => site_url('configuracion/servicios/edit/' . $servicio_cliente_id), 'active' => true]
+        ];
+        $this->viewData["model"] = $servicioCliente;
+
+        return view(static::$viewPath . 'ServicioClienteEdit', $this->viewData);
+    }
+    public function show(int $id)
+    {
+        $data = $this->servicioClienteModel->find($id)->withAllTarifas();
+        return $this->response->setJSON($data);
+    }
+    public function update_servicio_cliente(int $id)
+    {
+        $data = $this->request->getPost();
+        $status = $this->servicioClienteModel->update($id, [
+            "nombre" => $data["nombre"],
+            "code" => $data["code"]
+        ]);
+        if (isset($data["tarifa_manipulado_id"])) {
+            $this->servicioClienteModel->upsertTarifaManipulado($id, $data["tarifa_manipulado_id"]);
+        }else if(isset($data["tarifa_acabado_id"])) {
+            
+            $this->servicioClienteModel->upsertTarifaAcabado($id, $data["tarifa_acabado_id"]);
+        }else{
+            $this->servicioClienteModel->detachTarifas($id);
+        }
+  
+        return $this->response->setJSON(["message" => lang("App.global_success"), "status" => $status]);
+    }
+    public function store()
+    {
+        // $this->servicioClienteModel->update($id,[$this->request->getPost()]);
+        return $this->response->setJSON([]);
+    }
+    public function datatable()
+    {
+        $query = $this->servicioClienteModel->getQueryDatatable()->orderBy("created_at", "DESC");
+        return DataTable::of($query)
+            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
+            ->add("action", fn($q) => $q->id)
+            ->toJson(true);
+    }
+}

ci4/app/Controllers/Configuracion/Ubicaciones.php

@@ -0,0 +1,257 @@
+<?php namespace App\Controllers\Configuracion;
+
+use App\Controllers\BaseResourceController;
+use App\Models\Collection;
+use App\Entities\Configuracion\UbicacionesEntity;
+use App\Models\Configuracion\UbicacionesModel;
+
+class Ubicaciones extends BaseResourceController
+{
+
+    protected $modelName = UbicacionesModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectName = 'Ubicaciones';
+    protected static $singularObjectNameCc = 'ubicaciones';
+    protected static $pluralObjectName = 'Ubicaciones';
+    protected static $pluralObjectNameCc = 'ubicaciones';
+
+    protected static $controllerSlug = 'ubicaciones';
+
+    protected static $viewPath = 'themes/vuexy/form/configuracion/ubicaciones/';
+
+    protected $indexRoute = 'ubicacionesList';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('Ubicaciones.moduleTitle');
+        $this->viewData['usingSweetAlert'] = true;
+
+        // Breadcrumbs (IMN)
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_ubicaciones"), 'route' => route_to('ubicacionesList'), 'active' => true]
+        ];
+
+        parent::initController($request, $response, $logger);
+    }
+
+
+    public function index()
+    {
+
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Ubicaciones.pais')]),
+            'ubicacionesEntity' => new UbicacionesEntity(),
+            'usingServerSideDataTable' => true,
+
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . 'viewUbicacionesList', $viewData);
+    }
+
+
+    public function add()
+    {
+        if ($this->request->getPost()) :
+
+            $postData = $this->request->getPost();
+
+            $sanitizedData = $this->sanitized($postData, true);
+
+            $noException = true;
+            if ($successfulResult = $this->canValidate()) :
+
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [lang('Basic.global.record')]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+                endif;
+
+                $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
+            endif;
+            if ($noException && $successfulResult) :
+
+                $id = $this->model->db->insertID();
+
+                $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
+
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                    else:
+                        return $this->redirect2listView('sweet-success', $message);
+                    endif;
+                else:
+                    $this->session->setFlashData('sweet-success', $message);
+                endif;
+
+            endif; // $noException && $successfulResult
+
+        endif; // ($requestMethod === 'post')
+
+        $this->viewData['ubicacionesEntity'] = isset($sanitizedData) ? new UbicacionesEntity($sanitizedData) : new UbicacionesEntity();
+        $this->viewData['formAction'] = route_to('ubicacionesAdd');
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Ubicaciones.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
+
+
+        return $this->displayForm(__METHOD__);
+    } // end function add()
+
+    public function edit($requestedId = null)
+    {
+
+        if ($requestedId == null) :
+            return $this->redirect2listView();
+        endif;
+        $id = filter_var($requestedId, FILTER_SANITIZE_URL);
+        $ubicacionesEntity = $this->model->find($id);
+
+        if ($ubicacionesEntity == false) :
+            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Ubicaciones.moduleTitle')), $id]);
+            return $this->redirect2listView('sweet-error', $message);
+        endif;
+
+        if ($this->request->getPost()) :
+
+            $postData = $this->request->getPost();
+
+            $sanitizedData = $this->sanitized($postData, true);
+            if ($this->request->getPost('show_erp') == null) {
+                $sanitizedData['show_erp'] = false;
+            }
+
+            $noException = true;
+            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Ubicaciones.moduleTitle'))]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                endif;
+
+                $ubicacionesEntity->fill($sanitizedData);
+                $thenRedirect = false;
+            endif;
+            if ($noException && $successfulResult) :
+                $id = $ubicacionesEntity->id ?? $id;
+                $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                    else:
+                        return $this->redirect2listView('sweet-success', $message);
+                    endif;
+                else:
+                    $this->session->setFlashData('sweet-success', $message);
+                endif;
+
+            endif; // $noException && $successfulResult
+        endif; // ($requestMethod === 'post')
+
+        $this->viewData['ubicacionesEntity'] = $ubicacionesEntity;
+        $this->viewData['formAction'] = route_to('ubicacionesEdit', $id);
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Ubicaciones.moduleTitle') . ' ' . lang('Basic.global.edit3');
+
+        return $this->displayForm(__METHOD__, $id);
+    } // end function edit(...)
+
+
+    public function datatable()
+    {
+        if ($this->request->isAJAX()) {
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 1;
+            $order = UbicacionesModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+            $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResource()->countAllResults(),
+                $this->model->getResource($search)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function allItemsSelect()
+    {
+        if ($this->request->isAJAX()) {
+            $onlyActiveOnes = true;
+            $reqVal = $this->request->getPost('val') ?? 'id';
+            $menu = $this->model->getAllForMenu($reqVal . ', nombre', 'nombre', $onlyActiveOnes, false);
+            $nonItem = new \stdClass;
+            $nonItem->id = '';
+            $nonItem->nombre = '- ' . 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);
+        }
+    }
+
+    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/Users.php

@@ -1,22 +1,26 @@
-<?php  namespace App\Controllers\Configuracion;
-
+<?php namespace App\Controllers\Configuracion;
 
 use App\Entities\Usuarios\UserEntity;
-
+use App\Models\Chat\ChatDeparmentModel;
+use App\Models\Chat\ChatDeparmentUserModel;
 use App\Models\Usuarios\GroupModel;
 
 use App\Models\UserModel;
 use App\Models\Usuarios\GroupsUsersModel;
 use CodeIgniter\Shield\Entities\User;
+use function PHPUnit\Framework\isNull;
 
-class Users extends \App\Controllers\GoBaseController { 
+class Users extends \App\Controllers\GoBaseController
+{
 
     private $group_model;
     private $group_user_model;
     private $user_model;
+    private ChatDeparmentModel $chat_department_model;
+    private ChatDeparmentUserModel $chat_department_user_model;
 
 
-	use \CodeIgniter\API\ResponseTrait;
+    use \CodeIgniter\API\ResponseTrait;
 
     protected static $primaryModelName = 'App\Models\UserModel';
 
@@ -29,13 +33,16 @@ class Users extends \App\Controllers\GoBaseController {
 
     protected $indexRoute = 'userList';
 
-    
 
-    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) {
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
 
         $this->group_model = new GroupModel();
         $this->group_user_model = new GroupsUsersModel();
         $this->user_model = new UserModel();
+        $this->chat_department_model = model(ChatDeparmentModel::class);
+        $this->chat_department_user_model = model(ChatDeparmentUserModel::class);
+
 
         $this->viewData['pageTitle'] = lang('Users.moduleTitle');
 
@@ -46,71 +53,108 @@ class Users extends \App\Controllers\GoBaseController {
         ];
 
         parent::initController($request, $response, $logger);
-        
+
     }
 
-    public function index() {
-        
+    public function index()
+    {
         $this->viewData['usingClientSideDataTable'] = true;
-		$this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Users.user')]);
+        $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Users.user')]);
         $this->viewData['user_model'] = $this->user_model;
+        $this->viewData['userList2'] = auth()->getProvider()->findAll();
 
         parent::index();
-
     }
 
-    public function add() {
+    public function add()
+    {
 
         if ($this->request->getPost()) :
 
             $postData = $this->request->getPost();
 
-            $currentGroups = $postData['group']??[];
-            unset($postData['group']);
+            // Obtener contraseña nueva si se ha introducido en texto plano
+            if (empty($postData['new_pwd'])) {
+                $postData['password'] = 'Safekat2024';  // Contraseña por defecto
+            } else {
+                $postData['password'] = $postData['new_pwd'];
+            }
 
-			$sanitizedData = $this->sanitized($postData, true);
+            // Obtener los grupos a los que pertenece
+            $currentGroups = $postData['group'] ?? [];
+            $chatDepartments = $postData['chatDepartments'] ?? [];
+            unset($postData['group']);
+            unset($postData['chatDepartments']);
+
+            // Marcar el username como NULL
+            $sanitizedData = $this->sanitized($postData, true);
 
             $noException = true;
 
+            // Obtener proveedor de usuarios
             $users = auth()->getProvider();
 
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()) :
+                if ($this->canValidate()) :
+                    try {
 
-				if ($this->canValidate()) :
-					try {
+                        // The Email is unique
+                        if ($this->user_model->isEmailUnique($sanitizedData['email'])) {
 
-                        $user = new User([
-                            'username' => strstr($sanitizedData['email'], '@', true),
-                            'email'    => $sanitizedData['email'],
-                            'password' => 'Safekat2024',
-                        ]);
-                        $users->save($user);
-						$successfulResult = true;   // Hacked
-					} catch (\Exception $e) {
-						$noException = false;
-						$this->dealWithException($e);
-					}
-				else:
-					$this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Users.user'))]);
+                            // Crear el usuario si pasa la validación
+                            $user = new \CodeIgniter\Shield\Entities\User([
+                                'username' => null, // If you don't have a username, be sure to set the value to null anyway, so that it passes CodeIgniter's empty data check
+                                'first_name' => $sanitizedData['first_name'],
+                                'last_name' => $sanitizedData['last_name'],
+                                'cliente_id' => $sanitizedData['cliente_id'],
+                                'comments' => $sanitizedData['comments'],
+                                'email' => $sanitizedData['email'],
+                                'password' => $sanitizedData['password'],
+                                'status' => $sanitizedData['status'] ?? 0,
+                                'active' => $sanitizedData['active'] ?? 0,
+                            ]);
+                            // Add the user to the system
+                            $users->save($user);
+                            $successfulResult = true;   // Hacked
+
+                        } // Email is not unique!
+                        else {
+                            $this->viewData['errorMessage'] = "El correo '". $sanitizedData['email'] ."' ya está registrado en el sistema";
+                            $this->session->setFlashdata('formErrors', $this->model->errors());
+                            $successfulResult = false;   // Hacked
+                        }
+
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->viewData['errorMessage'] = $e->getMessage();
+                    }
+                else:
+                    $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Users.user'))]);
                     $this->session->setFlashdata('formErrors', $this->model->errors());
-				endif;
-            
-            $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
+                endif;
+                $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
             endif;
+
             if ($noException && $successfulResult) :
 
                 $id = $users->getInsertID();
-                $this->group_user_model->where('user_id', $user->id)->delete();
-                foreach($currentGroups as $group){
+                $this->group_user_model->where('user_id', $id)->delete();
+                foreach ($currentGroups as $group) {
                     $group_user_data = [
-                        'user_id' => $user->id,
+                        '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([
+                        "user_id" => $id,
+                        "chat_department_id" => $this->chat_department_model->where("name", $chatDepartment)->first()["id"]
+                    ]);
+                }
 
-                $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('Users.user'))]) . 'Downloads';
-                $message .= anchor(route_to('editUser', $id), lang('Basic.global.continueEditing').'?');
+                $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('Users.user'))]) . '.';
                 $message = ucfirst(str_replace("'", "\'", $message));
 
                 if ($thenRedirect) :
@@ -128,75 +172,104 @@ class Users extends \App\Controllers\GoBaseController {
         endif; // ($requestMethod === 'post')
 
         $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['boxTitle'] = lang('Basic.global.addNew') .lang('Users.user').' '.lang('Basic.global.addNewSuffix');
-        
+        $this->viewData['chatDepartments'] = $this->chat_department_model->findAll();
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Users.user') . ' ' . lang('Basic.global.addNewSuffix');
+
 
         return $this->displayForm(__METHOD__);
     } // end function add()
 
-    public function edit($requestedId = null) {
-        
-        if ($requestedId == null) :
+    public function edit($requestedId = null)
+    {
+        if ($requestedId == null) {
             return $this->redirect2listView();
-        endif;
+        }
 
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
-        $user = $this->model->find($id);
+        $users = auth()->getProvider();
+        $user = $users->findById($id);
 
         if ($user == false) :
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Users.user')), $id]);
             return $this->redirect2listView('errorMessage', $message);
         endif;
-        
 
         if ($this->request->getPost()) :
 
             $postData = $this->request->getPost();
 
-            $currentGroups = $postData['group'];
+            $currentGroups = $postData['group'] ?? [];
+            $chatDepartments = $postData['chatDepartments'] ?? [];
+
             unset($postData['group']);
+            unset($postData['chatDepartments']);
+
+            // Obtener contraseña nueva si se ha introducido en texto plano
+            if (!empty($postData['new_pwd'])) {
+                $postData['password'] = $postData['new_pwd'];
+            }
+
             $sanitizedData = $this->sanitized($postData, true);
 
-            if ($this->request->getPost('status') == 0 ) {
+            if ($this->request->getPost('status') == 0) {
                 $sanitizedData['status'] = null;
             }
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()) :
 
-            	if ($this->canValidate()) :
-            	    try {
-            	        $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
-            	    } catch (\Exception $e) {
-            	        $noException = false;
-            	        $this->dealWithException($e);
-            	    }
-            	else:
-            	    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Users.user'))]);
-            	    $this->session->setFlashdata('formErrors', $this->model->errors());
-            	
-            	endif;
+                if ($this->canValidate()) :
+                    try {
 
-            	$user->fill($sanitizedData);
-            	$thenRedirect = false;
+                        if (in_array('cliente-editor', $currentGroups) || in_array('cliente-administrador', $currentGroups)) {
+                            if (!array_key_exists('cliente_id', $sanitizedData) || is_null($sanitizedData['cliente_id'])) {
+                                $this->viewData['errorMessage'] = lang('Users.errors.cliente_sin_clienteID');
+                                $this->session->setFlashdata('formErrors', $this->model->errors());
+                                $successfulResult = false;
+                            } else {
+                                $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                            }
+                        } else {
+                            $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                        }
+
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Users.user'))]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                endif;
+
+                $user->fill($sanitizedData);
+                $users->save($user);
+                $thenRedirect = false;
 
             endif;
             if ($noException && $successfulResult) :
 
                 $this->group_user_model->where('user_id', $user->id)->delete();
-                foreach($currentGroups as $group){
+                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([
+                        "user_id" => $id,
+                        "chat_department_id" => $this->chat_department_model->where("name", $chatDepartment)->first()->id
+                    ]);
+                }
                 $id = $user->id ?? $id;
-                $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('Users.user'))]) . 'Downloads';
-                $message .= anchor(route_to('editUser', $id), lang('Basic.global.continueEditing').'?');
+                $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('Users.user'))]) . '.';
                 $message = ucfirst(str_replace("'", "\'", $message));
 
                 if ($thenRedirect) :
@@ -208,21 +281,25 @@ class Users extends \App\Controllers\GoBaseController {
                 else:
                     $this->session->setFlashData('sweet-success', $message);
                 endif;
-        
+
             endif; // $noException && $successfulResult
         endif; // ($requestMethod === 'post')
 
         $this->viewData['user'] = $user;
+        $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['boxTitle'] = lang('Basic.global.edit2') .lang('Users.user').' '.lang('Basic.global.edit3');
+        $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');
 
         return $this->displayForm(__METHOD__, $id);
     } // end function edit(...)
 
 
-    public function delete($requestedId = null, bool $deletePermanently = true) {
+    public function delete($requestedId = null, bool $deletePermanently = true)
+    {
 
         if ($requestedId == null) :
             return $this->redirect2listView();
@@ -237,26 +314,25 @@ class Users extends \App\Controllers\GoBaseController {
         endif;
 
         $users = auth()->getProvider();
-        $users->delete($user->id, $deletePermanently);
+        $users->delete($user->id, true);
 
         $message = "Usuario eliminado correctamente";
         return $this->redirect2listView('successMessage', $message);
 
 
-
     } // end function delete(...)
-    
-    
 
-    public function allItemsSelect() {
+
+    public function allItemsSelect()
+    {
         if ($this->request->isAJAX()) {
             $onlyActiveOnes = true;
             $reqVal = $this->request->getPost('val') ?? 'id_user';
-            $menu = $this->model->getAllForMenu($reqVal.', first_name', 'first_name', $onlyActiveOnes, false);
+            $menu = $this->model->getAllForMenu($reqVal . ', first_name', 'first_name', $onlyActiveOnes, false);
             $nonItem = new \stdClass;
             $nonItem->id_user = '';
-            $nonItem->first_name = '- '.lang('Basic.global.None').' -';
-            array_unshift($menu , $nonItem);
+            $nonItem->first_name = '- ' . lang('Basic.global.None') . ' -';
+            array_unshift($menu, $nonItem);
 
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
@@ -269,8 +345,9 @@ class Users extends \App\Controllers\GoBaseController {
             return $this->failUnauthorized('Invalid request', 403);
         }
     }
-    
-    public function menuItems() {
+
+    public function menuItems()
+    {
         if ($this->request->isAJAX()) {
             $searchStr = goSanitize($this->request->getPost('searchTerm'))[0];
             $reqId = goSanitize($this->request->getPost('id'))[0];
@@ -281,8 +358,8 @@ class Users extends \App\Controllers\GoBaseController {
             $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
             $nonItem = new \stdClass;
             $nonItem->id = '';
-            $nonItem->text = '- '.lang('Basic.global.None').' -';
-            array_unshift($menu , $nonItem);
+            $nonItem->text = '- ' . lang('Basic.global.None') . ' -';
+            array_unshift($menu, $nonItem);
 
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
@@ -296,14 +373,40 @@ class Users extends \App\Controllers\GoBaseController {
         }
     }
 
-    
-    protected function getPaisListItems() { 
-		$data = [''=>lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Pais.pais'))])];
+    public function getMenuComerciales()
+    {
+        if ($this->request->isAJAX()) {
+            $comerciales = $this->model->getComerciales();
+
+            return $this->respond($comerciales);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    protected function getPaisListItems()
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Pais.pais'))])];
         $paisModel = model('App\Models\Configuracion\PaisModel');
 
         $registers = $paisModel->findAll();
 
-		return $registers;
-	}
-        
+        return $registers;
+    }
+
+    protected function getClienteListItems($selId = null)
+    {
+        $data = ['' => ""];
+        if (!empty($selId)) :
+            $clienteModel = model('App\Models\Clientes\ClienteModel');
+
+            $selOption = $clienteModel->where('id', $selId)->findColumn('nombre');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
 }

ci4/app/Controllers/Excel/PrintGiros.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Controllers\Excel;
+
+use App\Controllers\BaseController;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+
+class PrintGiros extends BaseController
+{
+    public function generateExcel($factura_id = null)
+    {
+        // AQUI CREAR LAS CONSULTAS A LA BBDD, QUIZAS HAYA QUE CREARLO O COMO POST O COMO QUERY AJAX
+
+        // Crear un nuevo Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+
+        // Especificar encabezados
+        $headers = [
+            'BIC (SWIFT)*',
+            'FECHA FIRMA MANDATO*',
+            'IBAN*',
+            'IMPORTE*',
+            'NOMBRE*',
+            'PAIS*',
+            'REFERENCIA DEL ADEUDO (REFADEUDO)*',
+            'REFERENCIA*',
+            'REFERENCIA DEL MANDATO (REMANDATO)*',
+            'RESIDENTE*',
+            'TIPO DE ADEUDO*',
+            'FECHA DE COBRO*',
+            'DIAS*'
+        ];
+
+        // Establecer los encabezados en la primera fila
+        $column = 'A';
+        foreach ($headers as $header) {
+            $sheet->setCellValue($column . '1', $header);
+            $column++;
+        }
+
+        // Generar datos dummy
+        $dummyData = [
+            ['ABCDEF12', '2024-01-01', 'ES1234567890123456789012', 100.50, 'John Doe', 'Spain', 'REF001', '12345', 'MAND001', 'Yes', 'Type1', '2024-02-01', 30],
+            ['GHIJKL34', '2024-02-01', 'ES9876543210987654321098', 200.75, 'Jane Smith', 'France', 'REF002', '67890', 'MAND002', 'No', 'Type2', '2024-03-01', 60],
+            // Añade más datos dummy según sea necesario
+        ];
+
+        // Rellenar las filas con datos dummy
+        $rowNumber = 2; // Empezar en la segunda fila
+        foreach ($dummyData as $row) {
+            $column = 'A';
+            foreach ($row as $cell) {
+                $sheet->setCellValue($column . $rowNumber, $cell);
+                $column++;
+            }
+            $rowNumber++;
+        }
+
+        // Ajustar automáticamente el tamaño de las columnas
+        foreach (range('A', $column) as $col) {
+            $sheet->getColumnDimension($col)->setAutoSize(true);
+        }
+
+        // Crear un escritor para guardar el archivo
+        $writer = new Xlsx($spreadsheet);
+
+        // Configurar la respuesta para descarga
+        $fileName = 'giros_reporte.xlsx';
+        header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        header('Content-Disposition: attachment;filename="' . $fileName . '"');
+        header('Cache-Control: max-age=0');
+
+        // Escribir el archivo a la salida
+        $writer->save('php://output');
+        exit;
+
+    }
+
+}

ci4/app/Controllers/Excel/PrintLineas.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Controllers\Excel;
+
+use App\Controllers\BaseController;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+
+class PrintLineas extends BaseController
+{
+    public function generateExcel($factura_id = null)
+    {
+
+        // Modelos
+        $lineasFacturaModel = model('App\Models\Facturas\FacturaLineaModel');
+        $infoLineasFactura = $lineasFacturaModel->getResourceForExcel($factura_id)->get()->getResultObject();
+
+
+        // Crear un nuevo Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+
+        // Especificar encabezados
+        $headers = [
+            'Factura',
+            'ID Pedido',
+            'Ref. Cliente',
+            'Base'
+        ];
+
+        // Establecer los encabezados en la primera fila
+        $column = 'A';
+        foreach ($headers as $header) {
+            $sheet->setCellValue($column . '1', $header);
+            $column++;
+        }
+
+        // Rellenar las filas con datos
+        $rowNumber = 2; // Empezar en la segunda fila
+        foreach ($infoLineasFactura as $infoLineaFactura) {
+            $column = 'A';
+            foreach ($infoLineaFactura as $cell) {
+                $sheet->setCellValue($column . $rowNumber, $cell);
+                $column++;
+            }
+            $rowNumber++;
+        }
+
+        // Ajustar automáticamente el tamaño de las columnas
+        foreach (range('A', $column) as $col) {
+            $sheet->getColumnDimension($col)->setAutoSize(true);
+        }
+
+        // Crear un escritor para guardar el archivo
+        $writer = new Xlsx($spreadsheet);
+
+        // Configurar la respuesta para descarga
+        $fileName = 'lineas-pedido.xlsx';
+        header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        header('Content-Disposition: attachment;filename="' . $fileName . '"');
+        header('Cache-Control: max-age=0');
+
+        // Escribir el archivo a la salida
+        $writer->save('php://output');
+        exit;
+
+    }
+
+}

ci4/app/Controllers/Facturacion/Albaran.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Controllers\Facturacion;
-use App\Controllers\BaseController;
-
-
-class Albaran extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Albaran';
-    } 
-
-    public function delete()
-    {
-
-    }
-
-    public function export()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Facturacion/Factura.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Controllers\Facturacion;
-use App\Controllers\BaseController;
-
-
-class Factura extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Facturas';
-    }
-
-    public function nueva()
-    {
-        echo 'Nueva Factura';
-    }
-
-    public function vencimiento()
-    {
-        echo 'Vencimiento Factura';
-    }
-
-
-    public function delete()
-    {
-
-    }
-
-    public function export()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Facturacion/Facturas.php

@@ -0,0 +1,719 @@
+<?php
+
+namespace App\Controllers\Facturacion;
+
+use App\Models\Facturas\FacturaModel;
+use App\Entities\Facturas\FacturaEntity;
+use App\Models\Clientes\ClienteModel;
+use App\Models\Collection;
+
+
+class Facturas extends \App\Controllers\BaseResourceController
+{
+    protected $modelName = FacturaModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectNameCc = 'factura';
+    protected static $singularObjectName = 'Factura';
+    protected static $pluralObjectName = 'Facturas';
+    protected static $controllerSlug = 'factura';
+
+    protected static $viewPath = 'themes/vuexy/form/facturas/';
+
+    protected $indexRoute = 'facturaList';
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('Facturas.facturas');
+        // Se indica que este controlador trabaja con soft_delete
+        
+        $this->viewData = ['usingServerSideDataTable' => true];
+        
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_facturas"), 'route' => "javascript:void(0);", 'active' => false],
+        ];
+
+        parent::initController($request, $response, $logger);
+
+    }
+
+    public function index()
+    {
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = 0;
+        }
+
+        $this->viewData['cliente_id'] = $clienteId;
+
+        $this->viewData['usingClientSideDataTable'] = true;
+
+        $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tarifaextra.tarifaextra')]);
+        parent::index();
+    }
+
+    
+    public function list()
+    {
+        
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Facturas.facturas')]),
+            'usingServerSideDataTable' => true,
+            'pageTitle' => lang('Facturas.facturas'),
+            ['title' => lang("App.menu_facturas"), 'route' => site_url('facturas/list'), 'active' => true]
+        ];
+
+        $viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_facturas"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("Facturas.facturaList"), 'route' => "javascript:void(0);", 'active' => true]
+        ];
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = 0;
+        }
+
+        $viewData['cliente_id'] = $clienteId;
+
+        return view(static::$viewPath . 'viewFacturasList', $viewData);
+    }
+
+
+    public function add()
+    {
+        if ($this->request->getPost()) :
+
+            $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+            $postData = $this->request->getPost();
+
+            $noException = true;
+            $allData =  true;
+
+            if( !isset($postData['cliente_id']) || !isset($postData['serie_id']) ) {
+
+                $this->viewData['errorMessage'] = lang('Facturas.errors.requiredFields');
+                $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                $allData = false;
+                $noException = false;
+            }
+
+            try {
+                $clienteModel = model('App\Models\Clientes\ClienteModel');
+                $datosCliente = $clienteModel->getClienteDataFacturas($postData['cliente_id']);
+                if(count($datosCliente)>0){
+                // add array data datosCliente to postData
+                    $postData = array_merge($postData, $datosCliente[0]);
+                }
+            } catch (\Exception $e) {
+                $noException = false;
+                $this->dealWithException($e);
+            }
+
+            
+            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+
+            $sanitizedData['user_updated_id'] = auth()->user()->id;
+            $sanitizedData['user_created_id'] = auth()->user()->id;
+
+            if(!$sanitizedData['creditoAsegurado']){
+                $sanitizedData['creditoAsegurado'] = 0;
+            }
+            
+            if ($allData && $successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [lang('Basic.global.record')]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+                endif;
+
+            endif;
+            if ($noException && $successfulResult) :
+
+                $id = $this->model->db->insertID();
+
+                $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
+
+                return redirect()->to(route_to('editarFactura', $id))->with('sweet-success', $message);
+                
+                
+            endif; // $noException && $successfulResult
+
+        endif; // ($requestMethod === 'post')
+
+        $this->viewData['factura'] = isset($sanitizedData) ? new FacturaEntity($sanitizedData) : new FacturaEntity();
+
+        $this->viewData['formAction'] = route_to('createFactura');
+
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Facturas.facturas') . ' ' . lang('Basic.global.addNewSuffix');
+
+
+        helper('form');
+
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_facturas"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("Facturas.facturaList"), 'route' => route_to('facturasList'), 'active' => true]
+        ];
+        
+        $this->viewData['usingSelect2'] = true;
+
+        $validation = \Config\Services::validation();
+
+        $this->viewData['validation'] = $validation;
+
+        $viewFilePath = static::$viewPath . 'viewAddFactura';
+
+        return view($viewFilePath, $this->viewData);
+    } // end function add()
+
+
+    public function edit($id=null){
+        
+        if ($id == null) :
+            return $this->redirect2listView();
+        endif;
+        $id = filter_var($id, FILTER_SANITIZE_URL);
+        $factura = $this->model->find($id);
+
+        if ($factura == false) :
+            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Facturas.factura')), $id]);
+            return $this->redirect2listView('sweet-error', $message);
+        endif;
+        
+
+        $this->obtenerDatosFormulario($factura);
+
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_facturas"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("Facturas.facturaList"), 'route' => route_to('facturasList'), 'active' => true]
+        ];
+
+        $this->viewData['facturaEntity'] = $factura;
+
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Facturas.factura') . ' ' . lang('Basic.global.edit3');
+
+        return $this->displayForm(__METHOD__, $id);
+    }
+
+    public function datatable(){
+
+        if ($this->request->isAJAX()) {
+
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
+            $order = FacturaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+            $cliente_id = $reqData['cliente_id'] ?? -1;
+
+            $resourceData = $this->model->getResource($search, $cliente_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResource("", $cliente_id)->countAllResults(),
+                $this->model->getResource($search, $cliente_id)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function datatablePedidos(){
+
+        if ($this->request->isAJAX()) {
+
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
+            $order = FacturaModel::SORTABLE_PEDIDOS[$requestedOrder >= 0 ? $requestedOrder : 0];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+            $pedido_id = $reqData['pedido_id'] ?? 0;
+
+            $resourceData = $this->model->getResourcePedidos($pedido_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResourcePedidos($pedido_id)->countAllResults(),
+                $this->model->getResourcePedidos($pedido_id)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function update($id = null){
+
+        if ($this->request->isAJAX()) {
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            if ($id == null) :
+                $data = [
+                    'error' => 2,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+            $id = filter_var($id, FILTER_SANITIZE_URL);
+            $facturaEntity = $this->model->find($id);
+
+            if ($facturaEntity == false) :
+                $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Factura.factura')), $id]);
+                $data = [
+                    'error' => $message,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+
+            if ($this->request->getPost()) :
+
+                $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+                $postData = $this->request->getPost();
+
+                $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+                
+                // JJO
+                $sanitizedData['user_updated_id'] = auth()->user()->id;
+
+                $noException = true;
+                if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+                    if ($this->canValidate()) :
+                        try {
+                            $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                        } catch (\Exception $e) {
+                            $noException = false;
+                            $this->dealWithException($e);
+                        }
+                    else:
+                        $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Facturas.factura'))]);
+                        $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                    endif;
+
+                    $facturaEntity->fill($sanitizedData);
+
+                endif;
+                if ($noException && $successfulResult) :
+                    $id = $facturaEntity->id ?? $id;
+                    $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                    $data = [
+                        'error' => 0,
+                        $csrfTokenName => $newTokenHash
+                    ];
+                    return $this->respond($data);
+
+                endif; // $noException && $successfulResult
+            endif; // ($requestMethod === 'post')
+
+            $data = [
+                'error' => 1,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function menuPedidosPendientes($cliente_id){
+
+        if ($this->request->isAJAX()) {
+            $model = model('\App\Models\Pedidos\PedidoLineaModel');
+            
+            $pedidos = [];
+            try{
+                $pedidos = $model->obtenerLineasPedidoSinFacturar($cliente_id);
+            }
+            catch(Exception $e){
+                
+            }
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                'menu' => $pedidos,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function duplicate($factura_id = 0){
+        if($this->request->isAJAX()){
+
+            $factura_origen = $this->model->find($factura_id);
+            // se quita la key "id" del objeto
+            unset($factura_origen->id);
+            $factura_origen->estado = 'borrador';
+            $factura_origen->estado_pago = 'pendiente';
+            $factura_origen->base = 0;
+            $factura_origen->total = 0;
+            $factura_origen->pendiente = 0;
+            $factura_origen->total_pagos = 0;
+            $factura_origen->user_created_id = auth()->user()->id;
+            $factura_origen->user_updated_id = null;
+
+            $this->model->insert($factura_origen);
+            $id = $this->model->getInsertID();
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                'id' => $id,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);            
+
+        }else{
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function updateTotales($factura_id = 0){
+        if($this->request->isAJAX()){
+
+            $postData = $this->request->getPost();
+            
+            $pendiente = $postData['pendiente'] ?? 0;
+            $total = $postData['total'] ?? 0;
+
+            $data = [
+                'base' => $postData['base'] ?? 0,
+                'total' => $total,
+                'pendiente' => $pendiente,
+                'total_pagos' => $postData['total_pagos'] ?? 0,
+                'user_updated_id' => auth()->user()->id,
+                'estado_pago' => (intval($pendiente)==0 && intval($total)!=0) ? 'pagada' : 'pendiente',
+            ];
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data_ret = [
+                $csrfTokenName => $newTokenHash
+            ];
+            
+            if($factura_id == 0){
+                return $this->respond($data_ret);            
+            }
+
+            $data_ret['estado_pago'] = $data['estado_pago'];
+            $model = model('\App\Models\Facturas\FacturaModel');
+            $model->update($factura_id, $data);
+
+            return $this->respond($data_ret);            
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function addExcedentes($factura_id){
+
+        if ($this->request->isAJAX()) {
+            $model_factura_linea = model('\App\Models\Facturas\FacturaLineaModel');
+
+            $postData = $this->request->getPost();
+            $cantidad = $postData['cantidad'] ?? 0;
+            $precio_unidad = $postData['precio_unidad'] ?? 0;
+            $iva = $postData['iva'] ?? 0;
+            $descripcion = $postData['descripcion'] ?? '';
+            $descuento = $postData['descuento'] ?? 0;
+            $pedido_linea_impresion_id = $postData['pedido_linea_impresion_id'] ?? null;
+            $pedido_linea_maquetacion_id = $postData['pedido_linea_maquetacion_id'] ?? null;
+            $pedido_id = $postData['pedido_id'] ?? 0;
+
+            $nuevo_precio_unidad = round($precio_unidad*(100-floatval($descuento))/100, 4);
+            $base = round($cantidad * $nuevo_precio_unidad, 2);
+            $total_iva = round($base * $iva / 100, 2);
+
+            $data = (object)[
+                'factura_id'=>$factura_id,
+                'pedido_linea_impresion_id'=>$pedido_linea_impresion_id,
+                'pedido_linea_maquetacion_id'=>$pedido_linea_maquetacion_id,
+                'descripcion'=>$newString = preg_replace_callback('/Impresión de (\d+) ejemplares/', function ($matches) use ($cantidad) {
+                        return 'Impresión de ' . $cantidad . ' ejemplares';
+                    }, $descripcion),
+                'cantidad'=>$cantidad,
+                'precio_unidad'=> $nuevo_precio_unidad,
+                'iva' => $iva,
+                'base' => $base,
+                'total_iva' => $total_iva,
+                'total' => round($base + $total_iva, 2),
+                'user_updated_id' => auth()->user()->id,
+            ];
+            
+            $model_factura_linea->insert($data);
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data_ret = [
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data_ret);            
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+    
+    public function addLineaPedidoImpresion($factura_id){
+
+        if ($this->request->isAJAX()) {
+            $model_pedido_linea = model('\App\Models\Pedidos\PedidoLineaModel');
+            $model_presupuesto = model('\App\Models\Presupuestos\PresupuestoModel');
+            $model_factura_linea = model('\App\Models\Facturas\FacturaLineaModel');
+            
+            try{
+                $pedido_linea_id = $this->request->getPost('lineaPedido') ?? 0;
+                $linea = $model_pedido_linea->find($pedido_linea_id);
+
+                $factura = $this->model->find($factura_id);
+                
+                if($factura){
+
+                    if($linea){
+                        $presupuesto = $model_presupuesto->find($linea->presupuesto_id);
+
+                        if($presupuesto){
+                            // Se añade la linea de factura
+                            $descripcion = $model_presupuesto->generarLineaPedido($presupuesto->id, true, $linea->pedido_id);
+                            $cantidad = intval($presupuesto->tirada) - intval($this->model->getCantidadLineaPedidoFacturada($linea->id));
+                            $base = $cantidad * floatval($presupuesto->total_precio_unidad);
+                            $base = round($base, 2);
+                            $total_iva = $base * ($presupuesto->iva_reducido==1 ? 0.04 : 0.21);
+                            // se redondea a dos decimales
+                            $total_iva = round($total_iva, 2);
+                            $total = $base + $total_iva;
+
+                            $data = (object)[
+                                'factura_id'=>$factura_id,
+                                'pedido_linea_impresion_id'=>$linea->pedido_id,
+                                'descripcion'=>$descripcion[0]->concepto,
+                                'cantidad'=>$cantidad,
+                                'precio_unidad'=>$presupuesto->total_precio_unidad,
+                                'iva' => $presupuesto->iva_reducido==1 ? 4 : 21,
+                                'base' => $base,
+                                'total_iva' => $total_iva,
+                                'total' => $total,
+                                'user_updated_id' => auth()->user()->id,
+                            ];
+
+                            $model_factura_linea->insert($data);
+
+                            $id = $model_factura_linea->getInsertID();
+
+                            if($id){
+
+                                $model_factura_linea->addFacturaPedidoLinea($factura_id, $linea->id, $cantidad);
+                                
+                                $newTokenHash = csrf_hash();
+                                $csrfTokenName = csrf_token();
+                                $data = [
+                                    'error' => 0,
+                                    'id' => $id,
+                                    $csrfTokenName => $newTokenHash
+                                ];
+                                return $this->respond($data);
+                            }
+                        }
+                    }
+                }
+            }
+            catch(Exception $e){
+                
+            }
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function deleteLineaPedidoImpresion(){
+
+        if ($this->request->isAJAX()) {
+
+            $postData = $this->request->getPost();
+            $factura_id = $postData['factura_id'] ?? 0;
+            $linea_id = $postData['linea_id'] ?? 0;
+            $cantidad = $postData['cantidad'] ?? 0;
+
+            $model_factura_linea = model('\App\Models\Facturas\FacturaLineaModel');
+            $model_factura_linea->deleteFacturasLineasPedido($factura_id, $linea_id, $cantidad);
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+    
+
+    public function validar($factura_id){
+
+        if($this->request->isAJAX()){
+
+            $factura = $this->model->find($factura_id);
+
+            if($factura){
+                $model_series = model('\App\Models\Configuracion\SeriesFacturasModel');
+                $numero = $model_series->getSerieNumerada($factura->serie_id);
+
+                $data = [
+                    'estado' => 'validada',
+                    'numero' => $numero,
+                    'user_updated_id' => auth()->user()->id,
+                ];
+
+                if((strpos($numero, "REC ") === 0)){
+                    $data['estado_pago'] = 'pagada';   
+                }
+
+                $this->model->update($factura_id, $data);
+            }
+            
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function updateCabecera($factura_id){
+        
+        if($this->request->isAJAX()){
+            if($factura_id == 0){
+                return;
+            }
+            $factura = $this->model->find($factura_id);
+            if($factura){
+                $postData = $this->request->getPost();
+
+                $dataName = $postData['name'] ?? '';
+                $dataValue = $postData['value'] ?? '';
+
+                if($dataName == 'factura_rectificativa_id'){
+                    // se actualiza la factura donde el campo 'numero' sea igual al valor de $dataValue. El campo a actualizar es 'factura_rectificada_id'
+                    $factura_rectificada = $this->model->where('numero', $dataValue)->first();
+                    if($factura_rectificada){
+                        $data2 = [
+                            'factura_rectificada_id' => $factura->numero,
+                            'user_updated_id' => auth()->user()->id,
+                        ];
+                        $this->model->update($factura_rectificada->id, $data2);
+                    }
+                }
+
+                $data = [
+                    $dataName => $dataValue,
+                    'user_updated_id' => auth()->user()->id,
+                ];
+
+                $this->model->update($factura_id, $data);
+
+                $newTokenHash = csrf_hash();
+                $csrfTokenName = csrf_token();
+                $data = [
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            }
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    /*************************************
+     * FUNCIONES AUXILIARES
+     ************************************/
+
+     private function obtenerDatosFormulario(&$factura){
+        
+        if($factura->estado == 'borrador'){
+            $serieModel = model('App\Models\Configuracion\SeriesFacturasModel');
+            $serie = $serieModel->find($factura->serie_id);
+            if($serie){
+                $factura->numero = str_replace("{numero}", $serie->next, $serie->formato);
+            }
+        }
+
+        $clienteModel = model('App\Models\Clientes\ClienteModel');
+        $cliente = $clienteModel->find($factura->cliente_id);
+        $factura->cliente_alias = $cliente->alias;
+
+        $serieModel = model('App\Models\Configuracion\SeriesFacturasModel');
+        $serie = $serieModel->find($factura->serie_id);
+        $factura->serie_nombre = $serie->nombre;
+
+        $formaPagoModel = model('App\Models\Configuracion\FormaPagoModel');
+        $factura->formas_pago = $formaPagoModel->getMenuItems();
+        
+        $factura->fecha_factura_at_text = $factura->fecha_factura_at ? date('d/m/Y', strtotime($factura->fecha_factura_at)) : '';
+    }
+
+}
+ 

ci4/app/Controllers/Facturacion/FacturasLineas.php

@@ -0,0 +1,228 @@
+<?php
+
+namespace App\Controllers\Facturacion;
+
+use App\Models\Facturas\FacturaLineaModel;
+use App\Models\Collection;
+use DataTables\Editor;
+use DataTables\Editor\Field;
+use DataTables\Editor\Validate;
+
+class FacturasLineas extends \App\Controllers\BaseResourceController
+{
+    protected $modelName = FacturaLineaModel::class;
+    protected $format = 'json';
+
+    protected static $controllerSlug = 'factura-lineas';
+
+
+    public function datatable($factura_id = null){
+
+        if ($this->request->isAJAX() && $factura_id != null) {
+
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
+            //$order = FacturaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+            $resourceData = $this->model->getResource($factura_id)->orderBy(1, $dir)->limit($length, $start)->get()->getResultObject();
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResource($factura_id)->countAllResults(),
+                $this->model->getResource($factura_id)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function deleteLinea($factura_linea_id = 0){
+        
+        if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
+            $objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc));
+        } else {
+            $objName = lang('Basic.global.record');
+        }
+
+        if($factura_linea_id == 0){
+            return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
+        }
+
+        $facturaLinea = $this->model->find($factura_linea_id);
+        if($facturaLinea == null){
+            return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
+        }
+
+        if($facturaLinea->pedido_linea_impresion_id != null){
+            $this->model->deleteFacturasLineasPedido($facturaLinea->factura_id, $facturaLinea->pedido_linea_impresion_id, $facturaLinea->cantidad);    
+        }
+
+        if($facturaLinea->pedido_maquetacion_id != null){
+            //$this->model->deleteFacturasLineasPedido($facturaLinea->factura_id, $facturaLinea->pedido_maquetacion_id, $facturaLinea->cantidad);    
+        }
+        
+        $facturaLinea = $this->model->delete($factura_linea_id);
+        $message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]);
+        $response = $this->respondDeleted(['id' => $factura_linea_id, 'msg' => $message]);
+        return $response;
+    }
+
+
+    public function datatable_editor() {
+        if ($this->request->isAJAX()) {
+
+            include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php");
+
+            // Build our Editor instance and process the data coming from _POST
+            $response = Editor::inst( $db, 'facturas_lineas' )
+                ->fields(
+                    Field::inst( 'id' ),
+                    Field::inst( 'base' ),
+                    Field::inst( 'total_iva' ),
+                    Field::inst( 'total' ),
+                    Field::inst( 'cantidad' )
+                        ->validator('Validate::numeric', array(
+                            'message' => lang('Facturas.validation.numerico'))
+                        )
+                        ->validator('Validate::notEmpty', array(
+                            'message' => lang('Facturas.validation.requerido'))
+                        ),
+                    Field::inst( 'descripcion' ) 
+                        ->validator('Validate::notEmpty', array(
+                        'message' => lang('Facturas.validation.requerido'))
+                        ),
+                    Field::inst( 'precio_unidad' )
+                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
+                        ->validator('Validate::numeric', array(
+                                "decimal" => ',',
+                                'message' => lang('Facturas.validation.decimal'))
+                        )
+                        ->validator('Validate::notEmpty', array(
+                            'message' => lang('Facturas.validation.requerido'))
+                        ),
+                    Field::inst( 'iva' )
+                        ->validator('Validate::numeric', array(
+                            'message' => lang('Facturas.validation.numerico'))
+                        )
+                        ->validator('Validate::notEmpty', array(
+                            'message' => lang('Facturas.validation.requerido'))
+                        ),
+                    Field::inst( 'pedido_linea_impresion_id' )
+                        ->setFormatter(function($val, $data, $opts) {
+                            return $val === '' ? null : $val;
+                        }),
+                    Field::inst( 'factura_id' ),
+                    Field::inst( 'user_updated_id' ),
+                )
+                ->on('preCreate', function ($editor, &$values) {
+                    $totales = $this->generate_totales(
+                        $values['factura_id'], 
+                        $values['pedido_linea_impresion_id'], 
+                        $values['precio_unidad'], 
+                        $values['iva'], 
+                        $values['cantidad'],
+                        $values['old_cantidad']);
+                    $editor
+                        ->field('user_updated_id')
+                        ->setValue(auth()->user()->id);
+                    $editor
+                        ->field('base')
+                        ->setValue($totales['base']);
+                    $editor
+                        ->field('total_iva')
+                        ->setValue($totales['total_iva']);
+                    $editor
+                        ->field('total')
+                        ->setValue($totales['total']);
+                    $editor
+                        ->field('user_updated_id')
+                        ->setValue(auth()->user()->id);
+                })
+                ->on('preEdit', function ($editor, $id, &$values) {
+                    $totales = $this->generate_totales(
+                        $values['factura_id'], 
+                        $values['pedido_linea_impresion_id'], 
+                        $values['precio_unidad'], 
+                        $values['iva'], 
+                        $values['cantidad'],
+                        $values['old_cantidad']);
+                    $editor
+                        ->field('factura_id')
+                        ->setValue($values['factura_id']);
+                    $editor
+                        ->field('pedido_linea_impresion_id')
+                        ->setValue(null);
+                    $editor
+                        ->field('pedido_maquetacion_id')
+                        ->setValue(null);
+                    $editor
+                        ->field('user_updated_id')
+                        ->setValue(auth()->user()->id);
+                    $editor
+                        ->field('base')
+                        ->setValue($totales['base']);
+                    $editor
+                        ->field('total_iva')
+                        ->setValue($totales['total_iva']);
+                    $editor
+                        ->field('total')
+                        ->setValue($totales['total']);
+                })
+                ->debug(true)
+                ->process($_POST)
+                ->data();
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $response[$csrfTokenName] = $newTokenHash;
+
+            echo json_encode($response);
+
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function updateTotalesFactura($factura_id = 0){
+        if($factura_id == 0){
+            return;
+        }
+
+        $model = model('\App\Models\Facturas\FacturaModel');
+        $model->updateTotales($factura_id);
+    }
+
+    private function generate_totales($factura_id, $pedido_linea_id, $precio_unidad, $iva, $cantidad, $old_cantidad)
+    {
+        
+        // si es una linea que se refiere a pedido
+        if ($pedido_linea_id != null && $factura_id != null) {
+            // se actualiza la cantidad de la linea de pedido en la tabla pivote facturas_pedidos_lineas
+            $this->model->updateFacturaPedidoLinea($factura_id, $pedido_linea_id, $old_cantidad, $cantidad);
+        }
+        
+        // se calcula y se actualiza el subtotal, total_iva y total
+        // redondeando a 4 decimales el precio_unidad y a dos el resto
+        $base = round($precio_unidad * $cantidad, 2);
+        $total_iva = round($base * $iva / 100, 2);
+        $total = round($base + $total_iva, 2);
+        $values = [];
+        $values['base'] = $base;
+        $values['total_iva'] = $total_iva;
+        $values['total'] = $total;
+        
+        return $values;
+    }
+}
+

ci4/app/Controllers/Facturacion/FacturasPagos.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Controllers\Facturacion;
+
+use App\Models\Facturas\FacturaPagoModel;
+use App\Models\Collection;
+use DataTables\Editor;
+use DataTables\Editor\Field;
+use DataTables\Editor\Validate;
+use DataTables\Editor\Format;
+
+class FacturasPagos extends \App\Controllers\BaseResourceController
+{
+    protected $modelName = FacturaPagoModel::class;
+    protected $format = 'json';
+
+    protected static $controllerSlug = 'factura-pagos';
+
+
+    public function datatable($factura_id = null){
+
+        if ($this->request->isAJAX() && $factura_id != null) {
+
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
+            //$order = FacturaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+            $resourceData = $this->model->getResource($factura_id)->orderBy(1, $dir)->limit($length, $start)->get()->getResultObject();
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResource($factura_id)->countAllResults(),
+                $this->model->getResource($factura_id)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function datatable_editor() {
+        if ($this->request->isAJAX()) {
+
+            include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php");
+
+            // Build our Editor instance and process the data coming from _POST
+            $response = Editor::inst( $db, 'facturas_pagos' )
+                ->fields(
+                    Field::inst( 'id' ),
+                    Field::inst( 'forma_pago_id' ),
+                    Field::inst( 'notes' ) 
+                        ->validator('Validate::notEmpty', array(
+                        'message' => lang('Facturas.validation.requerido'))
+                        ),
+                    Field::inst( 'fecha_pago_at' )
+                        ->validator( Validate::dateFormat( 'Y-m-d H:i:s' ) )
+                        ->getFormatter( Format::dateSqlToFormat( 'Y-m-d H:i:s' ) )
+                        ->setFormatter( Format::dateFormatToSql( 'Y-m-d H:i:s' ) ),
+                    Field::inst( 'fecha_vencimiento_at' )
+                        ->validator( Validate::dateFormat( 'Y-m-d H:i:s' ) )
+                        ->getFormatter( Format::dateSqlToFormat( 'Y-m-d H:i:s' ) )
+                        ->setFormatter( Format::dateFormatToSql( 'Y-m-d H:i:s' ) ),
+                    Field::inst( 'total' )
+                        ->validator('Validate::numeric', array(
+                            'message' => lang('Facturas.validation.numerico'))
+                        )
+                        ->validator('Validate::notEmpty', array(
+                            'message' => lang('Facturas.validation.requerido'))
+                        ),
+                    Field::inst( 'factura_id' ),
+                    Field::inst( 'user_updated_id' ),
+                )
+                ->on('preCreate', function ($editor, &$values) {
+                    /*
+                    $editor
+                        ->field('user_updated_id')
+                        ->setValue(auth()->user()->id);
+                    $editor
+                        ->field('base')
+                        ->setValue($totales['base']);
+                    $editor
+                        ->field('total_iva')
+                        ->setValue($totales['total_iva']);
+                    $editor
+                        ->field('total')
+                        ->setValue($totales['total']);
+                    $editor
+                        ->field('user_updated_id')
+                        ->setValue(auth()->user()->id);
+                        */
+                })
+                ->on('preEdit', function ($editor, $id, &$values) {
+                    /*
+                    $editor
+                        ->field('factura_id')
+                        ->setValue($values['factura_id']);
+                    $editor
+                        ->field('pedido_linea_impresion_id')
+                        ->setValue(null);
+                    $editor
+                        ->field('pedido_maquetacion_id')
+                        ->setValue(null);
+                    $editor
+                        ->field('user_updated_id')
+                        ->setValue(auth()->user()->id);
+                    $editor
+                        ->field('base')
+                        ->setValue($totales['base']);
+                    $editor
+                        ->field('total_iva')
+                        ->setValue($totales['total_iva']);
+                    $editor
+                        ->field('total')
+                        ->setValue($totales['total']);
+                        */
+                })
+                ->debug(true)
+                ->process($_POST)
+                ->data();
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $response[$csrfTokenName] = $newTokenHash;
+
+            echo json_encode($response);
+
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+}

ci4/app/Controllers/GoBaseController.php

@@ -139,7 +139,7 @@ abstract class GoBaseController extends Controller {
      *
      * @var array
      */
-    protected $helpers = ['session', 'go_common', 'text', 'general','jwt']; //JJO
+    protected $helpers = ['session', 'go_common', 'text', 'general','jwt', 'rbac']; //JJO
 
     public static $queries = [];
 

ci4/app/Controllers/Home.php

@@ -17,7 +17,7 @@ class Home extends BaseController
     public function index()
     {
 
-        echo view(getenv('theme.path') . 'main/defaultlayout');
+        echo view(getenv('theme.path') . 'form/home/viewHome');
 
     }
 

ci4/app/Controllers/Js_loader.php

@@ -14,10 +14,10 @@ class Js_loader extends BaseController
 
 
 
-    function comparadorCosidoTapaBlanda_js()
+    function comparadorPresupuestoAdmin_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js');
+        return view('themes/vuexy/form/presupuestos/admin/comparador.js');
 
     }
 
@@ -37,49 +37,49 @@ class Js_loader extends BaseController
     function datosLibro_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js');
+        return view('themes/vuexy/form/presupuestos/admin/_datosLibroItems.js');
     }
 
     function previsualizador_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/previews.js');
+        return view('themes/vuexy/form/presupuestos/admin/previews.js');
     }
 
     function lineasPresupuesto_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js');
+        return view('themes/vuexy/form/presupuestos/admin/_lineasPresupuestoItems.js');
     }
 
     function tiradasAlternativas_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js');
+        return view('themes/vuexy/form/presupuestos/admin/_tiradasAlternativasItems.js');
     }
 
     function datosServicios_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js');
+        return view('themes/vuexy/form/presupuestos/admin/_datosServiciosItems.js');
     }
 
     function datosEnvios_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js');
+        return view('themes/vuexy/form/presupuestos/admin/_datosEnvios.js');
     }
 
     function resumenPresupuestos_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js');
+        return view('themes/vuexy/form/presupuestos/admin/_resumenPresupuestos.js');
     }
 
     function presupuestos_js()
     {
         $this->response->setHeader('Content-Type', 'text/javascript');
-        return view('themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js');
+        return view('themes/vuexy/form/presupuestos/admin/_presupuestos.js');
     }
 
     function presupuestoCliente_js()
@@ -117,5 +117,13 @@ class Js_loader extends BaseController
         $this->response->setHeader('Content-Type', 'text/javascript');
         return view('themes/vuexy/form/presupuestos/cliente/previews.js');
     }
+
+    function chat_js()
+    {
+        $this->response->setHeader('Content-Type', 'text/javascript');
+        return view('themes/vuexy/form/mensajes/mensajeria.js');
+    }
+
+
 }
  

ci4/app/Controllers/Language.php

@@ -15,4 +15,28 @@ class Language extends BaseController
         $url = previous_url();
         return redirect()->to($url);
     }
+
+    
+    // Function to get the translation of the language file from a AJAX request
+    public function getTranslation()
+    {
+        $translationFile = $this->request->getPost('translationFile');
+        $data = [];
+        if(is_array($translationFile)){
+            foreach($translationFile as $file){
+                $locale = $this->request->getPost('locale');
+                $path = "Language/{$locale}/$file.php";
+                $lang =  require APPPATH.$path;
+                $data[$file] = $lang;
+            }
+            return json_encode($data);
+        }
+        else{
+            $locale = $this->request->getPost('locale');
+            $path = "Language/{$locale}/$translationFile.php";
+            $lang =  require APPPATH.$path;
+            return json_encode($lang);
+        }
+        
+    }
 }

ci4/app/Controllers/Mensajeria/MensajesDirectos.php

@@ -0,0 +1,64 @@
+<?php namespace App\Controllers\Mensajeria;
+
+
+use App\Controllers\BaseResourceController;
+use App\Entities\Mensajeria\ConversacionEntity;
+use App\Entities\Sistema\ActivityEntity;
+use App\Models\CollectionModel;
+use App\Models\Mensajeria\ConversacionModel;
+use App\Models\Sistema\ActivityModel;
+
+class MensajesDirectos extends BaseResourceController
+{
+
+    protected $modelName = ConversacionModel::class;
+    protected $format = 'json';
+
+    protected static $controllerSlug = 'mensajes-internos';
+
+    protected static $viewPath = 'themes/vuexy/form/mensajes/';
+
+    protected static $indexRoute = 'mensajesView';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = "Mensajeria interna";
+
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => "Home", 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_mensajes"), 'route' => route_to('mensajeriaView'), 'active' => true]
+        ];
+
+        parent::initController($request, $response, $logger);
+    }
+
+    public function index()
+    {
+        return view(static::$viewPath . static::$indexRoute);
+    }
+
+
+    public function getChatInfo($conversacionId)
+    {
+        // Modelos
+        $conversacionModel = model('App\Models\Mensajeria\ConversacionModel');
+
+        // Verificar si es una solicitud AJAX
+        if ($this->request->isAJAX()) {
+            // Obtener los datos
+            $data = [
+                'people' => $conversacionModel->getChatParticipants($conversacionId),
+                'messages' => $conversacionModel->getChatMessages($conversacionId)
+            ];
+
+            // Devolver respuesta JSON
+            return $this->respond($data, 200, 'Chat information retrieved successfully');
+        } else {
+            return $this->failForbidden('Only AJAX requests are allowed');
+        }
+    }
+
+
+}

ci4/app/Controllers/Pdf/PrintAlbaranes.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Controllers\Pdf;
+
+use App\Controllers\BaseController;
+
+
+class PrintAlbaranes extends BaseController
+{
+
+    public function index($albaran_id)
+    {
+
+        $albaranModel = model('App\Models\Pedidos\AlbaranModel');
+        $lineasAlbaranModel = model('App\Models\Pedidos\AlbaranLineaModel');
+
+        $data['albaran'] = $albaranModel->getResourceForPdf($albaran_id)->get()->getRow();
+        $data['albaranLineas'] = $lineasAlbaranModel->getResourceForPdf($albaran_id)->get()->getResultObject();
+
+
+        return view(getenv('theme.path') . 'pdfs/albaran', $data);
+    }
+
+    public function generar($albaran_id)
+    {
+
+        // Cargar modelos
+        $albaranModel = model('App\Models\Pedidos\AlbaranModel');
+        $lineasAlbaranModel = model('App\Models\Pedidos\AlbaranLineaModel');
+
+        // Informacion del presupuesto
+        $data['albaran'] = $albaranModel->getResourceForPdf($albaran_id)->get()->getRow();
+        $data['albaranLineas'] = $lineasAlbaranModel->getResourceForPdf($albaran_id)->get()->getResultObject();
+
+
+        // Crear una instancia de Dompdf
+        $options = new \Dompdf\Options();
+        $options->set('isHtml5ParserEnabled', true);
+        $options->set('isPhpEnabled', true);
+        $options->set('isRemoteEnabled', true);
+        $dompdf = new \Dompdf\Dompdf($options);
+
+        // Contenido HTML del documento
+        $dompdf->loadHtml(view(getenv('theme.path').'pdfs/albaran', $data));
+
+        // Establecer el tamaño del papel
+        $dompdf->setPaper('A4', 'portrait');
+
+        // Renderizar el PDF
+        $dompdf->render();
+
+        // Obtener el contenido generado
+        $output = $dompdf->output();
+
+        // Establecer las cabeceras para visualizar en lugar de descargar
+        $file_name = "presupuesto-$albaran_id.pdf";
+        return $this->response
+            ->setStatusCode(200)
+            ->setHeader('Content-Type', 'application/pdf')
+            ->setHeader('Content-Disposition', 'inline; filename="' . $file_name . '"')
+            ->setHeader('Cache-Control', 'private, max-age=0, must-revalidate')
+            ->setHeader('Pragma', 'public')
+            ->setHeader('Content-Length', strlen($output))
+            ->setBody($output);
+    }
+}

ci4/app/Controllers/Pdf/PrintFacturas.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Controllers\Pdf;
+
+use App\Controllers\BaseController;
+
+
+class PrintFacturas extends BaseController
+{
+
+    public function index($id_factura)
+    {
+
+        $facturaModel = model('App\Models\Facturas\FacturaModel');
+        $lineasFacturaModel = model('App\Models\Facturas\FacturaLineaModel');
+        $data['factura'] = $facturaModel->getResourceForPdf($id_factura)->get()->getRow();
+        $data['lineas_factura'] = $lineasFacturaModel->getResourceForPdf($id_factura)->get()->getResultObject();
+        $data['resumen_por_iva'] = $lineasFacturaModel->getResourceResumenIVAsForPdf($id_factura)->get()->getResultObject();
+
+        return view(getenv('theme.path') . 'pdfs/factura', $data);
+    }
+
+    public function generar($id_factura)
+    {
+
+        // Cargar modelos
+        $facturaModel = model('App\Models\Facturas\FacturaModel');
+        $lineasFacturaModel = model('App\Models\Facturas\FacturaLineaModel');
+
+        // Informacion del presupuesto
+        $data['factura'] = $facturaModel->getResourceForPdf($id_factura)->get()->getRow();
+        $data['lineas_factura'] = $lineasFacturaModel->getResourceForPdf($id_factura)->get()->getResultObject();
+        $data['resumen_por_iva'] = $lineasFacturaModel->getResourceResumenIVAsForPdf($id_factura)->get()->getResultObject();
+
+        // Crear una instancia de Dompdf
+        $options = new \Dompdf\Options();
+        $options->set('isHtml5ParserEnabled', true);
+        $options->set('isPhpEnabled', true);
+        $options->set('isRemoteEnabled', true);
+        $dompdf = new \Dompdf\Dompdf($options);
+
+        // Contenido HTML del documento
+        $dompdf->loadHtml(view(getenv('theme.path').'pdfs/factura', $data));
+
+        // Establecer el tamaño del papel
+        $dompdf->setPaper('A4', 'portrait');
+
+        // Renderizar el PDF
+        $dompdf->render();
+
+        // Obtener el contenido generado
+        $output = $dompdf->output();
+
+        // Establecer las cabeceras para visualizar en lugar de descargar
+        $file_name = $data['factura']->numero . ".pdf";
+        return $this->response
+            ->setStatusCode(200)
+            ->setHeader('Content-Type', 'application/pdf')
+            ->setHeader('Content-Disposition', 'inline; filename="' . $file_name . '"')
+            ->setHeader('Cache-Control', 'private, max-age=0, must-revalidate')
+            ->setHeader('Pragma', 'public')
+            ->setHeader('Content-Length', strlen($output))
+            ->setBody($output);
+    }
+}

ci4/app/Controllers/Pdf/PrintPresupuestos.php

@@ -56,8 +56,13 @@ class PrintPresupuestos extends BaseController
         $options->set('isRemoteEnabled', true);
         $dompdf = new \Dompdf\Dompdf($options);
 
-        // Contenido HTML del documento
-        $dompdf->loadHtml(view(getenv('theme.path').'pdfs/presupuesto', $data));
+        // Metodo que funciona en el docker
+        $css = file_get_contents(getenv('theme.path'). 'css/pdf.presupuesto.css');
+        $html = view(getenv('theme.path') . 'pdfs/presupuesto', $data);
+        $html = "<style>$css</style>" . $html; 
+        $dompdf->loadHtml($html);
+
+        //$dompdf->loadHtml(view(getenv('theme.path') . 'pdfs/presupuesto', $data));
 
         // Establecer el tamaño del papel
         $dompdf->setPaper('A4', 'portrait');

ci4/app/Controllers/Pedidos/Albaran.php

@@ -0,0 +1,388 @@
+<?php
+
+namespace App\Controllers\Pedidos;
+use App\Entities\Pedidos\AlbaranEntity;
+use App\Models\Pedidos\AlbaranModel;
+
+
+class Albaran extends \App\Controllers\BaseResourceController
+{ 
+    protected $modelName = AlbaranModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectNameCc = 'albaran';
+    protected static $singularObjectName = 'Albaran';
+    protected static $pluralObjectName = 'Albaranes';
+    protected static $controllerSlug = 'albaran';
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+    }
+
+    public function index()
+    {
+        
+    } 
+
+    public function delete($id = null)
+    {
+        if ($this->request->isAJAX()) {
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $model_linea = model('App\Models\Pedidos\AlbaranLineaModel');
+            $model_linea->where('albaran_id', $id)->delete();
+
+            $this->model->where('id', $id)->delete();
+
+            $data = [
+                'error' => 0,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function addLinea($albaran_id){
+
+        if ($this->request->isAJAX()) {
+
+            $model_linea = model('App\Models\Pedidos\AlbaranLineaModel');
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            // si es un post, es el iva
+            if($this->request->getPost()){
+                $reqData = $this->request->getPost();
+                $albaran_id = $reqData['albaran_id'] ?? 0;
+
+                $albaran = $this->model->find($albaran_id);
+                if($albaran == false){
+                    $data = [
+                        'error' => 'Albaran no encontrado',
+                        $csrfTokenName => $newTokenHash
+                    ];
+                    return $this->respond($data);
+                }
+                $presupuesto_model = model('App\Models\Presupuestos\PresupuestoModel');
+                $presupuesto = $presupuesto_model->find($albaran->presupuesto_id);
+                if($presupuesto == false){
+                    $data = [
+                        'error' => 'Presupuesto no encontrado',
+                        $csrfTokenName => $newTokenHash
+                    ];
+                    return $this->respond($data);
+                }
+                $iva_reducido = $presupuesto->iva_reducido;
+                $lineas = $model_linea->where('albaran_id', $albaran_id)->findAll();
+                $total = 0;
+                foreach($lineas as $linea){
+                    $total += $linea->total;
+                }
+                $iva = $iva_reducido? $total * 4.0  / 100: $total * 21.0 / 100;
+                $data_linea= [
+                    'albaran_id' => $albaran_id,
+                    'titulo' => $iva_reducido?lang('Pedidos.iva4'):lang('Pedidos.iva21'),
+                    'cantidad' => 1,
+                    'precio_unidad' => round($iva,2),
+                    'total' => round($iva,2),
+                    'user_created_id' => auth()->user()->id,
+                    'user_updated_id' => auth()->user()->id
+                ];
+                $id_linea = $model_linea->insert($data_linea);
+                $linea = $model_linea->find($id_linea);
+                $data = [
+                    'error' => 0,
+                    'data' => $linea,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            }
+            else{
+                $linea = [
+                    'albaran_id' => $albaran_id,
+                    'user_created_id' => auth()->user()->id,
+                    'user_updated_id' => auth()->user()->id
+                ];
+                $id_linea = $model_linea->insert($linea);
+                $data = $model_linea->find($id_linea);
+    
+                $data = [
+                    'error' => 0,
+                    'data' => $data,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            }
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function add()
+    {
+        if ($this->request->isAJAX()) {
+
+            $user = auth()->user()->id;
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $reqData = $this->request->getPost();
+            $pedido_id = $reqData['pedido_id'] ?? 0;
+            $presupuestos_id = $reqData['presupuestos_id'] ?? 0;
+            
+            $return_data = $this->model->generarAlbaranes($pedido_id, $presupuestos_id, $user);
+            $data = [
+                'data' => $return_data,
+                $csrfTokenName => $newTokenHash
+            ];
+            
+            return $this->respond($data);
+
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function update($id = null){
+
+        if ($this->request->isAJAX()) {
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            if ($id == null) :
+                $data = [
+                    'error' => 2,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+            $id = filter_var($id, FILTER_SANITIZE_URL);
+            $albaranEntity = $this->model->find($id);
+
+            if ($albaranEntity == false) :
+                $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Pedidos.albaran')), $id]);
+                $data = [
+                    'error' => $message,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+
+            if ($this->request->getPost()) :
+
+                $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+                $postData = $this->request->getPost();
+
+                $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+                
+                // JJO
+                $sanitizedData['user_updated_id'] = auth()->user()->id;
+
+                $noException = true;
+                if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+                    if ($this->canValidate()) :
+                        try {
+                            $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                        } catch (\Exception $e) {
+                            $noException = false;
+                            $this->dealWithException($e);
+                        }
+                    else:
+                        $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Pedidos.albaran'))]);
+                        $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                    endif;
+
+                    $albaranEntity->fill($sanitizedData);
+
+                endif;
+                if ($noException && $successfulResult) :
+                    $id = $albaranEntity->id ?? $id;
+                    $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                    $data = [
+                        'error' => 0,
+                        $csrfTokenName => $newTokenHash
+                    ];
+                    return $this->respond($data);
+
+                endif; // $noException && $successfulResult
+            endif; // ($requestMethod === 'post')
+
+            $data = [
+                'error' => 1,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function updateLinea($id = null){
+
+        if ($this->request->isAJAX()) {
+
+            $model_linea = model('App\Models\Pedidos\AlbaranLineaModel');
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            if ($id == null) :
+                $data = [
+                    'error' => 2,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+            $id = filter_var($id, FILTER_SANITIZE_URL);
+            $albaranEntity = $model_linea->find($id);
+
+            if ($albaranEntity == false) :
+                $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Pedidos.albaran')), $id]);
+                $data = [
+                    'error' => $message,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+
+            if ($this->request->getPost()) :
+
+                $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+                $postData = $this->request->getPost();
+
+                $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+                
+                // JJO
+                $sanitizedData['user_updated_id'] = auth()->user()->id;
+
+                $noException = true;
+                if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+                    if ($this->canValidate()) :
+                        try {
+                            $successfulResult = $model_linea->skipValidation(true)->update($id, $sanitizedData);
+                        } catch (\Exception $e) {
+                            $noException = false;
+                            $this->dealWithException($e);
+                        }
+                    else:
+                        $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Pedidos.albaran'))]);
+                        $this->session->setFlashdata('formErrors', $model_linea->errors());
+
+                    endif;
+
+                    $albaranEntity->fill($sanitizedData);
+
+                endif;
+                if ($noException && $successfulResult) :
+                    $id = $albaranEntity->id ?? $id;
+                    $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                    $data = [
+                        'error' => 0,
+                        $csrfTokenName => $newTokenHash
+                    ];
+                    return $this->respond($data);
+
+                endif; // $noException && $successfulResult
+            endif; // ($requestMethod === 'post')
+
+            $data = [
+                'error' => 1,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function borrarLinea(){
+        if ($this->request->isAJAX()) {
+
+            $model_linea = model('App\Models\Pedidos\AlbaranLineaModel');
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $reqData = $this->request->getPost();
+            $id = $reqData['id'] ?? 0;
+            $id = filter_var($id, FILTER_SANITIZE_URL);
+            $albaranLineaEntity = $model_linea->find($id);
+
+            if ($albaranLineaEntity == false) :
+                $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Pedidos.albaran')), $id]);
+                $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Pedidos.albaran')), $id]);
+                $data = [
+                    'error' => $message,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+
+            $successfulResult = $model_linea->skipValidation(true)->update($id, ['deleted_at' => date('Y-m-d H:i:s')]);
+            
+            if ($successfulResult) :
+                $data = [
+                    'error' => 0,
+                    $csrfTokenName => $newTokenHash
+                ];
+            else:
+                $data = [
+                    'error' => 1,
+                    $csrfTokenName => $newTokenHash
+                ];
+            endif;
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function getAlbaranes($pedido_id = null){
+        if ($this->request->isAJAX()) {
+
+            $model_linea = model('App\Models\Pedidos\AlbaranLineaModel');
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $returnData = [];
+            $albaranes = $this->model->asArray()->where('pedido_id', $pedido_id)->findAll();
+
+            foreach($albaranes as $albaran){
+                $albaran['fecha_albaran'] = $albaran['updated_at'];
+                array_push($returnData, 
+                [
+                    'albaran' => $albaran,
+                    'lineas' => $model_linea->asArray()->where('albaran_id', $albaran['id'])->findAll()]
+                );
+            }
+
+            $data = [
+                'data' => $returnData,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+}
+ 

ci4/app/Controllers/Pedidos/Pedido.php

@@ -2,54 +2,395 @@
 
 namespace App\Controllers\Pedidos;
 use App\Controllers\BaseController;
+use App\Entities\Pedidos\PedidoEntity;
+use App\Models\Collection;
+use App\Models\Pedidos\PedidoModel;
+use App\Services\PedidoXMLService;
 
-
-class Pedido extends BaseController
+class Pedido extends \App\Controllers\BaseResourceController
 { 
-    function __construct()
-    { 
-            
+    protected $modelName = PedidoModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectNameCc = 'pedido';
+    protected static $singularObjectName = 'Pedido';
+    protected static $pluralObjectName = 'Pedidos';
+    protected static $controllerSlug = 'pedido';
+
+    protected static $viewPath = 'themes/vuexy/form/pedidos/';
+
+    protected $indexRoute = 'pedidoList';
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('Pedidos.moduleTitle');
+        // Se indica que este controlador trabaja con soft_delete
+        
+        $this->viewData = ['usingServerSideDataTable' => true];
+        
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_pedidos"), 'route' => "javascript:void(0);", 'active' => false],
+        ];
+
+        parent::initController($request, $response, $logger);
+
     }
 
     public function index()
     {
-        echo 'Pedidos';
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = -1;
+        }
+
+        $this->viewData['cliente_id'] = $clienteId;
+
+        $this->viewData['usingClientSideDataTable'] = true;
+
+        $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tarifaextra.tarifaextra')]);
+        parent::index();
+
     }
 
     public function activos()
     {
-        echo 'Pedidos Activos';
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Pedidos.pedido')]),
+            'pedidoEntity' => new PedidoEntity(),
+            'usingServerSideDataTable' => true,
+            'pageTitle' => lang('Pedidos.Pedidos'),
+            'estadoPedidos' => 'activo',
+            ['title' => lang("App.menu_pedidos"), 'route' => site_url('pedidos/todos'), 'active' => true]
+        ];
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = -1;
+        }
+
+        $viewData['cliente_id'] = $clienteId;
+
+        return view(static::$viewPath . 'viewPedidosList', $viewData);
     }
 
     public function finalizados()
     {
-        echo 'Pedidos Finalizados';
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Pedidos.pedido')]),
+            'pedidoEntity' => new PedidoEntity(),
+            'usingServerSideDataTable' => true,
+            'pageTitle' => lang('Pedidos.Pedidos'),
+            'estadoPedidos' => 'finalizado',
+            ['title' => lang("App.menu_pedidos"), 'route' => site_url('pedidos/todos'), 'active' => true]
+        ];
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = -1;
+        }
+
+        $viewData['cliente_id'] = $clienteId;
+
+        return view(static::$viewPath . 'viewPedidosList', $viewData);
     }
 
     public function cancelados()
     {
-        echo 'Pedidos Cancelados';
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Pedidos.pedido')]),
+            'pedidoEntity' => new PedidoEntity(),
+            'usingServerSideDataTable' => true,
+            'pageTitle' => lang('Pedidos.Pedidos'),
+            'estadoPedidos' => 'cancelado',
+            ['title' => lang("App.menu_pedidos"), 'route' => site_url('pedidos/todos'), 'active' => true]
+        ];
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = -1;
+        }
+
+        $viewData['cliente_id'] = $clienteId;
+
+        return view(static::$viewPath . 'viewPedidosList', $viewData);
     }
 
-    public function manuales()
+    public function todos()
     {
-        echo 'Pedidos Manuales';
+        
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Pedidos.pedido')]),
+            'pedidoEntity' => new PedidoEntity(),
+            'usingServerSideDataTable' => true,
+            'pageTitle' => lang('Pedidos.Pedidos'),
+            'estadoPedidos' => 'todos',
+            ['title' => lang("App.menu_pedidos"), 'route' => site_url('pedidos/todos'), 'active' => true]
+        ];
+
+        if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
+            // Se obtiene el cliente ID a partir del usuario de la sesion
+            $model_user = model('App\Models\Usuarios\UserModel');
+            $user = $model_user->find(auth()->user()->id);
+            $clienteId = $user->cliente_id;
+        } else {
+            $clienteId = -1;
+        }
+
+        $viewData['cliente_id'] = $clienteId;
+
+        return view(static::$viewPath . 'viewPedidosList', $viewData);
+
     }
 
-//    public function delete_files()
-//    {
-//
-//    }
-//
-//    public function pedidos_maquetacion()
-//    {
-//
-//    }
-//
-//    public function pedidos_prestashop()
-//    {
-//
-//    }
+    public function cambiarEstado(){
+        if($this->request->isAJAX()){
 
+            $id = $this->request->getPost('id');
+            $estado = $this->request->getPost('estado');
+
+            $this->model->where('id', $id)->set(['estado' => $estado])->update();
+            return $this->respond(['status' => 'success', 'message' => lang('Basic.global.success')]);
+        }else{
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function update($id = null){
+
+        if ($this->request->isAJAX()) {
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            if ($id == null) :
+                $data = [
+                    'error' => 2,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+            $id = filter_var($id, FILTER_SANITIZE_URL);
+            $pedidoEntity = $this->model->find($id);
+
+            if ($pedidoEntity == false) :
+                $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Pedidos.pedido')), $id]);
+                $data = [
+                    'error' => $message,
+                    $csrfTokenName => $newTokenHash
+                ];
+                return $this->respond($data);
+            endif;
+
+            if ($this->request->getPost()) :
+
+                $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+                $postData = $this->request->getPost();
+
+                $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+                
+                // JJO
+                $sanitizedData['user_updated_id'] = auth()->user()->id;
+
+                $noException = true;
+                if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+                    if ($this->canValidate()) :
+                        try {
+                            $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                        } catch (\Exception $e) {
+                            $noException = false;
+                            $this->dealWithException($e);
+                        }
+                    else:
+                        $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Pedidos.albaran'))]);
+                        $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                    endif;
+
+                    $pedidoEntity->fill($sanitizedData);
+
+                endif;
+                if ($noException && $successfulResult) :
+                    $id = $pedidoEntity->id ?? $id;
+                    $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                    $data = [
+                        'error' => 0,
+                        $csrfTokenName => $newTokenHash
+                    ];
+                    return $this->respond($data);
+
+                endif; // $noException && $successfulResult
+            endif; // ($requestMethod === 'post')
+
+            $data = [
+                'error' => 1,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function edit($id=null){
+        
+        if ($id == null) :
+            return $this->redirect2listView();
+        endif;
+        $id = filter_var($id, FILTER_SANITIZE_URL);
+        $pedidoEntity = $this->model->find($id);
+
+        if ($pedidoEntity == false) :
+            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Pedidos.pedido')), $id]);
+            return $this->redirect2listView('sweet-error', $message);
+        endif;
+
+        $this->obtenerDatosFormulario($pedidoEntity);
+
+        $this->viewData['pedidoEntity'] = $pedidoEntity;
+
+        
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Pedidos.moduleTitle') . ' ' . lang('Basic.global.edit3');
+
+        return $this->displayForm(__METHOD__, $id);
+    }
+
+    public function datatable(){
+
+        if ($this->request->isAJAX()) {
+
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 0;
+            $order = PedidoModel::SORTABLE_TODOS[$requestedOrder >= 0 ? $requestedOrder : 0];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+            $estado = $reqData['estado'] ?? 'todos';
+            $cliente_id = $reqData['cliente_id'] ?? -1;
+            if($estado == 'todos') $estado = '';
+
+            $showTotal = $reqData['showTotal'] ?? false;
+
+            $searchValues = get_filter_datatables_columns($reqData);
+
+            $model_linea = model('\App\Models\Pedidos\PedidoLineaModel');
+            $resourceData = $model_linea->getResource($searchValues, $estado, $cliente_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+            $totalTirada = $model_linea->getSumOfTirada($searchValues, $estado, $cliente_id, $start, $length);
+            $total = $model_linea->getSumOfTotalAceptado($searchValues, $estado, $cliente_id, $start, $length);
+            $total2 = 0;
+            if($showTotal){
+                $total2 = $model_linea->getTotalOfTotalAceptado();
+            }
+
+            if($total2 != 0){
+                $total = "" . $total . " \n(" . $total2 . ")";
+            }
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $model_linea->getResource("", $estado)->countAllResults(),
+                $model_linea->getResource($searchValues, $estado)->countAllResults(),
+                "",
+                [
+                    'total_tirada' => $totalTirada, 
+                    'total' => $total
+                ]
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    public function obtenerPedidosForFacturas(){
+        if ($this->request->isAJAX()) {
+            $reqData = $this->request->getPost();
+            $start = $reqData['start'] ?? 0;
+        }
+        else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function getlineas(){
+        if ($this->request->isAJAX()) {
+
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                return $response;
+            }
+            
+            $id = $reqData['pedido_id'] ?? 0;
+            $resourceData = $this->model->obtenerLineasPedido($id);
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                count($resourceData),
+                count($resourceData)
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    private function obtenerDatosFormulario(&$pedidoEntity){
+        
+        $datos = $this->model->obtenerDatosForm($pedidoEntity->id);
+
+        $pedidoEntity->estadoText = lang('Pedidos.' . $pedidoEntity->estado);
+
+        if(count($datos) > 0){
+            $pedidoEntity->cliente = $datos[0]->cliente;
+            $pedidoEntity->cliente_id = $datos[0]->cliente_id;
+            $pedidoEntity->comercial = $datos[0]->comercial;
+        }
+
+        $pedidoEntity->fecha_entrega_real_text = $pedidoEntity->fecha_entrega_real ? date('d/m/Y', strtotime($pedidoEntity->fecha_entrega_real)) : '';
+        $pedidoEntity->fecha_impresion_text = $pedidoEntity->fecha_impresion ? date('d/m/Y', strtotime($pedidoEntity->fecha_impresion)) : '';
+        $pedidoEntity->fecha_encuadernado_text = $pedidoEntity->fecha_encuadernado ? date('d/m/Y', strtotime($pedidoEntity->fecha_encuadernado)) : '';
+        $pedidoEntity->fecha_entrega_externo_text = $pedidoEntity->fecha_entrega_externo ? date('d/m/Y', strtotime($pedidoEntity->fecha_entrega_externo)) : '';
+    }
+    public function get_xml_pedido($pedido_id)
+    {
+        $data = PedidoXMLService::generate_xml($pedido_id);
+        // $xml_service = new PedidoXMLService($this->model);
+        return $this->respond($data);
+    }
+
+    public function pedidoToProduction(int $pedido_id){
+        
+    }
 }
  

ci4/app/Controllers/Presupuestos/Buscador.php

@@ -97,11 +97,11 @@ class Buscador extends \App\Controllers\BaseResourceController
             $order1 = PresupuestoModel::SORTABLE[$requestedOrder1 >= 0 ? $requestedOrder1 : 0];
             $dir1 = $reqData['order']['0']['dir'] ?? 'asc';
             $requestedOrder2 = $reqData['order']['1']['column'] ?? 0;
-            $order2 = PresupuestoModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder1 : 0];
-            $dir2 = $reqData['order']['0']['dir'] ?? 'asc';
+            $order2 = PresupuestoModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : 0];
+            $dir2 = $reqData['order']['1']['dir'] ?? 'asc';
             $requestedOrder3 = $reqData['order']['2']['column'] ?? 0;
-            $order3 = PresupuestoModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder1 : 0];
-            $dir3 = $reqData['order']['0']['dir'] ?? 'asc';
+            $order3 = PresupuestoModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : 0];
+            $dir3 = $reqData['order']['2']['dir'] ?? 'asc';
 
             $searchValues = get_filter_datatables_columns($reqData);
 
@@ -111,7 +111,7 @@ class Buscador extends \App\Controllers\BaseResourceController
             return $this->respond(Collection::datatable(
                 $resourceData,
                 $this->model->getResource("")->countAllResults(),
-                $this->model->getResource($search)->countAllResults()
+                $this->model->getResource($searchValues)->countAllResults()
             ));
         } else {
             return $this->failUnauthorized('Invalid request', 403);

ci4/app/Controllers/Presupuestos/Presupuestoacabados.php

@@ -99,12 +99,13 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
 
             $tarifa_acabado_id = $reqData['tarifa_acabado_id'] ?? 0;
             $tirada = $reqData['tirada'] ?? 0;
+            $proveedor_id = $reqData['proveedor_id'] ?? -1;
             $POD = $reqData['POD'] ?? 0;
             
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
 
-            $values = $this->model->getPrecioTarifa($tarifa_acabado_id, $tirada, $POD);
+            $values = $this->model->getPrecioTarifa($tarifa_acabado_id, $tirada, $proveedor_id, $POD);
 
             $data = [
                 'values' => $values,
@@ -119,4 +120,39 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
     }
 
 
+    public function menuItems()
+    {
+        if ($this->request->isAJAX()) {
+
+            $reqData = $this->request->getPost();
+            try{
+
+                $tarifa_id = $reqData['tarifa_id'] ?? -1;
+                $tirada = $reqData['tirada'] ?? 0;
+                
+                $newTokenHash = csrf_hash();
+                $csrfTokenName = csrf_token();
+
+                $menu = $this->model->getProveedoresForSelector($tarifa_id, $tirada);
+
+                $data = [
+                    'menu' => $menu,
+                    $csrfTokenName => $newTokenHash
+                ];
+
+            }
+            catch(Exception $e){
+                $data = [
+                    'error' => $e,
+                    $csrfTokenName => $newTokenHash
+                ];
+            }
+            finally{
+                return $this->respond($data);
+            }
+                
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
 }

ci4/app/Controllers/Presupuestos/Presupuestoadmin.php

@@ -19,22 +19,22 @@ use App\Models\Presupuestos\PresupuestoServiciosExtraModel;
 use App\Services\PresupuestoService;
 use Exception;
 
-class Cosidotapablanda extends \App\Controllers\BaseResourceController
+class Presupuestoadmin extends \App\Controllers\BaseResourceController
 {
 
     protected $modelName = "PresupuestoModel";
     protected $format = 'json';
 
-    protected static $singularObjectName = 'Cosido Tapa Blanda';
-    protected static $singularObjectNameCc = 'Cosidotapablanda';
-    protected static $pluralObjectName = 'Cosidos Tapa Blanda';
-    protected static $pluralObjectNameCc = 'cosidosTapaBlanda';
+    protected static $singularObjectName = 'Presupuesto Admin';
+    protected static $singularObjectNameCc = 'Presupuestoadmin';
+    protected static $pluralObjectName = 'Presupuestos Admin';
+    protected static $pluralObjectNameCc = 'PresupuestosAdmin';
 
-    protected static $controllerSlug = 'cosidotapablanda';
+    protected static $controllerSlug = 'presupuestoadmin';
 
-    protected static $viewPath = 'themes/vuexy/form/presupuestos/cosidotapablanda/';
+    protected static $viewPath = 'themes/vuexy/form/presupuestos/admin/';
 
-    protected $indexRoute = 'cosidotapablandaList';
+    protected $indexRoute = 'presupuestoadminList';
 
 
 
@@ -71,7 +71,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
         $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
 
 
-        return view(static::$viewPath . 'viewCosidotapablandaList', $viewData);
+        return view(static::$viewPath . 'viewPresupuestoAdminList', $viewData);
     }
 
 
@@ -126,7 +126,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
                 if ($thenRedirect) :
                     if (!empty($this->indexRoute)) :
                         //return redirect()->to(route_to( $this->indexRoute )  )->with('sweet-success', $message);
-                        return redirect()->to(site_url('presupuestos/cosidotapablanda/edit/' . $id))->with('sweet-success', $message);
+                        return redirect()->to(site_url('presupuestoadmin/edit/' . $id))->with('sweet-success', $message);
                     else :
                         return $this->redirect2listView('sweet-success', $message);
                     endif;
@@ -151,7 +151,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
 
         $this->viewData['POD'] = $this->getPOD();
 
-        $this->viewData['formAction'] = route_to('createCosidotapablanda', $tipo_impresion_id);
+        $this->viewData['formAction'] = route_to('createPresupuestoAdmin', $tipo_impresion_id);
 
         $this->viewData = array_merge($this->viewData, $this->getStringsFromTipoImpresion($tipo_impresion_id));
 
@@ -295,6 +295,12 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
                     endif;
                 else :
                     if ($this->request->isAJAX()) {
+
+                        if($presupuestoEntity->estado_id==1 && $presupuestoEntity->confirmar==1){
+                            $this->model->confirmarPresupuesto($id);
+                            PresupuestoService::crearPedido($id);
+                        }
+                        
                         $newTokenHash = csrf_hash();
                         $csrfTokenName = csrf_token();
                         $data = [
@@ -381,7 +387,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
 
         $this->viewData = array_merge($this->viewData, $this->getStringsFromTipoImpresion($presupuestoEntity->tipo_impresion_id));
 
-        $this->viewData['formAction'] = route_to('updateCosidotapablanda', $id);
+        $this->viewData['formAction'] = route_to('updatePresupuestoAdmin', $id);
 
         // Si se ha llamado a esta funcion porque se ha duplicado el presupuesto
         // se actualiza la bbdd para que sólo ejecute algunas funciones una vez
@@ -834,7 +840,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
         // Breadcrumbs
         $viewData['breadcrumb'] = [
             ['title' => lang("App.menu_presupuestos"), 'route' => "javascript:void(0);", 'active' => false],
-            ['title' => $breadcrumbTitle, 'route' => site_url('presupuestos/cosidotapablanda/list/' . $tipo_impresion_id), 'active' => true]
+            ['title' => $breadcrumbTitle, 'route' => site_url('presupuestoadmin/list/' . $tipo_impresion_id), 'active' => true]
         ];
 
         return $viewData;
@@ -861,6 +867,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
              $presupuesto = $this->model->find($id);
              $presupuesto->titulo = $presupuesto->titulo .' - ' . lang('Presupuestos.duplicado');
              $presupuesto->is_duplicado = 1;
+             $presupuesto->estado_id = 1;
              $new_id = $this->model->insert($presupuesto);
  
              $presupuestoAcabadosModel = model('App\Models\Presupuestos\PresupuestoAcabadosModel');
@@ -1271,8 +1278,8 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController
         $input_data['is_duplicado'] = $presupuestoEntity->is_duplicado;
         
         if($presupuestoEntity->papel_formato_personalizado){
-            $input_data['ancho'] = $presupuestoEntity->ancho;
-            $input_data['alto'] = $presupuestoEntity->alto;
+            $input_data['ancho'] = $presupuestoEntity->papel_formato_ancho ;
+            $input_data['alto'] = $presupuestoEntity->papel_formato_alto ;
         }
         else{
             $model = model("App\Models\Configuracion\PapelFormatoModel");

ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php

@@ -110,7 +110,7 @@ class Presupuestoencuadernaciones extends \App\Controllers\BaseResourceControlle
                 $proveedor_id = $reqData['proveedor_id'] ?? 0;
             }
             else{
-                $solapas = $reqData['solapas'] ?? -1;
+                $solapas = $reqData['solapas'] ?? 0;
             }
             $paginas = $reqData['paginas'] ?? 0;
             $tirada = $reqData['tirada'] ?? 0;
@@ -118,6 +118,7 @@ class Presupuestoencuadernaciones extends \App\Controllers\BaseResourceControlle
             $alto = $reqData['alto'] ?? 0;
             
             $POD = $reqData['POD'] ?? 0;
+            $paginas_cuadernillo = $reqData['paginas_por_cuadernillo'] ?? null;
             
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
@@ -125,7 +126,7 @@ class Presupuestoencuadernaciones extends \App\Controllers\BaseResourceControlle
             $tarifaModel = model('App\Models\Tarifas\TarifaEncuadernacionModel');
             if(is_null($tipo)){
                 if($tarifaModel->isTarifaPorHoras($tarifa_encuadernacion_id)){
-                    $values = $this->model->getPrecioTarifaHoras($tarifa_encuadernacion_id, $paginas, $tirada, $proveedor_id, $POD);
+                    $values = $this->model->getPrecioTarifaHoras($tarifa_encuadernacion_id, $paginas, $tirada, $proveedor_id, $POD, $paginas_cuadernillo);
                 }else{
                     $values = $this->model->getPrecioTarifa($tarifa_encuadernacion_id, $paginas, $tirada, $ancho, $alto, $proveedor_id, $POD);
                 }

ci4/app/Controllers/Produccion/Ordentrabajo.php

@@ -2,18 +2,34 @@
 
 namespace App\Controllers\Produccion;
 use App\Controllers\BaseController;
-
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
 
 class Ordentrabajo extends BaseController
 { 
-    function __construct()
-    { 
-            
+    protected $format = 'json';
+    protected array $viewData = [];
+
+
+    protected static $viewPath = 'themes/vuexy/form/produccion/';
+    protected static $controllerSlug = "orden-trabajo";
+    protected $indexRoute = 'viewOrdenTrabajoList';
+    protected $editRoute = 'viewOrdenTrabajoEdit';
+
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
     }
 
     public function index()
     {
-        echo 'Orden trabajo';
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.orden_trabajo"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => "Table", 'route' => site_url('produccion/ordentrabajo'), 'active' => true]
+        ];
+        return view(static::$viewPath . $this->indexRoute, $this->viewData);
     }
 
     public function delete()
@@ -26,9 +42,14 @@ class Ordentrabajo extends BaseController
 
     }
 
-    public function edit()
+    public function edit($orden_trabajo_id)
     {
-
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.orden_trabajo"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => "Table", 'route' => site_url('produccion/ordentrabajo'), 'active' => true]
+        ];
+        return view(static::$viewPath . $this->editRoute, $this->viewData);
     }
 
     public function cien()

ci4/app/Controllers/Profile.php

@@ -7,91 +7,81 @@ use App\Models\UserModel;
 
 class Profile extends BaseController
 {
-    private $user_model;
-    private $id_user;
-
 
     function __construct()
     {
-        $this->user_model = new UserModel();
-        $this->id_user = auth()->user()->id;
 
     }
 
     public function index()
     {
-        helper('file');
-        helper('form');
-        helper('text');
-
-        $data['title'] = [
-            'module' => lang("App.profile_title"),
-            'page' => lang("App.profile_subtitle"),
-            'icon' => 'fas fa-user'
-        ];
 
         $data['breadcrumb'] = [
             ['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
             ['title' => lang("App.profile_title"), 'route' => "", 'active' => true]
         ];
 
-        $data['btn_return'] = [
-            'title' => lang("App.global_come_back"),
-            'route' => '/',
-            'class' => 'btn btn-dark mr-1',
-            'icon' => 'fas fa-angle-left'
-        ];
+        // Get the User Provider (UserModel by default)
+        $users = auth()->getProvider();
 
-        $data['btn_submit'] = [
-            'title' => lang("App.global_save"),
-            'route' => '',
-            'class' => 'btn btn-primary mr-1',
-            'icon' => 'fas fa-save'
-        ];
+        // Find by the user_id
+        $data['obj'] = $users->findById(auth()->id());
 
-        $session = session();
-
-        $data['obj'] = $this->user_model->where('id', $this->id_user)->first();
-
-
-        echo view(getenv('theme.path') . 'form/profile/index', $data);
+        echo view(getenv('theme.path') . 'form/profile/profileDetails', $data);
 
     }
 
     public function store()
     {
-
         $session = session();
         helper('form');
 
         $rules = [
             'first_name' => 'required',
             'last_name' => 'required',
+            'new_pwd' => 'permit_empty|min_length[8]',
+            'new_pwd_confirm' => 'required_with[new_pwd]|matches[new_pwd]'
         ];
 
+        // Definir los mensajes de error personalizados
         $rules_error = [
             'first_name' => ['required' => lang("App.profile_rules_first_name_r")],
             'last_name' => ['required' => lang("App.profile_rules_last_name_r")],
+            'new_pwd' => ['min_length' => lang("App.profile_rules_password_m")],
+            'new_pwd_confirm' => [
+                'matches' => lang("App.profile_rules_password_confirm_m")
+            ]
         ];
 
-
-        if ($this->validate($rules ?? [], $rules_error ?? [])) {
-            if (!empty($this->id_user)) {
-                $this->user_model->save([
-                    'id' => $this->id_user,
-                    'first_name' => $this->request->getPost('first_name'),
-                    'last_name' => $this->request->getPost('last_name')
-                ]);
-                $session->setFlashdata('sweet', ['success', lang("App.global_alert_save_success")]);
-            } else {
-                $session->setFlashdata('sweet', ['error', lang("App.global_alert_save_error")]);
-            }
-        } else {
-
-            $session->setFlashdata('error', 'error');
-            return $this->index();
+        // Validar la entrada
+        if (!$this->validate($rules, $rules_error)) {
+            // Si la validación falla, redirigir de vuelta con errores
+            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
         }
 
-        return redirect()->to('/profile');
+        // Obtener los valores de los campos
+        $firstName = $this->request->getPost('first_name');
+        $lastName = $this->request->getPost('last_name');
+        $newPwd = $this->request->getPost('new_pwd');
+
+        $update_data = [
+            'first_name' => $firstName,
+            'last_name' => $lastName,
+            'password' => $newPwd,
+        ];
+
+        if(empty($newPwd)){
+            unset($update_data['password']);
+        }
+
+        // Aquí debes obtener el usuario actual, por ejemplo, desde la sesión
+        $users = auth()->getProvider();
+        $user = $users->findById(auth()->id());
+        $user->fill($update_data);
+        $users->save($user);
+
+        // Redirigir con un mensaje de éxito
+        return redirect()->back()->with('success', lang('App.profile_updated_successfully'));
+
     }
 }

ci4/app/Controllers/Sistema/AuthAPIController.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Controllers\Sistema;
+
+use App\Controllers\BaseController;
+use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Shield\Authentication\Authenticators\Session;
+use CodeIgniter\Shield\Authentication\JWTManager;
+use CodeIgniter\Shield\Validation\ValidationRules;
+
+class AuthAPIController extends BaseController
+{
+    use ResponseTrait;
+
+    /**
+     * Authenticate Existing User and Issue JWT.
+     */
+    public function jwtLogin(): ResponseInterface
+    {
+        // Get the validation rules
+        $rules = $this->getValidationRules();
+
+        // Validate credentials
+        if (! $this->validateData($this->request->getJSON(true), $rules, [], config('Auth')->DBGroup)) {
+            return $this->fail(
+                ['errors' => $this->validator->getErrors()],
+                $this->codes['unauthorized']
+            );
+        }
+
+        // Get the credentials for login
+        $credentials             = $this->request->getJsonVar(setting('Auth.validFields'));
+        $credentials             = array_filter($credentials);
+        $credentials['password'] = $this->request->getJsonVar('password');
+
+        /** @var Session $authenticator */
+        $authenticator = auth('session')->getAuthenticator();
+
+        // Check the credentials
+        $result = $authenticator->check($credentials);
+
+        // Credentials mismatch.
+        if (! $result->isOK()) {
+            // @TODO Record a failed login attempt
+
+            return $this->failUnauthorized($result->reason());
+        }
+
+        // Credentials match.
+        // @TODO Record a successful login attempt
+
+        $user = $result->extraInfo();
+
+        /** @var JWTManager $manager */
+        $manager = service('jwtmanager');
+
+        // Generate JWT and return to client
+        $jwt = $manager->generateToken($user);
+
+        return $this->respond([
+            'access_token' => $jwt,
+        ]);
+    }
+
+    /**
+     * Returns the rules that should be used for validation.
+     *
+     * @return array<string, array<string, array<string>|string>>
+     * @phpstan-return array<string, array<string, string|list<string>>>
+     */
+    protected function getValidationRules(): array
+    {
+        $rules = new ValidationRules();
+
+        return $rules->getLoginRules();
+    }
+}

ci4/app/Controllers/Sistema/Intranet.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Sistema;
+
+use CodeIgniter\Controller;
+
+class Intranet extends Controller
+{
+
+    function presupuestos($resource_name)
+    {
+        helper('file');
+
+        $resource_path = WRITEPATH . 'uploads/presupuestos/' . $resource_name;
+
+        if (file_exists($resource_path)) {
+            // Get the mime type of the file
+            $mime_type = mime_content_type($resource_path);
+
+            // Get an instance of the Response class
+            $response = service('response');
+
+            // Set the content type
+            $response->setContentType($mime_type);
+
+            // Set the output
+            $response->setBody(file_get_contents($resource_path));
+
+            // Send the response to the browser
+            $response->send();
+        }
+
+    }
+
+}

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

@@ -1,10 +1,16 @@
-<?php namespace App\Controllers\Tarifas\Acabados;
+<?php
+
+namespace App\Controllers\Tarifas\Acabados;
 
 use App\Controllers\BaseResourceController;
 use App\Entities\Tarifas\Acabados\TarifaAcabadoEntity;
 use App\Models\Collection;
 use App\Models\Tarifas\Acabados\TarifaAcabadoModel;
 
+use App\Models\Compras\ProveedorModel;
+use App\Models\Compras\ProveedorTipoModel;
+
+
 class TarifaAcabados extends BaseResourceController
 {
 
@@ -18,7 +24,7 @@ class TarifaAcabados extends BaseResourceController
 
     protected static $controllerSlug = 'tarifasacabado';
 
-     protected static $viewPath =  'themes/vuexy/form/tarifas/acabado/';
+    protected static $viewPath =  'themes/vuexy/form/tarifas/acabado/';
 
     protected $indexRoute = 'tarifaAcabadoList';
 
@@ -35,10 +41,10 @@ class TarifaAcabados extends BaseResourceController
 
         $this->viewData = ['usingServerSideDataTable' => true];
 
-        // Breadcrumbs
+        // Breadcrumbs 
         $this->viewData['breadcrumb'] = [
             ['title' => lang("App.menu_tarifas"), 'route' => "javascript:void(0);", 'active' => false],
-            ['title' => lang("App.menu_tarifaacabado"), 'route' => site_url('tarifas/tarifaacabado'), 'active' => true]
+            ['title' => lang("App.menu_tarifaacabado"), 'route' => site_url('tarifas/acabados'), 'active' => true]
         ];
 
         parent::initController($request, $response, $logger);
@@ -48,6 +54,8 @@ class TarifaAcabados extends BaseResourceController
     public function index()
     {
 
+        checkPermission('tarifa-acabado.menu');
+
         $viewData = [
             'currentModule' => static::$controllerSlug,
             'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Tarifaacabado.tarifaacabado')]),
@@ -64,6 +72,8 @@ class TarifaAcabados extends BaseResourceController
     public function add()
     {
 
+        checkPermission('tarifa-acabado.create', $this->indexRoute);
+
         if ($this->request->getPost()) :
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -125,6 +135,8 @@ class TarifaAcabados extends BaseResourceController
 
         endif; // ($requestMethod === 'post')
 
+        $this->viewData['proveedores'] = $this->getProveedores();
+
         $this->viewData['tarifaacabadoEntity'] = isset($sanitizedData) ? new TarifaAcabadoEntity($sanitizedData) : new TarifaAcabadoEntity();
         $this->viewData['formAction'] = route_to('tarifaAcabadoAdd');
         $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaacabado.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
@@ -133,8 +145,10 @@ class TarifaAcabados extends BaseResourceController
         return $this->displayForm(__METHOD__);
     } // end function add()
 
-    public function edit($requestedId = null)    {
+    public function edit($requestedId = null)
+    {
 
+        checkPermission('tarifa-acabado.edit', $this->indexRoute);
 
         if ($requestedId == null) :
             return $this->redirect2listView();
@@ -157,7 +171,7 @@ class TarifaAcabados extends BaseResourceController
 
             // JJO
             $sanitizedData['user_updated_id'] = auth()->user()->id;
-            
+
             if ($this->request->getPost('mostrar_en_presupuesto') == null) {
                 $sanitizedData['mostrar_en_presupuesto'] = false;
             }
@@ -169,7 +183,7 @@ class TarifaAcabados extends BaseResourceController
             if ($this->request->getPost('acabado_sobrecubierta') == null) {
                 $sanitizedData['acabado_sobrecubierta'] = false;
             }
-            
+
 
             $noException = true;
             if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@@ -195,7 +209,7 @@ class TarifaAcabados extends BaseResourceController
 
             if ($noException && $successfulResult) :
                 $id = $tarifaacabadoEntity->id ?? $id;
-                $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) .'.';
+                $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
                 if ($thenRedirect) :
                     if (!empty($this->indexRoute)) :
@@ -211,6 +225,7 @@ class TarifaAcabados extends BaseResourceController
         endif; // ($requestMethod === 'post')
 
         $this->viewData['tarifaacabadoEntity'] = $tarifaacabadoEntity;
+        $this->viewData['proveedores'] = $this->getProveedores();
 
         $this->viewData['formAction'] = route_to('updateTarifaAcabado', $id);
 
@@ -299,4 +314,26 @@ class TarifaAcabados extends BaseResourceController
         }
     }
 
+    private function getProveedores()
+    {
+        $provTipoModel = new ProveedorTipoModel();
+        $provModel = new ProveedorModel();
+
+        $tipoId = $provTipoModel->getTipoId("Acabados");
+        return $provModel->getProvList($tipoId);
+    }
+    public function show_select()
+    {
+        $query =  $this->model->builder()
+            ->select(
+                ["id", "nombre as name", "code as description"]
+            )
+            ->where("deleted_at",null);
+        if ($this->request->getGet("q")) {
+            $query->groupStart()
+                ->orLike("nombre", $this->request->getGet("q"))
+                ->groupEnd();
+        }
+        return $this->response->setJSON($query->get()->getResultObject());
+    }
 }

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

@@ -213,13 +213,14 @@ class TarifaAcabadosLineas extends \App\Controllers\BaseResourceController
 
             $id_TA = $reqData['id_tarifaacabado'] ?? -1;
 
+            $searchValues = get_filter_datatables_columns($reqData);
 
-            $resourceData = $this->model->getResource("", $id_TA)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
-
+            $resourceData = $this->model->getResource($searchValues, $id_TA)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+            
             return $this->respond(Collection::datatable(
                 $resourceData,
                 $this->model->getResource()->countAllResults(),
-                $this->model->getResource($search, $id_TA)->countAllResults()
+                $this->model->getResource($searchValues, $id_TA)->countAllResults()
             ));
         } else {
             return $this->failUnauthorized('Invalid request', 403);
@@ -280,6 +281,7 @@ class TarifaAcabadosLineas extends \App\Controllers\BaseResourceController
                         ->validator('Validate::notEmpty', array(
                                 'message' => lang('TarifaAcabadoLineas.validation.margen.required'))
                         ),
+                    Field::inst('proveedor_id'),
                     Field::inst('tarifa_acabado_id'),
                     Field::inst('user_created_id'),
                     Field::inst('created_at'),
@@ -297,6 +299,7 @@ class TarifaAcabadosLineas extends \App\Controllers\BaseResourceController
 
                                 $process_data['tirada_min'] = $data['data'][$pkey]['tirada_min'];
                                 $process_data['tirada_max'] = $data['data'][$pkey]['tirada_max'];
+                                $process_data['proveedor_id'] = $data['data'][$pkey]['proveedor_id'];
                                 $response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['tarifa_acabado_id']);
                                 // No se pueden duplicar valores al crear o al editar
                                 if (!empty($response)) {

ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Tarifas;
+<?php
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -10,15 +11,15 @@ use App\Entities\Tarifas\TarifaEncuadernacionLinea;
 use App\Models\Tarifas\TarifaEncuadernacionLineaModel;
 
 use
-    DataTables\Editor,
-    DataTables\Database,
-    DataTables\Editor\Field,
-    DataTables\Editor\Format,
-    DataTables\Editor\Mjoin,
-    DataTables\Editor\Options,
-    DataTables\Editor\Upload,
-    DataTables\Editor\Validate,
-    DataTables\Editor\ValidateOptions;
+DataTables\Editor,
+DataTables\Database,
+DataTables\Editor\Field,
+DataTables\Editor\Format,
+DataTables\Editor\Mjoin,
+DataTables\Editor\Options,
+DataTables\Editor\Upload,
+DataTables\Editor\Validate,
+DataTables\Editor\ValidateOptions;
 
 
 class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
@@ -73,9 +74,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
     {
 
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -84,10 +85,10 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
                     } catch (\Exception $e) {
@@ -101,14 +102,14 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
 
                 $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 = $this->model->db->insertID();
 
                 $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -134,20 +135,20 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
     public function edit($requestedId = null)
     {
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $tarifaEncuadernacionLinea = $this->model->find($id);
 
-        if ($tarifaEncuadernacionLinea == false) :
+        if ($tarifaEncuadernacionLinea == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('TarifaEncuadernacionLineas.tarifaencuadernacionLinea')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -156,10 +157,10 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
                     } catch (\Exception $e) {
@@ -176,12 +177,12 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
 
                 $thenRedirect = false;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $tarifaEncuadernacionLinea->id ?? $id;
                 $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -214,45 +215,90 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
             $response = Editor::inst($db, 'tarifa_encuadernacion_lineas')
                 ->fields(
                     Field::inst('paginas_libro_min')
-                        ->validator('Validate::numeric', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal'))
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required')
+                            )
                         ),
                     Field::inst('paginas_libro_max')
-                        ->validator('Validate::numeric', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal'))
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required')
+                            )
                         ),
                     Field::inst('precio_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required')
+                            )
                         ),
                     Field::inst('precio_max')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.required')
+                            )
+                        ),
+                    Field::inst('total_min')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal')
+                            )
+                        )
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required')
+                            )
                         ),
                     Field::inst('margen')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.required')
+                            )
                         ),
                     Field::inst('tirada_encuadernacion_id'),
                     Field::inst('user_created_id'),
@@ -322,10 +368,10 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
         if ($this->request->isAJAX()) {
 
             $reqData = $this->request->getPost();
-            
+
             $cleandatatable = $reqData['cleandatatable'] ?? 0;
-            
-            if($cleandatatable){
+
+            if ($cleandatatable) {
 
                 $tarifa_encuadernacion_id = $reqData['tarifa_encuadernacion_id'] ?? -1;
 
@@ -338,11 +384,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
                     $csrfTokenName => $newTokenHash
                 ];
                 return $this->respond($data);
-                
-            }
 
-            else{
-            
+            } else {
+
                 if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
                     $errstr = 'No data available in response to this specific request.';
                     $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);

ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Tarifas;
+<?php
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -10,15 +11,15 @@ use App\Entities\Tarifas\TarifaEncuadernacionLinea;
 use App\Models\Tarifas\TarifaEncuadernacionLineaHorasModel;
 
 use
-    DataTables\Editor,
-    DataTables\Database,
-    DataTables\Editor\Field,
-    DataTables\Editor\Format,
-    DataTables\Editor\Mjoin,
-    DataTables\Editor\Options,
-    DataTables\Editor\Upload,
-    DataTables\Editor\Validate,
-    DataTables\Editor\ValidateOptions;
+DataTables\Editor,
+DataTables\Database,
+DataTables\Editor\Field,
+DataTables\Editor\Format,
+DataTables\Editor\Mjoin,
+DataTables\Editor\Options,
+DataTables\Editor\Upload,
+DataTables\Editor\Validate,
+DataTables\Editor\ValidateOptions;
 
 
 class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceController
@@ -71,9 +72,9 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
 
     public function add()
     {
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -82,10 +83,10 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
                     } catch (\Exception $e) {
@@ -99,14 +100,14 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
 
                 $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 = $this->model->db->insertID();
 
                 $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -134,20 +135,20 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
     public function edit($requestedId = null)
     {
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $tarifaEncuadernacionLinea = $this->model->find($id);
 
-        if ($tarifaEncuadernacionLinea == false) :
+        if ($tarifaEncuadernacionLinea == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('TarifaEncuadernacionLineas.tarifaencuadernacionLinea')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -156,10 +157,10 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
                     } catch (\Exception $e) {
@@ -176,12 +177,12 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
 
                 $thenRedirect = false;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $tarifaEncuadernacionLinea->id ?? $id;
                 $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -214,40 +215,79 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
             $response = Editor::inst($db, 'tarifa_encuadernacion_lineas_horas')
                 ->fields(
                     Field::inst('tiempo_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required')
+                            )
                         ),
                     Field::inst('tiempo_max')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required')
+                            )
                         ),
                     Field::inst('precio_hora')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required')
+                            )
+                        ),
+                    Field::inst('total_min')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal')
+                            )
+                        )
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required')
+                            )
                         ),
                     Field::inst('margen')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.required')
+                            )
                         ),
                     Field::inst('tirada_encuadernacion_id'),
                     Field::inst('user_created_id'),
@@ -314,10 +354,10 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
     {
         if ($this->request->isAJAX()) {
             $reqData = $this->request->getPost();
-            
+
             $cleandatatable = $reqData['cleandatatable'] ?? 0;
-            
-            if($cleandatatable){
+
+            if ($cleandatatable) {
 
                 $tarifa_encuadernacion_id = $reqData['tarifa_encuadernacion_id'] ?? -1;
 
@@ -330,9 +370,8 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
                     $csrfTokenName => $newTokenHash
                 ];
                 return $this->respond($data);
-                
-            }
-            else{
+
+            } else {
                 if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
                     $errstr = 'No data available in response to this specific request.';
                     $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);

ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php

@@ -126,15 +126,6 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\BaseResourceControlle
                         ->validator('Validate::notEmpty', array(
                                 'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required'))
                         ),
-                    Field::inst('precio_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
-                                "decimal" => ',',
-                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal'))
-                        )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required'))
-                        ),
                     Field::inst('proveedor_id')
                         ->validator('Validate::notEmpty', array(
                             'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_max.required'))

ci4/app/Controllers/Tarifas/Tarifaextra.php

@@ -40,6 +40,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
 
     public function index()
     {
+        checkPermission('tarifa-extra.menu');
 
         $this->viewData['usingClientSideDataTable'] = true;
 
@@ -51,8 +52,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
     public function add()
     {
 
-
-        
+        checkPermission('tarifa-extra.create', $this->indexRoute);
 
         if ($this->request->getPost()) :
 
@@ -117,6 +117,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
     public function edit($requestedId = null)
     {
 
+        checkPermission('tarifa-extra.edit', $this->indexRoute);
 
         if ($requestedId == null) :
             return $this->redirect2listView();
@@ -129,14 +130,10 @@ class Tarifaextra extends \App\Controllers\GoBaseController
             return $this->redirect2listView('errorMessage', $message);
         endif;
 
-        
-
         if ($this->request->getPost()) :
 
-            $nullIfEmpty = true; // !(phpversion() >= '8.1');
-
             $postData = $this->request->getPost();
-            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+            $sanitizedData = $this->sanitized($postData, true);
 
             // JJO
             if (isset($this->model->user_updated_id)) {
@@ -192,7 +189,6 @@ class Tarifaextra extends \App\Controllers\GoBaseController
         return $this->displayForm(__METHOD__, $id);
     } // end function edit(...)
 
-
     public function allItemsSelect()
     {
         if ($this->request->isAJAX()) {

ci4/app/Controllers/Tarifas/Tarifaimpresion.php

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

ci4/app/Controllers/Tarifas/Tarifapapelcompra.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Controllers\Tarifas;
-use App\Controllers\BaseController;
-
-
-class Tarifapapelcompra extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Tarifa papel compra';
-    } 
-
-    public function delete()
-    {
-
-    }
-
-    public function add()
-    {
-
-    }
-
-    public function edit()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Tarifas/Tarifapapeldefecto.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Controllers\Tarifas;
-use App\Controllers\BaseController;
-
-
-class Tarifapapeldefecto extends BaseController
-{ 
-    function __construct()
-    { 
-            
-    }
-
-    public function index()
-    {
-        echo 'Tarifa papel defecto';
-    } 
-
-    public function delete()
-    {
-
-    }
-
-    public function add()
-    {
-
-    }
-
-    public function edit()
-    {
-
-    }
-
-}
- 

ci4/app/Controllers/Tarifas/Tarifapreimpresion.php

@@ -40,19 +40,17 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
 
     public function index()
     {
+        checkPermission('tarifa-preimpresion.menu');
 
         $this->viewData['usingClientSideDataTable'] = true;
 
         $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tarifapreimpresion.tarifapreimpresion')]);
         parent::index();
-
     }
 
     public function add()
     {
-
-
-        
+        checkPermission('tarifa-preimpresion.create', $this->indexRoute);
 
         if ($this->request->getPost()) :
 
@@ -117,6 +115,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
     public function edit($requestedId = null)
     {
 
+        checkPermission('tarifa-preimpresion.edit', $this->indexRoute);
 
         if ($requestedId == null) :
             return $this->redirect2listView();

ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php

@@ -1,4 +1,6 @@
-<?php namespace App\Controllers\Tarifas;
+<?php
+
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -55,6 +57,8 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        // Check if the user is allowed to list items
+        checkPermission('tarifa-encuadernacion.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -73,8 +77,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
     public function add()
     {
 
-
-        
+        checkPermission('tarifa-encuadernacion.create', $this->indexRoute);
 
         if ($this->request->getPost()) :
 
@@ -99,7 +102,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
             if ($this->request->getPost('servicio_encuadernacion') == null) {
                 $sanitizedData['servicio_encuadernacion'] = false;
             }
-            
+
             if ($this->request->getPost('por_horas') == null) {
                 $sanitizedData['por_horas'] = false;
             }
@@ -145,7 +148,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
 
         $this->viewData['tarifaEncuadernacionEntity'] = isset($sanitizedData) ? new TarifaEncuadernacionEntity($sanitizedData) : new TarifaEncuadernacionEntity();
 
-        $this->viewData['formAction'] = site_url('tarifas/tarifasencuadernacion/add');//route_to('createTarifaEncuadernacion');
+        $this->viewData['formAction'] = site_url('tarifas/tarifasencuadernacion/add'); //route_to('createTarifaEncuadernacion');
 
         $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaencuadernacion.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
 
@@ -157,6 +160,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
     public function edit($requestedId = null)
     {
 
+        checkPermission('tarifa-encuadernacion.edit', $this->indexRoute);
 
         if ($requestedId == null) :
             return $this->redirect2listView();
@@ -169,7 +173,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
+
 
         if ($this->request->getPost()) :
 
@@ -186,7 +190,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
             if ($this->request->getPost('mostrar_en_presupuesto') == null) {
                 $sanitizedData['mostrar_en_presupuesto'] = false;
             }
-            
+
             if ($this->request->getPost('tipo_encuadernacion') == null) {
                 $sanitizedData['tipo_encuadernacion'] = false;
             }
@@ -248,6 +252,12 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
         return $this->displayForm(__METHOD__, $id);
     } // end function edit(...)
 
+    /*public function delete($id =null){
+        if (!auth()->user()->can('tarifa-encuadernacion.delete')) {
+            return $this->fail('No tiene permisos');
+        }
+        parent::delete($id);
+    }*/
 
     public function datatable()
     {
@@ -327,7 +337,8 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
         }
     }
 
-    private function getProveedores(){
+    private function getProveedores()
+    {
         $provTipoModel = new ProveedorTipoModel();
         $provModel = new ProveedorModel();
 
@@ -335,12 +346,13 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
         return $provModel->getProvList($tipoId);
     }
 
-    private function getDimensiones(){
+    private function getDimensiones()
+    {
         $dimensionModel = new TarifaEncuadernacionDimensionesModel();
 
         $dimensiones = $dimensionModel->getDimensiones();
-        foreach($dimensiones as $dim){
-            $dim->label= lang("TarifaEncuadernacionLineas." . $dim->label);
+        foreach ($dimensiones as $dim) {
+            $dim->label = lang("TarifaEncuadernacionLineas." . $dim->label);
         }
         return $dimensiones;
     }

ci4/app/Controllers/Tarifas/Tarifasenvios.php

@@ -55,7 +55,10 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
 
 
     public function index() {
-        
+
+        // Check if the user is allowed to list items
+        checkPermission('tarifa-envio.menu');
+
         $viewData = [
                 'currentModule' => static::$controllerSlug,
                 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('TarifasEnvios.tarifaEnvio')]),
@@ -71,9 +74,8 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
 
 
     public function add() {
-        
 
-        
+        checkPermission('tarifa-envio.create', $this->indexRoute);
 
         if ($this->request->getPost()) :
 
@@ -142,6 +144,8 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
 
     public function edit($requestedId = null) {
 
+        checkPermission('tarifa-envio.edit', $this->indexRoute);
+
         
         if ($requestedId == null) :
             return $this->redirect2listView();
@@ -227,6 +231,10 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
     // JJO
     public function delete($id = null)
     {
+        /*if (!auth()->user()->can('tarifa-envio.delete')) {
+            return $this->fail('Error');
+        }*/
+
         if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
             $objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc));
         } else {
@@ -242,7 +250,6 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
         else{
             $datetime = (new \CodeIgniter\I18n\Time("now"));
 
-
             $zonaModel = new TarifaEnvioZonaModel();
             $zonaResult = $zonaModel->removeAllZonasLineas($id, $datetime, $this->delete_flag);
 

ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php

@@ -1,4 +1,5 @@
-<?php  namespace App\Controllers\Tarifas;
+<?php
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -14,10 +15,11 @@ use App\Models\Tarifas\TarifaEnvioModel;
 use App\Models\Tarifas\TarifaEnvioPrecioModel;
 
 use
-    DataTables\Editor,
-    DataTables\Editor\Field;
+DataTables\Editor,
+DataTables\Editor\Field;
 
-class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
+class Tarifasenviosprecios extends \App\Controllers\BaseResourceController
+{
 
     protected $modelName = TarifaEnvioPrecioModel::class;
     protected $format = 'json';
@@ -33,9 +35,10 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
 
     protected $indexRoute = 'tarifaEnvioPrecioList';
 
-    
 
-    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) {
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
         $this->viewData['pageTitle'] = lang('TarifasEnviosPrecios.moduleTitle');
         $this->viewData['usingSweetAlert'] = true;
 
@@ -48,66 +51,68 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
     }
 
 
-    public function index() {
-        
+    public function index()
+    {
+
         $viewData = [
-                'currentModule' => static::$controllerSlug,
-                'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('TarifasEnviosPrecios.tarifaEnvioPrecio')]),
-                'tarifaEnvioPrecioEntity' => new TarifaEnvioPrecioEntity(),
-                'usingServerSideDataTable' => true,
-                
-            ];
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('TarifasEnviosPrecios.tarifaEnvioPrecio')]),
+            'tarifaEnvioPrecioEntity' => new TarifaEnvioPrecioEntity(),
+            'usingServerSideDataTable' => true,
+
+        ];
 
         $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
 
-        return view(static::$viewPath.'viewTarifaEnvioPrecioList', $viewData);
+        return view(static::$viewPath . 'viewTarifaEnvioPrecioList', $viewData);
     }
 
 
-    public function add() {
-        
-        
+    public function add()
+    {
 
-        
 
-        if ($this->request->getPost()) :
+
+
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
             $postData = $this->request->getPost();
-            
-			$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+
+            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-				if ($this->canValidate()) :
-					try {
-						$successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
-					} catch (\Exception $e) {
-						$noException = false;
-						$this->dealWithException($e);
-					}
-				else:
-					$this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]);
-						$this->session->setFlashdata('formErrors', $this->model->errors());
-				endif;
-            
-            $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
+                if ($this->canValidate()):
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+                endif;
+
+                $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 = $this->model->db->insertID();
 
-                $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]).'.';
-                $message .= anchor( "admin/tarifasenviosprecios/{$id}/edit" , lang('Basic.global.continueEditing').'?');
+                $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]) . '.';
+                $message .= anchor("admin/tarifasenviosprecios/{$id}/edit", lang('Basic.global.continueEditing') . '?');
                 $message = ucfirst(str_replace("'", "\'", $message));
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
-                        return redirect()->to(route_to( $this->indexRoute )  )->with('sweet-success', $message);
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
                     endif;
@@ -120,97 +125,98 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
         endif; // ($requestMethod === 'post')
 
         $this->viewData['tarifaEnvioPrecioEntity'] = isset($sanitizedData) ? new TarifaEnvioPrecioEntity($sanitizedData) : new TarifaEnvioPrecioEntity();
-		$this->viewData['tarifaEnvioList'] = $this->getTarifaEnvioListItems($tarifaEnvioPrecioEntity->tarifa_envio_id ?? null);
-		$this->viewData['proveedorList'] = $this->getProveedorListItems($tarifaEnvioPrecioEntity->proveedor_id ?? null);
-		$this->viewData['tipoEnvioList'] = $this->getTipoEnvioOptions();
+        $this->viewData['tarifaEnvioList'] = $this->getTarifaEnvioListItems($tarifaEnvioPrecioEntity->tarifa_envio_id ?? null);
+        $this->viewData['proveedorList'] = $this->getProveedorListItems($tarifaEnvioPrecioEntity->proveedor_id ?? null);
+        $this->viewData['tipoEnvioList'] = $this->getTipoEnvioOptions();
 
         $this->viewData['formAction'] = route_to('createTarifaEnvioPrecio');
 
-        $this->viewData['boxTitle'] = lang('Basic.global.addNew').' '.lang('TarifasEnviosPrecios.moduleTitle').' '.lang('Basic.global.addNewSuffix');
-        
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('TarifasEnviosPrecios.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
+
 
         return $this->displayForm(__METHOD__);
     } // end function add()
 
-    public function edit($requestedId = null) {
-        
-        if ($requestedId == null) :
+    public function edit($requestedId = null)
+    {
+
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $tarifaEnvioPrecioEntity = $this->model->find($id);
 
-        if ($tarifaEnvioPrecioEntity == false) :
+        if ($tarifaEnvioPrecioEntity == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
-        
+
             $postData = $this->request->getPost();
-            
-            			$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+
+            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+
 
 
-            
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
-            
-            
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
-            	if ($this->canValidate()) :
-            	    try {
-            	        $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
-            	    } catch (\Exception $e) {
-            	        $noException = false;
-            	        $this->dealWithException($e);
-            	    }
-            	else:
-            	    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]);
-            	    $this->session->setFlashdata('formErrors', $this->model->errors());
-            	
-            	endif;
-            	
-            	$tarifaEnvioPrecioEntity->fill($sanitizedData);
 
-            	$thenRedirect = true;
+
+                if ($this->canValidate()):
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                endif;
+
+                $tarifaEnvioPrecioEntity->fill($sanitizedData);
+
+                $thenRedirect = true;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $tarifaEnvioPrecioEntity->id ?? $id;
-                $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]).'.';
-                $message .= anchor( "admin/tarifasenviosprecios/{$id}/edit" , lang('Basic.global.continueEditing').'?');
+                $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('TarifasEnviosPrecios.tarifaEnvioPrecio'))]) . '.';
+                $message .= anchor("admin/tarifasenviosprecios/{$id}/edit", lang('Basic.global.continueEditing') . '?');
                 $message = ucfirst(str_replace("'", "\'", $message));
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
-                        return redirect()->to(route_to( $this->indexRoute )  )->with('sweet-success', $message);
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
                     endif;
                 else:
                     $this->session->setFlashData('sweet-success', $message);
                 endif;
-        
+
             endif; // $noException && $successfulResult
         endif; // ($requestMethod === 'post')
 
         $this->viewData['tarifaEnvioPrecioEntity'] = $tarifaEnvioPrecioEntity;
-		$this->viewData['tarifaEnvioList'] = $this->getTarifaEnvioListItems($tarifaEnvioPrecioEntity->tarifa_envio_id ?? null);
-		$this->viewData['proveedorList'] = $this->getProveedorListItems($tarifaEnvioPrecioEntity->proveedor_id ?? null);
-		$this->viewData['tipoEnvioList'] = $this->getTipoEnvioOptions();
+        $this->viewData['tarifaEnvioList'] = $this->getTarifaEnvioListItems($tarifaEnvioPrecioEntity->tarifa_envio_id ?? null);
+        $this->viewData['proveedorList'] = $this->getProveedorListItems($tarifaEnvioPrecioEntity->proveedor_id ?? null);
+        $this->viewData['tipoEnvioList'] = $this->getTipoEnvioOptions();
+
+        $this->viewData['formAction'] = route_to('updateTarifaEnvioPrecio', $id);
+
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('TarifasEnviosPrecios.moduleTitle') . ' ' . lang('Basic.global.edit3');
 
-        		$this->viewData['formAction'] = route_to('updateTarifaEnvioPrecio', $id);
 
-        $this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('TarifasEnviosPrecios.moduleTitle').' '.lang('Basic.global.edit3');
-        
-        
         return $this->displayForm(__METHOD__, $id);
     } // end function edit(...)
-    
+
 
     public function datatable_editor()
     {
@@ -222,62 +228,101 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
             $response = Editor::inst($db, 'tarifas_envios_precios')
                 ->fields(
                     Field::inst('tipo_envio')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.tipo_envio.required'))
-                        ),                        
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.tipo_envio.required')
+                            )
+                        ),
                     Field::inst('peso_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.peso_min.required'))
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.peso_min.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifasEnviosPrecios.validation.peso_min.decimal'))
+                                'message' => lang('TarifasEnviosPrecios.validation.peso_min.decimal')
+                            )
                         ),
                     Field::inst('peso_max')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.peso_max.required'))
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.peso_max.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifasEnviosPrecios.validation.peso_max.decimal'))
+                                'message' => lang('TarifasEnviosPrecios.validation.peso_max.decimal')
+                            )
                         ),
                     Field::inst('precio_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.precio.required'))
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.precio.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
-                                "decimal" => ',',   
-                                'message' => lang('TarifasEnviosPrecios.validation.precio.decimal'))
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('TarifasEnviosPrecios.validation.precio.decimal')
+                            )
                         ),
                     Field::inst('precio_max')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.precio.required'))
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.precio.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifasEnviosPrecios.validation.precio.decimal'))
+                                'message' => lang('TarifasEnviosPrecios.validation.precio.decimal')
+                            )
                         ),
                     Field::inst('precio_adicional')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.required'))
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal'))
+                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal')
+                            )
                         ),
                     Field::inst('margen')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::required', array(
-                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.required'))
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::required',
+                            array(
+                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.required')
+                            )
                         )
-                        ->validator('Validate::numeric', array(
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal'))
+                                'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal')
+                            )
                         ),
                     Field::inst('tarifa_envio_id'),
                     Field::inst('proveedor_id'),
@@ -344,24 +389,35 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
     }
 
 
-    public function datatable() {
+    public function datatable()
+    {
         if ($this->request->isAJAX()) {
             $reqData = $this->request->getPost();
-            if (!isset($reqData['draw']) || !isset($reqData['columns']) ) {
+            if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
                 $errstr = 'No data available in response to this specific request.';
-                $response = $this->respond(Collection::datatable(  [], 0, 0, $errstr ), 400, $errstr);
+                $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
                 return $response;
             }
             $start = $reqData['start'] ?? 0;
             $length = $reqData['length'] ?? 5;
             $search = $reqData['search']['value'];
             $requestedOrder = $reqData['order']['0']['column'] ?? 1;
+            $requestedOrder2 = $reqData['order']['1']['column'] ?? $requestedOrder;
+            $requestedOrder3 = $reqData['order']['2']['column'] ?? $requestedOrder;
             $order = TarifaEnvioPrecioModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
+            $order2 = TarifaEnvioPrecioModel::SORTABLE[$requestedOrder2 > 0 ? $requestedOrder2 : 1];
+            $order3 = TarifaEnvioPrecioModel::SORTABLE[$requestedOrder3 > 0 ? $requestedOrder3 : 1];
             $dir = $reqData['order']['0']['dir'] ?? 'asc';
+            $dir2 = $reqData['order']['0']['dir'] ?? $dir;
+            $dir3 = $reqData['order']['0']['dir'] ?? $dir;
+
+
 
             $tarifa_envio_id = $reqData['tarifa_envio_id'] ?? -1;
 
-            $resourceData = $this->model->getResource($search, $tarifa_envio_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+            $resourceData = $this->model->getResource($search, $tarifa_envio_id)
+                ->orderBy($order, $dir)->orderBy($order2, $dir2)->orderBy($order3, $dir3)
+                ->limit($length, $start)->get()->getResultObject();
 
             return $this->respond(Collection::datatable(
                 $resourceData,
@@ -373,15 +429,16 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
         }
     }
 
-    public function allItemsSelect() {
+    public function allItemsSelect()
+    {
         if ($this->request->isAJAX()) {
             $onlyActiveOnes = true;
             $reqVal = $this->request->getPost('val') ?? 'id';
-            $menu = $this->model->getAllForMenu($reqVal.', tarifa_envio_id', 'tarifa_envio_id', $onlyActiveOnes, false);
+            $menu = $this->model->getAllForMenu($reqVal . ', tarifa_envio_id', 'tarifa_envio_id', $onlyActiveOnes, false);
             $nonItem = new \stdClass;
             $nonItem->id = '';
-            $nonItem->tarifa_envio_id = '- '.lang('Basic.global.None').' -';
-            array_unshift($menu , $nonItem);
+            $nonItem->tarifa_envio_id = '- ' . lang('Basic.global.None') . ' -';
+            array_unshift($menu, $nonItem);
 
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
@@ -395,7 +452,8 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
         }
     }
 
-    public function menuItems() {
+    public function menuItems()
+    {
         if ($this->request->isAJAX()) {
             $searchStr = goSanitize($this->request->getPost('searchTerm'))[0];
             $reqId = goSanitize($this->request->getPost('id'))[0];
@@ -406,8 +464,8 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
             $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
             $nonItem = new \stdClass;
             $nonItem->id = '';
-            $nonItem->text = '- '.lang('Basic.global.None').' -';
-            array_unshift($menu , $nonItem);
+            $nonItem->text = '- ' . lang('Basic.global.None') . ' -';
+            array_unshift($menu, $nonItem);
 
             $newTokenHash = csrf_hash();
             $csrfTokenName = csrf_token();
@@ -422,42 +480,45 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
     }
 
 
-	protected function getTarifaEnvioListItems($selId = null) { 
-		$data = [''=>lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('TarifasEnvios.tarifaEnvio'))])];
-        if (!empty($selId)) :
-            		$tarifaEnvioModel = model('App\Models\Tarifas\TarifaEnvioModel');
+    protected function getTarifaEnvioListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('TarifasEnvios.tarifaEnvio'))])];
+        if (!empty($selId)):
+            $tarifaEnvioModel = model('App\Models\Tarifas\TarifaEnvioModel');
 
             $selOption = $tarifaEnvioModel->where('id', $selId)->findColumn('id');
-            if (!empty($selOption)) :
+            if (!empty($selOption)):
                 $data[$selId] = $selOption[0];
             endif;
         endif;
-		return $data;
-	}
+        return $data;
+    }
 
 
-	protected function getProveedorListItems($selId = null) { 
-		$data = [''=>lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('LgProveedores.proveedor'))])];
-        if (!empty($selId)) :
-            		$proveedorModel = model('App\Models\compras\ProveedorModel');
+    protected function getProveedorListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('LgProveedores.proveedor'))])];
+        if (!empty($selId)):
+            $proveedorModel = model('App\Models\compras\ProveedorModel');
 
             $selOption = $proveedorModel->where('id', $selId)->findColumn('id');
-            if (!empty($selOption)) :
+            if (!empty($selOption)):
                 $data[$selId] = $selOption[0];
             endif;
         endif;
-		return $data;
-	}
+        return $data;
+    }
 
 
-	protected function getTipoEnvioOptions() { 
-		$tipoEnvioOptions = [ 
-				'' => lang('Basic.global.pleaseSelect'),
-				'cajas' => 'cajas',
-				'palets' => 'palets',
-			];
-		return $tipoEnvioOptions;
-	}
+    protected function getTipoEnvioOptions()
+    {
+        $tipoEnvioOptions = [
+            '' => lang('Basic.global.pleaseSelect'),
+            'cajas' => 'cajas',
+            'palets' => 'palets',
+        ];
+        return $tipoEnvioOptions;
+    }
 
 
 }

ci4/app/Controllers/Tarifas/Tarifasmanipulado.php

@@ -1,4 +1,6 @@
-<?php namespace App\Controllers\Tarifas;
+<?php
+
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -51,6 +53,8 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
 
     public function index()
     {
+        // Check if the user is allowed to list items
+        checkPermission('tarifa-manipulado.menu');
 
         $viewData = [
             'currentModule' => static::$controllerSlug,
@@ -69,8 +73,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
     public function add()
     {
 
-
-        
+        checkPermission('tarifa-manipulado.create', $this->indexRoute);
 
         if ($this->request->getPost()) :
 
@@ -129,7 +132,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
 
         $this->viewData['tarifaManipuladoEntity'] = isset($sanitizedData) ? new TarifaManipuladoEntity($sanitizedData) : new TarifaManipuladoEntity();
 
-        $this->viewData['formAction'] = site_url('tarifas/tarifasmanipulado/add');//route_to('createTarifaManipulado');
+        $this->viewData['formAction'] = site_url('tarifas/tarifasmanipulado/add'); //route_to('createTarifaManipulado');
 
         $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifamanipulado.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
 
@@ -140,6 +143,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
     public function edit($requestedId = null)
     {
 
+        checkPermission('tarifa-manipulado.edit', $this->indexRoute);
 
         if ($requestedId == null) :
             return $this->redirect2listView();
@@ -152,15 +156,12 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
         if ($this->request->getPost()) :
 
-            $nullIfEmpty = true; // !(phpversion() >= '8.1');
-
             $postData = $this->request->getPost();
 
-            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+            $sanitizedData = $this->sanitized($postData, true);
 
             // JJO
             if (isset($this->model->user_updated_id)) {
@@ -294,5 +295,19 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
             return $this->failUnauthorized('Invalid request', 403);
         }
     }
+    public function show_select()
+    {
+        $query =  $this->model->builder()
+            ->select(
+                ["id", "nombre as name", "code as description"]
+            )
+            ->where("deleted_at", null);
 
+        if ($this->request->getGet("q")) {
+            $query->groupStart()
+                ->orLike("nombre", $this->request->getGet("q"))
+                ->groupEnd();
+        }
+        return $this->response->setJSON($query->get()->getResultObject());
+    }
 }

ci4/app/Controllers/Test.php

@@ -18,31 +18,74 @@ class Test extends BaseController
     {
     }
 
+    public function echo(){
+
+        echo "echo";
+
+    }
+
     public function index()
     {
-        helper('rbac');
+        /*
+        $model = model("\App\Models\Pedidos\PedidoLineaModel");
+        $data = $model->obtenerLineasPedidoSinFacturar(999);
+        */
 
-        var_dump(auth()->user()->can('plantilla-tarifa.menu'));
-
-        //$user = auth()->user();
-
-        generate_php_permissions_constant();
-
-        //echo generate_php_permissions_matrix_constant();
-
-        //$user->syncGroups('admin');
-
-        //var_dump($user->can('token.menu'));
+        xdebug_info();
 
 
 
     }
 
+    private function clonar_tarifa_encuadernacion($teOrigen, $teDestino){
 
-    private function test_get_tirada_alt($tirada, $merma, $tipo_impresion_id, 
-        $json_data, $cliente_id, $ancho, $alto, 
-        $solapas_cubierta, $solapas_ancho_cubierta, $solapas_sobrecubierta, $solapas_ancho_sobrecubierta, $lomo)
-    {       
+        $tet_model = model('App\Models\Tarifas\TarifaEncuadernacionTiradaModel');
+        $tel_model = model('App\Models\Tarifas\TarifaEncuadernacionLineaModel');
+
+        $tarifasTiradas = $tet_model->asObject()->where('tarifa_encuadernacion_id',$teOrigen)->findAll();
+
+        foreach ($tarifasTiradas as $tarifasTirada){
+
+            echo "--->" . $tarifasTirada->id . "<br>";
+
+            $tarifasLineas = $tel_model->asObject()->where('tirada_encuadernacion_id',$tarifasTirada->id)->findAll();
+
+            // Prepare the data
+            unset($tarifasTirada->id);
+            $tarifasTirada->tarifa_encuadernacion_id = $teDestino;
+            $tarifasTirada->created_at = date('Y-m-d H:i:s');
+            $tarifasTirada->updated_at = date('Y-m-d H:i:s');
+            //var_dump($tarifasTirada);
+
+            // Insert it
+            $tet_model->insert($tarifasTirada);
+            $inserted_id = $tet_model->insertID();
+
+            foreach ($tarifasLineas as $tarifasLinea){
+
+                echo "------>" . $tarifasLinea->id . "<br>";
+
+                // Prepare the data
+                unset($tarifasLinea->id);
+                $tarifasLinea->tirada_encuadernacion_id = $inserted_id;
+                $tarifasLinea->created_at = date('Y-m-d H:i:s');
+                $tarifasLinea->updated_at = date('Y-m-d H:i:s');
+                //var_dump($tarifasLinea);
+
+                // Insert it
+                $tel_model->insert($tarifasLinea);
+
+            }
+        }
+
+    }
+
+
+
+    private function test_get_tirada_alt($tirada, $merma, $tipo_impresion_id,
+                                         $json_data, $cliente_id, $ancho, $alto,
+                                         $solapas_cubierta, $solapas_ancho_cubierta, $solapas_sobrecubierta, $solapas_ancho_sobrecubierta, $lomo)
+    {
         $values = [];
 
         if ($json_data) {

ci4/app/Controllers/Utiles.php

@@ -0,0 +1,320 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use App\Models\Configuracion\MaquinasTarifasImpresionModel;
+use App\Models\Configuracion\PapelGenericoModel;
+use App\Models\Configuracion\MaquinaModel;
+use App\Models\Presupuestos\PresupuestoModel;
+use App\Models\Usuarios\GroupModel;
+use App\Models\Usuarios\PermisosModel;
+use App\Services\PresupuestoService;
+use CodeIgniter\Shield\Entities\User;
+
+class Utiles extends BaseController
+{
+    function __construct()
+    {
+    }
+
+    public function echo()
+    {
+
+        echo "echo";
+
+    }
+
+    public function index()
+    {
+        echo "ok";
+
+
+    }
+
+
+    public function get_tarifas_encuadernacion()
+    {
+        // Llamar al modelo
+        $model = model('App\Models\Tarifas\TarifaEncuadernacionModel');
+
+        // Obtener todos los resultados
+        $results = $model->where(['is_deleted' => 0])->findAll();
+
+        // Iterar sobre cada entidad
+        echo '<pre>';
+        foreach ($results as $result) {
+            // Cada $result es una instancia de una entidad
+            print_r($result->toArray());  // Convierte la entidad a un array para imprimir sus valores
+        }
+        echo '</pre>';
+    }
+
+    public function get_tarifa_encuadernacion($tarifaEncuadernacionId)
+    {
+        // Llamar a los modelos
+        $modelTE = model('App\Models\Tarifas\TarifaEncuadernacionModel');
+        $modelTELineas = model('App\Models\Tarifas\TarifaEncuadernacionLineaModel');
+        $modelTELineasHoras = model('App\Models\Tarifas\TarifaEncuadernacionLineaHorasModel');
+        $modelTETiradas = model('App\Models\Tarifas\TarifaEncuadernacionTiradaModel');
+
+
+        // Obtener el registro principal de tarifa_encuadernacion
+        $tarifas_encuadernacion = $modelTE->where([
+            'id' => $tarifaEncuadernacionId,
+            'is_deleted' => 0
+        ])->findAll();
+
+        // Verificar si se encontró la tarifa
+        if (empty($tarifas_encuadernacion)) {
+            echo "No se encontraron datos para la tarifa de encuadernación con ID: $tarifaEncuadernacionId.";
+            return;
+        }
+
+        // Imprimir la tarifa de encuadernación principal
+        echo "<h3>---------------------- DATO TARIFA ENCUADERNACION ----------------------</h3>";
+        foreach ($tarifas_encuadernacion as $tarifa_encuadernacion) {
+            echo "<strong>ID Tarifa: </strong>" . $tarifa_encuadernacion->id . "<br>";
+            echo "<strong>Nombre: </strong>" . $tarifa_encuadernacion->nombre . "<br>";
+            echo "<hr>";
+        }
+
+        // Obtener las tiradas asociadas a esta tarifa de encuadernación
+        $tarifas_encuadernacion_tiradas = $modelTETiradas->where([
+            'tarifa_encuadernacion_id' => $tarifaEncuadernacionId,
+            'is_deleted' => 0
+        ])->findAll();
+
+        // Verificar si existen tiradas para la tarifa de encuadernación
+        if (empty($tarifas_encuadernacion_tiradas)) {
+            echo "No hay tiradas asociadas a esta tarifa de encuadernación.";
+            return;
+        }
+
+        // Imprimir las tiradas asociadas
+        echo "<h3>---------------------- DATO TARIFA ENCUADERNACION (TIRADAS) -------------</h3>";
+        foreach ($tarifas_encuadernacion_tiradas as $tarifa_encuadernacion_tirada) {
+            echo "<strong>ID Tirada: </strong>" . $tarifa_encuadernacion_tirada->id . "<br>";
+            echo "<strong>Tirada Min: </strong>" . $tarifa_encuadernacion_tirada->tirada_min . "<br>";
+            echo "<strong>Tirada Max: </strong>" . $tarifa_encuadernacion_tirada->tirada_max . "<br>";
+
+            // Obtener las líneas asociadas a esta tirada
+            $tarifas_encuadernacion_lineas = $modelTELineas->where([
+                'tirada_encuadernacion_id' => $tarifa_encuadernacion_tirada->id,
+                'is_deleted' => 0
+            ])->findAll();
+
+            // Verificar si existen líneas asociadas a la tirada
+            if (empty($tarifas_encuadernacion_lineas)) {
+                echo "No hay líneas asociadas a esta tirada de encuadernación.<br>";
+            } else {
+                // Imprimir las líneas asociadas
+                echo "<ul>";
+                foreach ($tarifas_encuadernacion_lineas as $tarifa_encuadernacion_linea) {
+                    echo "<li><strong>ID Línea: </strong>" . $tarifa_encuadernacion_linea->id . "<br>";
+                }
+                echo "</ul>";
+            }
+
+            // Obtener las líneas y horas asociadas a esta tirada
+            $tarifas_encuadernacion_lineas_horas = $modelTELineasHoras->where([
+                'tirada_encuadernacion_id' => $tarifa_encuadernacion_tirada->id,
+                'is_deleted' => 0
+            ])->findAll();
+
+            // Verificar si existen líneas y horas asociadas a la tirada
+            if (empty($tarifas_encuadernacion_lineas_horas)) {
+                echo "No hay líneas y horas asociadas a esta tirada de encuadernación.<br>";
+            } else {
+                // Imprimir las líneas asociadas
+                echo "<ul>";
+                foreach ($tarifas_encuadernacion_lineas_horas as $tarifas_encuadernacion_linea_hora) {
+                    echo "<li><strong>ID Línea/Hora: </strong>" . $tarifas_encuadernacion_linea_hora->id . "<br>";
+                }
+                echo "</ul>";
+            }
+
+            echo "<hr>";
+        }
+
+        echo "<h3>---------------------- FIN DE DATO TARIFA ENCUADERNACION ----------------------</h3>";
+    }
+
+    public function delete_tarifa_encuadernacion($tarifaEncuadernacionId)
+    {
+        // Llamar a los modelos
+        $modelTE = model('App\Models\Tarifas\TarifaEncuadernacionModel');
+        $modelTELineas = model('App\Models\Tarifas\TarifaEncuadernacionLineaModel');
+        $modelTELineasHoras = model('App\Models\Tarifas\TarifaEncuadernacionLineaHorasModel');
+        $modelTETiradas = model('App\Models\Tarifas\TarifaEncuadernacionTiradaModel');
+
+        // Obtener el registro principal de tarifa_encuadernacion
+        $tarifas_encuadernacion = $modelTE->where([
+            'id' => $tarifaEncuadernacionId,
+            'is_deleted' => 0
+        ])->findAll();
+
+        // Verificar si se encontró la tarifa
+        if (empty($tarifas_encuadernacion)) {
+            echo "No se encontró la tarifa de encuadernación con ID: $tarifaEncuadernacionId.";
+            return;
+        }
+
+        // Iniciar eliminación de datos asociados
+        echo "Eliminando datos asociados a la tarifa de encuadernación ID: $tarifaEncuadernacionId...<br>";
+
+        // Eliminar las tiradas asociadas a la tarifa de encuadernación
+        $tarifas_encuadernacion_tiradas = $modelTETiradas->where([
+            'tarifa_encuadernacion_id' => $tarifaEncuadernacionId,
+            'is_deleted' => 0
+        ])->findAll();
+
+        if (!empty($tarifas_encuadernacion_tiradas)) {
+            foreach ($tarifas_encuadernacion_tiradas as $tarifa_encuadernacion_tirada) {
+                // Eliminar las líneas de horas asociadas a cada tirada
+                $tarifas_encuadernacion_lineas_horas = $modelTELineasHoras->where([
+                    'tirada_encuadernacion_id' => $tarifa_encuadernacion_tirada->id,
+                    'is_deleted' => 0
+                ])->findAll();
+
+                if (!empty($tarifas_encuadernacion_lineas_horas)) {
+                    foreach ($tarifas_encuadernacion_lineas_horas as $tarifa_encuadernacion_linea_hora) {
+                        $modelTELineasHoras->delete($tarifa_encuadernacion_linea_hora->id);  // Eliminar la línea/hora
+                        echo "===sk >-Eliminando Línea/Hora ID: " . $tarifa_encuadernacion_linea_hora->id . "<br>";
+                    }
+                }
+
+                // Eliminar las líneas asociadas a cada tirada
+                $tarifas_encuadernacion_lineas = $modelTELineas->where([
+                    'tirada_encuadernacion_id' => $tarifa_encuadernacion_tirada->id,
+                    'is_deleted' => 0
+                ])->findAll();
+
+                if (!empty($tarifas_encuadernacion_lineas)) {
+                    foreach ($tarifas_encuadernacion_lineas as $tarifa_encuadernacion_linea) {
+                        $modelTELineas->delete($tarifa_encuadernacion_linea->id);  // Eliminar la línea
+                        echo "===>-Eliminando Línea ID: " . $tarifa_encuadernacion_linea->id . "<br>";
+                    }
+                }
+
+                // Eliminar la tirada
+                $modelTETiradas->delete($tarifa_encuadernacion_tirada->id);  // Eliminar la tirada
+                echo "=>-Eliminando Tirada ID: " . $tarifa_encuadernacion_tirada->id . "<br>";
+            }
+        }
+
+        echo " *** Proceso de eliminación completado. ***<br><br>";
+    }
+
+    public function clone_tarifa_encuadernacion($origenId, $destinoId)
+    {
+        // Llamar a los modelos
+        $modelTETiradas = model('App\Models\Tarifas\TarifaEncuadernacionTiradaModel');
+        $modelTELineas = model('App\Models\Tarifas\TarifaEncuadernacionLineaModel');
+        $modelTELineasHoras = model('App\Models\Tarifas\TarifaEncuadernacionLineaHorasModel');
+
+        // 1. Eliminar el contenido asociado de la tarifa destino
+        $this->delete_tarifa_encuadernacion($destinoId);
+
+        // 2. Obtener las tiradas asociadas a la tarifa origen
+        $tiradasOrigen = $modelTETiradas->where([
+            'tarifa_encuadernacion_id' => $origenId,
+            'is_deleted' => 0
+        ])->findAll();
+
+        foreach ($tiradasOrigen as $tiradaOrigen) {
+            // Crear un nuevo registro para la tirada en la tarifa destino
+            $nuevaTirada = [
+                'tarifa_encuadernacion_id' => (int) $destinoId,
+                'proveedor_id' => (int)  $tiradaOrigen->proveedor_id,
+                'importe_fijo' => (float) $tiradaOrigen->importe_fijo,
+                'tirada_min' => (int) $tiradaOrigen->tirada_min,
+                'tirada_max' => (int) $tiradaOrigen->tirada_max,
+                'user_created_id' =>  (int) auth()->id(),
+                'is_deleted' => 0
+            ];
+
+            try {
+                $nuevaTiradaId = $modelTETiradas->insert($nuevaTirada);
+                if (!$nuevaTiradaId) {
+                    throw new \Exception("Error al insertar el registro.");
+                }
+                echo "<br>==>+Tirada creada con ID: " . $nuevaTiradaId;
+            } catch (\Exception $e) {
+                echo "Error: " . $e->getMessage();
+            }
+
+            // 3. Clonar las líneas asociadas a esta tirada
+            $lineasOrigen = $modelTELineas->where([
+                'tirada_encuadernacion_id' => $tiradaOrigen->id,
+                'is_deleted' => 0
+            ])->findAll();
+
+            foreach ($lineasOrigen as $lineaOrigen) {
+                $nuevaLinea = [
+                    'tirada_encuadernacion_id' => (int) $nuevaTiradaId,
+                    'paginas_libro_min' => (float) $lineaOrigen->paginas_libro_min,
+                    'paginas_libro_max' => (float) $lineaOrigen->paginas_libro_max,
+                    'dimensiones_id' => (int) $lineaOrigen->dimensiones_id,
+                    'precio_min' => (float) $lineaOrigen->precio_min,
+                    'precio_max' => (float) $lineaOrigen->precio_max,
+                    'tirada_min' => (float) $lineaOrigen->tirada_min,
+                    'tirada_max' => (float) $lineaOrigen->tirada_max,
+                    'total_min' => (float) $lineaOrigen->total_min,
+                    'margen' => (float) $lineaOrigen->margen,
+                    'user_created_id' => (int)  auth()->id(),
+                    'is_deleted' => 0
+                ];
+
+                try {
+                    $nuevaLineaId = $modelTELineas->insert($nuevaLinea);
+                    if (!$nuevaLineaId) {
+                        throw new \Exception("Error al insertar el registro.");
+                    }
+                    echo "<br>====>+Linea creada con ID: " . $nuevaLineaId;
+                } catch (\Exception $e) {
+                    echo "Error: " . $e->getMessage();
+                }
+
+            }
+
+            // 4. Clonar las líneas y horas asociadas a esta tirada
+            $lineasHorasOrigen = $modelTELineasHoras->where([
+                'tirada_encuadernacion_id' => $tiradaOrigen->id,
+                'is_deleted' => 0
+            ])->findAll();
+
+            foreach ($lineasHorasOrigen as $lineaHoraOrigen) {
+                $nuevaLineaHora = [
+                    'tirada_encuadernacion_id' => (int) $nuevaTiradaId,
+                    'tiempo_min' => (float) $lineaHoraOrigen->tiempo_min,
+                    'tiempo_max' => (float) $lineaHoraOrigen->tiempo_max,
+                    'precio_hora' => (float) $lineaHoraOrigen->precio_hora,
+                    'total_min' => (float) $lineaHoraOrigen->total_min,
+                    'margen' => (float) $lineaHoraOrigen->margen,
+                    'user_created_id' => (int) auth()->id(),
+                    'is_deleted' => 0
+                ];
+
+                try {
+                    $nuevaLineaHoraId = $modelTELineasHoras->insert($nuevaLineaHora);
+                    if (!$nuevaLineaHoraId) {
+                        throw new \Exception("Error al insertar el registro.");
+                    }
+                    echo "<br>====>+Linea/Hora creado con ID: " . $nuevaLineaHoraId;
+                } catch (\Exception $e) {
+                    echo "Error: " . $e->getMessage();
+                }
+
+            }
+        }
+
+        echo "<br> *** Proceso de clonacion completado. ***<br><br>";
+    }
+
+
+
+
+
+
+}

ci4/app/Database/Migrations/2024-09-17-151435_ChatDepartments.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ChatDepartments extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "name" => [
+            "type" => "VARCHAR",
+            "constraint" => '45',
+            "unique" => true,
+        ],
+        "display" => [
+            "type" => "VARCHAR",
+            "constraint" => '255',
+        ],
+        "description" => [
+            "type" => "TEXT",
+            "null" => true,
+        ],
+        "type" => [
+            "type" => "ENUM",
+            'constraint' => ['general', 'presupuesto', 'pedido'],
+            'default'    => 'general',
+        ],
+
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->createTable("chat_departments", true);
+    }
+
+    public function down()
+    {
+        //
+        $this->forge->dropTable("chat_departments");
+    }
+}

ci4/app/Database/Migrations/2024-09-17-151440_ChatsTable.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\RawSql;
+use CodeIgniter\Database\Migration;
+
+class ChatsTable extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "chat_department_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "null" => true
+        ],
+        "pedido_id" => [
+            "type" => "INT",
+            "constraint" => 16,
+            "unsigned" => true,
+            "null" => true
+        ],
+        "presupuesto_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "unsigned" => true,
+            "null" => true
+        ],
+        "factura_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "unsigned" => true,
+            "null" => true
+        ],
+
+
+    ];
+    public function up()
+    {
+        $this->forge->dropTable("chat_conversaciones", true);
+        $this->forge->dropTable("chat_mensajes", true);
+        $this->forge->dropTable("chat_participantes", true);
+
+
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addForeignKey('pedido_id', 'pedidos', 'id');
+        $this->forge->addForeignKey('chat_department_id', 'chat_departments', 'id');
+        $this->forge->addForeignKey('factura_id', 'facturas', 'id');
+        $this->forge->addForeignKey('presupuesto_id', 'presupuestos', 'id');
+
+
+        $this->forge->createTable("chats", true);
+    }
+
+    public function down()
+    {
+        //
+        $this->forge->dropTable("chats", true);
+    }
+}

ci4/app/Database/Migrations/2024-09-17-151450_ChatMessages.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ChatMessages extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "auto_increment" => true,
+        ],
+        "chat_id" => [
+            "type" => "INT",
+            "unsigned" => true
+        ],
+
+        "sender_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "null" => true,
+
+        ],
+        "receiver_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "null" => true,
+        ],
+        "message" => [
+            "type" => "TEXT",
+        ],
+        "viewed" => [
+            "type" => "TEXT",
+            "type" => "boolean",
+            "default" => false,
+        ],
+
+
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addForeignKey(['receiver_id'], 'users', ['id']);
+        $this->forge->addForeignKey(['sender_id'], 'users', ['id']);
+        $this->forge->addForeignKey(['chat_id'], 'chats', ['id']);
+        $this->forge->createTable("chat_messages", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("chat_messages", true);
+    }
+}

ci4/app/Database/Migrations/2024-09-17-151500_ChatDepartmentUsers.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ChatDepartmentUsers extends Migration
+{
+    protected array $COLUMNS = [
+        "chat_department_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+        ],
+        "user_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+        ],
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addForeignKey(["user_id"], "users", ["id"]);
+        $this->forge->addForeignKey(["chat_department_id"], "chat_departments", ["id"]);
+        $this->forge->createTable("chat_department_users", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("chat_department_users");
+    }
+}

ci4/app/Database/Migrations/2024-10-02-090620_ConfigVariablesApp.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ConfigVariablesApp extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "name" => [
+            "type" => "VARCHAR",
+            "constraint" => '45',
+            "unique" => true,
+        ],
+        "value" => [
+            "type" => "VARCHAR",
+            "constraint" => '255',
+            "null" => true
+        ],
+        "description" => [
+            "type" => "TEXT",
+            "null" => true
+        ],
+
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->createTable("config_variables_app", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("config_variables_app");
+    }
+}

ci4/app/Database/Migrations/2024-10-12-151500_ChatUsers.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ChatUsers extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "chat_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+        ],
+        "user_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+        ],
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addForeignKey(["user_id"], "users", ["id"]);
+        $this->forge->addForeignKey(["chat_id"], "chats", ["id"]);
+        $this->forge->createTable("chat_users", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("chat_users");
+    }
+}

ci4/app/Database/Migrations/2024-10-13-185128_AlterChatTableAddTitleColumn.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\RawSql;
+use CodeIgniter\Database\Migration;
+
+class AlterChatTableAddTitleColumn extends Migration
+{
+    protected array $COLUMNS = [
+
+        "title" => [
+            "type" => "VARCHAR",
+            "constraint" => 255,
+            "null" => true
+        ],
+
+
+
+    ];
+    public function up()
+    {
+
+        $this->forge->addColumn("chats",$this->COLUMNS);
+
+    }
+
+    public function down()
+    {
+        //
+        $this->forge->dropColumn("chats","title");
+    }
+}

ci4/app/Database/Migrations/2024-10-13-200759_ChatNotifications.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ChatNotifications extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "chat_message_id" => [
+            "type" => "INT",
+        ],
+        "user_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+        ],
+        "viewed" => [
+            "type" => "BOOLEAN",
+            "default" => false
+        ],
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addForeignKey(["chat_message_id"], "chat_messages", ["id"]);
+        $this->forge->addForeignKey(["user_id"], "users", ["id"]);
+        $this->forge->createTable("chat_notifications", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("chat_notifications");
+    }
+}

ci4/app/Database/Migrations/2024-11-13-161331_CheckWebClientesPapeles.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class CheckWebClientesPapeles extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'show_in_client' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+
+        $this->forge->addColumn('lg_papel_impresion', $fields);
+    }
+
+    public function down()
+    {
+        $this->forge->dropColumn('lg_papel_impresion', 'show_in_client');
+    }
+}

ci4/app/Database/Migrations/2024-11-17-194547_ModifyNullableComercialSoporte.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class ModifyNullableComercialSoporte extends Migration
+{
+    public function up()
+    {
+        $this->forge->modifyColumn('clientes', [
+            'comercial_id' => [
+                'type'       => 'int(10) unsigned',
+                'null'       => true, // Permitir valores NULL
+            ],
+            'soporte_id' => [
+                'type'       => 'int(10) unsigned',
+                'null'       => true, // Permitir valores NULL
+            ],
+        ]);
+        
+    }
+
+    public function down()
+    {
+        $this->forge->modifyColumn('clientes', [
+            'comercial_id' => [
+                'type'       => 'int(10) unsigned',
+                'null'       => false,
+            ],
+            'soporte_id' => [
+                'type'       => 'int(10) unsigned',
+                'null'       => false,
+            ],
+        ]);
+    }
+}

ci4/app/Database/Migrations/2024-11-19-185529_TicksPapeles.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class TicksPapeles extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'show_in_client_special' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+
+        $this->forge->addColumn('lg_papel_generico', $fields);
+
+        $fields = [
+            'show_in_client_special' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+
+        $this->forge->addColumn('lg_papel_impresion', $fields);
+    }
+
+    public function down()
+    {
+        $this->forge->dropColumn('lg_papel_generico', 'show_in_client_special');
+        $this->forge->dropColumn('lg_papel_impresion', 'show_in_client_special');
+
+    }
+}

ci4/app/Database/Migrations/2024-11-20-162124_CambiarTicksPapelImpresion.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class CambiarTicksPapelImpresion extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'use_in_client' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+
+        $this->forge->addColumn('lg_papel_impresion', $fields);
+        $this->forge->dropColumn('lg_papel_impresion', 'show_in_client');
+        $this->forge->dropColumn('lg_papel_impresion', 'show_in_client_special');
+    }
+
+    public function down()
+    {
+        $fields = [
+            'show_in_client_special' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+            'show_in_client' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+
+        $this->forge->addColumn('lg_papel_impresion', $fields);
+        $this->forge->dropColumn('lg_papel_impresion', 'use_in_client');
+
+    }
+}

ci4/app/Database/Migrations/2024-11-25-173558_AddTickInteriorPapelImpresion.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddTickInteriorPapelImpresion extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'interior' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+        $this->forge->addColumn('lg_papel_impresion', $fields);
+    }
+
+    public function down()
+    {
+        $this->forge->dropColumn('lg_papel_impresion', 'interior');
+    }
+}

ci4/app/Database/Migrations/2024-11-27-105608_AddTickTapaDuraPapelImp.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddTickTapaDuraPapelImp extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'use_for_tapa_dura' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'null'       => false,
+                'default'    => 0,
+            ],
+        ];
+
+        $this->forge->addColumn('lg_papel_impresion', $fields);
+    }
+
+    public function down()
+    {
+        $this->forge->dropColumn('lg_papel_impresion', 'use_for_tapa_dura');
+    }
+}

ci4/app/Database/Migrations/2024-11-30-160000_TareasServicioTable.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class ServicioClienteTareas extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "servicio_cliente_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "comment" => "Servicio cliente asociado"
+        ],
+        "tarifa_acabado_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "null" => true,
+            "comment" => "Tarifa de acabado asociada a servicio"
+        ],
+        "tarifa_manipulado_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "null" => true,
+            "comment" => "Tarifa de manipulado asociada a servicio",
+
+        ]
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey("id");
+        $this->forge->addForeignKey('servicio_cliente_id','servicios_cliente','id');
+        $this->forge->addForeignKey('tarifa_acabado_id','lg_tarifa_acabado','id');
+        $this->forge->addForeignKey('tarifa_manipulado_id','lg_tarifa_manipulado','id');
+
+        $this->forge->createTable("servicio_cliente_tareas", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("servicio_cliente_tareas");
+    }
+}

ci4/app/Database/Migrations/2024-11-30-170000_OrdenTrabajoTable.php

@@ -0,0 +1,299 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class OrdenTrabajoTable extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "auto_increment" => true
+        ],
+        "pedido_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "comment" => "Pedido asociado",
+        ],
+        "user_created_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+        ],
+        "user_update_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+        ],
+        "maquina_orden_negro_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+        ],
+        "maquina_orden_color_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "maquina_orden_portada_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "maquina_orden_cubierta_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "negro_forma_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "color_forma_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "portada_forma_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "cubierta_forma_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+            "null" => true
+
+        ],
+        "tirada" => [
+            "type" => "DOUBLE",
+        ],
+        "negro_pliegos_pedido" => [
+            "type" => "DOUBLE",
+            "null" => true
+        ],
+        "color_pliegos_pedido" => [
+            "type" => "DOUBLE",
+            "null" => true
+        ],
+        "portada_pliegos_pedido" => [
+            "type" => "DOUBLE",
+            "null" => true
+        ],
+        "cubierta_pliegos_pedido" => [
+            "type" => "DOUBLE",
+            "null" => true
+        ],
+        "negro_clicks_pedido" => [
+            "type" => "DOUBLE",
+        ],
+        "color_clicks_pedido" => [
+            "type" => "DOUBLE",
+        ],
+        "portada_clicks_pedido" => [
+            "type" => "DOUBLE",
+        ],
+        "cubierta_clicks_pedido" => [
+            "type" => "DOUBLE",
+        ],
+        "pliegos1" => [
+            "type" => "INT",
+            "constraint" => 11,
+        ],
+        "paginas1" => [
+            "type" => "INT",
+            "constraint" => 11,
+        ],
+        "pliegos2" => [
+            "type" => "INT",
+            "constraint" => 11,
+        ],
+        "paginas2" => [
+            "type" => "INT",
+            "constraint" => 11,
+        ],
+        "negro_proveedor_nombre" => [
+            "type" => "VARCHAR",
+            "constraint" => 225
+        ],
+        "color_proveedor_nombre" => [
+            "type" => "VARCHAR",
+            "constraint" => 225
+        ],
+        "portada_proveedor_nombre" => [
+            "type" => "VARCHAR",
+            "constraint" => 225
+        ],
+        "corte_pie" => [
+            "type" => "DOUBLE",
+        ],
+        "lomo" => [
+            "type" => "INT",
+            "constraint" => 11,
+            "null" => true,
+        ],
+        "tipo_entrada" => [
+            "type" => "ENUM",
+            "constraint" => ["in", "out"],
+            "default" => "out"
+        ],
+
+   
+    
+        "fecha_entrega_real_warning" => [
+            "type" => "BOOLEAN",
+            "default" => false,
+        ],
+
+ 
+
+        "fecha_entrega_warning" => [
+            "type" => "BOOLEAN",
+            "default" => false
+        ],
+        "fecha_entrega_warning_revised" => [
+            "type" => "BOOLEAN",
+            "default" => false
+        ],
+
+
+ 
+
+ 
+
+        "ferro_disponible" => [
+            "type" => "TINYINT",
+            "constraint" => 4,
+        ],
+        "ferro_disponible_thread_id" => [
+            "type" => "INT",
+            "constraint" => 10,
+        ],
+ 
+
+  
+        "ferro_cp" => [
+            "type" => "VARCHAR",
+            "constraint" => 10,
+            "null" => true
+        ],
+        "ferro_proveedor" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "constraint" => 10,
+        ],
+        "ferro_tracking" => [
+            "type" => "VARCHAR",
+            "constraint" => 100,
+            "null" => true,
+        ],
+
+        "pre_formato" => [
+            "type" => "BOOLEAN",
+            "default" => false
+        ],
+
+
+        "pre_lomo" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+
+
+        "pre_solapa" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+
+
+        "pre_isbn" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+
+        "pre_codbarras" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+   
+ 
+        "pre_imposicion" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+
+  
+        "pre_imprimir" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+
+        "pre_faltan_materiales" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+
+        "pre_faltan_materiales_note" => [
+            "type" => "TEXT",
+            "null" => true,
+        ],
+        "progreso" => [
+            "type" => "DOUBLE",
+            "default" => 0.00,
+        ],
+        "message_production_send" => [
+            
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+        "finalizado" => [
+            "type" => "BOOLEAN",
+            "default" => 0,
+        ],
+        "comentarios" => [
+            "type" => "TEXT",
+            "null" => true,
+        ]
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+        ]);
+        $this->forge->addPrimaryKey("id");
+        // $this->forge->addForeignKey(["maquina_orden_portada_id"],"lg_maquinas",["id"]);
+        // $this->forge->addForeignKey(["maquina_orden_negro_id"],"lg_maquinas",["id"]);
+        // $this->forge->addForeignKey(["maquina_orden_cubierta_id"],"lg_maquinas",["id"]);
+        // $this->forge->addForeignKey(["maquina_orden_color_id"],"lg_maquinas",["id"]);
+        $this->forge->createTable("ordenes_trabajo", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("ordenes_trabajo");
+    }
+}

ci4/app/Database/Migrations/2024-11-30-170001_OrdenTrabajoTareasTable.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\RawSql;
+
+class OrdenTrabajoTareasTable extends Migration
+{
+    protected array $COLUMNS = [
+        "id" => [
+            "type" => "INT",
+            "unsigned" => true,
+            "autoincrement" => true
+        ],
+        "tarea_servicio_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+        ],
+        "orden_trabajo_id" => [
+            "type" => "INT",
+            "unsigned" => true,
+
+        ],
+    ];
+    public function up()
+    {
+        $this->forge->addField($this->COLUMNS);
+        $currenttime = new RawSql("CURRENT_TIMESTAMP");
+        $this->forge->addField([
+            "created_at" => [
+                "type" => "TIMESTAMP",
+                "default" => $currenttime,
+
+            ],
+            "updated_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+
+            ],
+            "deleted_at" => [
+                "type" => "TIMESTAMP",
+                "null" => true,
+            ],
+        ]);
+        // $this->forge->addPrimaryKey("id");
+        // $this->forge->addForeignKey("orden_trabajo_id","ordenes_trabajo","id");
+        // $this->forge->addForeignKey("tarea_servicio_id","tareas_servicio","id");
+        $this->forge->createTable("orden_trabajo_tareas", true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable("orden_trabajo_tareas");
+    }
+}