diff --git a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php index 9515a89c..35923914 100644 --- a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php @@ -419,6 +419,7 @@ class Maquinastarifasimpresion extends \App\Controllers\GoBaseResourceController 'color' => 'color', 'negrohq' => 'negrohq', 'bicolor' => 'bicolor', + 'colorhq' => 'colorhq', ]; return $tipoOptions; } diff --git a/ci4/app/Language/en/MaquinasTarifasImpresions.php b/ci4/app/Language/en/MaquinasTarifasImpresions.php index 0cff47a2..31f29370 100644 --- a/ci4/app/Language/en/MaquinasTarifasImpresions.php +++ b/ci4/app/Language/en/MaquinasTarifasImpresions.php @@ -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)", diff --git a/ci4/app/Language/es/MaquinasTarifasImpresions.php b/ci4/app/Language/es/MaquinasTarifasImpresions.php index e7deb3eb..1fda1bb8 100644 --- a/ci4/app/Language/es/MaquinasTarifasImpresions.php +++ b/ci4/app/Language/es/MaquinasTarifasImpresions.php @@ -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)", diff --git a/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php b/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php index f95608f9..62b3e037 100644 --- a/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php +++ b/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php @@ -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", diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php index e1bf226b..330e3874 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php @@ -243,7 +243,8 @@ {label:'', value:'negro'}, {label:'', value: 'negrohq'}, {label:'', value: 'bicolor'}, - {label:'', value: 'color'} + {label:'', value: 'color'}, + {label:'', value: 'colorhq'}, ]; editor = new $.fn.dataTable.Editor( { @@ -405,6 +406,8 @@ return ''; else if (data=='color') return ''; + else if (data=='colorhq') + return ''; } }, { 'data': 'precio' },