From 63d4470fabb7d12ed1a0dbddb5f48712a0774927 Mon Sep 17 00:00:00 2001 From: 75134972k <75134972k@csic.es> Date: Wed, 13 Mar 2024 09:53:46 +0100 Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20formatter=20a=20los=20decimales?= =?UTF-8?q?=20en=20los=20dattables=20editor=20de=20las=20tarifas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Clientes/Clienteplantillaprecioslineas.php | 8 ++++++++ ci4/app/Controllers/Clientes/Clienteprecios.php | 8 ++++++++ .../Configuracion/Maquinastarifasimpresion.php | 4 ++++ .../Configuracion/Papelimpresionmargenes.php | 6 ++++++ ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php | 10 ++++++++++ .../Tarifas/Tarifaencuadernacionlineas.php | 6 ++++++ .../Tarifas/Tarifaencuadernacionlineashoras.php | 8 ++++++++ .../Tarifas/Tarifaencuadernaciontiradas.php | 4 ++++ .../Controllers/Tarifas/Tarifamanipuladolineas.php | 10 ++++++++++ ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php | 12 ++++++++++++ ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php | 2 ++ 11 files changed, 78 insertions(+) diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php index 3eae3b23..36d0b9e9 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php @@ -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')) ), diff --git a/ci4/app/Controllers/Clientes/Clienteprecios.php b/ci4/app/Controllers/Clientes/Clienteprecios.php index 8c8dd087..92da1979 100755 --- a/ci4/app/Controllers/Clientes/Clienteprecios.php +++ b/ci4/app/Controllers/Clientes/Clienteprecios.php @@ -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')) ), diff --git a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php index 42f509c4..7f4aa48e 100755 --- a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php @@ -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( diff --git a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php index 0509edd7..f05b50ab 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php @@ -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( diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php index 457a0616..88c311bc 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php @@ -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( diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index 3b860328..6dfcb06f 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -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( diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php index 94cd99e3..99665755 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php @@ -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( diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php index c4ab5b37..f5f49d91 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php @@ -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( diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php index efc375a1..b9e6d365 100755 --- a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php @@ -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( diff --git a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php index 763c86dc..146a133e 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php @@ -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'), diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php index 39ebd1cb..e193ba54 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php @@ -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'),