From 77cb70ede4ff90d2b5d41e89169c55e51fabfac1 Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Fri, 18 Aug 2023 13:51:09 +0200 Subject: [PATCH] Finalizadas las tareas de modificacion --- ci4/app/Controllers/Tarifas/Tarifaacabado.php | 7 +- .../Tarifas/Tarifaacabadolineas.php | 21 ++-- .../Tarifas/Tarifaencuadernacionlineas.php | 5 + .../Tarifas/Tarifaencuadernaciontiradas.php | 40 ++++++++ .../Tarifas/Tarifamanipuladolineas.php | 22 +++-- .../Tarifas/Tarifasencuadernacion.php | 6 ++ .../Controllers/Tarifas/Tarifasmanipulado.php | 6 ++ .../Tarifas/TarifaEncuadernacionEntity.php | 2 + .../Tarifas/TarifaManipuladoEntity.php | 2 + .../Entities/Tarifas/TarifaacabadoEntity.php | 2 + .../en/TarifaEncuadernacionLineas.php | 1 + ci4/app/Language/en/Tarifaacabado.php | 1 + ci4/app/Language/en/Tarifaencuadernacion.php | 1 + ci4/app/Language/en/Tarifamanipulado.php | 1 + .../es/TarifaEncuadernacionLineas.php | 1 + ci4/app/Language/es/Tarifaacabado.php | 1 + ci4/app/Language/es/Tarifaencuadernacion.php | 1 + ci4/app/Language/es/Tarifamanipulado.php | 1 + .../TarifaEncuadernacionLineaModel.php | 12 +++ .../Tarifas/TarifaEncuadernacionModel.php | 8 +- .../Models/Tarifas/TarifaManipuladoModel.php | 7 +- ci4/app/Models/Tarifas/TarifaacabadoModel.php | 4 +- .../Tarifas/TarifapreimpresionModel.php | 4 +- .../acabado/_tarifaAcabadoFormItems.php | 10 ++ .../tarifas/acabado/viewTarifaAcabadoForm.php | 72 +++++++------- .../tarifas/acabado/viewTarifaAcabadoList.php | 10 ++ .../_tarifaEncuadernacionFormItems.php | 14 ++- .../viewTarifaEncuadernacionForm.php | 96 +++++++++---------- .../viewTarifaEncuadernacionList.php | 11 +++ .../manipulado/_tarifaManipuladoFormItems.php | 10 ++ .../manipulado/viewTarifaManipuladoForm.php | 48 +++++++--- .../manipulado/viewTarifaManipuladoList.php | 13 +++ .../_tarifapreimpresionFormItems.php | 6 +- .../viewTarifapreimpresionForm.php | 1 + 34 files changed, 318 insertions(+), 129 deletions(-) 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="importe_fijo) ?>"> +
+
+ + +
+
+ \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php index 5683ecd8..c793fa29 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php @@ -1,6 +1,7 @@ include('themes/_commonPartialsBs/datatables') ?> include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> +include('themes/_commonPartialsBs/_confirm2delete') ?> extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?> @@ -49,7 +50,7 @@ - + @@ -79,10 +80,10 @@ const actionBtns = function(data) { return ` - - - - `; + + + + `; }; @@ -96,11 +97,11 @@ table : "#tableOfTarifaacabadolineas", idSrc: 'id', fields: [ { - name: "paginas_min" + name: "tirada_min" }, { name: "precio_max" }, { - name: "paginas_max" + name: "tirada_max" }, { name: "precio_min" },{ @@ -165,9 +166,9 @@ async: true, }), columns: [ - { 'data': 'paginas_min' }, + { 'data': 'tirada_min' }, { 'data': 'precio_max' }, - { 'data': 'paginas_max' }, + { 'data': 'tirada_max' }, { 'data': 'precio_min' }, { 'data': 'margen' }, { @@ -193,7 +194,7 @@ editor: editor, formOptions: { submitTrigger: -1, - submitHtml: '' + submitHtml: '' } } ] } ); @@ -205,9 +206,9 @@ editor.inline( theTable.cells(this.parentNode.parentNode, '*').nodes(), { - cancelHtml: '', + cancelHtml: '', cancelTrigger: 'span.cancel', - submitHtml: '', + submitHtml: '', submitTrigger: 'span.edit', submit: 'allIfChanged' } @@ -216,32 +217,29 @@ // Delete row - $('#tableOfTarifaacabadolineas').on( 'click', 'tbody span.remove', function (e) { - - Swal.fire({ - title: '', - text: '', - icon: 'warning', - showCancelButton: true, - confirmButtonColor: '#3085d6', - confirmButtonText: '', - cancelButtonText: '', - cancelButtonColor: '#d33' - }) - .then((result) => { - const dataId = $(this).data('id'); - const row = $(this).closest('tr'); - if (result.value) { - editor - .create( false ) - .edit( this.parentNode, false) - .set( 'deleted_at', new Date().toISOString().slice(0, 19).replace('T', ' ') ) - .set( 'is_deleted', 1 ) - .submit(); - - } - }); + $(document).on('click', '.btn-delete', function(e) { + $(".btn-remove").attr('data-id', $(this).attr('data-id')); }); + + $(document).on('click', '.btn-remove', function(e) { + const dataId = $(this).attr('data-id'); + const row = $(this).closest('tr'); + if ($.isNumeric(dataId)) { + $.ajax({ + url: `/tarifas/tarifaacabadolineas/delete/${dataId}`, + method: 'GET', + }).done((data, textStatus, jqXHR) => { + $('#confirm2delete').modal('toggle'); + theTable.clearPipeline(); + theTable.row($(row)).invalidate().draw(); + popSuccessAlert(data.msg ?? jqXHR.statusText); + }).fail((jqXHR, textStatus, errorThrown) => { + popErrorAlert(jqXHR.responseJSON.messages.error) + }) + } + }); + + endSection() ?> section('css') ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php index 8f9a689f..86307c6e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php @@ -19,6 +19,7 @@ + @@ -89,10 +90,19 @@ { 'data': 'nombre' }, { 'data': 'precio_min' }, { 'data': 'importe_fijo' }, + { 'data': 'mostrar_en_presupuesto' }, { 'data': actionBtns } ] }); + theTable.on( 'draw.dt', function () { + const boolCols = [3]; + for (let coln of boolCols) { + theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { + cell.innerHTML = cell.innerHTML == '1' ? '' : ''; + }); + } + }); $(document).on('click', '.btn-edit', function(e) { window.location.href = `/tarifas/tarifaacabado/edit/${$(this).attr('data-id')}`; diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php index 87bb6eb4..89e34635 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php @@ -1,6 +1,7 @@
-
+ +
@@ -21,6 +22,15 @@
-
+
+
+ +
+
+ +
\ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php index af1c9838..501757ee 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php @@ -69,6 +69,8 @@
+ +

@@ -117,11 +119,36 @@ `; }; + // Delete row $(document).on('click', '.btn-delete', function(e) { $(".btn-remove").attr('data-id', $(this).attr('data-id')); + if($(this).closest('table').attr('id').includes('tiradas')){ + $(".btn-remove").attr('table', "tiradas"); + } + else if($(this).closest('table').attr('id').includes('lineas')){ + $(".btn-remove").attr('table', "lineas"); + } + else{ + $(".btn-remove").attr('table', ); + } }); var selected_tirada_id = -1; + + + $(document).on('click', '.btn-remove', function(e) { + const dataId = $(this).attr('data-id'); + const row = $(this).closest('tr'); + if ($.isNumeric(dataId)) { + + if($(this).attr('table').includes('tiradas')){ + remove_tiradas(dataId, row); + } + else if ($(this).attr('table').includes('lineas')){ + remove_lineas(dataId, row); + } + } + }); endSection() ?> @@ -278,14 +305,11 @@ ); } ); - // Delete row - $(document).on('click', '.btn-remove', function(e) { - const dataId = $(this).attr('data-id'); - const row = $(this).closest('tr'); - if ($.isNumeric(dataId)) { - /*$.ajax({ - url: `/configuracion/papelimpresiontipologias/delete/${dataId}`, + function remove_lineas(dataId, row){ + + $.ajax({ + url: `/tarifas/tarifaencuadernacionlineas/delete/${dataId}`, method: 'GET', }).done((data, textStatus, jqXHR) => { $('#confirm2delete').modal('toggle'); @@ -294,44 +318,11 @@ popSuccessAlert(data.msg ?? jqXHR.statusText); }).fail((jqXHR, textStatus, errorThrown) => { popErrorAlert(jqXHR.responseJSON.messages.error) - })*/ - /*editor - .create( false ) - .edit( this.parentNode, false) - .set( 'deleted_at', new Date().toISOString().slice(0, 19).replace('T', ' ') ) - .set( 'is_deleted', 1 ) - .submit();*/ - } - }); - - /* - $('#tableOfTarifaencuadernacionlineas').on( 'click', 'tbody span.remove', function (e) { - - Swal.fire({ - title: '', - text: '', - icon: 'warning', - showCancelButton: true, - confirmButtonColor: '#3085d6', - confirmButtonText: '', - cancelButtonText: '', - cancelButtonColor: '#d33' - }) - .then((result) => { - const dataId = $(this).data('id'); - const row = $(this).closest('tr'); - if (result.value) { - editor - .create( false ) - .edit( this.parentNode, false) - .set( 'deleted_at', new Date().toISOString().slice(0, 19).replace('T', ' ') ) - .set( 'is_deleted', 1 ) - .submit(); - - } }); - });*/ - + + } + + endSection() ?> @@ -505,23 +496,22 @@ // Delete row - $(document).on('click', '.btn-remove', function(e) { - const dataId = $(this).attr('data-id'); - const row = $(this).closest('tr'); - if ($.isNumeric(dataId)) { - $.ajax({ + function remove_tiradas(dataId, row){ + + $.ajax({ url: `/tarifas/tarifaencuadernaciontiradas/delete/${dataId}`, method: 'GET', }).done((data, textStatus, jqXHR) => { $('#confirm2delete').modal('toggle'); theTable2.clearPipeline(); theTable2.row($(row)).invalidate().draw(); + theTable.clearPipeline(); + theTable.draw(); popSuccessAlert(data.msg ?? jqXHR.statusText); }).fail((jqXHR, textStatus, errorThrown) => { - popErrorAlert(jqXHR.responseJSON.messages.error) - }) - } - }); + popErrorAlert(jqXHR.statusText) + }); + } endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php index 6810c9af..c053adf8 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php @@ -19,6 +19,7 @@ + @@ -89,10 +90,20 @@ { 'data': 'nombre' }, { 'data': 'precio_min' }, { 'data': 'importe_fijo' }, + { 'data': 'mostrar_en_presupuesto' }, { 'data': actionBtns } ] }); + theTable.on( 'draw.dt', function () { + const boolCols = [3]; + for (let coln of boolCols) { + theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { + cell.innerHTML = cell.innerHTML == '1' ? '' : ''; + }); + } + }); + $(document).on('click', '.btn-edit', function(e) { window.location.href = `/tarifas/tarifasencuadernacion/edit/${$(this).attr('data-id')}`; diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php index fced007e..7becab96 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php @@ -21,6 +21,16 @@ +
+
+ + +
+
+ \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php index 1a12da80..a1276a7b 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php @@ -52,7 +52,7 @@ - + @@ -80,10 +80,10 @@ const actionBtns = function(data) { return ` - - - - `; + + + + `; }; @@ -97,11 +97,11 @@ table : "#tableOfTarifamanipuladolineas", idSrc: 'id', fields: [ { - name: "paginas_min" + name: "tirada_min" }, { name: "precio_max" }, { - name: "paginas_max" + name: "tirada_max" }, { name: "precio_min" }, { @@ -166,9 +166,9 @@ async: true, }), columns: [ - { 'data': 'paginas_min' }, + { 'data': 'tirada_min' }, { 'data': 'precio_max' }, - { 'data': 'paginas_max' }, + { 'data': 'tirada_max' }, { 'data': 'precio_min' }, { 'data': 'margen' }, { @@ -194,7 +194,7 @@ editor: editor, formOptions: { submitTrigger: -1, - submitHtml: '' + submitHtml: '' } } ] } ); @@ -206,9 +206,9 @@ editor.inline( theTable.cells(this.parentNode.parentNode, '*').nodes(), { - cancelHtml: '', + cancelHtml: '', cancelTrigger: 'span.cancel', - submitHtml: '', + submitHtml: '', submitTrigger: 'span.edit', submit: 'allIfChanged' } @@ -243,6 +243,30 @@ } }); }); + + + // Delete row + $(document).on('click', '.btn-delete', function(e) { + $(".btn-remove").attr('data-id', $(this).attr('data-id')); + }); + + $(document).on('click', '.btn-remove', function(e) { + const dataId = $(this).attr('data-id'); + const row = $(this).closest('tr'); + if ($.isNumeric(dataId)) { + $.ajax({ + url: `/tarifas/tarifamanipuladolineas/delete/${dataId}`, + method: 'GET', + }).done((data, textStatus, jqXHR) => { + $('#confirm2delete').modal('toggle'); + theTable.clearPipeline(); + theTable.row($(row)).invalidate().draw(); + popSuccessAlert(data.msg ?? jqXHR.statusText); + }).fail((jqXHR, textStatus, errorThrown) => { + popErrorAlert(jqXHR.responseJSON.messages.error) + }) + } + }); endSection() ?> section('css') ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php index 0f6212c1..3b8a6d64 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php @@ -19,6 +19,7 @@ + @@ -88,15 +89,27 @@ { 'data': 'nombre' }, { 'data': 'precio_min' }, { 'data': 'importe_fijo' }, + { 'data': 'mostrar_en_presupuesto' }, { 'data': actionBtns } ] }); + theTable.on( 'draw.dt', function () { + const boolCols = [3]; + for (let coln of boolCols) { + theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { + cell.innerHTML = cell.innerHTML == '1' ? '' : ''; + }); + } + }); + + $(document).on('click', '.btn-edit', function(e) { window.location.href = `/tarifas/tarifasmanipulado/edit/${$(this).attr('data-id')}`; }); + $(document).on('click', '.btn-delete', function(e) { $(".btn-remove").attr('data-id', $(this).attr('data-id')); }); diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php index 356faf7b..e2f00abc 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php @@ -21,13 +21,13 @@ diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php index 266655af..c4cc3555 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php @@ -1,4 +1,5 @@ include("themes/_commonPartialsBs/select2bs5") ?> +include("themes/_commonPartialsBs/sweetalert") ?> extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>