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 'bug/punto_decimal_tarifas_encuadernacion' into 'main'

Browse Source 
añadido formatter a los decimales en los dattables editor de las tarifas

See merge request jjimenez/safekat!187
This commit is contained in:
Jaime Jimenez Ortega
2024-03-13 08:54:55 +00:00
parent feb2e7ffeb 63d4470fab
commit b645fb030c
11 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php
View File

@ -140,34 +140,42 @@ class Clienteplantillaprecioslineas extends \App\Controllers\GoBaseResourceContr
Field::inst( 'user_updated_id' ),
Field::inst( 'updated_at' ),
Field::inst( 'tiempo_min' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),
Field::inst( 'tiempo_max' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),
Field::inst( 'precio_hora' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),
Field::inst( 'margen' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),

8
ci4/app/Controllers/Clientes/Clienteprecios.php
View File

@ -142,34 +142,42 @@ class ClientePrecios extends \App\Controllers\GoBaseResourceController
Field::inst( 'updated_at' ),
Field::inst( 'is_deleted' ),
Field::inst( 'tiempo_min' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),
Field::inst( 'tiempo_max' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),
Field::inst( 'precio_hora' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),
Field::inst( 'margen' )
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator( 'Validate::notEmpty',array(
'message' => lang('ClientePrecios.validation.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('ClientePrecios.validation.decimal'))
),

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

@ -228,14 +228,18 @@ class Maquinastarifasimpresion extends \App\Controllers\GoBaseResourceController
'message' => lang('MaquinasTarifasImpresions.validation.tipo.required'))
),
Field::inst('precio')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('MaquinasTarifasImpresions.validation.precio.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('MaquinasTarifasImpresions.validation.tipo.required'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('MaquinasTarifasImpresions.validation.precio.decimal'))
)
->validator('Validate::notEmpty', array(

6
ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php
View File

@ -60,21 +60,27 @@ class Papelimpresionmargenes extends \App\Controllers\GoBaseResourceController
$response = Editor::inst($db, 'papel_impresion_margenes')
->fields(
Field::inst('paginas_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('PapelImpresionMargenesvalidation.paginas_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('PapelImpresionMargenesvalidation.paginas_min.required'))
),
Field::inst('paginas_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('PapelImpresionMargenesvalidation.paginas_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('PapelImpresionMargenesvalidation.paginas_max.required'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('PapelImpresionMargenesvalidation.margen.decimal'))
)
->validator('Validate::notEmpty', array(

10
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
View File

@ -254,35 +254,45 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController
$response = Editor::inst($db, 'tarifa_acabado_lineas')
->fields(
Field::inst('tirada_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.tirada_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_min.required'))
),
Field::inst('tirada_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.tirada_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_max.required'))
),
Field::inst('precio_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
),
Field::inst('precio_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_max.required'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
)
->validator('Validate::notEmpty', array(

6
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
View File

@ -228,21 +228,27 @@ class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceControll
'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required'))
),
Field::inst('precio_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
),
Field::inst('precio_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_max.required'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
)
->validator('Validate::notEmpty', array(

8
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php
View File

@ -214,28 +214,36 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\GoBaseResourceCon
$response = Editor::inst($db, 'tarifa_encuadernacion_lineas_horas')
->fields(
Field::inst('tiempo_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required'))
),
Field::inst('tiempo_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required'))
),
Field::inst('precio_hora')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
)
->validator('Validate::notEmpty', array(

4
ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
View File

@ -100,14 +100,18 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl
$response = Editor::inst($db, 'tarifa_encuadernacion_tiradas')
->fields(
Field::inst('tirada_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required'))
),
Field::inst('tirada_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_max.decimal'))
)
->validator('Validate::notEmpty', array(

10
ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
View File

@ -217,35 +217,45 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController
$response = Editor::inst($db, 'tarifa_manipulado_lineas')
->fields(
Field::inst('tirada_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.tirada_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_min.required'))
),
Field::inst('tirada_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.tirada_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_max.required'))
),
Field::inst('precio_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
),
Field::inst('precio_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal'))
)
->validator('Validate::notEmpty', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_max.required'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
)
->validator('Validate::notEmpty', array(

12
ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
View File

@ -226,45 +226,57 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
'message' => lang('TarifasEnviosPrecios.validation.tipo_envio.required'))
),
Field::inst('peso_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.peso_min.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosPrecios.validation.peso_min.decimal'))
),
Field::inst('peso_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.peso_max.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosPrecios.validation.peso_max.decimal'))
),
Field::inst('precio_min')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.precio.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosPrecios.validation.precio.decimal'))
),
Field::inst('precio_max')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.precio.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosPrecios.validation.precio.decimal'))
),
Field::inst('precio_adicional')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal'))
),
Field::inst('margen')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal'))
),
Field::inst('tarifa_envio_id'),

2
ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
View File

@ -240,10 +240,12 @@ class Tarifasenvioszonas extends \App\Controllers\GoBaseResourceController {
'message' => lang('TarifasEnviosZonas.validation.cp_final.max_length'))
),
Field::inst('importe_fijo')
->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosZonas.validation.importe_fijo.required'))
)
->validator('Validate::numeric', array(
"decimal" => ',',
'message' => lang('TarifasEnviosZonas.validation.importe_fijo.integer'))
),
Field::inst('tarifa_envio_id'),