diff --git a/ci4/app/Controllers/Presupuestos/Presupuesto.php b/ci4/app/Controllers/Presupuestos/Presupuesto.php
index 68944464..db856c19 100644
--- a/ci4/app/Controllers/Presupuestos/Presupuesto.php
+++ b/ci4/app/Controllers/Presupuestos/Presupuesto.php
@@ -13,8 +13,36 @@ class Presupuesto extends BaseController
public function index()
{
- echo 'Presupuesto';
- }
+
+ $data['title'] = [
+ 'module' => lang("App.settings_title"),
+ 'page' => lang("App.settings_subtitle"),
+ 'icon' => 'fas fa-sliders-h'
+ ];
+
+ $data['breadcrumb'] = [
+ ['title' => lang("App.menu_presupuesto"), 'route' => site_url('presupuesto'), 'active' => true]
+ ];
+
+ echo view(getenv('theme.path').'form/presupuestos/index', $data);
+ }
+
+ public function tapa_blanda_encolada()
+ {
+
+ $data['title'] = [
+ 'module' => lang("App.settings_title"),
+ 'page' => lang("App.settings_subtitle"),
+ 'icon' => 'fas fa-sliders-h'
+ ];
+
+ $data['breadcrumb'] = [
+ ['title' => lang("App.menu_presupuesto"), 'route' => site_url('presupuesto'), 'active' => false],
+ ['title' => lang("App.menu_presupuesto"), 'route' => site_url('presupuesto/tapa_blanda_encolada'), 'active' => true]
+ ];
+
+ echo view(getenv('theme.path').'form/presupuestos/tapa-blanda-encolada', $data);
+ }
public function delete()
{
diff --git a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php b/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php
index 74827121..8b7dfa49 100644
--- a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php
@@ -8,6 +8,8 @@ class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity
protected $attributes = [
"id" => null,
"nombre" => null,
+ "precio_min" => 0,
+ "importe_fijo" => 0,
"user_created_id" => 0,
"user_update_id" => 0,
"is_deleted" => 0,
diff --git a/ci4/app/Language/es/Tarifaacabado.php b/ci4/app/Language/es/Tarifaacabado.php
index 35bb5601..98c9b9ed 100644
--- a/ci4/app/Language/es/Tarifaacabado.php
+++ b/ci4/app/Language/es/Tarifaacabado.php
@@ -10,13 +10,11 @@ return [
'id' => 'ID',
'moduleTitle' => 'Tarifas Acabado',
'nombre' => 'Nombre',
- 'precioMax' => 'Precio Max',
- 'precioMin' => 'Precio Min',
+ 'precioMin' => 'Precio Mínimo',
+ 'importeFijo' => 'Importe Fijo',
'tarifaacabado' => 'Tarifas Acabado',
'tarifaacabadoList' => 'Lista Tarifas Acabado',
'tarifasacabado' => 'Tarifas Acabado',
- 'tiradaMax' => 'Tirada Max',
- 'tiradaMin' => 'Tirada Min',
'updatedAt' => 'Actualizado en',
'userCreatedId' => 'ID Usuario "Creado en"',
'userUpdateId' => 'ID Usuario "Actualizado en"',
@@ -26,25 +24,12 @@ return [
'required' => 'El campo {field} es obligatorio.',
],
-
-
],
'validation' => [
'nombre' => [
'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
'required' => 'El campo {field} es obligatorio.',
-
- ],
-
-
- ],
-
- 'validation' => [
- 'precio_max' => [
- 'decimal' => 'El campo {field} debe contener un número decimal.',
- 'required' => 'El campo {field} es obligatorio.',
-
],
@@ -54,31 +39,15 @@ return [
'precio_min' => [
'decimal' => 'El campo {field} debe contener un número decimal.',
'required' => 'El campo {field} es obligatorio.',
-
],
-
-
],
- 'validation' => [
- 'tirada_max' => [
- 'integer' => 'El campo {field} debe contener un número entero.',
- 'required' => 'El campo {field} es obligatorio.',
-
- ],
-
-
- ],
-
- 'validation' => [
- 'tirada_min' => [
- 'integer' => 'El campo {field} debe contener un número entero.',
- 'required' => 'El campo {field} es obligatorio.',
-
- ],
-
-
- ],
+ 'validation' => [
+ 'importe_fijo' => [
+ 'decimal' => 'El campo {field} debe contener un número decimal.',
+ 'required' => 'El campo {field} es obligatorio.',
+ ],
+ ],
'validation' => [
'user_created_id' => [
diff --git a/ci4/app/Models/Tarifas/TarifaacabadoModel.php b/ci4/app/Models/Tarifas/TarifaacabadoModel.php
index 8f178563..c929279b 100644
--- a/ci4/app/Models/Tarifas/TarifaacabadoModel.php
+++ b/ci4/app/Models/Tarifas/TarifaacabadoModel.php
@@ -18,6 +18,8 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
protected $allowedFields = [
"nombre",
+ "precio_min",
+ "importe_fijo",
"deleted_at",
"is_deleted",
"user_created_id",
@@ -36,16 +38,33 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
protected $validationRules = [
"nombre" => [
- "label" => "Acabadoes.nombre",
+ "label" => "TarifaAcabado.nombre",
"rules" => "trim|required|max_length[255]",
],
+ "precio_min" => [
+ "label" => "TarifaAcabado.precioMin",
+ "rules" => "required|decimal",
+ ],
+ "importe_fijo" => [
+ "label" => "TarifaAcabado.importeFijo",
+ "rules" => "required|decimal",
+ ],
];
protected $validationMessages = [
"nombre" => [
- "max_length" => "Acabadoes.validation.nombre.max_length",
- "required" => "Acabadoes.validation.nombre.required",
+ "max_length" => "TarifaAcabado.validation.nombre.max_length",
+ "required" => "TarifaAcabado.validation.nombre.required",
],
+ "precio_min" => [
+ "required" => "TarifaAcabado.validation.precio_min.required",
+ "decimal" => "TarifaAcabado.validation.precio_min.decimal",
+ ],
+ "importe_fijo" => [
+ "required" => "TarifaAcabado.validation.importe_fijo.required",
+ "decimal" => "TarifaAcabado.validation.importe_fijo.decimal",
+ ],
+
];
/**
@@ -57,7 +76,9 @@ 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");
+ $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"
+ );
//JJO
$builder->where("t1.is_deleted", 0);
@@ -68,6 +89,8 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
->groupStart()
->like("t1.nombre", $search)
->orLike("t1.nombre", $search)
+ ->orLike("t1.precio_min", $search)
+ ->orLike("t1.importe_fijo", $search)
->groupEnd();
}
}
diff --git a/ci4/app/Views/themes/_commonPartialsBs/sweetalert.php b/ci4/app/Views/themes/_commonPartialsBs/sweetalert.php
index d518979b..17331237 100644
--- a/ci4/app/Views/themes/_commonPartialsBs/sweetalert.php
+++ b/ci4/app/Views/themes/_commonPartialsBs/sweetalert.php
@@ -1,8 +1,8 @@
section('css') ?>
-
-
-
+
+
+
1