jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cambiado el obtener la lista a pedidos_linea

Browse Source
This commit is contained in:
Jaime Jiménez
2024-06-11 11:11:02 +02:00
parent 3f876a0b81
commit e491172b28
3 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ci4/app/Controllers/Pedidos/Pedido.php
View File

@ -92,7 +92,7 @@ class Pedido extends \App\Controllers\BaseResourceController
endif;
$this->obtenerDatosFormulario($pedidoEntity);
$this->viewData['pedidoEntity'] = $pedidoEntity;
$this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Pedidos.moduleTitle') . ' ' . lang('Basic.global.edit3');
@ -117,12 +117,13 @@ class Pedido extends \App\Controllers\BaseResourceController
$order = PedidoModel::SORTABLE_TODOS[$requestedOrder >= 0 ? $requestedOrder : 0];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$model_linea = model('\App\Models\Pedidos\PedidoLineaModel');
$resourceData = $model_linea->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource($search)->countAllResults()
$model_linea->getResource()->countAllResults(),
$model_linea->getResource($search)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);

32
ci4/app/Models/Pedidos/PedidoLineaModel.php
View File

@ -39,4 +39,36 @@ class PedidoLineaModel extends \App\Models\BaseModel
public static $labelField = "id";
public function getResource(string $search = "", $estado="")
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t2.id AS id, t2.updated_at AS fecha, t2.fecha_entrega_real AS fecha_entrega,
t4.nombre AS cliente, CONCAT(t5.first_name, ' ', t5.last_name) AS comercial,
t3.titulo AS titulo, t6.nombre AS ubicacion, t3.inc_rei AS inc_rei,
t3.paginas AS paginas, t3.tirada AS tirada, t3.total_aceptado AS total_presupuesto,
t2.estado AS estado"
);
$builder->join("pedidos t2", "t2.id = t1.pedido_id", "left");
$builder->join("presupuestos t3", "t1.presupuesto_id = t3.id", "left");
$builder->join("clientes t4", "t4.id = t3.cliente_id", "left");
$builder->join("users t5", "t5.id = t4.comercial_id", "left");
$builder->join("ubicaciones t6", "t6.id = t1.ubicacion_id", "left");
if($estado != "") {
$builder->where("t1.estado", $estado);
}
// Falta implementar la busqueda por grupos
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.id", $search)
->orLike("t1.id", $search)
->groupEnd();
}
}

31
ci4/app/Models/Pedidos/PedidoModel.php
View File

@ -53,35 +53,4 @@ class PedidoModel extends \App\Models\BaseModel
public static $labelField = "id";
public function getResource(string $search = "", $estado="")
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.updated_at AS fecha, t1.fecha_entrega_real AS fecha_entrega,
t4.nombre AS cliente, CONCAT(t5.first_name, ' ', t5.last_name) AS comercial,
t3.titulo AS titulo, t6.nombre AS ubicacion, t3.inc_rei AS inc_rei,
t3.paginas AS paginas, t3.tirada AS tirada, t3.total_aceptado AS total_presupuesto,
t1.estado AS estado"
);
$builder->join("pedidos_linea t2", "t1.id = t2.pedido_id", "left");
$builder->join("presupuestos t3", "t2.presupuesto_id = t3.id", "left");
$builder->join("clientes t4", "t4.id = t3.cliente_id", "left");
$builder->join("users t5", "t5.id = t4.comercial_id", "left");
$builder->join("ubicaciones t6", "t6.id = t2.ubicacion_id", "left");
if($estado != "") {
$builder->where("t1.estado", $estado);
}
// Falta implementar la busqueda por grupos
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.id", $search)
->orLike("t1.id", $search)
->groupEnd();
}
}