Merge branch 'main' into 'dev/api_il_2'

Main

See merge request jjimenez/safekat!562
This commit is contained in:
Ignacio Martinez Navajas
2025-02-21 13:03:55 +00:00
6 changed files with 62 additions and 44 deletions

View File

@ -154,7 +154,7 @@ class PresupuestoServiciosExtraModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tarifa_extra_id AS tarifa_extra_id, t1.precio AS precio, t1.margen AS margen, t2.nombre AS nombre"
"t1.id AS id, t1.tarifa_extra_id AS tarifa_extra_id, t1.tarifa_extra_id AS tarifa_id, t1.precio AS precio, t1.margen AS margen, t2.nombre AS nombre"
);
$builder->where('t1.presupuesto_id', $presupuesto_id);