diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index cc80c24d..1fa8ff55 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -84,7 +84,9 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController // JJO $sanitizedData['user_created_id'] = $session->id_user; - + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -164,6 +166,9 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController // JJO $sanitizedData['user_updated_id'] = $session->id_user; + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } $noException = true; diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php index 70a9bbc9..457a0616 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php @@ -47,6 +47,11 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController $this->viewData['pageTitle'] = lang('TarifaAcabadoLineas.moduleTitle'); $this->viewData['usingSweetAlert'] = true; parent::initController($request, $response, $logger); + + // Se indica que este controlador trabaja con soft_delete + $this->soft_delete = true; + // Se indica el flag para los ficheros borrados + $this->delete_flag = 1; } @@ -248,19 +253,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('paginas_min') + Field::inst('tirada_min') ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_min.decimal')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_min.decimal')) ) ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_min.required')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_min.required')) ), - Field::inst('paginas_max') + Field::inst('tirada_max') ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_max.decimal')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_max.decimal')) ) ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_max.required')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_max.required')) ), Field::inst('precio_min') ->validator('Validate::numeric', array( @@ -298,8 +303,8 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController // Si no se quiere borrar... if ($data['data'][$pkey]['is_deleted'] != 1) { - $process_data['paginas_min'] = $data['data'][$pkey]['paginas_min']; - $process_data['paginas_max'] = $data['data'][$pkey]['paginas_max']; + $process_data['tirada_min'] = $data['data'][$pkey]['tirada_min']; + $process_data['tirada_max'] = $data['data'][$pkey]['tirada_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)) { diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index da5d9e93..33e35632 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -44,6 +44,11 @@ class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceControll $this->viewData['pageTitle'] = lang('TarifaEncuadernacionLineas.moduleTitle'); $this->viewData['usingSweetAlert'] = true; parent::initController($request, $response, $logger); + + // Se indica que este controlador trabaja con soft_delete + $this->soft_delete = true; + // Se indica el flag para los ficheros borrados + $this->delete_flag = 1; } diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php index 200cc139..ca32f89d 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php @@ -8,6 +8,7 @@ use App\Models\Collection; use App\Entities\Tarifas\TarifaEncuadernacionTirada; use App\Models\Tarifas\TarifaEncuadernacionTiradaModel; +use App\Models\Tarifas\TarifaEncuadernacionLineaModel; use App\Models\Compras\ProveedorModel; use App\Models\Compras\ProveedorTipoModel; @@ -47,6 +48,45 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl parent::initController($request, $response, $logger); } + + public function delete($id = null) + { + if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) { + $objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc)); + } else { + $objName = lang('Basic.global.record'); + } + + if (!$this->soft_delete){ + + if (!$this->model->delete($id)) { + return $this->failNotFound(lang('Basic.global.deleteError', [$objName])); + } + } + else{ + $datetime = (new \CodeIgniter\I18n\Time("now")); + + $lineaModel = new TarifaEncuadernacionLineaModel(); + $lineaResult = $lineaModel->removeAllEncuadernacionLineas($id, $datetime, $this->delete_flag); + + $rawResult = $this->model->where('id',$id) + ->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'), + 'is_deleted' => $this->delete_flag]) + ->update(); + + if (!$rawResult && !$lineaResult) { + return $this->failNotFound(lang('Basic.global.deleteError', [$objName])); + } + + } + + // $message = lang('Basic.global.deleteSuccess', [$objName]); IMN commented + $message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]); + $response = $this->respondDeleted(['id' => $id, 'msg' => $message]); + return $response; + } + + public function datatable_editor() { if ($this->request->isAJAX()) { diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php index a4372d4f..efc375a1 100644 --- a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php @@ -43,6 +43,12 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController { $this->viewData['pageTitle'] = lang('TarifaManipuladoLineas.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + + // Se indica que este controlador trabaja con soft_delete + $this->soft_delete = true; + // Se indica el flag para los ficheros borrados + $this->delete_flag = 1; + parent::initController($request, $response, $logger); } @@ -210,19 +216,19 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController // Build our Editor instance and process the data coming from _POST $response = Editor::inst($db, 'tarifa_manipulado_lineas') ->fields( - Field::inst('paginas_min') + Field::inst('tirada_min') ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_min.decimal')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_min.decimal')) ) ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_min.required')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_min.required')) ), - Field::inst('paginas_max') + Field::inst('tirada_max') ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_max.decimal')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_max.decimal')) ) ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.paginas_max.required')) + 'message' => lang('TarifaAcabadoLineas.validation.tirada_max.required')) ), Field::inst('precio_min') ->validator('Validate::numeric', array( @@ -259,8 +265,8 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController foreach ($data['data'] as $pkey => $values) { // Si no se quiere borrar... if ($data['data'][$pkey]['is_deleted'] != 1) { - $process_data['paginas_min'] = $data['data'][$pkey]['paginas_min']; - $process_data['paginas_max'] = $data['data'][$pkey]['paginas_max']; + $process_data['tirada_min'] = $data['data'][$pkey]['tirada_min']; + $process_data['tirada_max'] = $data['data'][$pkey]['tirada_max']; $response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['tarifa_manipulado_id']); // No se pueden duplicar valores al crear o al editar if (!empty($response)) { diff --git a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php index f9fc8713..96665d10 100644 --- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php +++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php @@ -89,6 +89,9 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController if (isset($this->model->user_updated_id)) { $sanitizedData['user_created_id'] = $session->id_user; } + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -170,6 +173,9 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController if (isset($this->model->user_updated_id)) { $sanitizedData['user_updated_id'] = $session->id_user; } + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php index c045ac23..b245f1dd 100644 --- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php @@ -86,6 +86,9 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController if (isset($this->model->user_updated_id)) { $sanitizedData['user_created_id'] = $session->id_user; } + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -167,6 +170,9 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController if (isset($this->model->user_updated_id)) { $sanitizedData['user_updated_id'] = $session->id_user; } + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php index bdc01d4b..9fa7fb51 100644 --- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php @@ -11,6 +11,7 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity "nombre" => null, "precio_min" => 0, "importe_fijo" => 0, + "mostrar_en_presupuesto" => 1, "user_created_id" => 0, "user_updated_id" => 0, "is_deleted" => 0, @@ -21,6 +22,7 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio_min" => "float", "importe_fijo" => "float", + "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_updated_id" => "int", "is_deleted" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php index 33394422..aac261a4 100644 --- a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php @@ -11,6 +11,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity "nombre" => null, "precio_min" => 0, "importe_fijo" => 0, + "mostrar_en_presupuesto" => 1, "user_created_id" => 0, "user_updated_id" => 0, "is_deleted" => 0, @@ -21,6 +22,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio_min" => "float", "importe_fijo" => "float", + "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_updated_id" => "int", "is_deleted" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php b/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php index 8c0e69c7..0d2d9b91 100644 --- a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php @@ -10,6 +10,7 @@ class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity "nombre" => null, "precio_min" => 0, "importe_fijo" => 0, + "mostrar_en_presupuesto" => 1, "user_created_id" => 0, "user_updated_id" => 0, "is_deleted" => 0, @@ -20,6 +21,7 @@ class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio_min" => "float", "importe_fijo" => "float", + "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_updated_id" => "int", "is_deleted" => "int", diff --git a/ci4/app/Language/en/TarifaEncuadernacionLineas.php b/ci4/app/Language/en/TarifaEncuadernacionLineas.php index 97f92970..9194f806 100644 --- a/ci4/app/Language/en/TarifaEncuadernacionLineas.php +++ b/ci4/app/Language/en/TarifaEncuadernacionLineas.php @@ -11,6 +11,7 @@ return [ 'precioUnidad' => 'Price Unit', 'paginasMax' => 'Max Pages', 'paginasMin' => 'Min Pages', + 'moduleExplanation' => 'The number of pages indicated in this section refers per copy, not to the total of the order.', 'margen' => 'Margin', 'validation' => [ 'error_seleccion_tiradas' => 'A line from the Printings table must be selected before creating a new record.', diff --git a/ci4/app/Language/en/Tarifaacabado.php b/ci4/app/Language/en/Tarifaacabado.php index 64532898..e9413fab 100644 --- a/ci4/app/Language/en/Tarifaacabado.php +++ b/ci4/app/Language/en/Tarifaacabado.php @@ -15,6 +15,7 @@ return [ 'precioMin' => 'Min Price', 'importeFijo' => 'Fixed amount', 'margen' => 'Margin', + 'mostrar_en_presupuesto' => 'Show in budget', 'tarifaacabado' => 'Finishing Rates', 'tarifaacabadoList' => 'Finishing Rates List', 'tarifasacabado' => 'Finishing Rates', diff --git a/ci4/app/Language/en/Tarifaencuadernacion.php b/ci4/app/Language/en/Tarifaencuadernacion.php index 99936ab0..60412c11 100644 --- a/ci4/app/Language/en/Tarifaencuadernacion.php +++ b/ci4/app/Language/en/Tarifaencuadernacion.php @@ -21,6 +21,7 @@ return [ 'tarifasencuadernacion' => 'Binding rates', 'tiradaMax' => 'Print Max', 'tiradaMin' => 'Print Min', + 'mostrar_en_presupuesto' => 'Show in budget', 'updatedAt' => 'Updated At', 'userCreatedId' => 'User Created ID', 'userUpdateId' => 'User Update ID', diff --git a/ci4/app/Language/en/Tarifamanipulado.php b/ci4/app/Language/en/Tarifamanipulado.php index a29c2097..da383fea 100644 --- a/ci4/app/Language/en/Tarifamanipulado.php +++ b/ci4/app/Language/en/Tarifamanipulado.php @@ -15,6 +15,7 @@ return [ 'precioMin' => 'Price Min', 'precioMin' => 'Min Price', 'importeFijo' => 'Fixed amount', + 'mostrar_en_presupuesto' => 'Show in budget', 'margen' => 'Margin', 'tarifamanipulado' => 'Handling rate', 'tarifamanipuladoList' => 'Handling rates List', diff --git a/ci4/app/Language/es/TarifaEncuadernacionLineas.php b/ci4/app/Language/es/TarifaEncuadernacionLineas.php index 69f95d65..d941975d 100644 --- a/ci4/app/Language/es/TarifaEncuadernacionLineas.php +++ b/ci4/app/Language/es/TarifaEncuadernacionLineas.php @@ -11,6 +11,7 @@ return [ 'precioUnidad' => 'Precio Unidad', 'paginasMax' => 'Páginas Max', 'paginasMin' => 'Páginas Min', + 'moduleExplanation' => 'El número de páginas reflejado en este apartado se refiere por ejemplar, no al total del pedido', 'margen' => 'Margen', 'validation' => [ 'error_seleccion_tiradas' => 'Debe seleccionar una línea de la tabla tiradas antes de crear un registro nuevo.', diff --git a/ci4/app/Language/es/Tarifaacabado.php b/ci4/app/Language/es/Tarifaacabado.php index 63db7206..fdb1d0e9 100644 --- a/ci4/app/Language/es/Tarifaacabado.php +++ b/ci4/app/Language/es/Tarifaacabado.php @@ -11,6 +11,7 @@ return [ 'nombre' => 'Nombre', 'precioMin' => 'Precio Mínimo', 'importeFijo' => 'Importe Fijo', + 'mostrar_en_presupuesto' => 'Mostrar en presupuesto', 'tarifaacabado' => 'Tarifas Acabado', 'tarifaacabadoList' => 'Lista Tarifas Acabado', 'tarifasacabado' => 'Tarifas Acabado', diff --git a/ci4/app/Language/es/Tarifaencuadernacion.php b/ci4/app/Language/es/Tarifaencuadernacion.php index 1bf6306d..8b3aa73b 100644 --- a/ci4/app/Language/es/Tarifaencuadernacion.php +++ b/ci4/app/Language/es/Tarifaencuadernacion.php @@ -18,6 +18,7 @@ return [ 'tarifasencuadernacion' => 'Tarifas Encuadernación', 'tiradaMax' => 'Tirada Max', 'tiradaMin' => 'Tirada Min', + 'mostrar_en_presupuesto' => 'Mostrar en presupuesto', 'updatedAt' => 'Actualizado en', 'userCreatedId' => 'ID Usuario \"Creado en\"', 'userUpdateId' => 'ID Usuario \"Actualizado en\"', diff --git a/ci4/app/Language/es/Tarifamanipulado.php b/ci4/app/Language/es/Tarifamanipulado.php index 0f0b0235..3e1fc7c5 100644 --- a/ci4/app/Language/es/Tarifamanipulado.php +++ b/ci4/app/Language/es/Tarifamanipulado.php @@ -13,6 +13,7 @@ return [ 'precioMax' => 'Precio Max', 'precioMin' => 'Precio Min', 'importeFijo' => 'Importe Fijo', + 'mostrar_en_presupuesto' => 'Mostrar en presupuesto', 'tarifamanipulado' => 'Tarifa Manipulado', 'tarifamanipuladoList' => 'Lista Tarifas Manipulado', 'tarifasmanipulado' => 'Tarifas Manipulado', diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php index d714b390..2c2381aa 100644 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php @@ -156,4 +156,16 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel return ""; } + + public function removeAllEncuadernacionLineas($tiradaId = -1, $datetime = null, $delete_flag=1){ + + $builder = $this->db + ->table($this->table) + ->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'), + 'is_deleted' => $delete_flag]) + ->where('tirada_encuadernacion_id',$tiradaId) + ->update(); + + return $builder; + } } diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php index 69d5a181..05be7bda 100644 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php @@ -14,12 +14,17 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel const SORTABLE = [ 0 => "t1.nombre", + 1 => "t1.precio_min", + 2 => "t1.importe_fijo", + 3 => "t1.mostrar_en_presupuesto", + ]; protected $allowedFields = [ "nombre", "precio_min", "importe_fijo", + "mostrar_en_presupuesto", "deleted_at", "is_deleted", "user_created_id", @@ -76,7 +81,8 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel */ public function getResource(string $search = "") { - $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo"); + $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, + t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, t1.mostrar_en_presupuesto AS mostrar_en_presupuesto"); //JJO $builder->where("t1.is_deleted", 0); diff --git a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php index f7accda2..8afc3ab4 100644 --- a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php +++ b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php @@ -14,12 +14,16 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel const SORTABLE = [ 0 => "t1.nombre", + 1 => "precio_min", + 2 => "importe_fijo", + 3 => "t1.mostrar_en_presupuesto", ]; protected $allowedFields = [ "nombre", "precio_min", "importe_fijo", + "mostrar_en_presupuesto", "deleted_at", "is_deleted", "user_created_id", @@ -76,7 +80,8 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel */ public function getResource(string $search = "") { - $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo"); + $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo + ,t1.mostrar_en_presupuesto AS mostrar_en_presupuesto"); //JJO $builder->where("t1.is_deleted", 0); diff --git a/ci4/app/Models/Tarifas/TarifaacabadoModel.php b/ci4/app/Models/Tarifas/TarifaacabadoModel.php index 049b16f2..8d9d209d 100644 --- a/ci4/app/Models/Tarifas/TarifaacabadoModel.php +++ b/ci4/app/Models/Tarifas/TarifaacabadoModel.php @@ -16,12 +16,14 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel 0 => "t1.nombre", 1 => "precio_min", 2 => "importe_fijo", + 3 => "t1.mostrar_en_presupuesto", ]; protected $allowedFields = [ "nombre", "precio_min", "importe_fijo", + "mostrar_en_presupuesto", "deleted_at", "is_deleted", "user_created_id", @@ -79,7 +81,7 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel public function getResource(string $search = "") { $builder = $this->db->table($this->table . " t1")->select( - "t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo" + "t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, t1.mostrar_en_presupuesto AS mostrar_en_presupuesto" ); //JJO diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index e56da859..b5c70fae 100644 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -38,7 +38,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "label" => "Tarifapreimpresion.nombre", "rules" => "trim|required|max_length[255]", ], - "precio" => [ + "precio_pagina" => [ "label" => "Tarifapreimpresion.precio", "rules" => "required|decimal", ], @@ -61,7 +61,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "max_length" => "Tarifapreimpresion.validation.nombre.max_length", "required" => "Tarifapreimpresion.validation.nombre.required", ], - "precio" => [ + "precio_pagina" => [ "decimal" => "Tarifapreimpresion.validation.precio.decimal", "required" => "Tarifapreimpresion.validation.precio.required", ], diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php index f6508319..24fb87d6 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php @@ -24,6 +24,16 @@ value="= old('importe_fijo', $tarifaacabadoEntity->importe_fijo) ?>"> +
= lang("TarifaEncuadernacionLineas.moduleExplanation") ?>