From d7e86ec7d0842e7c6749f11d61b48bce66eeab21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Tue, 9 Jan 2024 09:05:39 +0100 Subject: [PATCH] arreglado bug que solo mostraba inkjet en los papeles --- ci4/app/Models/Configuracion/MaquinaModel.php | 2 +- .../Models/Configuracion/MaquinasPapelesImpresionModel.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci4/app/Models/Configuracion/MaquinaModel.php b/ci4/app/Models/Configuracion/MaquinaModel.php index 675e4040..9f9de24e 100755 --- a/ci4/app/Models/Configuracion/MaquinaModel.php +++ b/ci4/app/Models/Configuracion/MaquinaModel.php @@ -261,7 +261,7 @@ class MaquinaModel extends \App\Models\GoBaseModel "'" . $papel_impresion_id . "'" . " as papel_impresion_id, t1.id AS maquina_id, '0' as active" ); $builder->where("t1.is_rotativa", $rotativa); - $builder->where("t1.is_inkjet", $inkjet); + //$builder->where("t1.is_inkjet", $inkjet); return $builder; } diff --git a/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php b/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php index 0b96a7b0..33c1b6e5 100755 --- a/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php +++ b/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php @@ -158,7 +158,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel $builder->where("t2.is_deleted", 0); $builder->where("t2.isActivo", 1); $builder->where("t2.rotativa", $isRotativa); - $builder->where("t2.inkjet", $isInkjet); + //$builder->where("t2.inkjet", $isInkjet); $builder->where("t1.active", 1); $isFirst = true; @@ -211,7 +211,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel // Se aplican las condiciones que tienen que cumplir $builder->where("t2.is_rotativa", $isRotativa); - $builder->where("t2.is_inkjet", $isInkjet); + //$builder->where("t2.is_inkjet", $isInkjet); return $builder; }