fix: Corregir cálculo de excedente para casas con consumo_only

- Agregar método getExpectedAmountWithDiscount() que retorna el monto sin descuento de 00
- El excedente ahora se calcula contra el monto original configurado, no contra el monto con descuento
- Casas que pagan exactamente el monto por casa aparecen al corriente (/bin/bash.00)
- Casas que pagan más del monto por casa muestran excedente
This commit is contained in:
2026-01-16 17:18:18 -06:00
parent c82cf3de89
commit 8f2f04951f
3 changed files with 29 additions and 3 deletions

View File

@@ -58,6 +58,7 @@
foreach ($houses as $house):
$total = 0;
$totalExpected = 0;
$totalExpectedOriginal = 0;
?>
<tr>
<td><strong><?= $house['number'] ?></strong></td>
@@ -68,8 +69,10 @@
$monthTotals[$month] += $amount;
$expected = Payment::getExpectedAmount($house, $year, $month);
$expectedOriginal = Payment::getExpectedAmountWithDiscount($house, $year, $month);
$total += $amount;
$totalExpected += $expected;
$totalExpectedOriginal += $expectedOriginal;
$bg_color = '#FFFFFF'; // Default white
if ($house['status'] == 'deshabitada') {
@@ -89,7 +92,7 @@
</td>
<?php endforeach; ?>
<?php
$difference = $total - $totalExpected;
$difference = $total - $totalExpectedOriginal;
$diffColor = $difference < 0 ? 'red' : 'green';
$diffText = $difference == 0 ? '$0.00' : '$' . number_format($difference, 2);
$grandTotal += $total;