Merge branch 'main' into 'feat/soporte'

create migration to add check_presupuesto_cliente column to tarifas tables...

See merge request jjimenez/safekat!554

ci4/app/Models/Configuracion/PapelGenericoModel.php

@@ -22,7 +22,7 @@ class PapelGenericoModel extends \App\Models\BaseModel
         4 => "t1.show_in_client_special",
     ];
 
-    protected $allowedFields = ["nombre", "code", "code_ot", "show_in_client", "show_in_client_special", "deleted_at", "is_deleted"];
+    protected $allowedFields = ["nombre", "code", "code_ot", "show_in_client", "show_in_client_special", "deleted_at", "is_deleted", "activo"];
     protected $returnType = "App\Entities\Configuracion\PapelGenerico";
 
     protected $useTimestamps = true;
@@ -120,25 +120,28 @@ class PapelGenericoModel extends \App\Models\BaseModel
     {
         $builder = $this->db
             ->table($this->table . " t1")
-            ->select(
-                "t1.id AS id, t1.nombre AS nombre, t1.code AS code, t1.code_ot AS code_ot, 
-                t1.show_in_client AS show_in_client, t1.show_in_client_special AS show_in_client_special"
+            ->select("t1.id AS id, t1.nombre AS nombre, 
+                t1.code AS code, 
+                t1.code_ot AS code_ot, 
+                t1.activo AS activo,
+                t1.show_in_client AS show_in_client, 
+                t1.show_in_client_special AS show_in_client_special"
             )
             ->where("is_deleted", 0);
 
         return empty($search)
             ? $builder
             : $builder
-                ->groupStart()
-                ->like("t1.id", $search)
-                ->orLike("t1.nombre", $search)
-                ->orLike("t1.code", $search)
-                ->orLike("t1.code_ot", $search)
-                ->orLike("t1.id", $search)
-                ->orLike("t1.nombre", $search)
-                ->orLike("t1.code", $search)
-                ->orLike("t1.code_ot", $search)
-                ->groupEnd();
+            ->groupStart()
+            ->like("t1.id", $search)
+            ->orLike("t1.nombre", $search)
+            ->orLike("t1.code", $search)
+            ->orLike("t1.code_ot", $search)
+            ->orLike("t1.id", $search)
+            ->orLike("t1.nombre", $search)
+            ->orLike("t1.code", $search)
+            ->orLike("t1.code_ot", $search)
+            ->groupEnd();
     }
 
 

ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php

@@ -26,6 +26,7 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
         "precio_min",
         "importe_fijo",
         "mostrar_en_presupuesto",
+        "mostrar_en_presupuesto_cliente",
         "acabado_cubierta",
         "acabado_sobrecubierta",
         "deleted_at",
@@ -86,7 +87,7 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
     {
         $builder = $this->db->table($this->table . " t1")->select(
             "t1.id AS id, t1.nombre AS nombre,t1.code AS code, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, 
-            t1.mostrar_en_presupuesto AS mostrar_en_presupuesto, t1.acabado_cubierta AS acabado_cubierta, t1.acabado_sobrecubierta AS acabado_sobrecubierta"
+            t1.mostrar_en_presupuesto AS mostrar_en_presupuesto,t1.mostrar_en_presupuesto_cliente AS mostrar_en_presupuesto_cliente, t1.acabado_cubierta AS acabado_cubierta, t1.acabado_sobrecubierta AS acabado_sobrecubierta"
         );
 
         //JJO

ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php

@@ -25,6 +25,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
         "code",
         "comment",
         "mostrar_en_presupuesto",
+        "mostrar_en_presupuesto_cliente",
         "tipo_encuadernacion",
         "servicio_encuadernacion",
         "por_horas",
@@ -69,6 +70,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
     {
         $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.code AS code,
                 t1.mostrar_en_presupuesto AS mostrar_en_presupuesto,
+                t1.mostrar_en_presupuesto_cliente AS mostrar_en_presupuesto_cliente,
                 t1.tipo_encuadernacion AS tipo_encuadernacion, t1.servicio_encuadernacion AS servicio_encuadernacion,
                 t1.por_horas AS por_horas");
 

ci4/app/Models/Tarifas/TarifaManipuladoModel.php

@@ -29,7 +29,8 @@ class TarifaManipuladoModel extends \App\Models\BaseModel
         "deleted_at",
         "is_deleted",
         "user_created_id",
-        "user_updated_id"
+        "user_updated_id",
+        "mostrar_en_presupuesto_cliente"
     ];
     protected $returnType = "App\Entities\Tarifas\TarifaManipuladoEntity";
 
@@ -83,7 +84,7 @@ class TarifaManipuladoModel extends \App\Models\BaseModel
     public function getResource(string $search = "")
     {
         $builder = $this->db->table($this->table . " t1")->select("t1.id AS id,t1.code AS code, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo
-        ,t1.mostrar_en_presupuesto AS mostrar_en_presupuesto");
+        ,t1.mostrar_en_presupuesto AS mostrar_en_presupuesto,t1.mostrar_en_presupuesto_cliente AS mostrar_en_presupuesto_cliente");
 
         //JJO
         $builder->where("t1.is_deleted", 0);

ci4/app/Models/Tarifas/TarifaextraModel.php

@@ -19,6 +19,7 @@ class TarifaextraModel extends \App\Models\BaseModel
         "precio",
         "margen",
         "mostrar_en_presupuesto",
+        "mostrar_en_presupuesto_cliente",
         "deleted_at",
         "is_deleted",
         "user_created_id", 

ci4/app/Models/Tarifas/TarifapreimpresionModel.php

@@ -19,6 +19,7 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
         "precio",
         "margen",
         "mostrar_en_presupuesto",
+        "mostrar_en_presupuesto_cliente",
         "deleted_at",
         "is_deleted",
         "user_created_id",