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

Merge branch 'fix/factor' into 'main'

Browse Source 
Fix/factor

See merge request jjimenez/safekat!561
This commit is contained in:
Jaime Jimenez Ortega
2025-02-20 19:45:49 +00:00
parent 9311c7b9ae 068a2307bc
commit c666925101
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
httpdocs/assets/js/safekat/pages/presupuestoAdmin/sections/resumen.js
View File

@ -133,7 +133,7 @@ class Resumen {
if (rowData.maquinaTipo == 'inkjet') {
totalImpresion += parseFloat(rowData.totalTinta)
totalImpresion += parseFloat(rowData.totalCorte)?? 0;
sumForFactor += (parseFloat(rowData.totalTinta) + parseFloat(rowData.totalCorte))
//sumForFactor += (parseFloat(rowData.totalTinta) + parseFloat(rowData.totalCorte))
}
//sumForFactor -= parseFloat($('#' + rowData.row_id + '_margenClicks').val())
@ -176,7 +176,7 @@ class Resumen {
margenImpresion = parseFloat($('#margenImpresion').attr('val'))
}
//sumForFactorPonderado = sumForFactor;
sumForFactorPonderado = sumForFactor;
if (updateServicios) {
@ -344,8 +344,8 @@ class Resumen {
'total_presupuesto': $('#totalDespuesDecuento').text().replace('€', '').replace('.', '').replace(',', '.'),
'total_precio_unidad': $('#precioUnidadPresupuesto').text().replace('€', '').replace('.', '').replace(',', '.'),
'total_factor': $('#factor').text().replace(/,/g, '.').replace('.', '').replace(',', '.'),
'total_factor_ponderado': $('#factor_ponderado').text().replace(/,/g, '.').replace('.', '').replace(',', '.'),
'total_factor': $('#factor').text().replace(/,/g, '.'),
'total_factor_ponderado': $('#factor_ponderado').text().replace(/,/g, '.')
};
if($('#confirmar_presupuesto').prop('checked')){