arreglados varios fallos de la comprobación del editor (JJO)

This commit is contained in:
Jaime Jiménez
2023-06-16 12:25:09 +02:00
parent 51552bc594
commit 39c69ddd03
7 changed files with 89 additions and 62 deletions

View File

@ -138,16 +138,13 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
"t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.precio_unidad AS precio_unidad, t1.user_created_id AS user_created_id, t1.user_updated_id AS user_updated_id, t1.is_deleted AS is_deleted, t1.created_at AS created_at, t1.updated_at AS updated_at, t2.id AS tarifa_acabado"
);
if($tarifa_acabado_id>=0)
{
$builder->where('tarifa_acabado_id', $tarifa_acabado_id);
}
//JJO
$builder->where('tarifa_acabado_id', $tarifa_acabado_id);
$builder->where("t1.is_deleted", 0);
$builder->join("lg_tarifa_acabado t2", "t1.tarifa_acabado_id = t2.id", "left");
//JJO
$builder->where("t1.is_deleted", 0);
return empty($search)
? $builder
: $builder