Finalizadas las tareas de modificacion

ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php

@@ -156,4 +156,16 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
 
         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/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

@@ -38,7 +38,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 +61,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",
         ],