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 rellenar presupuesto

Browse Source
This commit is contained in:
Jaime Jiménez
2023-12-19 15:15:08 +01:00
parent 19d3cdd163
commit 9e97329abf
12 changed files with 213 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php
View File

@ -38,29 +38,43 @@ class Presupuestodirecciones extends \App\Controllers\GoBaseResourceController
{
if ($this->request->isAJAX()) {
$reqData = $this->request->getPost();
if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
$errstr = 'No data available in response to this specific request.';
$response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
return $response;
if( is_null($reqData['tipo']?? null)){
if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
$errstr = 'No data available in response to this specific request.';
$response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
return $response;
}
$start = $reqData['start'] ?? 0;
$length = 30;
$search = $reqData['search']['value'];
$requestedOrder = $reqData['order']['0']['column'] ?? 1;
$order = PresupuestoDireccionesModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$id_P = $reqData['presupuesto_id'] ?? -1;
$resourceData = $this->model->getResource($search, $id_P)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource("", $id_P)->countAllResults()
));
}
$start = $reqData['start'] ?? 0;
$length = 30;
$search = $reqData['search']['value'];
$requestedOrder = $reqData['order']['0']['column'] ?? 1;
$order = PresupuestoDireccionesModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
else if($reqData['tipo']=='get_tarifa'){
$peso = $reqData['peso'] ?? 0;
$paisId = $reqData['paisId'] ?? 0;
$cp = $reqData['cp'] ?? 0;
$tipo_envio = $reqData['tipo_envio'] ?? null;
$id_P = $reqData['presupuesto_id'] ?? -1;
$model = model('App\Models\Tarifas\TarifaEnvioModel');
return $this->respond($model->getTarifaEnvio($paisId, $cp, $peso, $tipo_envio));
}
$resourceData = $this->model->getResource($search, $id_P)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource("", $id_P)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);
}

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

@ -239,7 +239,14 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
->validator('Validate::numeric', array(
'message' => lang('TarifasEnviosPrecios.validation.peso_max.decimal'))
),
Field::inst('precio')
Field::inst('precio_min')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.precio.required'))
)
->validator('Validate::numeric', array(
'message' => lang('TarifasEnviosPrecios.validation.precio.decimal'))
),
Field::inst('precio_max')
->validator('Validate::required', array(
'message' => lang('TarifasEnviosPrecios.validation.precio.required'))
)

4
ci4/app/Controllers/Test.php
View File

@ -17,9 +17,9 @@ class Test extends BaseController
public function index()
{
$model = model('App\Models\Clientes\ClienteDireccionesModel');
$model = model('App\Models\Tarifas\TarifaEnvioPrecioModel');
echo '<pre>';
var_dump($model->getDireccion(1));
var_dump($model->getEnvioPrecio(2, 1.5, "cajas"));
echo '</pre>';
}