diff --git a/ci4/app/Controllers/Configuracion/Papelesgenericos.php b/ci4/app/Controllers/Configuracion/Papelesgenericos.php index dfcef7ac..628be5c4 100755 --- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php +++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php @@ -301,8 +301,10 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController $tipo = goSanitize($this->request->getGet('tipo'))[0]; $selected_papel = goSanitize($this->request->getGet('papel'))[0] ?? null; $cubierta = goSanitize($this->request->getGet('cubierta'))[0] ?? 0; - $menu = $this->model->getPapelCliente($tipo, $cubierta, $selected_papel, false); - $menu2 = $this->model->getPapelCliente($tipo, $cubierta, $selected_papel, true); + $tapa_dura = goSanitize($this->request->getGet('tapa_dura'))[0] ?? null; + + $menu = $this->model->getPapelCliente($tipo, $cubierta, $selected_papel, $tapa_dura, false); + $menu2 = $this->model->getPapelCliente($tipo, $cubierta, $selected_papel, $tapa_dura, true); $newTokenHash = csrf_hash(); $csrfTokenName = csrf_token(); diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index 9b820be4..d3da2fad 100755 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/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(); @@ -200,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; } diff --git a/ci4/app/Database/Migrations/2024-11-27-105608_AddTickTapaDuraPapelImp.php b/ci4/app/Database/Migrations/2024-11-27-105608_AddTickTapaDuraPapelImp.php new file mode 100644 index 00000000..e5cc1b91 --- /dev/null +++ b/ci4/app/Database/Migrations/2024-11-27-105608_AddTickTapaDuraPapelImp.php @@ -0,0 +1,27 @@ + [ + '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'); + } +} diff --git a/ci4/app/Entities/Configuracion/PapelImpresion.php b/ci4/app/Entities/Configuracion/PapelImpresion.php index d2e0b2ff..4d79a06e 100755 --- a/ci4/app/Entities/Configuracion/PapelImpresion.php +++ b/ci4/app/Entities/Configuracion/PapelImpresion.php @@ -25,6 +25,7 @@ class PapelImpresion extends \CodeIgniter\Entity\Entity "rotativa" => false, "isActivo" => true, "use_in_client" => false, + "use_for_tapa_dura" => false, "is_deleted" => 0, "created_at" => null, "updated_at" => null, @@ -45,6 +46,7 @@ class PapelImpresion extends \CodeIgniter\Entity\Entity "rotativa" => "boolean", "isActivo" => "boolean", "use_in_client" => "boolean", + "use_for_tapa_dura" => "boolean", "is_deleted" => "int", ]; } diff --git a/ci4/app/Language/es/PapelImpresion.php b/ci4/app/Language/es/PapelImpresion.php index 780fc979..939442db 100755 --- a/ci4/app/Language/es/PapelImpresion.php +++ b/ci4/app/Language/es/PapelImpresion.php @@ -10,6 +10,7 @@ return [ 'color' => 'Color', 'createdAt' => 'Creado en', 'cubierta' => 'Cubierta', + 'use_for_tapa_dura' => 'Papel tapa dura', 'sobrecubierta' => 'Sobrecubierta', 'guardas' => 'Guardas', 'defecto' => 'Por defecto', diff --git a/ci4/app/Models/Configuracion/PapelGenericoModel.php b/ci4/app/Models/Configuracion/PapelGenericoModel.php index 60257b83..63f0403e 100755 --- a/ci4/app/Models/Configuracion/PapelGenericoModel.php +++ b/ci4/app/Models/Configuracion/PapelGenericoModel.php @@ -313,7 +313,7 @@ class PapelGenericoModel extends \App\Models\BaseModel } - public function getPapelCliente($tipo, $is_cubierta = false, $selected_papel_id = null, $papel_especial = false) + public function getPapelCliente($tipo, $is_cubierta = false, $selected_papel_id = null, $tapa_dura = null, $papel_especial = false) { /* 1.-> Tipo impresion @@ -382,6 +382,9 @@ class PapelGenericoModel extends \App\Models\BaseModel if ($is_cubierta == true) { $builder->where("t2.cubierta", 1); $builder->where("t5.uso", 'cubierta'); + if($tapa_dura == true){ + $builder->where("t2.use_for_tapa_dura", 1); + } } else { $builder->where("t2.interior", 1); $builder->where("t5.uso", 'interior'); diff --git a/ci4/app/Models/Configuracion/PapelImpresionModel.php b/ci4/app/Models/Configuracion/PapelImpresionModel.php index 814463f8..de9473b9 100755 --- a/ci4/app/Models/Configuracion/PapelImpresionModel.php +++ b/ci4/app/Models/Configuracion/PapelImpresionModel.php @@ -20,12 +20,13 @@ class PapelImpresionModel extends \App\Models\BaseModel 4 => "t1.bn", 5 => "t1.color", 6 => "t1.cubierta", - 7 => "t1.sobrecubierta", - 8 => "t1.guardas", - 9 => "t1.inkjet", - 10 => "t1.rotativa", - 11 => "t1.isActivo", - 12 => "t1.use_in_client", + 7 => "t1.use_for_tapa_dura", + 8 => "t1.sobrecubierta", + 9 => "t1.guardas", + 10 => "t1.inkjet", + 11 => "t1.rotativa", + 12 => "t1.isActivo", + 13 => "t1.use_in_client", ]; @@ -48,6 +49,7 @@ class PapelImpresionModel extends \App\Models\BaseModel "rotativa", "isActivo", "use_in_client", + "use_for_tapa_dura", "deleted_at", "is_deleted", "user_updated_id", @@ -152,7 +154,8 @@ class PapelImpresionModel extends \App\Models\BaseModel ->select( "t1.id AS id, t1.nombre AS nombre, t1.defecto AS defecto, t1.referencia AS referencia, t1.mano AS mano, t1.espesor AS espesor, t1.gramaje AS gramaje, t1.interior AS interior, t1.precio_tonelada AS precio_tonelada, - t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta, t1.guardas AS guardas, + t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.use_for_tapa_dura AS use_for_tapa_dura, + t1.sobrecubierta AS sobrecubierta, t1.guardas AS guardas, t1.inkjet AS inkjet, t1.rotativa AS rotativa, t1.isActivo AS isActivo, t2.nombre AS papel_generico_id, t1.use_in_client AS use_in_client" diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/papel/_papelImpresionFormItems.php b/ci4/app/Views/themes/vuexy/form/configuracion/papel/_papelImpresionFormItems.php index b094e35d..5d0473d6 100644 --- a/ci4/app/Views/themes/vuexy/form/configuracion/papel/_papelImpresionFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/papel/_papelImpresionFormItems.php @@ -99,6 +99,17 @@ +