Merge branch 'main' into 'dev/delete-ui'

# Conflicts:
#   ci4/app/Controllers/Tarifas/Tarifaacabado.php
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php

ci4/app/Models/Configuracion/MaquinaModel.php

@@ -72,23 +72,23 @@ class MaquinaModel extends \App\Models\GoBaseModel
     protected $validationRules = [
         "alto" => [
             "label" => "Maquinas.alto",
-            "rules" => "required|decimal",
+            "rules" => "required|decimal|greater_than[0]",
         ],
         "alto_click" => [
             "label" => "Maquinas.altoClick",
-            "rules" => "required|decimal",
+            "rules" => "required|decimal|greater_than[0]",
         ],
         "alto_impresion" => [
             "label" => "Maquinas.altoImpresion",
-            "rules" => "required|decimal",
+            "rules" => "required|decimal|greater_than[0]",
         ],
         "ancho" => [
             "label" => "Maquinas.ancho",
-            "rules" => "required|decimal",
+            "rules" => "required|decimal|greater_than[0]",
         ],
         "ancho_impresion" => [
             "label" => "Maquinas.anchoImpresion",
-            "rules" => "required|decimal",
+            "rules" => "required|decimal|greater_than[0]",
         ],
         "duracion_jornada" => [
             "label" => "Maquinas.duracionJornada",

ci4/app/Models/Configuracion/MaquinasDefectoModel.php

@@ -183,6 +183,8 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
 
     public function checkIntervals($data = [], $id = null){
 
+        helper('general');
+
         if(floatval($data["ancho_min"])>= floatval($data["ancho_max"])){
             return lang('MaquinasPorDefecto.validation.error_ancho_range');
         }
@@ -209,17 +211,17 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
                     continue;
                 }
             }
-            if($this->check_overlap(floatval($data["ancho_min"]), floatval($data["ancho_max"]),
+            if(check_overlap(floatval($data["ancho_min"]), floatval($data["ancho_max"]),
                                 $row->ancho_min, $row->ancho_max)){
                 return lang('MaquinasPorDefecto.validation.error_ancho_overlap');
             }
-            if($this->check_overlap(floatval($data["alto_min"]), floatval($data["alto_max"]),
+            if(check_overlap(floatval($data["alto_min"]), floatval($data["alto_max"]),
                                 $row->alto_min, $row->alto_max)){
                 return lang('MaquinasPorDefecto.validation.error_alto_overlap');
             }
-            if($this->check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
                                 $row->tirada_min, $row->tirada_max)){
-                    return lang('MaquinasPorDefecto.validation.error_ancho_overlap');
+                    return lang('MaquinasPorDefecto.validation.error_tirada_overlap');
             }
         }
 
@@ -227,15 +229,6 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
         return "";
     }
 
-
-    // Devuelve true si los intervalos (a1,a2) (b1,b2) se solapan
-    // https://stackoverflow.com/questions/3269434/whats-the-most-efficient-way-to-test-if-two-ranges-overlap
-    private function check_overlap($a1, $a2, $b1, $b2){
-
-        if (max($a2, $b2) - min($a1, $b1) < ($a2 - $a1) + ($b2 - $b1))
-            return true;
-        return false;
-    }
 }
 
 

ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php

@@ -13,19 +13,19 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.tirada_min",
-        1 => "t1.tirada_max",
+        0 => "t1.paginas_min",
+        1 => "t1.paginas_max",
         2 => "t1.precio_min",
         3 => "t1.precio_max",
-        4 => "t1.precio_unidad",
+        4 => "t1.margen",
     ];
 
     protected $allowedFields = [
-        "tirada_min",
-        "tirada_max",
+        "paginas_min",
+        "paginas_max",
         "precio_min",
         "precio_max",
-        "precio_unidad",
+        "margen",
         "user_created_id",
         "is_deleted",
     ];
@@ -53,15 +53,11 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
             "label" => "TarifaAcabadoLineas.precioMin",
             "rules" => "required|decimal",
         ],
-        "precio_unidad" => [
-            "label" => "TarifaAcabadoLineas.precioUnidad",
-            "rules" => "required|decimal",
-        ],
-        "tirada_max" => [
+        "paginas_max" => [
             "label" => "TarifaAcabadoLineas.tiradaMax",
             "rules" => "required|integer",
         ],
-        "tirada_min" => [
+        "paginas_min" => [
             "label" => "TarifaAcabadoLineas.tiradaMin",
             "rules" => "required|integer",
         ],
@@ -84,17 +80,17 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
             "decimal" => "TarifaAcabadoLineas.validation.precio_min.decimal",
             "required" => "TarifaAcabadoLineas.validation.precio_min.required",
         ],
-        "precio_unidad" => [
-            "decimal" => "TarifaAcabadoLineas.validation.precio_unidad.decimal",
-            "required" => "TarifaAcabadoLineas.validation.precio_unidad.required",
+        "paginas_max" => [
+            "integer" => "TarifaAcabadoLineas.validation.paginas_max.integer",
+            "required" => "TarifaAcabadoLineas.validation.paginas_max.required",
         ],
-        "tirada_max" => [
-            "integer" => "TarifaAcabadoLineas.validation.tirada_max.integer",
-            "required" => "TarifaAcabadoLineas.validation.tirada_max.required",
+        "paginas_min" => [
+            "integer" => "TarifaAcabadoLineas.validation.paginas_min.integer",
+            "required" => "TarifaAcabadoLineas.validation.paginas_min.required",
         ],
-        "tirada_min" => [
-            "integer" => "TarifaAcabadoLineas.validation.tirada_min.integer",
-            "required" => "TarifaAcabadoLineas.validation.tirada_min.required",
+        "margen" => [
+            "integer" => "TarifaAcabadoLineas.validation.margen.integer",
+            "required" => "TarifaAcabadoLineas.validation.margen.required",
         ],
         "user_created_id" => [
             "integer" => "TarifaAcabadoLineas.validation.user_created_id.integer",
@@ -135,7 +131,7 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.precio_unidad AS precio_unidad, t1.user_created_id AS user_created_id, t1.user_updated_id AS user_updated_id, t1.is_deleted AS is_deleted, t1.created_at AS created_at, t1.updated_at AS updated_at, t2.id AS tarifa_acabado"
+                "t1.id AS id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_acabado"
             );
 
         //JJO
@@ -149,28 +145,14 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
             ? $builder
             : $builder
                 ->groupStart()
-                ->like("t1.tirada_min", $search)
-                ->orLike("t1.tirada_max", $search)
+                ->like("t1.paginas_min", $search)
+                ->orLike("t1.paginas_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
-                ->orLike("t1.precio_unidad", $search)
-                ->orLike("t1.user_created_id", $search)
-                ->orLike("t1.user_updated_id", $search)
-                ->orLike("t1.is_deleted", $search)
-                ->orLike("t1.created_at", $search)
-                ->orLike("t1.updated_at", $search)
-                ->orLike("t2.id", $search)
-                ->orLike("t1.tirada_min", $search)
-                ->orLike("t1.tirada_max", $search)
+                ->orLike("t1.paginas_min", $search)
+                ->orLike("t1.paginas_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
-                ->orLike("t1.precio_unidad", $search)
-                ->orLike("t1.user_created_id", $search)
-                ->orLike("t1.user_updated_id", $search)
-                ->orLike("t1.is_deleted", $search)
-                ->orLike("t1.created_at", $search)
-                ->orLike("t1.updated_at", $search)
-                ->orLike("t2.id", $search)
                 ->groupEnd();
     }
 
@@ -185,4 +167,35 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
         return $builder;        
 
     }
+
+    public function checkIntervals($data = [], $id_linea = null, $id_tarifa_acabado = null){
+        
+        helper('general');
+
+        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
+            return lang('TarifaAcabadoLineas.validation.error_paginas_range');
+        }
+
+        $rows = $this->db
+            ->table($this->table)
+            ->select("id, paginas_min, paginas_max")
+            ->where("is_deleted", 0)
+            ->where("tarifa_acabado_id", $id_tarifa_acabado)
+            ->get()->getResultObject();
+
+
+        foreach ($rows as $row) {
+            if (!is_null($id_linea)){
+                if($row->id == $id_linea){
+                    continue;
+                }
+            }
+            if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
+                                $row->paginas_min, $row->paginas_max)){
+                    return lang('TarifaAcabadoLineas.validation.error_paginas_overlap');
+            }
+        }
+
+        return "";
+    }
 }

ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php

@@ -0,0 +1,159 @@
+<?php
+namespace App\Models\Tarifas;
+
+class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
+{
+    protected $table = "tarifa_encuadernacion_lineas";
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    const SORTABLE = [
+        0 => "t1.paginas_min",
+        1 => "t1.paginas_max",
+        2 => "t1.precio_min",
+        3 => "t1.precio_max",
+    ];
+
+    protected $allowedFields = [
+        "tarifa_encuadernacion_id",
+        "paginas_min",
+        "paginas_max",
+        "precio_min",
+        "precio_max",
+        "user_created_id",
+        "is_deleted",
+
+    ];
+    protected $returnType = "App\Entities\Tarifas\TarifaManipuladoLinea";
+
+    protected $useTimestamps = true;
+    protected $useSoftDeletes = false;
+
+    protected $createdField = "created_at";
+
+    protected $updatedField = "updated_at";
+
+    public static $labelField = "tarifa_encuadernacion_id";
+
+    protected $validationRules = [
+        "precio_max" => [
+            "label" => "TarifaManipuladoLineas.precioMax",
+            "rules" => "required|decimal",
+        ],
+        "precio_min" => [
+            "label" => "TarifaManipuladoLineas.precioMin",
+            "rules" => "required|decimal",
+        ],
+        "paginas_max" => [
+            "label" => "TarifaManipuladoLineas.paginasMax",
+            "rules" => "required|decimal",
+        ],
+        "paginas_min" => [
+            "label" => "TarifaManipuladoLineas.paginasMin",
+            "rules" => "required|decimal",
+        ],
+        "margen" => [
+            "label" => "TarifaManipuladoLineas.margen",
+            "rules" => "required|decimal",
+        ],
+    ];
+
+    protected $validationMessages = [
+        "precio_max" => [
+            "decimal" => "TarifaManipuladoLineas.validation.precio_max.decimal",
+            "required" => "TarifaManipuladoLineas.validation.precio_max.required",
+        ],
+        "precio_min" => [
+            "decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
+            "required" => "TarifaManipuladoLineas.validation.precio_min.required",
+        ],
+        "paginas_max" => [
+            "decimal" => "TarifaManipuladoLineas.validation.paginas_max.decimal",
+            "required" => "TarifaManipuladoLineas.validation.paginas_max.required",
+        ],
+        "paginas_min" => [
+            "decimal" => "TarifaManipuladoLineas.validation.paginas_min.decimal",
+            "required" => "TarifaManipuladoLineas.validation.paginas_min.required",
+        ],
+        "margen" => [
+            "decimal" => "TarifaManipuladoLineas.validation.margen.decimal",
+            "required" => "TarifaManipuladoLineas.validation.margen.required",
+        ],
+    ];
+
+    /**
+     * Get resource data.
+     *
+     * @param string $search
+     *
+     * @return \CodeIgniter\Database\BaseBuilder
+     */
+    public function getResource(string $search = "", $tarifa_encuadernacion_id = -1)
+    {
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->select(
+                "t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion"
+            );
+        //JJO
+        $builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id);    
+        $builder->where("t1.is_deleted", 0);
+
+        $builder->join("tarifa_encuadernacion t2", "t1.tarifa_encuadernacion_id = t2.id", "left");
+
+
+        return empty($search)
+            ? $builder
+            : $builder
+                ->groupStart()
+                ->like("t1.id", $search)
+                ->orLike("t1.tarifa_encuadernacion_id", $search)
+                ->orLike("t1.paginas_min", $search)
+                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.precio_min", $search)
+                ->orLike("t1.precio_max", $search)
+                ->orLike("t1.id", $search)
+                ->orLike("t1.tarifa_encuadernacion_id", $search)
+                ->orLike("t1.paginas_min", $search)
+                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.precio_min", $search)
+                ->orLike("t1.precio_max", $search)
+                ->groupEnd();
+    }
+
+    public function checkIntervals($data = [], $id_linea = null, $id_tarifa_encuadernacion = null){
+        
+        helper('general');
+
+        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
+            return lang('TarifaManipuladoLineas.validation.error_paginas_range');
+        }
+
+        $rows = $this->db
+            ->table($this->table)
+            ->select("id, paginas_min, paginas_max")
+            ->where("is_deleted", 0)
+            ->where("tarifa_encuadernacion_id", $id_tarifa_encuadernacion)
+            ->get()->getResultObject();
+
+
+        foreach ($rows as $row) {
+            if (!is_null($id_linea)){
+                if($row->id == $id_linea){
+                    continue;
+                }
+            }
+            if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
+                                $row->paginas_min, $row->paginas_max)){
+                    return lang('TarifaManipuladoLineas.validation.error_paginas_overlap');
+            }
+        }
+
+        return "";
+    }
+}

ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php

@@ -0,0 +1,91 @@
+<?php
+namespace App\Models\Tarifas;
+
+class TarifaEncuadernacionModel extends \App\Models\GoBaseModel
+{
+    protected $table = "tarifa_encuadernacion";
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    const SORTABLE = [
+        0 => "t1.nombre",
+    ];
+
+    protected $allowedFields = [
+        "nombre",
+        "precio_min",
+        "importe_fijo",
+        "deleted_at",
+        "is_deleted",
+        "user_created_id",
+        "user_updated_id"
+    ];
+    protected $returnType = "App\Entities\Tarifas\TarifaEncuadernacionEntity";
+
+    protected $useTimestamps = true;
+    protected $useSoftDeletes = false;
+
+    protected $createdField = "created_at";
+
+    protected $updatedField = "updated_at";
+
+    public static $labelField = "nombre";
+
+    protected $validationRules = [
+        "nombre" => [
+            "label" => "Tarifaencuadernacion.nombre",
+            "rules" => "trim|required|max_length[255]",
+        ],
+
+        "precio_min" => [
+            "label" => "Tarifaencuadernacion.precioMin",
+            "rules" => "required|decimal",
+        ],
+        "importe_fijo" => [
+            "label" => "Tarifaencuadernacion.importeFijo",
+            "rules" => "required|decimal",
+        ],
+    ];
+
+    protected $validationMessages = [
+        "nombre" => [
+            "max_length" => "Tarifaencuadernacion.validation.nombre.max_length",
+            "required" => "Tarifaencuadernacion.validation.nombre.required",
+        ],
+        "precio_min" => [
+            "required" => "Tarifaencuadernacion.validation.precio_min.required",
+            "decimal" => "Tarifaencuadernacion.validation.precio_min.decimal",
+        ],
+        "importe_fijo" => [
+            "required" => "Tarifaencuadernacion.validation.importe_fijo.required",
+            "decimal" => "Tarifaencuadernacion.validation.importe_fijo.decimal",
+        ],
+    ];
+
+    /**
+     * Get resource data.
+     *
+     * @param string $search
+     *
+     * @return \CodeIgniter\Database\BaseBuilder
+     */
+    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");
+
+        //JJO
+        $builder->where("t1.is_deleted", 0);
+
+        return empty($search)
+            ? $builder
+            : $builder
+                ->groupStart()
+                ->like("t1.nombre", $search)
+                ->groupEnd();
+    }
+}

ci4/app/Models/Tarifas/TarifaManipuladoLineaModel.php

@@ -13,20 +13,18 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.tirada_min",
-        1 => "t1.tirada_max",
+        0 => "t1.paginas_min",
+        1 => "t1.paginas_max",
         2 => "t1.precio_min",
         3 => "t1.precio_max",
-        4 => "t1.precio_unidad",
     ];
 
     protected $allowedFields = [
         "tarifa_manipulado_id",
-        "tirada_min",
-        "tirada_max",
+        "paginas_min",
+        "paginas_max",
         "precio_min",
         "precio_max",
-        "precio_unidad",
         "user_created_id",
         "is_deleted",
 
@@ -51,16 +49,16 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
             "label" => "TarifaManipuladoLineas.precioMin",
             "rules" => "required|decimal",
         ],
-        "precio_unidad" => [
-            "label" => "TarifaManipuladoLineas.precioUnidad",
+        "paginas_max" => [
+            "label" => "TarifaManipuladoLineas.paginasMax",
             "rules" => "required|decimal",
         ],
-        "tirada_max" => [
-            "label" => "TarifaManipuladoLineas.tiradaMax",
+        "paginas_min" => [
+            "label" => "TarifaManipuladoLineas.paginasMin",
             "rules" => "required|decimal",
         ],
-        "tirada_min" => [
-            "label" => "TarifaManipuladoLineas.tiradaMin",
+        "margen" => [
+            "label" => "TarifaManipuladoLineas.margen",
             "rules" => "required|decimal",
         ],
     ];
@@ -74,17 +72,17 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
             "decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
             "required" => "TarifaManipuladoLineas.validation.precio_min.required",
         ],
-        "precio_unidad" => [
-            "decimal" => "TarifaManipuladoLineas.validation.precio_unidad.decimal",
-            "required" => "TarifaManipuladoLineas.validation.precio_unidad.required",
+        "paginas_max" => [
+            "decimal" => "TarifaManipuladoLineas.validation.paginas_max.decimal",
+            "required" => "TarifaManipuladoLineas.validation.paginas_max.required",
         ],
-        "tirada_max" => [
-            "decimal" => "TarifaManipuladoLineas.validation.tirada_max.decimal",
-            "required" => "TarifaManipuladoLineas.validation.tirada_max.required",
+        "paginas_min" => [
+            "decimal" => "TarifaManipuladoLineas.validation.paginas_min.decimal",
+            "required" => "TarifaManipuladoLineas.validation.paginas_min.required",
         ],
-        "tirada_min" => [
-            "decimal" => "TarifaManipuladoLineas.validation.tirada_min.decimal",
-            "required" => "TarifaManipuladoLineas.validation.tirada_min.required",
+        "margen" => [
+            "decimal" => "TarifaManipuladoLineas.validation.margen.decimal",
+            "required" => "TarifaManipuladoLineas.validation.margen.required",
         ],
     ];
 
@@ -100,7 +98,7 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.id AS id, t1.tarifa_manipulado_id AS tarifa_manipulado_id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.precio_unidad AS precio_unidad, t2.id AS tarifa_manipulado"
+                "t1.id AS id, t1.tarifa_manipulado_id AS tarifa_manipulado_id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_manipulado"
             );
         //JJO
         $builder->where('tarifa_manipulado_id', $tarifa_manipulado_id);    
@@ -115,18 +113,47 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
                 ->groupStart()
                 ->like("t1.id", $search)
                 ->orLike("t1.tarifa_manipulado_id", $search)
-                ->orLike("t1.tirada_min", $search)
-                ->orLike("t1.tirada_max", $search)
+                ->orLike("t1.paginas_min", $search)
+                ->orLike("t1.paginas_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
-                ->orLike("t1.precio_unidad", $search)
                 ->orLike("t1.id", $search)
                 ->orLike("t1.tarifa_manipulado_id", $search)
-                ->orLike("t1.tirada_min", $search)
-                ->orLike("t1.tirada_max", $search)
+                ->orLike("t1.paginas_min", $search)
+                ->orLike("t1.paginas_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
-                ->orLike("t1.precio_unidad", $search)
                 ->groupEnd();
     }
+
+    public function checkIntervals($data = [], $id_linea = null, $id_tarifa_manipulado = null){
+        
+        helper('general');
+
+        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
+            return lang('TarifaManipuladoLineas.validation.error_paginas_range');
+        }
+
+        $rows = $this->db
+            ->table($this->table)
+            ->select("id, paginas_min, paginas_max")
+            ->where("is_deleted", 0)
+            ->where("tarifa_manipulado_id", $id_tarifa_manipulado)
+            ->get()->getResultObject();
+
+
+        foreach ($rows as $row) {
+            if (!is_null($id_linea)){
+                if($row->id == $id_linea){
+                    continue;
+                }
+            }
+            if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
+                                $row->paginas_min, $row->paginas_max)){
+                    return lang('TarifaManipuladoLineas.validation.error_paginas_overlap');
+            }
+        }
+
+        return "";
+    }
 }

ci4/app/Models/Tarifas/TarifaManipuladoModel.php

@@ -76,7 +76,7 @@ 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");
+        $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);

ci4/app/Models/Tarifas/TarifaacabadoModel.php

@@ -14,6 +14,8 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
 
     const SORTABLE = [
         0 => "t1.nombre",
+        1 => "precio_min",
+        2 => "importe_fijo",
     ];
 
     protected $allowedFields = [
@@ -77,7 +79,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.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo"
         );
 
         //JJO

ci4/app/Models/Tarifas/TarifapreimpresionModel.php

@@ -14,9 +14,10 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
 
     protected $allowedFields = [
         "nombre", 
-        "precio",
+        "precio_pagina",
         "precio_min",
         "importe_fijo",
+        "margen",
         "deleted_at",
         "is_deleted",
         "user_created_id", 
@@ -49,6 +50,10 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
             "label" => "Tarifapreimpresion.importeFijo",
             "rules" => "required|decimal",
         ],
+        "margen" => [
+            "label" => "Tarifapreimpresion.margen",
+            "rules" => "required|decimal",
+        ],
     ];
 
     protected $validationMessages = [
@@ -68,5 +73,9 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
             "required" => "Tarifapreimpresion.validation.importe_fijo.required",
             "decimal" => "Tarifapreimpresion.validation.importe_fijo.decimal",
         ],
+        "margen" => [
+            "required" => "Tarifapreimpresion.validation.margen.required",
+            "decimal" => "Tarifapreimpresion.validation.margen.decimal",
+        ],
     ];
 }