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

terminada revision de pedidos

Browse Source
This commit is contained in:
Jaime Jiménez
2025-03-28 00:52:49 +01:00
parent 0e91105f68
commit 33ce64df0f
20 changed files with 960 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class Pedido extends \App\Controllers\BaseResourceController
'pedidoEntity' => new PedidoEntity(),
'usingServerSideDataTable' => true,
'pageTitle' => lang('Pedidos.Pedidos'),
'estadoPedidos' => 'activo',
'estadoPedidos' => 'produccion',
['title' => lang("App.menu_pedidos"), 'route' => site_url('pedidos/todos'), 'active' => true]
];
@ -112,6 +112,32 @@ class Pedido extends \App\Controllers\BaseResourceController
return view(static::$viewPath . 'viewPedidosList', $viewData);
}
public function validacion()
{
$viewData = [
'currentModule' => static::$controllerSlug,
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Pedidos.pedido')]),
'pedidoEntity' => new PedidoEntity(),
'usingServerSideDataTable' => true,
'pageTitle' => lang('Pedidos.Pedidos'),
'estadoPedidos' => 'validacion',
['title' => lang("App.menu_pedidos"), 'route' => site_url('pedidos/todos'), 'active' => true]
];
if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
// Se obtiene el cliente ID a partir del usuario de la sesion
$model_user = model('App\Models\Usuarios\UserModel');
$user = $model_user->find(auth()->user()->id);
$clienteId = $user->cliente_id;
} else {
$clienteId = -1;
}
$viewData['cliente_id'] = $clienteId;
return view(static::$viewPath . 'viewPedidosList', $viewData);
}
public function cancelados()
{
$viewData = [
@ -283,6 +309,12 @@ class Pedido extends \App\Controllers\BaseResourceController
$pendiente = $pendiente[0] + $pendiente[1];
$this->viewData['importePendiente'] = $pendiente;
}
$modelOrden = new \App\Models\OrdenTrabajo\OrdenTrabajoModel();
$orden = $modelOrden->where('pedido_id', $pedidoEntity->id)->first();
if($orden){
$this->viewData['orden_id'] = $orden->id;
}
$this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Pedidos.moduleTitle') . ' ' . lang('Basic.global.edit3');
@ -317,23 +349,22 @@ class Pedido extends \App\Controllers\BaseResourceController
$resourceData = $model_linea->getResource($searchValues, $estado, $cliente_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$totalTirada = $model_linea->getSumOfTirada($searchValues, $estado, $cliente_id, $start, $length);
$total = $model_linea->getSumOfTotalAceptado($searchValues, $estado, $cliente_id, $start, $length);
$extra_data['total_tirada'] = $totalTirada;
$extra_data['total'] = $total;
$total2 = 0;
if($showTotal){
$total2 = $model_linea->getTotalOfTotalAceptado();
$total2 = $model_linea->getTotalOfTotalAceptado($estado);
$tirada2 = $model_linea->getTotalTirada($estado);
$extra_data['total2'] = $total2;
$extra_data['total_tirada2'] = $tirada2;
}
if($total2 != 0){
$total = "" . $total . " \n(" . $total2 . ")";
}
return $this->respond(Collection::datatable(
$resourceData,
$model_linea->getResource("", $estado)->countAllResults(),
$model_linea->getResource($searchValues, $estado)->countAllResults(),
"",
[
'total_tirada' => $totalTirada,
'total' => $total
]
$extra_data
));
} else {
return $this->failUnauthorized('Invalid request', 403);