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

# Conflicts:
#   ci4/app/Config/Routes.php

ci4/app/Models/Compras/ProveedorModel.php

@@ -0,0 +1,213 @@
+<?php
+namespace App\Models\Compras;
+
+class ProveedorModel extends \App\Models\GoBaseModel
+{
+    protected $table = "lg_proveedores";
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    const SORTABLE = [
+        0 => "t1.nombre",
+        1 => "t2.nombre",
+        
+    ];
+
+    protected $allowedFields = [
+        "nombre",
+        "tipo_id",
+        "razon_social",
+        "cif",
+        "direccion",
+        "cp",
+        "ciudad",
+        "provincia_id",
+        "pais_id",
+        "persona_contacto",
+        "email",
+        "telefono",
+        "is_deleted",
+        "deleted_at"
+    ];
+    protected $returnType = "App\Entities\Compras\ProveedorEntity";
+
+    protected $useTimestamps = true;
+    protected $useSoftDeletes = false;
+
+    protected $createdField = "created_at";
+
+    protected $updatedField = "updated_at";
+
+    public static $labelField = "nombre";
+
+    protected $validationRules = [
+        "cif" => [
+            "label" => "Proveedores.cif",
+            "rules" => "trim|max_length[15]",
+        ],
+        "tipo_id" => [
+            "label" => "Proveedores.tipoId",
+            "rules" => "required",
+        ],
+        "ciudad" => [
+            "label" => "Proveedores.ciudad",
+            "rules" => "trim|max_length[255]",
+        ],
+        "cp" => [
+            "label" => "Proveedores.cp",
+            "rules" => "trim|max_length[10]",
+        ],
+        "direccion" => [
+            "label" => "Proveedores.direccion",
+            "rules" => "trim|max_length[255]",
+        ],
+        "email" => [
+            "label" => "Proveedores.email",
+            "rules" => "trim|max_length[255]|valid_email|permit_empty",
+        ],
+        "nombre" => [
+            "label" => "Proveedores.nombre",
+            "rules" => "trim|required|max_length[255]",
+        ],
+        "persona_contacto" => [
+            "label" => "Proveedores.personaContacto",
+            "rules" => "trim|max_length[255]",
+        ],
+        "razon_social" => [
+            "label" => "Proveedores.razonSocial",
+            "rules" => "trim|max_length[255]",
+        ],
+        "telefono" => [
+            "label" => "Proveedores.telefono",
+            "rules" => "trim|max_length[60]",
+        ],
+    ];
+
+    protected $validationMessages = [
+        "cif" => [
+            "max_length" => "Proveedores.validation.cif.max_length",
+        ],
+        "ciudad" => [
+            "max_length" => "Proveedores.validation.ciudad.max_length",
+        ],
+        "cp" => [
+            "max_length" => "Proveedores.validation.cp.max_length",
+        ],
+        "direccion" => [
+            "max_length" => "Proveedores.validation.direccion.max_length",
+        ],
+        "email" => [
+            "max_length" => "Proveedores.validation.email.max_length",
+            "valid_email" => "Proveedores.validation.email.valid_email",
+        ],
+        "nombre" => [
+            "max_length" => "Proveedores.validation.nombre.max_length",
+            "required" => "Proveedores.validation.nombre.required",
+        ],
+        "tipo_id" => [
+            "required" => "Proveedores.validation.tipo.required",
+        ],
+        "persona_contacto" => [
+            "max_length" => "Proveedores.validation.persona_contacto.max_length",
+        ],
+        "razon_social" => [
+            "max_length" => "Proveedores.validation.razon_social.max_length",
+        ],
+        "telefono" => [
+            "max_length" => "Proveedores.validation.telefono.max_length",
+        ],
+    ];
+    public function findAllWithAllRelations(string $selcols = "*", int $limit = null, int $offset = 0)
+    {
+        $sql =
+            "SELECT t1." .
+            $selcols .
+            ",  t2.nombre AS tipo,  t3.nombre AS provincia,  t4.nombre AS pais FROM " .
+            $this->table .
+            " t1  LEFT JOIN lg_proveedores_tipos t2 ON t1.tipo_id = t2.id LEFT JOIN lg_provincias t3 ON t1.provincia_id = t3.id LEFT JOIN lg_paises t4 ON t1.pais_id = t4.id";
+        if (!is_null($limit) && intval($limit) > 0) {
+            $sql .= " LIMIT " . intval($limit);
+        }
+
+        if (!is_null($offset) && intval($offset) > 0) {
+            $sql .= " OFFSET " . intval($offset);
+        }
+
+        $query = $this->db->query($sql);
+        $result = $query->getResultObject();
+        return $result;
+    }
+
+    /**
+     * 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.razon_social AS razon_social, t1.cif AS cif, t1.direccion AS direccion, t1.cp AS cp, t1.ciudad AS ciudad, t1.persona_contacto AS persona_contacto, t1.email AS email, t1.telefono AS telefono, t2.nombre AS tipo, t3.nombre AS provincia, t4.nombre AS pais"
+            );
+        $builder->join("lg_proveedores_tipos t2", "t1.tipo_id = t2.id", "left");
+        $builder->join("lg_provincias t3", "t1.provincia_id = t3.id", "left");
+        $builder->join("lg_paises t4", "t1.pais_id = t4.id", "left");
+
+        //JJO
+        $builder->where("t1.is_deleted", 0);
+
+        return empty($search)
+            ? $builder
+            : $builder
+                ->groupStart()
+                ->like("t1.id", $search)
+                ->orLike("t1.nombre", $search)
+                ->orLike("t1.razon_social", $search)
+                ->orLike("t1.cif", $search)
+                ->orLike("t1.direccion", $search)
+                ->orLike("t1.cp", $search)
+                ->orLike("t1.ciudad", $search)
+                ->orLike("t1.persona_contacto", $search)
+                ->orLike("t1.email", $search)
+                ->orLike("t1.telefono", $search)
+                ->orLike("t2.id", $search)
+                ->orLike("t3.id", $search)
+                ->orLike("t4.id", $search)
+                ->orLike("t1.id", $search)
+                ->orLike("t1.nombre", $search)
+                ->orLike("t1.tipo_id", $search)
+                ->orLike("t1.razon_social", $search)
+                ->orLike("t1.cif", $search)
+                ->orLike("t1.direccion", $search)
+                ->orLike("t1.cp", $search)
+                ->orLike("t1.ciudad", $search)
+                ->orLike("t1.provincia_id", $search)
+                ->orLike("t1.pais_id", $search)
+                ->orLike("t1.persona_contacto", $search)
+                ->orLike("t1.email", $search)
+                ->orLike("t1.telefono", $search)
+                ->orLike("t2.nombre", $search)
+                ->orLike("t3.nombre", $search)
+                ->orLike("t4.nombre", $search)
+                ->groupEnd();
+    }
+
+    public function getProvList(int $tipoId = -1){
+
+        $builder = $this->db
+        ->table($this->table . " t1")
+        ->select(
+            "t1.id AS value, t1.nombre AS label")
+        ->where("tipo_id", $tipoId);
+
+        return $builder->get()->getResultObject();
+    }
+}

ci4/app/Models/Compras/ProveedorTipoModel.php

@@ -0,0 +1,90 @@
+<?php
+namespace App\Models\Compras;
+
+class ProveedorTipoModel extends \App\Models\GoBaseModel
+{
+    protected $table = "lg_proveedores_tipos";
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    const SORTABLE = [
+        1 => "t1.id",
+        2 => "t1.nombre",
+        3 => "t1.created_at",
+        4 => "t1.updated_at",
+    ];
+
+    protected $allowedFields = ["nombre"];
+    protected $returnType = "App\Entities\Compras\ProveedorTipoEntity";
+
+    protected $useTimestamps = true;
+    protected $useSoftDeletes = false;
+
+    protected $createdField = "created_at";
+
+    protected $updatedField = "updated_at";
+
+    public static $labelField = "nombre";
+
+    protected $validationRules = [
+        "nombre" => [
+            "label" => "LgProveedoresTipos.nombre",
+            "rules" => "trim|required|max_length[255]",
+        ],
+    ];
+
+    protected $validationMessages = [
+        "nombre" => [
+            "max_length" => "LgProveedoresTipos.validation.nombre.max_length",
+            "required" => "LgProveedoresTipos.validation.nombre.required",
+        ],
+    ];
+
+    /**
+     * 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.created_at AS created_at, t1.updated_at AS updated_at");
+
+        return empty($search)
+            ? $builder
+            : $builder
+                ->groupStart()
+                ->like("t1.id", $search)
+                ->orLike("t1.nombre", $search)
+                ->orLike("t1.created_at", $search)
+                ->orLike("t1.updated_at", $search)
+                ->orLike("t1.id", $search)
+                ->orLike("t1.nombre", $search)
+                ->orLike("t1.created_at", $search)
+                ->orLike("t1.updated_at", $search)
+                ->groupEnd();
+    }
+
+
+    public function getTipoId(string $tipo = ""){
+        
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->select("t1.id AS id")
+            ->where("t1.nombre", $tipo);
+
+        $rows = $builder->get()->getResultObject();
+        if(sizeof($rows)>0)
+            return intval($rows[0]->id);
+        else
+            return -1;
+    }
+}

ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php

@@ -37,7 +37,7 @@ class MaquinasTarifasImpresionModel extends \App\Models\GoBaseModel
         ],
         "tipo" => [
             "label" => "MaquinasTarifasImpresions.tipo",
-            "rules" => "permit_empty|in_list[negro,color,negrohq,bicolor]",
+            "rules" => "permit_empty|in_list[negro,color,negrohq,bicolor,colorhq]",
         ],
         "uso" => [
             "label" => "MaquinasTarifasImpresions.uso",

ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php

@@ -13,16 +13,16 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.paginas_min",
-        1 => "t1.paginas_max",
+        0 => "t1.tirada_min",
+        1 => "t1.tirada_max",
         2 => "t1.precio_min",
         3 => "t1.precio_max",
         4 => "t1.margen",
     ];
 
     protected $allowedFields = [
-        "paginas_min",
-        "paginas_max",
+        "tirada_min",
+        "tirada_max",
         "precio_min",
         "precio_max",
         "margen",
@@ -53,11 +53,11 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
             "label" => "TarifaAcabadoLineas.precioMin",
             "rules" => "required|decimal",
         ],
-        "paginas_max" => [
+        "tirada_max" => [
             "label" => "TarifaAcabadoLineas.tiradaMax",
             "rules" => "required|integer",
         ],
-        "paginas_min" => [
+        "tirada_min" => [
             "label" => "TarifaAcabadoLineas.tiradaMin",
             "rules" => "required|integer",
         ],
@@ -80,13 +80,13 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
             "decimal" => "TarifaAcabadoLineas.validation.precio_min.decimal",
             "required" => "TarifaAcabadoLineas.validation.precio_min.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",
@@ -131,7 +131,7 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "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"
+                "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.margen AS margen, t2.id AS tarifa_acabado"
             );
 
         //JJO
@@ -145,12 +145,12 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
             ? $builder
             : $builder
                 ->groupStart()
-                ->like("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->like("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
-                ->orLike("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
                 ->groupEnd();
@@ -172,13 +172,13 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
         
         helper('general');
 
-        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
-            return lang('TarifaAcabadoLineas.validation.error_paginas_range');
+        if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
+            return lang('TarifaAcabadoLineas.validation.error_tirada_range');
         }
 
         $rows = $this->db
             ->table($this->table)
-            ->select("id, paginas_min, paginas_max")
+            ->select("id, tirada_min, tirada_max")
             ->where("is_deleted", 0)
             ->where("tarifa_acabado_id", $id_tarifa_acabado)
             ->get()->getResultObject();
@@ -190,9 +190,9 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
                     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');
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+                                $row->tirada_min, $row->tirada_max)){
+                    return lang('TarifaAcabadoLineas.validation.error_tirada_overlap');
             }
         }
 

ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php

@@ -20,7 +20,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
     ];
 
     protected $allowedFields = [
-        "tarifa_encuadernacion_id",
+        "tirada_encuadernacion_id",
         "paginas_min",
         "paginas_max",
         "precio_min",
@@ -29,7 +29,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
         "is_deleted",
 
     ];
-    protected $returnType = "App\Entities\Tarifas\TarifaManipuladoLinea";
+    protected $returnType = "App\Entities\Tarifas\TarifaEncuadernacionLinea";
 
     protected $useTimestamps = true;
     protected $useSoftDeletes = false;
@@ -38,51 +38,51 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
 
     protected $updatedField = "updated_at";
 
-    public static $labelField = "tarifa_encuadernacion_id";
+    public static $labelField = "tirada_encuadernacion_id";
 
     protected $validationRules = [
         "precio_max" => [
-            "label" => "TarifaManipuladoLineas.precioMax",
+            "label" => "TarifaEncuadernacionLineas.precioMax",
             "rules" => "required|decimal",
         ],
         "precio_min" => [
-            "label" => "TarifaManipuladoLineas.precioMin",
+            "label" => "TarifaEncuadernacionLineas.precioMin",
             "rules" => "required|decimal",
         ],
         "paginas_max" => [
-            "label" => "TarifaManipuladoLineas.paginasMax",
+            "label" => "TarifaEncuadernacionLineas.paginasMax",
             "rules" => "required|decimal",
         ],
         "paginas_min" => [
-            "label" => "TarifaManipuladoLineas.paginasMin",
+            "label" => "TarifaEncuadernacionLineas.paginasMin",
             "rules" => "required|decimal",
         ],
         "margen" => [
-            "label" => "TarifaManipuladoLineas.margen",
+            "label" => "TarifaEncuadernacionLineas.margen",
             "rules" => "required|decimal",
         ],
     ];
 
     protected $validationMessages = [
         "precio_max" => [
-            "decimal" => "TarifaManipuladoLineas.validation.precio_max.decimal",
-            "required" => "TarifaManipuladoLineas.validation.precio_max.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.precio_max.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.precio_max.required",
         ],
         "precio_min" => [
-            "decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
-            "required" => "TarifaManipuladoLineas.validation.precio_min.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.precio_min.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.precio_min.required",
         ],
         "paginas_max" => [
-            "decimal" => "TarifaManipuladoLineas.validation.paginas_max.decimal",
-            "required" => "TarifaManipuladoLineas.validation.paginas_max.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.paginas_max.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.paginas_max.required",
         ],
         "paginas_min" => [
-            "decimal" => "TarifaManipuladoLineas.validation.paginas_min.decimal",
-            "required" => "TarifaManipuladoLineas.validation.paginas_min.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.paginas_min.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.paginas_min.required",
         ],
         "margen" => [
-            "decimal" => "TarifaManipuladoLineas.validation.margen.decimal",
-            "required" => "TarifaManipuladoLineas.validation.margen.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.margen.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.margen.required",
         ],
     ];
 
@@ -93,18 +93,18 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
      *
      * @return \CodeIgniter\Database\BaseBuilder
      */
-    public function getResource(string $search = "", $tarifa_encuadernacion_id = -1)
+    public function getResource(string $search = "", $tirada_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"
+                "t1.id AS id, t1.tirada_encuadernacion_id AS tirada_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('tirada_encuadernacion_id', $tirada_encuadernacion_id);    
         $builder->where("t1.is_deleted", 0);
 
-        $builder->join("tarifa_encuadernacion t2", "t1.tarifa_encuadernacion_id = t2.id", "left");
+        $builder->join("tarifa_encuadernacion_tiradas    t2", "t1.tirada_encuadernacion_id = t2.id", "left");
 
 
         return empty($search)
@@ -112,13 +112,13 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
             : $builder
                 ->groupStart()
                 ->like("t1.id", $search)
-                ->orLike("t1.tarifa_encuadernacion_id", $search)
+                ->orLike("t1.tirada_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.tirada_encuadernacion_id", $search)
                 ->orLike("t1.paginas_min", $search)
                 ->orLike("t1.paginas_max", $search)
                 ->orLike("t1.precio_min", $search)
@@ -126,19 +126,19 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
                 ->groupEnd();
     }
 
-    public function checkIntervals($data = [], $id_linea = null, $id_tarifa_encuadernacion = null){
+    public function checkIntervals($data = [], $id_linea = null, $tirada_encuadernacion_id = null){
         
         helper('general');
 
         if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
-            return lang('TarifaManipuladoLineas.validation.error_paginas_range');
+            return lang('TarifaEncuadernacionLineas.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)
+            ->where("tirada_encuadernacion_id", $tirada_encuadernacion_id)
             ->get()->getResultObject();
 
 
@@ -150,10 +150,22 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
             }
             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 lang('TarifaEncuadernacionLineas.validation.error_paginas_overlap');
             }
         }
 
         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;
+    }
 }

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);

ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php

@@ -0,0 +1,133 @@
+<?php
+namespace App\Models\Tarifas;
+
+class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
+{
+    protected $table = "tarifa_encuadernacion_tiradas";
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    const SORTABLE = [
+        1 => "t3.nombre",
+        2 => "t1.tirada_min",
+        3 => "t1.tirada_max",
+        
+    ];
+
+    protected $allowedFields = [
+        "tarifa_encuadernacion_id",
+        "tirada_min",
+        "tirada_max",
+        "proveedor_id", 
+        "user_created_id",
+        "user_updated_id",
+        "is_deleted",
+        "deleted_at",
+
+    ];
+    protected $returnType = "App\Entities\Tarifas\TarifaEncuadernacionTirada";
+
+    protected $useTimestamps = true;
+    protected $useSoftDeletes = false;
+
+    protected $createdField = "created_at";
+
+    protected $updatedField = "updated_at";
+
+    public static $labelField = "tarifa_encuadernacion_id";
+
+    protected $validationRules = [
+        "tirada_max" => [
+            "label" => "TarifaEncuadernacionTiradas.tiradaMax",
+            "rules" => "required|integer",
+        ],
+        "tirada_min" => [
+            "label" => "TarifaEncuadernacionTiradas.tiradaMin",
+            "rules" => "required|integer",
+        ]
+    ];
+
+    protected $validationMessages = [
+        "tirada_max" => [
+            "integer" => "TarifaEncuadernacionTiradas.validation.tirada_max.integer",
+            "required" => "TarifaEncuadernacionTiradas.validation.tirada_max.required",
+        ],
+        "tirada_min" => [
+            "integer" => "TarifaEncuadernacionTiradas.validation.tirada_min.integer",
+            "required" => "TarifaEncuadernacionTiradas.validation.tirada_min.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.tirada_min AS tirada_min, 
+                t1.tirada_max AS tirada_max, t3.nombre AS proveedor, t3.id AS proveedor_id, 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");
+        $builder->join("lg_proveedores t3", "t1.proveedor_id = t3.id", "left");
+
+
+        return empty($search)
+            ? $builder
+            : $builder
+                ->groupStart()
+                ->Like("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
+                ->orLike("t3.nombre", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
+                ->orLike("t3.nombre", $search)
+                ->groupEnd();
+    }
+
+    public function checkIntervals($data = [], $id_tirada = null, $tarifa_encuadernacion_id = null){
+        
+        helper('general');
+
+        if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
+            return lang('TarifaEncuadernacionTiradas.validation.error_tirada_range');
+        }
+
+        $rows = $this->db
+            ->table($this->table)
+            ->select("id, tirada_min, tirada_max")
+            ->where("is_deleted", 0)
+            ->where("tarifa_encuadernacion_id", $tarifa_encuadernacion_id)
+            ->where("proveedor_id", $data["proveedor_id"])
+            ->get()->getResultObject();
+
+
+        foreach ($rows as $row) {
+            if (!is_null($id_tirada)){
+                if($row->id == $id_tirada){
+                    continue;
+                }
+            }
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+                                $row->tirada_min, $row->tirada_max)){
+                    return lang('TarifaEncuadernacionTiradas.validation.error_tirada_overlap');
+            }
+        }
+
+        return "";
+    }
+}

ci4/app/Models/Tarifas/TarifaManipuladoLineaModel.php

@@ -13,16 +13,16 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.paginas_min",
-        1 => "t1.paginas_max",
+        0 => "t1.tirada_min",
+        1 => "t1.tirada_max",
         2 => "t1.precio_min",
         3 => "t1.precio_max",
     ];
 
     protected $allowedFields = [
         "tarifa_manipulado_id",
-        "paginas_min",
-        "paginas_max",
+        "tirada_min",
+        "tirada_max",
         "precio_min",
         "precio_max",
         "user_created_id",
@@ -49,12 +49,12 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
             "label" => "TarifaManipuladoLineas.precioMin",
             "rules" => "required|decimal",
         ],
-        "paginas_max" => [
-            "label" => "TarifaManipuladoLineas.paginasMax",
+        "tirada_max" => [
+            "label" => "TarifaManipuladoLineas.tiradaMax",
             "rules" => "required|decimal",
         ],
-        "paginas_min" => [
-            "label" => "TarifaManipuladoLineas.paginasMin",
+        "tirada_min" => [
+            "label" => "TarifaManipuladoLineas.tiradaMin",
             "rules" => "required|decimal",
         ],
         "margen" => [
@@ -72,13 +72,13 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
             "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",
+        "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",
@@ -98,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.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"
+                "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.margen AS margen, t2.id AS tarifa_manipulado"
             );
         //JJO
         $builder->where('tarifa_manipulado_id', $tarifa_manipulado_id);    
@@ -113,14 +113,14 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
                 ->groupStart()
                 ->like("t1.id", $search)
                 ->orLike("t1.tarifa_manipulado_id", $search)
-                ->orLike("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
                 ->orLike("t1.id", $search)
                 ->orLike("t1.tarifa_manipulado_id", $search)
-                ->orLike("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                 ->orLike("t1.precio_min", $search)
                 ->orLike("t1.precio_max", $search)
                 ->groupEnd();
@@ -130,13 +130,13 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
         
         helper('general');
 
-        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
-            return lang('TarifaManipuladoLineas.validation.error_paginas_range');
+        if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
+            return lang('TarifaManipuladoLineas.validation.error_tirada_range');
         }
 
         $rows = $this->db
             ->table($this->table)
-            ->select("id, paginas_min, paginas_max")
+            ->select("id, tirada_min, tirada_max")
             ->where("is_deleted", 0)
             ->where("tarifa_manipulado_id", $id_tarifa_manipulado)
             ->get()->getResultObject();
@@ -148,9 +148,9 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
                     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');
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+                                $row->tirada_min, $row->tirada_max)){
+                    return lang('TarifaManipuladoLineas.validation.error_tirada_overlap');
             }
         }
 

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);

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

ci4/app/Models/Tarifas/TarifapreimpresionModel.php

@@ -18,6 +18,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
         "precio_min",
         "importe_fijo",
         "margen",
+        "mostrar_en_presupuesto",
         "deleted_at",
         "is_deleted",
         "user_created_id", 
@@ -38,7 +39,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 +62,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",
         ],