modificaciones en tarifas: añadido margen, cambiado tirada por paginas y añadidas tarifas encuadernacion

This commit is contained in:
Jaime Jimenez
2023-07-21 18:07:46 +02:00
parent 2a30e2d8a2
commit 4d1fd30cb1
44 changed files with 2018 additions and 205 deletions

View File

@ -250,19 +250,19 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
// Build our Editor instance and process the data coming from _POST
$response = Editor::inst( $db, 'tarifa_acabado_lineas' )
->fields(
Field::inst( 'tirada_min' )
Field::inst( 'paginas_min' )
->validator( 'Validate::numeric', array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_min.decimal') )
'message' => lang('TarifaAcabadoLineas.validation.paginas_min.decimal') )
)
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_min.required') )
'message' => lang('TarifaAcabadoLineas.validation.paginas_min.required') )
),
Field::inst( 'tirada_max' )
Field::inst( 'paginas_max' )
->validator( 'Validate::numeric', array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_max.decimal') )
'message' => lang('TarifaAcabadoLineas.validation.paginas_max.decimal') )
)
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.tirada_max.required') )
'message' => lang('TarifaAcabadoLineas.validation.paginas_max.required') )
),
Field::inst( 'precio_min' )
->validator( 'Validate::numeric', array(
@ -278,6 +278,13 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.precio_max.required') )
),
Field::inst( 'margen' )
->validator( 'Validate::numeric', array(
'message' => lang('TarifaAcabadoLineas.validation.margen.decimal') )
)
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.margen.required') )
),
Field::inst( 'tarifa_acabado_id' ),
Field::inst( 'user_created_id' ),
Field::inst( 'created_at' ),
@ -293,8 +300,8 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
// Si no se quiere borrar...
if($data['data'][$pkey]['is_deleted'] != 1){
$process_data['tirada_min'] = $data['data'][$pkey]['tirada_min'];
$process_data['tirada_max'] = $data['data'][$pkey]['tirada_max'];
$process_data['paginas_min'] = $data['data'][$pkey]['paginas_min'];
$process_data['paginas_max'] = $data['data'][$pkey]['paginas_max'];
$response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['tarifa_acabado_id']);
// No se pueden duplicar valores al crear o al editar
if (!empty($response)){
@ -330,7 +337,7 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
// if unique key is set in DB
/*if(isset($response['error'])){
if(str_contains($response['error'], "tirada_min_tirada_max") &&
if(str_contains($response['error'], "paginas_min_paginas_max") &&
str_contains($response['error'], "Duplicate entry ")){
$response['error'] = lang('TarifaAcabadoLineas.validation.duplicated_tirada');
}