Merge branch 'main' into 'dev/proveedores'

# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php

ci4/app/Models/Tarifas/TarifaManipuladoModel.php

@@ -18,6 +18,8 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel
 
     protected $allowedFields = [
         "nombre",
+        "precio_min",
+        "importe_fijo",
         "deleted_at",
         "is_deleted",
         "user_created_id",
@@ -39,6 +41,15 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel
             "label" => "Tarifamanipulado.nombre",
             "rules" => "trim|required|max_length[255]",
         ],
+
+        "precio_min" => [
+            "label" => "Tarifamanipulado.precioMin",
+            "rules" => "required|decimal",
+        ],
+        "importe_fijo" => [
+            "label" => "Tarifamanipulado.importeFijo",
+            "rules" => "required|decimal",
+        ],
     ];
 
     protected $validationMessages = [
@@ -46,6 +57,14 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel
             "max_length" => "Tarifamanipulado.validation.nombre.max_length",
             "required" => "Tarifamanipulado.validation.nombre.required",
         ],
+        "precio_min" => [
+            "required" => "Tarifamanipulado.validation.precio_min.required",
+            "decimal" => "Tarifamanipulado.validation.precio_min.decimal",
+        ],
+        "importe_fijo" => [
+            "required" => "Tarifamanipulado.validation.importe_fijo.required",
+            "decimal" => "Tarifamanipulado.validation.importe_fijo.decimal",
+        ],
     ];
 
     /**
@@ -67,7 +86,6 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel
             : $builder
                 ->groupStart()
                 ->like("t1.nombre", $search)
-                ->orLike("t1.nombre", $search)
                 ->groupEnd();
     }
 }

ci4/app/Models/Tarifas/TarifaacabadoModel.php

@@ -77,7 +77,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"
         );
 
         //JJO
@@ -88,9 +88,6 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
             : $builder
                 ->groupStart()
                 ->like("t1.nombre", $search)
-                ->orLike("t1.nombre", $search)
-                ->orLike("t1.precio_min", $search)
-                ->orLike("t1.importe_fijo", $search)
                 ->groupEnd();
     }
 }

ci4/app/Models/Tarifas/TarifapreimpresionModel.php

@@ -14,7 +14,9 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
 
     protected $allowedFields = [
         "nombre", 
-        "precio", 
+        "precio",
+        "precio_min",
+        "importe_fijo",
         "deleted_at",
         "is_deleted",
         "user_created_id", 
@@ -38,7 +40,15 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
         "precio" => [
             "label" => "Tarifapreimpresion.precio",
             "rules" => "required|decimal",
-        ]
+        ],
+        "precio_min" => [
+            "label" => "Tarifapreimpresion.precioMin",
+            "rules" => "required|decimal",
+        ],
+        "importe_fijo" => [
+            "label" => "Tarifapreimpresion.importeFijo",
+            "rules" => "required|decimal",
+        ],
     ];
 
     protected $validationMessages = [
@@ -50,5 +60,13 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
             "decimal" => "Tarifapreimpresion.validation.precio.decimal",
             "required" => "Tarifapreimpresion.validation.precio.required",
         ],
+        "precio_min" => [
+            "required" => "Tarifapreimpresion.validation.precio_min.required",
+            "decimal" => "Tarifapreimpresion.validation.precio_min.decimal",
+        ],
+        "importe_fijo" => [
+            "required" => "Tarifapreimpresion.validation.importe_fijo.required",
+            "decimal" => "Tarifapreimpresion.validation.importe_fijo.decimal",
+        ],
     ];
 }