From 49e03fb7e95eebfe42da137c0df0cdeaa355abab Mon Sep 17 00:00:00 2001 From: amazuecos Date: Sun, 20 Oct 2024 17:50:49 +0000 Subject: [PATCH 01/13] fix : add breadcumbs and fix button save --- ci4/app/Controllers/Configuracion/ConfigErrores.php | 11 ++++++++++- .../error_presupuesto/viewErrorPresupuestoForm.php | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ci4/app/Controllers/Configuracion/ConfigErrores.php b/ci4/app/Controllers/Configuracion/ConfigErrores.php index a47eb8b0..fcaade48 100644 --- a/ci4/app/Controllers/Configuracion/ConfigErrores.php +++ b/ci4/app/Controllers/Configuracion/ConfigErrores.php @@ -30,15 +30,24 @@ class ConfigErrores extends BaseResourceController public function index() { + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_error_presupuesto"), 'route' => site_url('configuracion/errores-presupuesto'), 'active' => true] + ]; return view(static::$viewPath . $this->indexRoute, $this->viewData); } public function viewForm(int $error_presupuesto_id) { + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_error_presupuesto"), 'route' => site_url('configuracion/errores-presupuesto'), 'active' => true] + ]; + $this->viewData["error_presupuesto_id"] = $error_presupuesto_id; $this->errorPresupuestoModel->update($error_presupuesto_id, [ "last_user_id" => auth()->user()->id, "visto" => true, ]); - return view(static::$viewPath . 'viewErrorPresupuestoForm', ["error_presupuesto_id" => $error_presupuesto_id]); + return view(static::$viewPath . 'viewErrorPresupuestoForm', $this->viewData); } public function store() { diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php index b0f2a90d..c3efd394 100644 --- a/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php @@ -56,7 +56,7 @@
- From 73a60466d39d2f972eba3dd7f059fdfffacc4fc5 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 16:51:19 +0000 Subject: [PATCH 02/13] add code field to models and entities --- ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifaEnvioEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifaextraEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php | 2 ++ ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php | 1 + ci4/app/Models/Tarifas/TarifaEnvioModel.php | 2 +- ci4/app/Models/Tarifas/TarifaManipuladoModel.php | 1 + ci4/app/Models/Tarifas/TarifaextraModel.php | 3 ++- ci4/app/Models/Tarifas/TarifapreimpresionModel.php | 3 ++- 10 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php index 87d18ebe..03d68989 100755 --- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php @@ -9,6 +9,7 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity protected $attributes = [ "id" => null, "nombre" => null, + "code" => null, "mostrar_en_presupuesto" => 1, "tipo_encuadernacion" => 0, "servicio_encuadernacion" => 0, @@ -22,6 +23,7 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity ]; protected $casts = [ "mostrar_en_presupuesto" => "int", + "code" => "string", "tipo_encuadernacion" => "int", "servicio_encuadernacion" => "int", "por_horas" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php b/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php index 0becbc9d..e0645cb9 100755 --- a/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php @@ -9,6 +9,7 @@ class TarifaEnvioEntity extends \CodeIgniter\Entity\Entity "id" => null, "pais_id" => null, "nombre" => null, + "code" => null, "user_created_id" => 0, "user_updated_id" => 0, "is_deleted" => 0, @@ -17,6 +18,7 @@ class TarifaEnvioEntity extends \CodeIgniter\Entity\Entity ]; protected $casts = [ "pais_id" => "?int", + "code" => "string", "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 aac261a4..f899eacf 100755 --- a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php @@ -9,6 +9,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity protected $attributes = [ "id" => null, "nombre" => null, + "code" => null, "precio_min" => 0, "importe_fijo" => 0, "mostrar_en_presupuesto" => 1, @@ -22,6 +23,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio_min" => "float", "importe_fijo" => "float", + "code" => "string", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_updated_id" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaextraEntity.php b/ci4/app/Entities/Tarifas/TarifaextraEntity.php index ac6b35eb..c4e7d093 100755 --- a/ci4/app/Entities/Tarifas/TarifaextraEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaextraEntity.php @@ -8,6 +8,7 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity protected $attributes = [ "id" => null, "nombre" => null, + "code" => null, "precio" => null, "margen" => 0, "mostrar_en_presupuesto" => 1, @@ -20,6 +21,7 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity ]; protected $casts = [ "precio" => "float", + "code" => "string", "margen" => "float", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php index a6ea7177..20f93889 100755 --- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php @@ -8,6 +8,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity protected $attributes = [ "id" => null, "nombre" => null, + "code" => null, "precio" => null, "margen" => 0, "mostrar_en_presupuesto" => 1, @@ -21,6 +22,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio" => "float", "margen" => "float", + "code" => "string", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_update_id" => "int", diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php index f0c50663..d216cdab 100755 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php @@ -22,6 +22,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel protected $allowedFields = [ "nombre", + "code", "mostrar_en_presupuesto", "tipo_encuadernacion", "servicio_encuadernacion", diff --git a/ci4/app/Models/Tarifas/TarifaEnvioModel.php b/ci4/app/Models/Tarifas/TarifaEnvioModel.php index 9583d4df..be6134e2 100755 --- a/ci4/app/Models/Tarifas/TarifaEnvioModel.php +++ b/ci4/app/Models/Tarifas/TarifaEnvioModel.php @@ -17,7 +17,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel 1 => "t2.nombre", ]; - protected $allowedFields = ["pais_id", "nombre","deleted_at","is_deleted"]; + protected $allowedFields = ["pais_id", "nombre","code","deleted_at","is_deleted"]; protected $returnType = "App\Entities\Tarifas\TarifaEnvioEntity"; protected $useTimestamps = true; diff --git a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php index 9a4aefd4..69d45086 100755 --- a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php +++ b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php @@ -22,6 +22,7 @@ class TarifaManipuladoModel extends \App\Models\BaseModel protected $allowedFields = [ "nombre", "precio_min", + "code", "importe_fijo", "mostrar_en_presupuesto", "deleted_at", diff --git a/ci4/app/Models/Tarifas/TarifaextraModel.php b/ci4/app/Models/Tarifas/TarifaextraModel.php index 10ec5dd8..8e29243a 100755 --- a/ci4/app/Models/Tarifas/TarifaextraModel.php +++ b/ci4/app/Models/Tarifas/TarifaextraModel.php @@ -13,7 +13,8 @@ class TarifaextraModel extends \App\Models\BaseModel protected $useAutoIncrement = true; protected $allowedFields = [ - "nombre", + "nombre", + "code", "precio", "margen", "mostrar_en_presupuesto", diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index 6bb1391f..aeb98ad9 100755 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -13,7 +13,8 @@ class TarifapreimpresionModel extends \App\Models\BaseModel protected $useAutoIncrement = true; protected $allowedFields = [ - "nombre", + "nombre", + "code", "precio", "margen", "mostrar_en_presupuesto", From c6b1bd9292d27c04d91b157f8269874fd7fd6ff9 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 17:05:50 +0000 Subject: [PATCH 03/13] add comment field --- ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php | 3 +++ ci4/app/Entities/Tarifas/TarifaEnvioEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifaextraEntity.php | 2 ++ ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php | 2 ++ 5 files changed, 11 insertions(+) diff --git a/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php index 2368cb47..37554c8d 100644 --- a/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php +++ b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php @@ -9,6 +9,7 @@ class TarifaAcabadoEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "code" => null, + "comment" => null, "precio_min" => 0, "importe_fijo" => 0, "mostrar_en_presupuesto" => 1, @@ -23,6 +24,8 @@ class TarifaAcabadoEntity extends \CodeIgniter\Entity\Entity ]; protected $casts = [ "precio_min" => "float", + "comment" => "string", + "code" => "string", "importe_fijo" => "float", "user_created_id" => "int", "user_updated_id" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php b/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php index e0645cb9..acc68f37 100755 --- a/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php @@ -10,6 +10,7 @@ class TarifaEnvioEntity extends \CodeIgniter\Entity\Entity "pais_id" => null, "nombre" => null, "code" => null, + "comment" => null, "user_created_id" => 0, "user_updated_id" => 0, "is_deleted" => 0, @@ -19,6 +20,7 @@ class TarifaEnvioEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "pais_id" => "?int", "code" => "string", + "comment" => "string", "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 f899eacf..d9f3c2f7 100755 --- a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php @@ -10,6 +10,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "code" => null, + "comment" => null, "precio_min" => 0, "importe_fijo" => 0, "mostrar_en_presupuesto" => 1, @@ -24,6 +25,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity "precio_min" => "float", "importe_fijo" => "float", "code" => "string", + "comment" => "string", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_updated_id" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaextraEntity.php b/ci4/app/Entities/Tarifas/TarifaextraEntity.php index c4e7d093..db2b0594 100755 --- a/ci4/app/Entities/Tarifas/TarifaextraEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaextraEntity.php @@ -9,6 +9,7 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "code" => null, + "comment" => null, "precio" => null, "margen" => 0, "mostrar_en_presupuesto" => 1, @@ -22,6 +23,7 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity protected $casts = [ "precio" => "float", "code" => "string", + "comment" => "string", "margen" => "float", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php index 20f93889..b1873597 100755 --- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php @@ -9,6 +9,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "code" => null, + "comment" => null, "precio" => null, "margen" => 0, "mostrar_en_presupuesto" => 1, @@ -23,6 +24,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity "precio" => "float", "margen" => "float", "code" => "string", + "comment" => "string", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", "user_update_id" => "int", From 9b964a89f6f717591f9c92fe8db1ac365276245a Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 17:06:03 +0000 Subject: [PATCH 04/13] add comment field --- .../Tarifas/Acabados/TarifaAcabadoModel.php | 1 + .../Tarifas/TarifaEncuadernacionModel.php | 1 + ci4/app/Models/Tarifas/TarifaEnvioModel.php | 43 ++++++++++--------- .../Models/Tarifas/TarifaManipuladoModel.php | 1 + ci4/app/Models/Tarifas/TarifaextraModel.php | 1 + .../Tarifas/TarifapreimpresionModel.php | 9 ++++ 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php index eb1a2719..a49df3a9 100644 --- a/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php +++ b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php @@ -22,6 +22,7 @@ class TarifaAcabadoModel extends \App\Models\BaseModel protected $allowedFields = [ "nombre", "code", + "comment", "precio_min", "importe_fijo", "mostrar_en_presupuesto", diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php index d216cdab..a50adf90 100755 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php @@ -23,6 +23,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel protected $allowedFields = [ "nombre", "code", + "comment", "mostrar_en_presupuesto", "tipo_encuadernacion", "servicio_encuadernacion", diff --git a/ci4/app/Models/Tarifas/TarifaEnvioModel.php b/ci4/app/Models/Tarifas/TarifaEnvioModel.php index be6134e2..b50eb6bf 100755 --- a/ci4/app/Models/Tarifas/TarifaEnvioModel.php +++ b/ci4/app/Models/Tarifas/TarifaEnvioModel.php @@ -1,4 +1,5 @@ "t2.nombre", ]; - protected $allowedFields = ["pais_id", "nombre","code","deleted_at","is_deleted"]; + protected $allowedFields = ["pais_id", "nombre", "code", "comment", "deleted_at", "is_deleted"]; protected $returnType = "App\Entities\Tarifas\TarifaEnvioEntity"; protected $useTimestamps = true; @@ -82,43 +83,43 @@ class TarifaEnvioModel extends \App\Models\BaseModel return empty($search) ? $builder : $builder - ->groupStart() - ->like("t1.nombre", $search) - ->orLike("t2.id", $search) - ->orLike("t1.pais_id", $search) - ->orLike("t1.nombre", $search) - ->orLike("t2.nombre", $search) - ->groupEnd(); + ->groupStart() + ->like("t1.nombre", $search) + ->orLike("t2.id", $search) + ->orLike("t1.pais_id", $search) + ->orLike("t1.nombre", $search) + ->orLike("t2.nombre", $search) + ->groupEnd(); } - public function getTarifaEnvio($paisId, string $cp, $peso, $tipo_envio){ + public function getTarifaEnvio($paisId, string $cp, $peso, $tipo_envio) + { // Si el pais es españa se tienen que tener en cuenta los postales // Se busca primero la tarifa a la que corresponde $builder = $this->db->table($this->table . " t1") - ->select("t1.id AS tarifa_envio_id, t2.importe_fijo as importe_fijo") - ->join("tarifas_envios_zonas t2", "t1.id = t2.tarifa_envio_id") - ->where("t1.pais_id", $paisId) - ->where("t1.is_deleted", 0) - ->where("t2.is_deleted", 0); - - if($paisId == 1) {// España + ->select("t1.id AS tarifa_envio_id, t2.importe_fijo as importe_fijo") + ->join("tarifas_envios_zonas t2", "t1.id = t2.tarifa_envio_id") + ->where("t1.pais_id", $paisId) + ->where("t1.is_deleted", 0) + ->where("t2.is_deleted", 0); + + if ($paisId == 1) { // España $builder->where("CAST(t2.cp_inicial AS UNSIGNED)<=", intval($cp)) - ->where("CAST(t2.cp_final AS UNSIGNED) >=", intval($cp)); + ->where("CAST(t2.cp_final AS UNSIGNED) >=", intval($cp)); } $tarifas = $builder->get()->getResultObject(); $resultado = []; - + $model = model('App\Models\Tarifas\TarifaEnvioPrecioModel'); - foreach($tarifas as $tarifa){ + foreach ($tarifas as $tarifa) { $precio_tarifas = $model->getEnvioPrecio($tarifa->tarifa_envio_id, $peso, $tipo_envio); - foreach($precio_tarifas as $precio_tarifa){ + foreach ($precio_tarifas as $precio_tarifa) { $precio_tarifa->importe_fijo = $tarifa->importe_fijo; array_push($resultado, $precio_tarifa); } } return $resultado; - } } diff --git a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php index 69d45086..6dbfc38e 100755 --- a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php +++ b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php @@ -23,6 +23,7 @@ class TarifaManipuladoModel extends \App\Models\BaseModel "nombre", "precio_min", "code", + "comment", "importe_fijo", "mostrar_en_presupuesto", "deleted_at", diff --git a/ci4/app/Models/Tarifas/TarifaextraModel.php b/ci4/app/Models/Tarifas/TarifaextraModel.php index 8e29243a..8b1001a1 100755 --- a/ci4/app/Models/Tarifas/TarifaextraModel.php +++ b/ci4/app/Models/Tarifas/TarifaextraModel.php @@ -15,6 +15,7 @@ class TarifaextraModel extends \App\Models\BaseModel protected $allowedFields = [ "nombre", "code", + "comment", "precio", "margen", "mostrar_en_presupuesto", diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index aeb98ad9..f59852be 100755 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -15,6 +15,7 @@ class TarifapreimpresionModel extends \App\Models\BaseModel protected $allowedFields = [ "nombre", "code", + "comment", "precio", "margen", "mostrar_en_presupuesto", @@ -38,6 +39,10 @@ class TarifapreimpresionModel extends \App\Models\BaseModel "label" => "Tarifapreimpresion.nombre", "rules" => "trim|required|max_length[255]", ], + "code" => [ + "label" => "Tarifapreimpresion.code", + "rules" => "trim|required|max_length[5]", + ], "precio" => [ "label" => "Tarifapreimpresion.precio", "rules" => "required|decimal", @@ -53,6 +58,10 @@ class TarifapreimpresionModel extends \App\Models\BaseModel "max_length" => "Tarifapreimpresion.validation.nombre.max_length", "required" => "Tarifapreimpresion.validation.nombre.required", ], + "nombre" => [ + "max_length" => "Tarifapreimpresion.validation.code.max_length", + "required" => "Tarifapreimpresion.validation.code.required", + ], "precio" => [ "decimal" => "Tarifapreimpresion.validation.precio.decimal", "required" => "Tarifapreimpresion.validation.precio.required", From c7c9b54556903dc913fa4f79af593748c114297e Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 17:20:02 +0000 Subject: [PATCH 05/13] add code and comment tarifapreimpresion --- ci4/app/Language/es/Tarifapreimpresion.php | 12 +++ .../Tarifas/TarifapreimpresionModel.php | 10 ++- .../_tarifapreimpresionFormItems.php | 79 ++++++++++++------- .../viewTarifapreimpresionList.php | 4 + 4 files changed, 75 insertions(+), 30 deletions(-) diff --git a/ci4/app/Language/es/Tarifapreimpresion.php b/ci4/app/Language/es/Tarifapreimpresion.php index 80a0562a..f98cd490 100755 --- a/ci4/app/Language/es/Tarifapreimpresion.php +++ b/ci4/app/Language/es/Tarifapreimpresion.php @@ -7,6 +7,9 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Preimpresión', 'nombre' => 'Nombre', + 'code' => 'Código', + 'comment' => 'Comentario', + 'comment_placeholder' => 'Inserte un comentario', 'precio' => 'Precio', 'precioMin' => 'Precio Mínimo', 'importeFijo' => 'Importe Fijo', @@ -25,7 +28,16 @@ return [ 'required' => 'El campo {field} es obligatorio.', ], + 'code' => [ + 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', + 'required' => 'El campo {field} es obligatorio.', + ], + 'comment' => [ + 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', + 'required' => 'El campo {field} es obligatorio.', + + ], 'precio' => [ 'decimal' => 'El campo {field} debe contener un número decimal.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index f59852be..56ed6999 100755 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -43,6 +43,10 @@ class TarifapreimpresionModel extends \App\Models\BaseModel "label" => "Tarifapreimpresion.code", "rules" => "trim|required|max_length[5]", ], + "comment" => [ + "label" => "Tarifapreimpresion.comment", + "rules" => "trim|max_length[255]", + ], "precio" => [ "label" => "Tarifapreimpresion.precio", "rules" => "required|decimal", @@ -58,10 +62,14 @@ class TarifapreimpresionModel extends \App\Models\BaseModel "max_length" => "Tarifapreimpresion.validation.nombre.max_length", "required" => "Tarifapreimpresion.validation.nombre.required", ], - "nombre" => [ + "code" => [ "max_length" => "Tarifapreimpresion.validation.code.max_length", "required" => "Tarifapreimpresion.validation.code.required", ], + "comment" => [ + "max_length" => "Tarifapreimpresion.validation.comment.max_length", + "required" => "Tarifapreimpresion.validation.comment.required", + ], "precio" => [ "decimal" => "Tarifapreimpresion.validation.precio.decimal", "required" => "Tarifapreimpresion.validation.precio.required", diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php index 9080ce83..47df4f08 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php @@ -5,62 +5,83 @@ * + type="text" + id="nombre" + name="nombre" + required + maxLength="255" + class="form-control" + value="nombre) ?>"> +
+
+ +
-
+ type="number" + id="precio" + name="precio" + required + maxLength="31" + step="0.01" + class="form-control" + value="precio) ?>">
- +
+ type="text" + id="margen" + name="margen" + required + class="form-control" + value="margen) ?>">
+ +
+ + +
+
mostrar_en_presupuesto == true ? 'checked' : ''; ?> - > + class="form-check-input" mostrar_en_presupuesto == true ? 'checked' : ''; ?>>
- \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php index 62334363..64c69e67 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php @@ -16,6 +16,7 @@ + @@ -28,6 +29,9 @@ nombre) || strlen($item->nombre) < 51 ? esc($item->nombre) : character_limiter(esc($item->nombre), 50) ?> + + code) ?> + precio) ?> From 2ff86a774305d822d2cfd5f8233216ad81d0e45d Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 17:46:46 +0000 Subject: [PATCH 06/13] add comment field --- ci4/app/Language/es/Tarifamanipulado.php | 3 + .../Models/Tarifas/TarifaManipuladoModel.php | 2 +- .../tarifas/envios/_tarifaEnvioFormItems.php | 70 +++++++++++++------ .../tarifas/envios/viewTarifaEnvioForm.php | 3 +- .../tarifas/envios/viewTarifaEnvioList.php | 1 + .../tarifas/extra/_tarifaextraFormItems.php | 27 ++++++- .../tarifas/extra/viewTarifaextraList.php | 4 ++ .../manipulado/_tarifaManipuladoFormItems.php | 27 ++++++- .../manipulado/viewTarifaManipuladoList.php | 2 + 9 files changed, 110 insertions(+), 29 deletions(-) diff --git a/ci4/app/Language/es/Tarifamanipulado.php b/ci4/app/Language/es/Tarifamanipulado.php index 20079ddb..80afab6a 100755 --- a/ci4/app/Language/es/Tarifamanipulado.php +++ b/ci4/app/Language/es/Tarifamanipulado.php @@ -10,6 +10,9 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Manipulado', 'nombre' => 'Nombre', + 'code' => 'Código', + 'comment' => 'Comentario', + 'comment_placeholder' => 'Inserte un comentario', 'importeMinimo' => 'Importe mínimo', 'precioMax' => 'Precio T. Mín', 'precioMin' => 'Precio T. Máx', diff --git a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php index 6dbfc38e..7783d480 100755 --- a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php +++ b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php @@ -82,7 +82,7 @@ class TarifaManipuladoModel extends \App\Models\BaseModel */ 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.code AS code, 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/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php index a8bcbd97..4554153b 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php @@ -1,28 +1,52 @@
-
- +
+ +
+ + +
+
+ + +
+
+ + +
- - -
+ + +
-
- - -
- -
+
\ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioForm.php index e00c5810..eebcfc00 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioForm.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioForm.php @@ -176,7 +176,8 @@ idSrc: 'id', fields: [ { name: "nombre" - }, { + }, + { name: "cp_inicial" }, { name: "cp_final" diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioList.php b/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioList.php index aaa5cad2..90010f72 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioList.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/envios/viewTarifaEnvioList.php @@ -18,6 +18,7 @@ + diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php index a51d2a8b..a82397bd 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php @@ -14,7 +14,19 @@ value="nombre) ?>" > - +
+ + +
- +
+ + +
+ @@ -28,6 +29,9 @@ nombre) || strlen($item->nombre) < 51 ? esc($item->nombre) : character_limiter(esc($item->nombre), 50) ?> + + code) ?> + precio) ?> diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php index ad10fafa..90307429 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php @@ -6,7 +6,19 @@
- +
+ + +
- +
+ + +
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php index f906ea10..8febbc74 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php @@ -17,6 +17,7 @@ + @@ -87,6 +88,7 @@ ], columns : [ { 'data': 'nombre' }, + { 'data': 'code' }, { 'data': 'precio_min' }, { 'data': 'importe_fijo' }, { 'data': 'mostrar_en_presupuesto' }, From 66a5651a30563afd85ae08fbfa9ab9e276188071 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 17:52:09 +0000 Subject: [PATCH 07/13] add code and comment to tarifaacabado --- ci4/app/Language/en/Tarifaacabado.php | 3 + .../Tarifas/Acabados/TarifaAcabadoModel.php | 2 +- .../acabado/_tarifaAcabadoFormItems.php | 33 ++++++-- .../tarifas/acabado/viewTarifaAcabadoList.php | 2 + .../manipulado/_tarifaManipuladoFormItems.php | 82 +++++++++---------- 5 files changed, 75 insertions(+), 47 deletions(-) diff --git a/ci4/app/Language/en/Tarifaacabado.php b/ci4/app/Language/en/Tarifaacabado.php index e9413fab..e527a403 100755 --- a/ci4/app/Language/en/Tarifaacabado.php +++ b/ci4/app/Language/en/Tarifaacabado.php @@ -10,6 +10,9 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Finishing Rates', 'nombre' => 'Name', + 'code' => 'Código', + 'comment' => 'Comentario', + 'comment_placeholder' => 'Inserte un comentario', 'precioMax' => 'Price Max', 'precioMin' => 'Price Min', 'precioMin' => 'Min Price', diff --git a/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php index a49df3a9..cbbbe3bd 100644 --- a/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php +++ b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php @@ -85,7 +85,7 @@ class TarifaAcabadoModel extends \App\Models\BaseModel 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.code AS code, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, t1.mostrar_en_presupuesto AS mostrar_en_presupuesto, t1.acabado_cubierta AS acabado_cubierta, t1.acabado_sobrecubierta AS acabado_sobrecubierta" ); diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php index f07290fc..01e578e4 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php @@ -5,15 +5,27 @@ * + value="nombre) ?>"> +
+
+ +
-
+ value="precio_min) ?>">
@@ -21,9 +33,21 @@ * + value="importe_fijo) ?>">
+
+ + +
-
From db67b1946f1271f5caa17ef5410fd97948b65ad9 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 17:56:39 +0000 Subject: [PATCH 08/13] add code and comment to tarifas encuadernacion --- ci4/app/Language/es/Tarifaencuadernacion.php | 3 +++ .../Tarifas/TarifaEncuadernacionModel.php | 2 +- .../_tarifaEncuadernacionFormItems.php | 27 ++++++++++++++++++- .../viewTarifaEncuadernacionList.php | 2 ++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ci4/app/Language/es/Tarifaencuadernacion.php b/ci4/app/Language/es/Tarifaencuadernacion.php index 34c01087..fbc59ef5 100755 --- a/ci4/app/Language/es/Tarifaencuadernacion.php +++ b/ci4/app/Language/es/Tarifaencuadernacion.php @@ -10,6 +10,9 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Encuadernación', 'nombre' => 'Nombre', + 'code' => 'Código', + 'comment' => 'Comentario', + 'comment_placeholder' => 'Inserte un comentario', 'precioMax' => 'Precio T. Mín', 'precioMin' => 'Precio T. Máx', 'importeFijo' => 'Importe Fijo', diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php index a50adf90..b014f83d 100755 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php @@ -67,7 +67,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel */ public function getResource(string $search = "") { - $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, + $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.code AS code, t1.mostrar_en_presupuesto AS mostrar_en_presupuesto, t1.tipo_encuadernacion AS tipo_encuadernacion, t1.servicio_encuadernacion AS servicio_encuadernacion, t1.por_horas AS por_horas"); diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php index 24e86283..9e99f140 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php @@ -7,13 +7,38 @@
- +
+ + +
+
+ + +
+
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php index 9e99f140..4fa004f8 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php @@ -9,13 +9,12 @@
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php index 4554153b..39629c84 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php @@ -9,13 +9,12 @@
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php index a82397bd..861a2e25 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php @@ -16,13 +16,12 @@
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php index 4fdf0e88..ae6437bd 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php @@ -8,13 +8,12 @@
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php index 47df4f08..84834389 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php @@ -15,13 +15,12 @@
From 1ed5c868b5d88884b5ce56fe240489717420bd1d Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 18:07:22 +0000 Subject: [PATCH 11/13] add comment and code to tarifas extra --- ci4/app/Language/es/Tarifaextra.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci4/app/Language/es/Tarifaextra.php b/ci4/app/Language/es/Tarifaextra.php index 3d640b2b..ea711c63 100755 --- a/ci4/app/Language/es/Tarifaextra.php +++ b/ci4/app/Language/es/Tarifaextra.php @@ -7,6 +7,9 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Servicios Extra', 'nombre' => 'Nombre', + 'code' => 'Código', + 'comment' => 'Comentario', + 'comment_placeholder' => 'Inserte un comentario', 'precio' => 'Precio', 'precioMin' => 'Precio Mínimo', 'importeFijo' => 'Importe Fijo', From e64788ddb5e91961a5bdab10a646c205f4a10160 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 21 Oct 2024 18:08:56 +0000 Subject: [PATCH 12/13] remove * from label comment input form --- .../vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php | 2 +- .../tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php | 2 +- .../themes/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php | 2 +- .../themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php | 2 +- .../form/tarifas/manipulado/_tarifaManipuladoFormItems.php | 2 +- .../form/tarifas/preimpresion/_tarifapreimpresionFormItems.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php index 50910b4e..77331599 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php @@ -37,7 +37,7 @@
+
@@ -58,21 +59,26 @@
+ " + class="btn btn-secondary"> +
-
- +
- -
-
-
- + +
+ +
+ +
+