añadido que solo compruebe el ancho en vertical si es rotativa

This commit is contained in:
2025-01-29 09:49:52 +01:00
parent 20442bb784
commit 5b89cc0c1d

View File

@ -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) {