Merge branch 'main' into 'dev/chat'

Main

See merge request jjimenez/safekat!305

ci4/app/Models/Clientes/ClienteModel.php

@@ -257,7 +257,7 @@ class ClienteModel extends \App\Models\BaseModel
             LEFT JOIN lg_paises t4 ON t1.pais_id = t4.id 
             LEFT JOIN users t5 ON t1.comercial_id = t5.id 
             LEFT JOIN users t6 ON t1.soporte_id = t6.id 
-            LEFT JOIN lg_formas_pago t7 ON t1.forma_pago_id = t7.id";
+            LEFT JOIN formas_pago t7 ON t1.forma_pago_id = t7.id";
         if (!is_null($limit) && intval($limit) > 0) {
             $sql .= " LIMIT " . intval($limit);
         }
@@ -287,7 +287,7 @@ class ClienteModel extends \App\Models\BaseModel
             )
             ->where("is_deleted", 0);;
         $builder->join("users t5", "t1.comercial_id = t5.id", "left");
-        $builder->join("lg_formas_pago t7", "t1.forma_pago_id = t7.id", "left");
+        $builder->join("formas_pago t7", "t1.forma_pago_id = t7.id", "left");
 
 
         return empty($search)

ci4/app/Models/Collection.php

@@ -15,7 +15,7 @@ class Collection
      *
      * @return array
      */
-    public static function datatable(array $data, int $recordsTotal, int $recordsFiltered, string $error = null)
+    public static function datatable(array $data, int $recordsTotal, int $recordsFiltered, string $error = null, $extra_data = [])
     {
         $draw = 1;
         $req = service('request');
@@ -38,6 +38,10 @@ class Collection
             $response['error'] = $error;
         }
 
+        if (count($extra_data)>0) {
+            $response['extra'] = $extra_data;
+        }
+
         return $response;
     }
 }

ci4/app/Models/Configuracion/FormaPagoModel.php

@@ -15,8 +15,6 @@ class FormaPagoModel extends \App\Models\BaseModel
     const SORTABLE = [
         1 => "t1.id",
         2 => "t1.nombre",
-        3 => "t1.created_at",
-        4 => "t1.updated_at",
     ];
 
     protected $allowedFields = ["nombre"];
@@ -26,15 +24,15 @@ class FormaPagoModel extends \App\Models\BaseModel
 
     protected $validationRules = [
         "nombre" => [
-            "label" => "FormasPagoes.nombre",
+            "label" => "FormasPago.nombre",
             "rules" => "trim|required|max_length[255]",
         ],
     ];
 
     protected $validationMessages = [
         "nombre" => [
-            "max_length" => "FormasPagoes.validation.nombre.max_length",
-            "required" => "FormasPagoes.validation.nombre.required",
+            "max_length" => "FormasPago.validation.nombre.max_length",
+            "required" => "FormasPago.validation.nombre.required",
         ],
     ];
 
@@ -61,7 +59,7 @@ class FormaPagoModel extends \App\Models\BaseModel
     {
         $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");
+            ->select("t1.id AS id, t1.nombre AS nombre");
 
         return empty($search)
             ? $builder
@@ -69,12 +67,6 @@ class FormaPagoModel extends \App\Models\BaseModel
                 ->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();
     }
 }

ci4/app/Models/Facturas/FacturaLineaModel.php

@@ -40,10 +40,14 @@ class FacturaLineaModel extends \App\Models\BaseModel {
                 t1.pedido_linea_impresion_id AS pedido_linea_impresion_id, t1.pedido_maquetacion_id AS pedido_maquetacion_id, 
                 t1.descripcion AS descripcion, t1.cantidad as cantidad, t1.precio_unidad AS precio_unidad, t1.iva AS iva,
                 t1.base AS base, t1.total_iva AS total_iva, t1.total AS total, t1.data AS data, t2.pedido_id AS pedido_id,
-                t3.total_aceptado AS total_aceptado"
+                t3.total_aceptado AS total_aceptado, t4.tirada_flexible AS tirada_flexible, t4.descuento_tirada_flexible AS descuento_tirada_flexible,
+                t6.cantidad AS cantidad_albaran"
             )
             ->join("pedidos_linea t2", "t2.id = t1.pedido_linea_impresion_id", "left")
             ->join("presupuestos t3", "t3.id = t2.presupuesto_id", "left")
+            ->join("clientes t4", "t4.id = t3.cliente_id", "left")
+            ->join("albaranes t5", "t5.pedido_id = t2.pedido_id", "left")
+            ->join("albaranes_lineas t6", "t6.albaran_id = t5.id", "left")
             ->where("t1.factura_id", $factura_id)
             ->where("t1.deleted_at", null);
 

ci4/app/Models/Pedidos/PedidoLineaModel.php

@@ -14,12 +14,20 @@ class PedidoLineaModel extends \App\Models\BaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.id",
-        1 => "t1.estado",
-        2 => "t1.total_precio",
-        3 => "t1.total_tirada",
+        0 => "t2.id",
+        1 => "t2.updated_at",
+        2 => "t2.fecha_entrega_real",
+        3 => "t4.nombre",
+        4 => "CONCAT(t5.first_name, ' ', t5.last_name)",
+        5 => "t3.titulo",
+        6 => "t6.nombre",
+        7 => "t3.inc_rei",
+        8 => "t3.paginas",
+        9 => "t3.tirada",
+        10 => "t3.total_aceptado",
+        11 => "t2.estado"
     ];
-
+    
     protected $allowedFields = [
         "pedido_id", 
         "presupuesto_id", 
@@ -40,7 +48,7 @@ class PedidoLineaModel extends \App\Models\BaseModel
     public static $labelField = "id";
 
     
-    public function getResource(string $search = "", $estado="")
+    public function getResource($search = [], $estado="")
     {
         $builder = $this->db
             ->table($this->table . " t1")
@@ -67,16 +75,112 @@ class PedidoLineaModel extends \App\Models\BaseModel
             }
         }
 
-        // Falta implementar la busqueda por grupos
-        return empty($search)
-            ? $builder
-            : $builder
-                ->groupStart()
-                ->like("t1.id", $search)
-                ->orLike("t1.id", $search)
-                ->groupEnd();
+        if (empty($search))
+            return $builder;
+        else {
+            $builder->groupStart();
+            foreach ($search as $col_search) {
+                if ($col_search[0] != 1 && $col_search[0] != 2)
+                    $builder->like(self::SORTABLE[$col_search[0]], $col_search[2]);
+                else {
+                    $dates = explode(" ", $col_search[2]);
+                    $builder->where(self::SORTABLE[$col_search[0]] . ">=", $dates[0]);
+                    $builder->where(self::SORTABLE[$col_search[0]] . "<=", $dates[1]);
+                }
+            }
+            $builder->groupEnd();
+            return $builder;
+        }
     }
 
+    public function getSumOfTirada(array $search, $estado = '', $start = 0, $length = 5)
+    {
+
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->selectSum('t3.tirada', 'total_tirada');
+            
+        $builder->join("pedidos t2", "t2.id = t1.pedido_id", "left");        
+        $builder->join("presupuestos t3", "t1.presupuesto_id = t3.id", "left");    
+        
+            
+
+        // Aplica los filtros de búsqueda y estado
+        if (!empty($search)) {
+            $builder->groupStart();
+            foreach ($search as $col_search) {
+                if ($col_search[0] != 1 && $col_search[0] != 2)
+                    $builder->like(self::SORTABLE[$col_search[0]], $col_search[2]);
+                else {
+                    $dates = explode(" ", $col_search[2]);
+                    $builder->where(self::SORTABLE[$col_search[0]] . ">=", $dates[0]);
+                    $builder->where(self::SORTABLE[$col_search[0]] . "<=", $dates[1]);
+                }
+            }
+            $builder->groupEnd();
+        }
+
+        if ($estado !== '') {
+            $builder->where('estado', $estado);
+        }
+
+        // Aplicar el orden y el límite
+        $builder->limit($length, $start);
+
+        return $builder->get()->getRow()->total_tirada;
+    }
+
+    public function getSumOfTotalAceptado(array $search, $estado = '', $start = 0, $length = 5)
+    {
+
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->selectSum('t3.total_aceptado', 'total');
+            
+        $builder->join("pedidos t2", "t2.id = t1.pedido_id", "left");        
+        $builder->join("presupuestos t3", "t1.presupuesto_id = t3.id", "left");    
+        
+            
+
+        // Aplica los filtros de búsqueda y estado
+        if (!empty($search)) {
+            $builder->groupStart();
+            foreach ($search as $col_search) {
+                if ($col_search[0] != 1 && $col_search[0] != 2)
+                    $builder->like(self::SORTABLE[$col_search[0]], $col_search[2]);
+                else {
+                    $dates = explode(" ", $col_search[2]);
+                    $builder->where(self::SORTABLE[$col_search[0]] . ">=", $dates[0]);
+                    $builder->where(self::SORTABLE[$col_search[0]] . "<=", $dates[1]);
+                }
+            }
+            $builder->groupEnd();
+        }
+
+        if ($estado !== '') {
+            $builder->where('estado', $estado);
+        }
+
+        // Aplicar el orden y el límite
+        $builder
+                ->limit($length, $start);
+
+        return $builder->get()->getRow()->total;
+    }
+
+    public function getTotalOfTotalAceptado()
+    {
+
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->selectSum('t3.total_aceptado', 'total');
+            
+        $builder->join("pedidos t2", "t2.id = t1.pedido_id", "left");        
+        $builder->join("presupuestos t3", "t1.presupuesto_id = t3.id", "left");    
+        
+        
+        return $builder->get()->getRow()->total;
+    }
 
     public function obtenerLineasPedidoSinFacturar($cliente_id) {
         $resultaArray = [];

ci4/app/Models/Presupuestos/PresupuestoModel.php

@@ -215,7 +215,7 @@ class PresupuestoModel extends \App\Models\BaseModel
             ",  t2.nombre AS cliente,  t3.nombre AS forma_pago,  t4.nombre AS tipo_impresion,  t5.nombre AS tipologia,  t6.nombre AS pais,  t7.estado AS estado,  t8.id AS papel_formato,  t9.first_name AS total_confirmado_user,  t10.first_name AS aprobado_user FROM " .
             $this->table .
             " t1 LEFT JOIN clientes 
-            t2 ON t1.cliente_id = t2.id LEFT JOIN lg_formas_pago 
+            t2 ON t1.cliente_id = t2.id LEFT JOIN formas_pago 
             t3 ON t1.forma_pago_id = t3.id LEFT JOIN lg_tipos_impresion 
             t4 ON t1.tipo_impresion_id = t4.id LEFT JOIN lg_tipologias_libros 
             t5 ON t1.tipologia_id = t5.id LEFT JOIN lg_paises