Merge branch 'bug/presupuesto_cliente' into 'dev/añadir_palets_cajas'

Bug/presupuesto cliente

See merge request jjimenez/safekat!246
This commit is contained in:
2024-05-17 09:27:48 +00:00
2 changed files with 21 additions and 8 deletions

View File

@ -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,