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

realizado los cambios en los selects

Browse Source
This commit is contained in:
Jaime Jiménez
2024-12-14 10:36:51 +01:00
parent 4b4c320e04
commit b4de7978cc
6 changed files with 100 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
ci4/app/Controllers/Presupuestos/Presupuestoacabados.php
View File

@ -1,4 +1,5 @@
<?php namespace App\Controllers\Presupuestos;
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseResourceController;
@ -9,7 +10,7 @@ use App\Models\Collection;
use App\Models\Presupuestos\PresupuestoAcabadosModel;
class Presupuestoacabados extends \App\Controllers\BaseResourceController
{
@ -37,19 +38,18 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
public function edit($requestedId = null)
{
if ($requestedId == null) :
if ($requestedId == null):
return;
endif;
$postData = $this->request->getJSON();
if(count($postData->datos)>0){
if (count($postData->datos) > 0) {
$this->model->deleteServiciosNotInArray($requestedId, $postData->datos);
}
else{
} else {
$this->model->deleteAllServicios($requestedId);
}
if(count($postData->datos)>0){
if (count($postData->datos) > 0) {
$this->model->updateTarifas($requestedId, $postData->datos);
}
@ -58,14 +58,14 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
$data = [
$csrfTokenName => $newTokenHash
];
return $this->respond($data);
}
public function update($requestedId = null)
{
if ($requestedId == null) :
if ($requestedId == null):
return;
endif;
@ -75,20 +75,20 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
$POD = $postData->POD ?? 0;
$result = [];
if(count($tarifas)>0){
foreach ($tarifas as $tarifa){
if (count($tarifas) > 0) {
foreach ($tarifas as $tarifa) {
$values = $this->model->getPrecioTarifa($tarifa, $tirada, $POD);
array_push($result, $values);
}
}
$newTokenHash = csrf_hash();
$csrfTokenName = csrf_token();
$data = [
'lines' => $result,
$csrfTokenName => $newTokenHash
];
return $this->respond($data);
}
@ -101,7 +101,7 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
$tirada = $reqData['tirada'] ?? 0;
$proveedor_id = $reqData['proveedor_id'] ?? -1;
$POD = $reqData['POD'] ?? 0;
$newTokenHash = csrf_hash();
$csrfTokenName = csrf_token();
@ -119,17 +119,59 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
}
}
public function getAcabados()
{
if ($this->request->isAJAX()) {
$cubierta = $this->request->getGet("cubierta") ?? 0;
$sobrecubierta = $this->request->getGet("sobrecubierta") ?? 0;
$model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel');
$query = $model->builder()->select(
[
"id",
"nombre as name"
]
)
->where("lg_tarifa_acabado.is_deleted", 0)
->where("lg_tarifa_acabado.mostrar_en_presupuesto", 1);
if($cubierta == 1){
$query->where("lg_tarifa_acabado.acabado_cubierta", 1);
}
else if ($sobrecubierta == 1){
$query->where("lg_tarifa_acabado.acabado_sobrecubierta", 1);
}
if ($this->request->getGet("q")) {
$query->groupStart()
->orLike("lg_tarifa_acabado.nombre", $this->request->getGet("q"))
->groupEnd();
}
$items = $query->get()->getResultObject();
// add a custom item at the beginning
$customItem = new \stdClass;
$customItem->id = 0;
$customItem->name = "Ninguno";
array_unshift($items, $customItem);
return $this->response->setJSON($items);
} else {
return $this->failUnauthorized('Invalid request', 403);
}
}
public function menuItems()
{
if ($this->request->isAJAX()) {
$reqData = $this->request->getPost();
try{
try {
$tarifa_id = $reqData['tarifa_id'] ?? -1;
$tirada = $reqData['tirada'] ?? 0;
$newTokenHash = csrf_hash();
$csrfTokenName = csrf_token();
@ -140,17 +182,15 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController
$csrfTokenName => $newTokenHash
];
}
catch(Exception $e){
} catch (Exception $e) {
$data = [
'error' => $e,
$csrfTokenName => $newTokenHash
];
}
finally{
} finally {
return $this->respond($data);
}
} else {
return $this->failUnauthorized('Invalid request', 403);
}

16
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -2278,22 +2278,6 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
return $data;
}
protected function getAcabadosCubierta()
{
$model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel');
$data = $model->getServiciosAcabadoCubierta();
array_unshift($data, (object) ['id' => '', 'label' => lang('Basic.global.None')]);
return $data;
}
protected function getAcabadosSobrecubierta()
{
$model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel');
$data = $model->getServiciosAcabadoSobrecubierta();
array_unshift($data, (object) ['id' => '', 'label' => lang('Basic.global.None')]);
return $data;
}
protected function getClienteListItems($selId = null)
{
$data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Clientes.cliente'))])];