From 01eff4f3238277474df6a61a972333496b30e8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= <jaimejimenezortega@gmail.com>
Date: Thu, 16 May 2024 18:39:59 +0200
Subject: [PATCH] medio arreglado

---
 .../Tarifas/Tarifaencuadernacionlineas.php        | 14 +++++++++++++-
 .../Tarifas/TarifaEncuadernacionLineaModel.php    | 15 ++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
index 4b104456..60545c9d 100755
--- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
@@ -351,13 +351,25 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
                 $start = $reqData['start'] ?? 0;
                 $length = $reqData['length'] ?? 5;
                 $search = $reqData['search']['value'];
+
                 $requestedOrder = $reqData['order']['0']['column'] ?? 0;
                 $order = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
                 $dir = $reqData['order']['0']['dir'] ?? 'asc';
 
+                $requestedOrder1 = $reqData['order']['0']['column'] ?? 0;
+                $order1 = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder1 >= 0 ? $requestedOrder1 : 0];
+                $dir1 = $reqData['order']['1']['dir'] ?? 'asc';
+                $requestedOrder2 = $reqData['order']['1']['column'] ?? 0;
+                $order2 = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : 0];
+                $dir2 = $reqData['order']['1']['dir'] ?? 'asc';
+                $requestedOrder3 = $reqData['order']['2']['column'] ?? 0;
+                $order3 = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : 0];
+                $dir3 = $reqData['order']['2']['dir'] ?? 'asc';
+
                 $id_TE = $reqData['tirada_id'] ?? -1;
 
-                $resourceData = $this->model->getResource("", $id_TE)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+                $resourceData = $this->model->getResource("", $id_TE)->
+                    orderBy($order1, $dir1)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->limit($length, $start)->get()->getResultObject();
 
                 return $this->respond(Collection::datatable(
                     $resourceData,
diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
index 14365cdb..ff1f71d1 100755
--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
@@ -13,12 +13,13 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
     protected $useAutoIncrement = true;
 
     const SORTABLE = [
-        0 => "t1.dimensiones_id",
-        1 => "t1.paginas_libro_min",
-        2 => "t1.paginas_libro_max",
-        3 => "t1.precio_min",
-        4 => "t1.precio_max",
-    ];
+        0 => "t1.id",
+        1 => "t1.dimensiones_id",
+        2 => "t1.paginas_libro_min",
+        3 => "t1.paginas_libro_max",
+        4 => "t1.precio_min",
+        5 => "t1.precio_max",
+    ]; 
 
     protected $allowedFields = [
         "tirada_encuadernacion_id",
@@ -119,7 +120,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
             ->table($this->table . " t1")
             ->select(
                 "t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_id, t1.paginas_libro_min AS paginas_libro_min, t1.paginas_libro_max AS paginas_libro_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.tirada_min AS tirada_min, 
-                t1.tirada_max AS tirada_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion, t3.id AS dimensiones_id, t3.ancho_min, t3.ancho_max, , t3.alto_min, t3.alto_max"
+                t1.tirada_max AS tirada_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion, t3.id AS dimensiones_id, t3.ancho_min, t3.ancho_max, , t3.alto_min, t3.alto_max, t3.descripcion as descripcion"
             );
         //JJO
         $builder->where('tirada_encuadernacion_id', $tirada_encuadernacion_id);