jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

trabajando en bugs

Browse Source
This commit is contained in:
Jaime Jimenez
2023-12-21 21:28:14 +01:00
parent 86d45bee83
commit 7aaa140e46
12 changed files with 124 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ci4/app/Models/Presupuestos/PresupuestoDireccionesModel.php
View File

@ -36,7 +36,6 @@ class PresupuestoDireccionesModel extends \App\Models\GoBaseModel
"email",
"direccion",
"pais_id",
"ccaa_id",
"provincia",
"municipio",
"cp",
@ -45,6 +44,7 @@ class PresupuestoDireccionesModel extends \App\Models\GoBaseModel
'margen',
"proveedor_id",
"proveedor",
"entregaPieCalle",
];
protected $returnType = "App\Entities\Clientes\ClienteDireccionesEntity";
@ -67,15 +67,13 @@ class PresupuestoDireccionesModel extends \App\Models\GoBaseModel
->select(
"t1.id AS id, t1.presupuesto_id AS presupuesto_id, t1.tarifa_id AS tarifa_id, t1.att AS att,
t1.email AS email, t1.direccion AS direccion, t1.pais_id AS pais_id, t2.nombre AS pais,
t1.ccaa_id AS ccaa_id, t3.nombre AS ccaa_nombre,
t1.municipio AS municipio, t1.provincia AS provincia, t1.cp AS cp, t1.telefono AS telefono,
t1.peso AS peso, t1.cantidad AS cantidad, t1.precio AS precio, t1.margen AS margen,
t1.proveedor_id AS proveedor_id, t1.proveedor AS proveedor"
t1.proveedor_id AS proveedor_id, t1.proveedor AS proveedor, t1.entregaPieCalle AS entregaPieCalle"
);
$builder->where('t1.presupuesto_id', $presupuesto_id);
$builder->join("lg_paises t2", "t1.pais_id = t2.id", "left");
$builder->join("lg_comunidades_autonomas t3", "t1.ccaa_id = t3.id", "left");
return empty($search)
? $builder
@ -85,7 +83,6 @@ class PresupuestoDireccionesModel extends \App\Models\GoBaseModel
->orLike("t1.email", $search)
->orLike("t1.direccion", $search)
->orLike("t2.nombre", $search)
->orLike("t3.nombre", $search)
->orLike("t1.municipio", $search)
->orLike("t1.provincia", $search)
->orLike("t1.cp", $search)