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/percent_margin_resumen_admin' into 'main'

Browse Source 
corregido

See merge request jjimenez/safekat!656
This commit is contained in:
Jaime Jimenez Ortega
2025-04-04 16:14:54 +00:00
parent 077cfd7d82 6b1dc57821
commit f937695714
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Views/themes/vuexy/form/presupuestos/admin/_resumenPresupuestoItems.php
View File

@ -143,7 +143,7 @@
class="btn btn-primary w-100">Ajustar</button> class="btn btn-primary w-100">Ajustar</button>
</div> </div>
</div> </div>
<?php /*if ($presupuestoEntity->estado_id == 2): ?> <?php if ($presupuestoEntity->estado_id == 2): ?>
<div class="row"> <div class="row">
<div class="col-sm-6 mb-1"> <div class="col-sm-6 mb-1">
<label for="totalAceptado" <label for="totalAceptado"
@ -152,7 +152,7 @@
class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>> class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
</div> </div>
</div> </div>
<?php endif; */?> <?php endif; ?>
<div class="row"> <div class="row">
<p> <p>
<span id="aprobado_by_at"></span> <span id="aprobado_by_at"></span>

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

@ -338,7 +338,7 @@ class Resumen {
} }
} }
let porcentajeMargen = totalCostes + totalMargenes > 0 ? (100 * totalMargenes / (totalCostes + totalMargenes)).toFixed(0) : 0 let porcentajeMargen = totalCostes + totalMargenes > 0 ? (100 * totalMargenes / (totalCostes)).toFixed(0) : 0
$('#totalCostes').html(totalCostes).val(totalCostes.toFixed(2)) $('#totalCostes').html(totalCostes).val(totalCostes.toFixed(2))
$('#totalMargenes').html(totalMargenes).val(totalMargenes.toFixed(2)) $('#totalMargenes').html(totalMargenes).val(totalMargenes.toFixed(2))
$('#porcentajeMargen').html(porcentajeMargen).val(porcentajeMargen) $('#porcentajeMargen').html(porcentajeMargen).val(porcentajeMargen)