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

Merge branch 'main' into 'dev/new_lp'

Browse Source 
# Conflicts:
#   ci4/app/Controllers/Test.php
This commit is contained in:
Jaime Jimenez Ortega
2024-01-07 16:28:13 +00:00
parent c11c541768 2f9a8524c4
commit 366ce69b2f
13 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ci4/app/Models/Clientes/ClienteDireccionesModel.php
View File

@ -33,8 +33,7 @@ class ClienteDireccionesModel extends \App\Models\GoBaseModel
"email",
"direccion",
"pais_id",
"ccaa_id",
"provincia",
"provincia",
"municipio",
"cp",
"telefono",
@ -101,14 +100,12 @@ class ClienteDireccionesModel extends \App\Models\GoBaseModel
->select(
"t1.id AS id, t1.cliente_id AS cliente_id, t2.nombre as cliente_nombre, t1.att AS att, t1.alias AS alias,
t1.email AS email, t1.direccion AS direccion, t1.pais_id AS pais_id, t3.nombre AS pais,
t1.ccaa_id AS ccaa_id, t4.nombre AS ccaa_nombre,
t1.municipio AS municipio, t1.provincia AS provincia, t1.cp AS cp, t1.telefono AS telefono"
);
$builder->where('t1.cliente_id', $cliente_id);
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
$builder->join("lg_paises t3", "t1.pais_id = t3.id", "left");
$builder->join("lg_comunidades_autonomas t4", "t1.ccaa_id = t4.id", "left");
return empty($search)
@ -134,14 +131,12 @@ class ClienteDireccionesModel extends \App\Models\GoBaseModel
->select(
"t1.id AS id, t1.cliente_id AS cliente_id, t2.nombre as cliente_nombre, t1.att AS att, t1.alias AS alias,
t1.email AS email, t1.direccion AS direccion, t1.pais_id AS pais_id, t3.nombre AS pais,
t1.ccaa_id AS ccaa_id, t4.nombre AS ccaa_nombre,
t1.municipio AS municipio, t1.provincia AS provincia, t1.cp AS cp, t1.telefono AS telefono"
);
$builder->where('t1.id', $id);
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
$builder->join("lg_paises t3", "t1.pais_id = t3.id", "left");
$builder->join("lg_comunidades_autonomas t4", "t1.ccaa_id = t4.id", "left");
return $builder->get()->getResultObject();