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

terminado tarifas envio

Browse Source
This commit is contained in:
Jaime Jimenez
2023-08-31 11:21:04 +02:00
parent 227441583f
commit 370fd7289f
11 changed files with 178 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ci4/app/Controllers/Tarifas/Tarifasenvios.php
View File

@ -191,12 +191,12 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
$tarifaEnvioEntity->fill($sanitizedData);
$thenRedirect = true;
$thenRedirect = false;
endif;
if ($noException && $successfulResult) :
$id = $tarifaEnvioEntity->id ?? $id;
$message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('TarifasEnvios.tarifaEnvio'))]).'.';
$message .= anchor( "admin/tarifasenvios/{$id}/edit" , lang('Basic.global.continueEditing').'?');
//$message .= anchor( "admin/tarifasenvios/{$id}/edit" , lang('Basic.global.continueEditing').'?');
$message = ucfirst(str_replace("'", "\'", $message));
if ($thenRedirect) :
@ -215,7 +215,7 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
$this->viewData['tarifaEnvioEntity'] = $tarifaEnvioEntity;
$this->viewData['paisList'] = $this->getPaisListItems();
$this->viewData['formAction'] = route_to('updateTarifaEnvio', $id);
$this->viewData['formAction'] = route_to('updateTarifaEnvio', $id);
$this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('TarifasEnvios.moduleTitle').' '.lang('Basic.global.edit3');
@ -238,8 +238,8 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
$start = $reqData['start'] ?? 0;
$length = $reqData['length'] ?? 5;
$search = $reqData['search']['value'];
$requestedOrder = $reqData['order']['0']['column'] ?? 1;
$order = TarifaEnvioModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
$requestedOrder = $reqData['order']['0']['column'] ?? 0;
$order = TarifaEnvioModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();

18
ci4/app/Controllers/Tarifas/Tarifasenvioserecios.php → ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
View File

@ -17,7 +17,7 @@ use
DataTables\Editor,
DataTables\Editor\Field;
class Tarifasenvioserecios extends \App\Controllers\GoBaseResourceController {
class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
protected $modelName = TarifaEnvioPrecioModel::class;
protected $format = 'json';
@ -268,7 +268,15 @@ class Tarifasenvioserecios extends \App\Controllers\GoBaseResourceController {
foreach ($data['data'] as $pkey => $values) {
// Si no se quiere borrar...
if ($data['data'][$pkey]['is_deleted'] != 1) {
/*Los CP son string... consultar si checkear*/
$process_data['peso_min'] = $data['data'][$pkey]['peso_min'];
$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']);
// No se pueden duplicar valores al crear o al editar
if (!empty($response)) {
return $response;
}
}
}
}
@ -325,12 +333,14 @@ class Tarifasenvioserecios extends \App\Controllers\GoBaseResourceController {
$order = TarifaEnvioPrecioModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$zona_envio_id = $reqData['zona_envio_id'] ?? -1;
$resourceData = $this->model->getResource($search, $zona_envio_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource($search)->countAllResults()
$this->model->getResource($search, $zona_envio_id)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);

44
ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
View File

@ -10,6 +10,7 @@ use App\Entities\Tarifas\TarifaEnvioZonaEntity;
use App\Models\Tarifas\TarifaEnvioModel;
use App\Models\Tarifas\TarifaEnvioZonaModel;
use App\Models\Tarifas\TarifaEnvioPrecioModel;
use
DataTables\Editor,
@ -208,6 +209,43 @@ class Tarifasenvioszonas extends \App\Controllers\GoBaseResourceController {
} // end function edit(...)
public function delete($id = null)
{
if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
$objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc));
} else {
$objName = lang('Basic.global.record');
}
if (!$this->soft_delete){
if (!$this->model->delete($id)) {
return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
}
}
else{
$datetime = (new \CodeIgniter\I18n\Time("now"));
$precioModel = new TarifaEnvioPrecioModel();
$precioResult = $precioModel->removeAllPrecioLineas($id, $datetime, $this->delete_flag);
$rawResult = $this->model->where('id',$id)
->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'),
'is_deleted' => $this->delete_flag])
->update();
if (!$rawResult && !$precioResult) {
return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
}
}
// $message = lang('Basic.global.deleteSuccess', [$objName]); IMN commented
$message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]);
$response = $this->respondDeleted(['id' => $id, 'msg' => $message]);
return $response;
}
public function datatable_editor()
{
if ($this->request->isAJAX()) {
@ -308,12 +346,14 @@ class Tarifasenvioszonas extends \App\Controllers\GoBaseResourceController {
$order = TarifaEnvioZonaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$tarifa_envio_id = $reqData['tarifa_envio_id'] ?? -1;
$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)->countAllResults()
$this->model->getResource($search, $tarifa_envio_id)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);