Modificando usuarios y roles

This commit is contained in:
imnavajas
2024-05-03 01:09:25 +02:00
parent 497e55f593
commit 9858616b6e
20 changed files with 57 additions and 626 deletions

View File

@ -249,9 +249,15 @@ class ClienteModel extends \App\Models\BaseModel
$sql =
"SELECT t1." .
$selcols .
", t2.nombre AS comunidad_autonoma_id, t3.nombre AS provincia, t4.nombre AS pais_id, t5.first_name AS comercial, t6.last_name AS soporte, t7.nombre AS forma_pago_id FROM " .
", t2.nombre AS comunidad_autonoma_id, t3.nombre AS provincia, t4.nombre AS pais_id, t5.first_name AS comercial,
t6.last_name AS soporte, t7.nombre AS forma_pago_id FROM " .
$this->table .
" t1 LEFT JOIN lg_comunidades_autonomas t2 ON t1.comunidad_autonoma_id = t2.id LEFT JOIN lg_provincias t3 ON t1.provincia_id = t3.id LEFT JOIN lg_paises t4 ON t1.pais_id = t4.id LEFT JOIN auth_user t5 ON t1.comercial_id = t5.id_user LEFT JOIN auth_user t6 ON t1.soporte_id = t6.id_user LEFT JOIN lg_formas_pago t7 ON t1.forma_pago_id = t7.id";
" t1 LEFT JOIN lg_comunidades_autonomas t2 ON t1.comunidad_autonoma_id = t2.id
LEFT JOIN lg_provincias t3 ON t1.provincia_id = t3.id
LEFT JOIN lg_paises t4 ON t1.pais_id = t4.id
LEFT JOIN users t5 ON t1.comercial_id = t5.id
LEFT JOIN users t6 ON t1.soporte_id = t6.id
LEFT JOIN lg_formas_pago t7 ON t1.forma_pago_id = t7.id";
if (!is_null($limit) && intval($limit) > 0) {
$sql .= " LIMIT " . intval($limit);
}
@ -280,7 +286,7 @@ class ClienteModel extends \App\Models\BaseModel
"t1.id AS id, t1.nombre AS nombre, t1.alias AS alias, t1.cif AS cif, t1.email AS email, t1.vencimiento AS vencimiento, t5.first_name AS comercial, t7.nombre AS forma_pago_id"
)
->where("is_deleted", 0);;
$builder->join("auth_user t5", "t1.comercial_id = t5.id_user", "left");
$builder->join("users t5", "t1.comercial_id = t5.id", "left");
$builder->join("lg_formas_pago t7", "t1.forma_pago_id = t7.id", "left");