Merge branch 'main' into 'feat/catalogo_historico_pedidos'

Main

See merge request jjimenez/safekat!843
This commit is contained in:
Ignacio Martinez Navajas
2025-06-04 13:21:11 +00:00
5 changed files with 18 additions and 3 deletions

View File

@ -278,7 +278,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
$searchValues = get_filter_datatables_columns($reqData);
if (auth()->user()->can('tickets.edit')) {
if (auth()->user()->can('tickets.edit') && auth()->user()->inGroup('admin')) {
$user_id = null;
} else {
$user_id = auth()->user()->id;