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

falta botones exportar, etc

Browse Source
This commit is contained in:
Jaime Jimenez
2023-09-04 09:05:48 +02:00
parent 56b233af1f
commit 289d89851b
11 changed files with 112 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
View File

@ -253,7 +253,7 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
->validator('Validate::numeric', array(
'message' => lang('TarifasEnviosPrecios.validation.precio_adicional.decimal'))
),
Field::inst('zona_envio_id'),
Field::inst('tarifa_envio_id'),
Field::inst('proveedor_id'),
Field::inst('user_created_id'),
Field::inst('created_at'),
@ -272,7 +272,7 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
$process_data['peso_max'] = $data['data'][$pkey]['peso_max'];
$process_data['proveedor_id'] = $data['data'][$pkey]['proveedor_id'];
$process_data['tipo_envio'] = $data['data'][$pkey]['tipo_envio'];
$response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['zona_envio_id']);
$response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['tarifa_envio_id']);
// No se pueden duplicar valores al crear o al editar
if (!empty($response)) {
return $response;
@ -333,14 +333,14 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
$order = TarifaEnvioPrecioModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$zona_envio_id = $reqData['zona_envio_id'] ?? -1;
$tarifa_envio_id = $reqData['tarifa_envio_id'] ?? -1;
$resourceData = $this->model->getResource($search, $zona_envio_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$resourceData = $this->model->getResource($search, $tarifa_envio_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource($search, $zona_envio_id)->countAllResults()
$this->model->getResource($search, $tarifa_envio_id)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);
@ -427,7 +427,6 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
protected function getTipoEnvioOptions() {
$tipoEnvioOptions = [
'' => lang('Basic.global.pleaseSelect'),
'a domicilio' => 'a domicilio',
'cajas' => 'cajas',
'palets' => 'palets',
];