Revisada la generacion de presupuestos en PDf

This commit is contained in:
imnavajas
2025-02-22 23:25:52 +01:00
parent 190037f9df
commit 0f7fa4a809
6 changed files with 397 additions and 329 deletions

View File

@ -217,7 +217,7 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tarifa_acabado_id AS tarifa_acabado_id, t1.tarifa_acabado_id AS tarifa_id, t1.precio_unidad AS precio_unidad,
"t1.id AS id, t1.tarifa_acabado_id AS tarifa_acabado_id, t1.tarifa_acabado_id AS tarifa_id, t1.precio_unidad AS precio_unidad,
t1.precio_total AS precio_total, t1.margen AS margen, t2.nombre AS nombre, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta,
t1.faja AS faja,
t1.proveedor_id AS proveedor_id, t3.nombre AS proveedor,"
@ -291,8 +291,8 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
);
$builder->join("lg_tarifa_acabado t2", "t1.tarifa_acabado_id = t2.id", "left");
$builder->where("t1.tarifa_acabado_id", self::TARIFA_RESERVA_UVI_ID);
$builder->where("t1.presupuesto_id", $presupuesto_id);
$builder->like("t2.nombre", "reserva uvi", "both");
return $builder;
}