Avance en Servicios de acabado

ci4/app/Models/Presupuestos/PresupuestoAcabadoModel.php

@@ -14,9 +14,9 @@ class PresupuestoAcabadoModel extends \App\Models\GoBaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.nombre",
-        1 => "t1.precio",
-        2 => "t1.precio_unidad"
+        0 => "t2.nombre",
+        1 => "t1.precio_unidad",
+        2 => "t1.precio_total"
     ];
 
     protected $allowedFields = ["presupuesto_id", "tarifa_acabado_id", "nombre", "precio", "precio_unidad"];
@@ -31,38 +31,19 @@ class PresupuestoAcabadoModel extends \App\Models\GoBaseModel
     public static $labelField = "nombre";
 
     protected $validationRules = [
-        "precio" => [
-            "label" => "ClienteContactos.precio",
-            "rules" => "trim|max_length[100]",
+        "precio_total" => [
+            "label" => "Presupuestos.precioTotal",
+            "rules" => "decimal|required",
         ],
     ];
 
     protected $validationMessages = [
-        "precio" => [
-            "max_length" => "ClienteContactos.validation.apellidos.max_length",
+        "precio_total" => [
+            "decimal" => "Presupuestos.validation.decimal",
+            "requerido" => "Presupuestos.validation.decimal",
         ],
     ];
 
-    public function findAllWithClientes(string $selcols = "*", int $limit = null, int $offset = 0)
-    {
-        $sql =
-            "SELECT t1." .
-            $selcols .
-            ",  t2.nombre AS cliente_id FROM " .
-            $this->table .
-            " t1  LEFT JOIN clientes t2 ON t1.cliente_id = t2.id";
-        if (!is_null($limit) && intval($limit) > 0) {
-            $sql .= " LIMIT " . $limit;
-        }
-
-        if (!is_null($offset) && intval($offset) > 0) {
-            $sql .= " OFFSET " . $offset;
-        }
-
-        $query = $this->db->query($sql);
-        $result = $query->getResultObject();
-        return $result;
-    }
 
     /**
      * Get resource data.
@@ -76,21 +57,19 @@ class PresupuestoAcabadoModel extends \App\Models\GoBaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.id AS id, t1.cargo AS cargo, t1.nombre AS nombre, t1.apellidos AS apellidos, t1.telefono AS telefono, t1.email AS email, t1.cliente_id AS cliente_id"
+                "t1.id AS id, t1.tarifa_acabado_id AS tarifa_acabado_id, t1.precio_unidad AS precio_unidad, t1.precio_total AS precio_total, t2.nombre AS nombre"
             );
 
         $builder->where('t1.presupuesto_id', $presupuesto_id);
-        $builder->join("presupuestos t2", "t1.presupuesto_id = t2.id", "left");
+        $builder->join("lg_tarifa_acabado t2", "t1.tarifa_acabado_id = t2.id", "left");
 
         return empty($search)
             ? $builder
             : $builder
                 ->groupStart()
-                ->like("t1.nombre", $search)
-                ->orLike("t1.nombre", $search)
-                ->orLike("t1.apellidos", $search)
-                ->orLike("t1.telefono", $search)
-                ->orLike("t1.email", $search)
+                ->like("t2.nombre", $search)
+                ->orlike("t1.precio_unidad", $search)
+                ->orLike("t1.precio_total", $search)
                 ->groupEnd();
     }
 }

ci4/app/Models/Tarifas/TarifaacabadoModel.php

@@ -103,7 +103,7 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.id as id, t1.nombre AS nombre"
+                "t1.id as value, t1.nombre AS label"
             )
             ->where("t1.is_deleted", 0)
             ->where("t1.mostrar_en_presupuesto", 1);