From 5b89cc0c1d93f84466a8de76dd10ea44e1c278cf Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Wed, 29 Jan 2025 09:49:52 +0100 Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20que=20solo=20compruebe=20el=20an?= =?UTF-8?q?cho=20en=20vertical=20si=20es=20rotativa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Configuracion/PapelGenericoModel.php | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/ci4/app/Models/Configuracion/PapelGenericoModel.php b/ci4/app/Models/Configuracion/PapelGenericoModel.php index b97c2c8e..41aa10d7 100755 --- a/ci4/app/Models/Configuracion/PapelGenericoModel.php +++ b/ci4/app/Models/Configuracion/PapelGenericoModel.php @@ -129,16 +129,16 @@ class PapelGenericoModel extends \App\Models\BaseModel return empty($search) ? $builder : $builder - ->groupStart() - ->like("t1.id", $search) - ->orLike("t1.nombre", $search) - ->orLike("t1.code", $search) - ->orLike("t1.code_ot", $search) - ->orLike("t1.id", $search) - ->orLike("t1.nombre", $search) - ->orLike("t1.code", $search) - ->orLike("t1.code_ot", $search) - ->groupEnd(); + ->groupStart() + ->like("t1.id", $search) + ->orLike("t1.nombre", $search) + ->orLike("t1.code", $search) + ->orLike("t1.code_ot", $search) + ->orLike("t1.id", $search) + ->orLike("t1.nombre", $search) + ->orLike("t1.code", $search) + ->orLike("t1.code_ot", $search) + ->groupEnd(); } @@ -210,6 +210,10 @@ class PapelGenericoModel extends \App\Models\BaseModel ->where("t4.ancho_impresion >", $alto) ->where("t4.alto_impresion >", $ancho) ->groupEnd() + ->orGroupStart() + ->where("t4.ancho_impresion >", $alto) + ->where("t4.is_rotativa", 1) + ->groupEnd() ->groupEnd(); if ($is_cubierta == true) { @@ -308,6 +312,10 @@ class PapelGenericoModel extends \App\Models\BaseModel ->where("t4.ancho_impresion >", $alto) ->where("t4.alto_impresion >", $ancho) ->groupEnd() + ->orGroupStart() + ->where("t4.ancho_impresion >", $alto) + ->where("t4.is_rotativa", 1) + ->groupEnd() ->groupEnd(); if ($is_cubierta == true) { @@ -497,6 +505,10 @@ class PapelGenericoModel extends \App\Models\BaseModel ->where("t4.ancho_impresion >", $alto) ->where("t4.alto_impresion >", $ancho) ->groupEnd() + ->orGroupStart() + ->where("t4.ancho_impresion >", $alto) + ->where("t4.is_rotativa", 1) + ->groupEnd() ->groupEnd(); if ($is_cubierta == true) {