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

Merge branch 'main' into add/impresion_etiquetas_envios

Browse Source
This commit is contained in:
Jaime Jiménez
2025-04-26 09:56:47 +02:00
parent 151e4a2d7a f473caf06c
commit ef173ab0fc
41 changed files with 1605 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ci4/app/Controllers/Logistica/LogisticaController.php
View File

@ -70,11 +70,11 @@ class LogisticaController extends BaseController
}
public function findPedidosNewEnvio()
public function findForNewEnvio()
{
if ($this->request->isAJAX()) {
$query = LogisticaService::findPedidosNewEnvio();
$query = LogisticaService::findForNewEnvio();
if ($this->request->getGet("q")) {
$query->groupStart()
->orLike("id", $this->request->getGet("q"))
@ -109,21 +109,6 @@ class LogisticaController extends BaseController
public function searchPedidoOrISBN($search = "", $envio_id = null)
{
if (empty($search)) {
$result = [
'status' => false,
'message' => lang('Logistica.errors.noDataToFind'),
];
return $this->response->setJSON($result);
}
$result = LogisticaService::findPedidoOrISBN($search);
return $this->response->setJSON($result);
}
public function generarEnvio()
{
if ($this->request->isAJAX()) {
@ -191,9 +176,18 @@ class LogisticaController extends BaseController
public function datatable_envios()
{
$otsFilter = $this->request->getGetPost('otsFilter');
$model = model('App\Models\Logistica\EnvioModel');
$q = $model->getDatatableQuery();
if (!empty($otsFilter)) {
$q->groupStart();
$q->like('t5.id', $otsFilter);
$q->groupEnd();
}
$result = DataTable::of($q)
->edit(