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

cambios realizados y bug direcciones corregidos

Browse Source
This commit is contained in:
Jaime Jiménez ORtega
2024-05-10 17:59:54 +02:00
parent bba9dab9ba
commit 782c0e7c88
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
ci4/.env
.vscode/
xdebug.log
./xdebug.log

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

@ -1004,7 +1004,8 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$coste = $tarifa_final->precio;
}
else{
$coste = $tarifas_envio[0]->precio;
if(count($tarifas_envio) > 0)
$coste = $tarifas_envio[0]->precio;
}

8
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/_resumenItems.php
View File

@ -22,12 +22,12 @@
<p class="mb-3"><small id="resumenAcabadoCubierta">Acabado: Ninguno</small></p>
<h5 class="mb-1 resumen-sobrecubierta">Sobrecubierta</h5>
<p class="mb-0 resumen-sobrecubierta"><small id="resumenPapelSobrecubierta">Papel: Blanco Offset 70gr/m<sup>2</sup></small></p>
<p class="mb-0 resumen-sobrecubierta"><small id="resumenPapelSobrecubierta">Papel: Blanco Offset 70gr/m²</small></p>
<p class="mb-0 resumen-sobrecubierta"><small id="resumenSolapasCubierta">Ancho solapas: 25mm</small></p>
<p class="mb-3 resumen-sobrecubierta"><small id="resumenAcabadoCubierta">Acabado: Ninguno</small></p>
<h5 class="mb-1 resumen-guardas">Guardas</h5>
<p class="mb-0 resumen-guardas"><small id="resumenGuardasPapel">Papel: Blanco Offset 70gr/m<sup>2</sup></small></p>
<p class="mb-0 resumen-guardas"><small id="resumenGuardasPapel">Papel: Blanco Offset 70gr/m²</small></p>
<p class="mb-3 resumen-guardas"><small id="resumenGuardasCaras">Impresión: 1 cara</small></p>
<h5 class="mb-1 resumen-extras">Extras</h5>
@ -37,10 +37,8 @@
</div>
<div class="col-sm-6">
<h4 id="resumenTotal" class="mb-1">Total: 100€</h4>
<h4 id="resumenTotalIVA" class="mb-1">Total: 100€</h4>
<h6 id="resumenPrecioU" class="mb-0">10.4€/ud</h6>
<h6 id="resumenTotalIVA"class="mb-0">Coste impresion (4% IVA): 104€</h6>
<h6 id="resumenEnvio" class="mb-1">Envío: 30€</h6>
</div>
</div>

13
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/direcciones.js
View File

@ -37,9 +37,9 @@ function initTiradasDirecciones() {
let html = '';
html += '<div class="col-sm-3">';
html += '<div class="form-check custom-option custom-option-basic custom-option-tiradasDirecciones' + (i==1?' checked':'')+ ' ">';
html += '<div id=div-env_' + id + ' class="form-check custom-option custom-option-basic custom-option-tiradasDirecciones">';
html += '<label class="form-check-label custom-option-content" for="tiradaEnvios' + i + '">';
html += '<input name=env_"' + id + '" peso="' + peso + '" class="form-check-input" type="radio" value="" id="env_' + id + '">';
html += '<input name=env_"' + id + '" peso="' + peso + '" class="form-check-input" type="radio" value="" id="env_' + id + '"></input>';
html += '<span class="custom-option-header">';
html += '<span id="tiradaDireccionesValue' + i + '" class="h6 mb-0">' + $('#' + tirada_id).text().split(' ')[0] + '</span>';
html += '<span class="text-muted">' + $('#' + total_id).text() + '</span>';
@ -55,6 +55,7 @@ function initTiradasDirecciones() {
$('#' + id).hide();
}
$('#env_tiradaPrecio1').trigger('click');
}
const tiradasDireccionesList = [].slice.call(document.querySelectorAll('.custom-option-tiradasDirecciones .form-check-input'))
@ -76,10 +77,16 @@ function updateTiradasDireccionesCheck(el) {
const customRadioOptionList = [].slice.call(el.closest('.row').querySelectorAll('.custom-option-tiradasDirecciones'))
customRadioOptionList.map(function (customRadioOptionEL) {
customRadioOptionEL.closest('.custom-option-tiradasDirecciones').classList.remove('checked')
let id_temp = customRadioOptionEL.id.split('-')[1];
$('#' + id_temp).prop('checked', false);
})
}
el.closest('.custom-option-tiradasDirecciones').classList.add('checked')
const element = el.closest('.custom-option-tiradasDirecciones');
element.classList.add('checked');
let id = element.id.split('-')[1];
$('#' + id).prop('checked', true);
} else {
el.closest('.custom-option-tiradasDirecciones').classList.remove('checked')
}

13
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/resumen.js
View File

@ -81,17 +81,16 @@ function generarResumen(){
let id = "tiradaPrecio" + i;
if ($('#' + id).length > 0) {
const envio = getTotalEnvio();
let tirada_id = "ud_tiradaPrecio" + i;
if(parseInt($('#' + tirada_id).text().replace(' ud.', '')) != tirada){
continue;
}
let total_id = "tot_tiradaPrecio" + i;
let precio_u_id = "pu_tiradaPrecio" + i;
$('#resumenTotal').text($('#' + total_id).text());
$('#resumenPrecioU').text($('#' + precio_u_id).text());
let total = parseFloat($('#' + total_id).text().replace('€', '').replace('Total: ', ''));
let total = parseFloat($('#' + total_id).text().replace('€', '').replace('Total: ', '')) + envio;
let total_iva = 0.0;
if($('#ivaReducido').val() == '1'){
total_iva = total * 1.04;
@ -99,9 +98,9 @@ function generarResumen(){
else{
total_iva = total * 1.21;
}
const precio_u = total_iva/tirada;
$('#resumenTotalIVA').text('Total (I.V.A. ' + (($('#ivaReducido').val() == '1')?'4':'21') + '%): ' + total_iva.toFixed(2) + '€');
const envio = getTotalEnvio();
$('#resumenEnvio').text('Envío: ' + envio.toFixed(2) + '€');
$('#resumenPrecioU').text(precio_u.toFixed(4) + '€/ud');
}
}

24
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php
View File

@ -86,9 +86,9 @@
<?= view("themes/vuexy/form/presupuestos/cliente/_tipoLibroItems") ?>
<div class="col-12 d-flex justify-content-between mt-4">
<button class="btn btn-label-secondary btn-prev waves-effect">
<i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
<span class="align-middle d-sm-inline-block d-none">Anterior</span>
<button class="btn btn-primary btn-prev waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
<i class="ti ti-arrow-right ti-xs"></i>
</button>
<button class="btn btn-primary btn-next waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Siguiente</span>
@ -105,9 +105,9 @@
<?= view("themes/vuexy/form/presupuestos/cliente/_disenioLibroItems") ?>
<div class="col-12 d-flex justify-content-between mt-4">
<button class="btn btn-label-secondary btn-prev waves-effect">
<i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
<span class="align-middle d-sm-inline-block d-none">Anterior</span>
<button class="btn btn-primary btn-prev waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
<i class="ti ti-arrow-right ti-xs"></i>
</button>
<button class="btn btn-primary btn-next waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Siguiente</span>
@ -124,9 +124,9 @@
<?= view("themes/vuexy/form/presupuestos/cliente/_direccionesItems") ?>
<div class="col-12 d-flex justify-content-between mt-4">
<button class="btn btn-label-secondary btn-prev waves-effect">
<i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
<span class="align-middle d-sm-inline-block d-none">Anterior</span>
<button class="btn btn-primary btn-prev waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
<i class="ti ti-arrow-right ti-xs"></i>
</button>
<button class="btn btn-primary btn-next waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Siguiente</span>
@ -145,9 +145,9 @@
</div>
<div class="col-12 d-flex justify-content-between mt-4">
<div class="col-6 d-flex flex-row">
<button class="btn btn-label-secondary btn-prev waves-effect">
<i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
<span class="align-middle d-sm-inline-block d-none">Anterior</span>
<button class="btn btn-primary btn-prev waves-effect waves-light">
<span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
<i class="ti ti-arrow-right ti-xs"></i>
</button>
</div>
<div class="col-6 d-flex flex-row-reverse">