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 'mod/tarifa_imp_maquina' into 'main'

Browse Source 
Insertada la opcion Color HQ en la lista de tarifas impresion

See merge request jjimenez/safekat!51
This commit is contained in:
Jaime Jimenez Ortega
2023-08-18 13:08:31 +00:00
parent a4d0330ed6 bbde91f4b9
commit aab3b89cfc
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php
View File

@ -419,6 +419,7 @@ class Maquinastarifasimpresion extends \App\Controllers\GoBaseResourceController
'color' => 'color',
'negrohq' => 'negrohq',
'bicolor' => 'bicolor',
'colorhq' => 'colorhq',
];
return $tipoOptions;
}

1
ci4/app/Language/en/MaquinasTarifasImpresions.php
View File

@ -26,6 +26,7 @@ return [
'negro' => 'Black',
'color' => 'Color',
'negrohq' => 'Black HQ',
'colorhq' => 'Color HQ',
'bicolor' => 'Bicolor',
'validation' => [
'duplicated_uso_tipo' => "Duplicate line (the combination 'use' and 'type' already exists)",

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

@ -26,6 +26,7 @@ return [
'negro' => 'Negro',
'color' => 'Color',
'negrohq' => 'Negro HQ',
'colorhq' => 'Color HQ',
'bicolor' => 'Bicolor',
'validation' => [
'duplicated_uso_tipo' => "Línea duplicada (la combinación 'uso' y 'tipo' ya existe)",

2
ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php
View File

@ -37,7 +37,7 @@ class MaquinasTarifasImpresionModel extends \App\Models\GoBaseModel
],
"tipo" => [
"label" => "MaquinasTarifasImpresions.tipo",
"rules" => "permit_empty|in_list[negro,color,negrohq,bicolor]",
"rules" => "permit_empty|in_list[negro,color,negrohq,bicolor,colorhq]",
],
"uso" => [
"label" => "MaquinasTarifasImpresions.uso",

5
ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php
View File

@ -243,7 +243,8 @@
{label:'<?= lang('MaquinasTarifasImpresions.negro') ?>', value:'negro'},
{label:'<?= lang('MaquinasTarifasImpresions.negrohq') ?>', value: 'negrohq'},
{label:'<?= lang('MaquinasTarifasImpresions.bicolor') ?>', value: 'bicolor'},
{label:'<?= lang('MaquinasTarifasImpresions.color') ?>', value: 'color'}
{label:'<?= lang('MaquinasTarifasImpresions.color') ?>', value: 'color'},
{label:'<?= lang('MaquinasTarifasImpresions.colorhq') ?>', value: 'colorhq'},
];
editor = new $.fn.dataTable.Editor( {
@ -405,6 +406,8 @@
return '<?= lang('MaquinasTarifasImpresions.bicolor') ?>';
else if (data=='color')
return '<?= lang('MaquinasTarifasImpresions.color') ?>';
else if (data=='colorhq')
return '<?= lang('MaquinasTarifasImpresions.colorhq') ?>';
}
},
{ 'data': 'precio' },