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

Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor de App\Models\Usuarios\UserModel

Browse Source
This commit is contained in:
imnavajas
2025-04-03 13:54:19 +02:00
parent ac804e9720
commit a123c2dfa7
10 changed files with 154 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Controllers/Clientes/Cliente.php
View File

@ -384,7 +384,7 @@ class Cliente extends \App\Controllers\BaseResourceController
{
$data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Users.user'))])];
if (!is_null($selId)) :
$userModel = model('App\Models\UserModel');
$userModel = model('App\Models\Usuarios\UserModel');
$selOption = $userModel->where('id', $selId)->findColumn('first_name');
if (!empty($selOption)) :
@ -414,7 +414,7 @@ class Cliente extends \App\Controllers\BaseResourceController
{
$data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Users.user'))])];
if (!is_null($selId)) :
$userModel = model('App\Models\UserModel');
$userModel = model('App\Models\Usuarios\UserModel');
$selOption = $userModel->where('id', $selId)->findColumn('last_name');
if (!empty($selOption)) :

2
ci4/app/Controllers/Configuracion/Users.php
View File

@ -5,7 +5,7 @@ use App\Models\Chat\ChatDeparmentModel;
use App\Models\Chat\ChatDeparmentUserModel;
use App\Models\Usuarios\GroupModel;
use App\Models\UserModel;
use App\Models\Usuarios\UserModel;
use App\Models\Usuarios\GroupsUsersModel;
use App\Models\Collection;

2
ci4/app/Controllers/Facturacion/Facturas.php
View File

@ -220,7 +220,7 @@ class Facturas extends \App\Controllers\BaseResourceController
['title' => lang("Facturas.facturaList"), 'route' => route_to('facturasList'), 'active' => true]
];
$userModel = model('App\Models\UserModel');
$userModel = model('App\Models\Usuarios\UserModel');
$factura->created_by = $userModel->getFullName($factura->user_created_id);
$factura->updated_by = $userModel->getFullName($factura->user_updated_id);
$factura->created_at_footer = $factura->created_at ? date(' H:i d/m/Y', strtotime($factura->created_at)) : '';

2
ci4/app/Controllers/Pedidos/Pedido.php
View File

@ -583,7 +583,7 @@ class Pedido extends \App\Controllers\BaseResourceController
$pedidoEntity->fecha_encuadernado_text = $pedidoEntity->fecha_encuadernado ? date('d/m/Y', strtotime($pedidoEntity->fecha_encuadernado)) : '';
$pedidoEntity->fecha_entrega_externo_text = $pedidoEntity->fecha_entrega_externo ? date('d/m/Y', strtotime($pedidoEntity->fecha_entrega_externo)) : '';
$userModel = model('App\Models\UserModel');
$userModel = model('App\Models\Usuarios\UserModel');
$pedidoEntity->created_by = $userModel->getFullName($pedidoEntity->user_created_id);
$pedidoEntity->updated_by = $userModel->getFullName($pedidoEntity->user_updated_id);
$pedidoEntity->created_at_footer = $pedidoEntity->created_at ? date(' H:i d/m/Y', strtotime($pedidoEntity->created_at)) : '';

4
ci4/app/Controllers/Presupuestos/Presupuestoadmin.php
View File

@ -635,8 +635,8 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$data['resumen']['iva_reducido'] = $presupuesto->iva_reducido;
$data['created_by'] = model('App\Models\UserModel')->getFullName($presupuesto->user_created_id);
$data['updated_by'] = model('App\Models\UserModel')->getFullName($presupuesto->user_update_id);
$data['created_by'] = model('App\Models\Usuarios\UserModel')->getFullName($presupuesto->user_created_id);
$data['updated_by'] = model('App\Models\Usuarios\UserModel')->getFullName($presupuesto->user_update_id);
$data['created_at'] = date(' H:i d/m/Y', strtotime($presupuesto->created_at));
$data['updated_at'] = date(' H:i d/m/Y', strtotime($presupuesto->updated_at));

2
ci4/app/Controllers/Profile.php
View File

@ -3,7 +3,7 @@
namespace App\Controllers;
use App\Models\UserModel;
use App\Models\Usuarios\UserModel;
class Profile extends BaseController
{

10
ci4/app/Controllers/Soporte/Ticketcontroller.php
View File

@ -109,7 +109,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
$message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
$userModel = new \App\Models\UserModel();
$userModel = new \App\Models\Usuarios\UserModel();
$this->sendMail(lang('Tickets.newTicket'), lang('Tickets.newTicketBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['user_soporte_id'])->email);
@ -195,7 +195,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
}
// envio de correos
$userModel = new \App\Models\UserModel();
$userModel = new \App\Models\Usuarios\UserModel();
if ($oldUserSupport != $sanitizedData['user_soporte_id']) {
$this->sendMail(lang('Tickets.asgignToChanged'), lang('Tickets.asgignToChangedBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['user_soporte_id'])->email);
}
@ -379,15 +379,15 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
$supportUsers = array(
array(
'id' => $defatulSoporteUserId,
'name' => model('App\Models\UserModel')->getFullName($defatulSoporteUserId)
'name' => model('App\Models\Usuarios\UserModel')->getFullName($defatulSoporteUserId)
),
array(
'id' => 2,
'name' => model('App\Models\UserModel')->getFullName(2)
'name' => model('App\Models\Usuarios\UserModel')->getFullName(2)
),
array(
'id' => 1,
'name' => model('App\Models\UserModel')->getFullName(1)
'name' => model('App\Models\Usuarios\UserModel')->getFullName(1)
),
);