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 preview resumen

Browse Source
This commit is contained in:
Jaime Jiménez
2024-10-16 03:45:10 +02:00
parent 2c5ea4d7ba
commit b5924dceb5
19 changed files with 1132 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ci4/app/Controllers/Clientes/Clientedirecciones.php
View File

@ -82,7 +82,7 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
$att = $reqData['att'] ?? "";
$email = $reqData['email'] ?? "";
$direccion = $reqData['direccion'] ?? "";
$pais_id = $reqData['paisId'] ?? -1;
$pais_id = $reqData['pais_id'] ?? -1;
$provincia = $reqData['provincia'] ?? "";
$municipio = $reqData['municipio'] ?? "";
$cp = $reqData['cp'] ?? "";
@ -103,11 +103,8 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
];
$response = $this->model->insert($data);
$newTokenHash = csrf_hash();
$csrfTokenName = csrf_token();
$data_ret = [
'data' => $response,
$csrfTokenName => $newTokenHash
];
return $this->respond($data_ret);
} else {
@ -140,6 +137,34 @@ class Clientedirecciones extends \App\Controllers\BaseResourceController
}
public function getSelect2()
{
if ($this->request->isAJAX()) {
$cliente_id = $this->request->getGet('cliente_id');
$query = $this->model->builder()->select(
[
"id",
"alias as name"
]
)
->where("cliente_id", $cliente_id)
->orderBy("alias", "asc");
if ($this->request->getGet("q")) {
$query->groupStart()
->orLike("clientes.nombre", $this->request->getGet("q"))
->groupEnd();
}
return $this->response->setJSON($query->get()->getResultObject());
} else {
return $this->failUnauthorized('Invalid request', 403);
}
}
public function datatable()
{
if ($this->request->isAJAX()) {

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

@ -320,7 +320,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$tipo = $reqData['tipo'];
$paginasCuadernillo = $reqData['paginasCuadernillo'] ?? null;
$papelInteriorDiferente = $reqData['papelInteriorDiferente'] ?? null;
$papelInteriorDiferente = intval($reqData['papelInteriorDiferente']) ?? null;
$isColor = intval($reqData['isColor']) ?? 0;
$isHq = intval($reqData['isHq']) ?? 0;
@ -331,16 +331,26 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$guardas = $reqData['guardas'] ?? [];
$faja = $reqData['faja'] ?? [];
$excluirRotativa = $reqData['excluirRotativa'] ?? 0;
$ivaReducido = $reqData['ivaReducido'] ?? 0;
$ivaReducido = intval($reqData['ivaReducido']) ?? 0;
$direcciones = $reqData['direcciones'] ?? [];
$tipo_impresion_id = $this->getTipoImpresion($tipo, $cubierta['tipoCubierta']);
if($papelInteriorDiferente){
$papel['negro'] = $modelPapelGenerico->getIdFromCode($interior['papelInterior']['negro']);
$papel['color'] = $modelPapelGenerico->getIdFromCode($interior['papelInterior']['color']);
$gramaje['negro'] = intval($interior['gramajeInterior']['negro']);
$gramaje['color'] = intval($interior['gramajeInterior']['color']);
}
else{
$papel = $modelPapelGenerico->getIdFromCode($interior['papelInterior']);
$gramaje = intval($interior['gramajeInterior']);
}
// Interior
$interior = [
'papel_generico' => $modelPapelGenerico->getIdFromCode($interior['papelInterior']),
'gramaje' => intval($interior['gramajeInterior']),
'papel_generico' => $papel,
'gramaje' => $gramaje,
'excluirRotativa' => $excluirRotativa == "false" ? false : true,
'paginas' => $paginas,
'paginas_color' => $paginas_color,
@ -396,7 +406,11 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
);
$return_data = $this->calcular_presupuesto($datos_presupuesto, 0, false); //TRUE FOR DEBUG
if(array_key_exists('exception', $return_data)){
return $this->failServerError(
$return_data['exception'] . ' - ' .
$return_data['file'] . ' - ' . $return_data['line']);
}
if(count($direcciones) > 1){
for ($i=0; $i<count($tirada); $i++){