falta botones exportar, etc

ci4/app/Models/Tarifas/TarifaEnvioPrecioModel.php

@@ -18,7 +18,8 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
         2 => "t1.peso_min",
         3 => "t1.peso_max",
         4 => "t1.precio",
-        5 => "t1.precio_adicional"
+        5 => "t1.precio_adicional",
+        5 => "t1.margen"
     ];
 
     protected $allowedFields = [
@@ -29,6 +30,7 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
         "peso_max",
         "precio",
         "precio_adicional",
+        "margen",
         "deleted_at",
         "is_deleted",
     ];
@@ -60,9 +62,13 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
             "label" => "TarifasEnviosPrecios.precioAdicional",
             "rules" => "required|decimal",
         ],
+        "margen" => [
+            "label" => "TarifasEnviosPrecios.margen",
+            "rules" => "required|decimal",
+        ],
         "tipo_envio" => [
             "label" => "TarifasEnviosPrecios.tipoEnvio",
-            "rules" => "required|in_list[a domicilio,cajas,palets]",
+            "rules" => "required|in_list[cajas,palets]",
         ],
     ];
 
@@ -83,6 +89,10 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
             "decimal" => "TarifasEnviosPrecios.validation.precio_adicional.decimal",
             "required" => "TarifasEnviosPrecios.validation.precio_adicional.required",
         ],
+        "margen" => [
+            "decimal" => "TarifasEnviosPrecios.margen.margen.decimal",
+            "required" => "TarifasEnviosPrecios.margen.margen.required",
+        ],
         "tipo_envio" => [
             "in_list" => "TarifasEnviosPrecios.validation.tipo_envio.in_list",
             "required" => "TarifasEnviosPrecios.validation.tipo_envio.required",
@@ -116,17 +126,17 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
      *
      * @return \CodeIgniter\Database\BaseBuilder
      */
-    public function getResource(string $search = "", $zona_envio_id = -1)
+    public function getResource(string $search = "", $tarifa_envio_id = -1)
     {
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
                 "t1.id AS id, t1.tipo_envio AS tipo_envio, t1.peso_min AS peso_min, t1.peso_max AS peso_max, t1.precio AS precio, 
-                t1.precio_adicional AS precio_adicional, t2.id AS tarifa_envio, t3.id AS proveedor_id, t3.nombre AS proveedor"
+                t1.precio_adicional AS precio_adicional, t1.margen AS margen, t2.id AS tarifa_envio, t3.id AS proveedor_id, t3.nombre AS proveedor"
             );
-        $builder->join("tarifas_envios_zonas t2", "t1.zona_envio_id = t2.id", "left");
+        $builder->join("tarifas_envios_zonas t2", "t1.tarifa_envio_id = t2.id", "left");
         $builder->join("lg_proveedores t3", "t1.proveedor_id = t3.id", "left");
-        $builder->where("t1.zona_envio_id", $zona_envio_id);
+        $builder->where("t1.tarifa_envio_id", $tarifa_envio_id);
            
         //JJO
         $builder->where("t1.is_deleted", 0);
@@ -140,12 +150,14 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
                 ->orLike("t1.peso_max", $search)
                 ->orLike("t1.precio", $search)
                 ->orLike("t1.precio_adicional", $search)
+                ->orLike("t1.margen", $search)
                 ->orLike("t3.nombre", $search)
                 ->orLike("t1.tipo_envio", $search)
                 ->orLike("t1.peso_min", $search)
                 ->orLike("t1.peso_max", $search)
                 ->orLike("t1.precio", $search)
                 ->orLike("t1.precio_adicional", $search)
+                ->orLike("t1.margen", $search)
                 ->orLike("t3.nombre", $search)
                 ->groupEnd();
     }
@@ -163,7 +175,7 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
             ->table($this->table)
             ->select("id, proveedor_id, tipo_envio, peso_min, peso_max")
             ->where("is_deleted", 0)
-            ->where("zona_envio_id", $zona_id)
+            ->where("tarifa_envio_id", $zona_id)
             ->get()->getResultObject();
 
 
@@ -190,7 +202,7 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
             ->table($this->table)
             ->set(['deleted_at' =>  $datetime->format('Y-m-d H:i:s'),
                     'is_deleted' => $delete_flag])
-            ->where('zona_envio_id',$zona_id)
+            ->where('tarifa_envio_id',$zona_id)
             ->update();
 
         return $builder;

ci4/app/Models/Tarifas/TarifaEnvioZonaModel.php

@@ -13,12 +13,13 @@ class TarifaEnvioZonaModel extends \App\Models\GoBaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.cp_inicial",
-        1 => "t1.cp_final",
-        2 => "t1.importe_fijo",
+        0 => "t1.nombre",
+        1 => "t1.cp_inicial",
+        2 => "t1.cp_final",
+        3 => "t1.importe_fijo",
     ];
 
-    protected $allowedFields = ["tarifa_envio_id", "cp_inicial", "cp_final", "importe_fijo", "is_deleted", "deleted_at"];
+    protected $allowedFields = ["tarifa_envio_id", "nombre", "cp_inicial", "cp_final", "importe_fijo", "is_deleted", "deleted_at"];
     protected $returnType = "App\Entities\Tarifas\TarifaEnvioZonaEntity";
 
     protected $useTimestamps = true;
@@ -31,6 +32,11 @@ class TarifaEnvioZonaModel extends \App\Models\GoBaseModel
     public static $labelField = "tarifa_envio_id";
 
     protected $validationRules = [
+        "nombre" => [
+            "label" => "TarifasEnviosZonas.nombre",
+            "rules" => "trim|required|max_length[50]",
+        ],
+
         "cp_final" => [
             "label" => "TarifasEnviosZonas.cpFinal",
             "rules" => "trim|required|max_length[10]",
@@ -46,6 +52,10 @@ class TarifaEnvioZonaModel extends \App\Models\GoBaseModel
     ];
 
     protected $validationMessages = [
+        "nombre" => [
+            "max_length" => "TarifasEnviosZonas.validation.nombre.max_length",
+            "required" => "TarifasEnviosZonas.validation.nombre.required",
+        ],
         "cp_final" => [
             "max_length" => "TarifasEnviosZonas.validation.cp_final.max_length",
             "required" => "TarifasEnviosZonas.validation.cp_final.required",
@@ -93,7 +103,7 @@ class TarifaEnvioZonaModel extends \App\Models\GoBaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.id as id, t1.cp_inicial AS cp_inicial, t1.cp_final AS cp_final, t1.importe_fijo AS importe_fijo, t2.id AS tarifa_envio"
+                "t1.id as id, t1.nombre AS nombre, t1.cp_inicial AS cp_inicial, t1.cp_final AS cp_final, t1.importe_fijo AS importe_fijo, t2.id AS tarifa_envio"
             );
         $builder->join("lg_tarifas_envios t2", "t1.tarifa_envio_id = t2.id", "left");
         $builder->where("t1.tarifa_envio_id", $tarifa_envio_id);
@@ -105,9 +115,11 @@ class TarifaEnvioZonaModel extends \App\Models\GoBaseModel
             ? $builder
             : $builder
                 ->groupStart()
-                ->like("t1.cp_inicial", $search)
+                ->like("t1.nombre", $search)
+                ->orLike("t1.cp_inicial", $search)
                 ->orLike("t1.cp_final", $search)
                 ->orLike("t1.importe_fijo", $search)
+                ->orLike("t1.nombre", $search)
                 ->orLike("t1.cp_inicial", $search)
                 ->orLike("t1.cp_final", $search)
                 ->orLike("t1.importe_fijo", $search)