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 'feat/catalogo_historico_pedidos'

Browse Source 
Main

See merge request jjimenez/safekat!843
This commit is contained in:
Ignacio Martinez Navajas
2025-06-04 13:21:11 +00:00
parent 84693d5c6c 884f9f1a67
commit 7f88ea7296
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
$searchValues = get_filter_datatables_columns($reqData); $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; $user_id = null;
} else { } else {
$user_id = auth()->user()->id; $user_id = auth()->user()->id;

1
ci4/app/Language/es/Presupuestos.php
View File

@ -395,6 +395,7 @@ return [
'gramaje_interior' => 'Seleccione el gramaje', 'gramaje_interior' => 'Seleccione el gramaje',
'pais' => 'Debe seleccionar un país', 'pais' => 'Debe seleccionar un país',
'integer_greatherThan_0' => 'Número entero > 0 requerido', 'integer_greatherThan_0' => 'Número entero > 0 requerido',
'greater_than_0' => 'El campo {field} debe ser mayor que 0',
'tirada_no_valida' => "Tirada no valida", 'tirada_no_valida' => "Tirada no valida",
'sin_gramaje' => "Seleccione gramaje", 'sin_gramaje' => "Seleccione gramaje",
'tipo_cubierta' => 'Seleccione tipo de cubierta', 'tipo_cubierta' => 'Seleccione tipo de cubierta',

14
ci4/app/Models/Presupuestos/PresupuestoModel.php
View File

@ -151,6 +151,14 @@ class PresupuestoModel extends \App\Models\BaseModel
public static $labelField = "titulo"; public static $labelField = "titulo";
protected $validationRulesAdd = [ protected $validationRulesAdd = [
"tirada" => [
"label" => "Presupuestos.tirada",
"rules" => "required|integer|greater_than[0]",
],
"paginas" => [
"label" => "Presupuestos.paginas",
"rules" => "required|integer|greater_than[0]",
],
"autor" => [ "autor" => [
"label" => "Presupuestos.autor", "label" => "Presupuestos.autor",
"rules" => "trim|max_length[150]", "rules" => "trim|max_length[150]",
@ -190,6 +198,12 @@ class PresupuestoModel extends \App\Models\BaseModel
]; ];
protected $validationMessagesAdd = [ protected $validationMessagesAdd = [
"tirada" => [
"greater_than" => "Presupuestos.validation.greater_than_0",
],
"paginas" => [
"greater_than" => "Presupuestos.validation.greater_than_0",
],
"autor" => [ "autor" => [
"max_length" => "Presupuestos.validation.max_length", "max_length" => "Presupuestos.validation.max_length",
"required" => "Presupuestos.validation.requerido", "required" => "Presupuestos.validation.requerido",

2
httpdocs/assets/js/safekat/components/table.js
View File

@ -93,7 +93,7 @@ let Table = function (
autoWidth: true, autoWidth: true,
responsive: true, responsive: true,
scrollX: true, scrollX: true,
stateSave: false, stateSave: true,
lengthMenu: [5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500], lengthMenu: [5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500],
order: order, order: order,
orderCellsTop: true, orderCellsTop: true,

2
httpdocs/assets/js/safekat/pages/soporte/tickets.js
View File

@ -259,7 +259,7 @@ class Ticket {
selectorPrioridad.append('<option value="">Todos</option>'); // Opción vacía selectorPrioridad.append('<option value="">Todos</option>'); // Opción vacía
selectorPrioridad.append('<option value="baja">' + window.language.Tickets.baja + '</option>'); selectorPrioridad.append('<option value="baja">' + window.language.Tickets.baja + '</option>');
selectorPrioridad.append('<option value="media">' + window.language.Tickets.media + '</option>'); selectorPrioridad.append('<option value="media">' + window.language.Tickets.media + '</option>');
selectorPrioridad.append('<option value="baja">' + window.language.Tickets.alta + '</option>'); selectorPrioridad.append('<option value="alta">' + window.language.Tickets.alta + '</option>');
selectorPrioridad.on('change', function () { selectorPrioridad.on('change', function () {
var val = $.fn.dataTable.util.escapeRegex( var val = $.fn.dataTable.util.escapeRegex(