AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-25 14:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Collected Tax Report, was not adding totals OCT-Dec was misaligned and Grand Total wasnt displaying

Browse Source
This commit is contained in:
johnnyq
2026-01-29 14:02:50 -05:00
parent 1ce4dd932e
commit bf1ccc62f5
1 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
agent/reports/tax_summary.php
View File

@@ -70,47 +70,78 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
</thead> </thead>
<tbody> <tbody>
<?php <?php
// Running totals
$monthly_totals = array_fill(1, 12, 0.0);
$quarterly_totals = array_fill(1, 4, 0.0);
$grand_total = 0.0;
while ($row = mysqli_fetch_assoc($sql_tax)) { while ($row = mysqli_fetch_assoc($sql_tax)) {
$tax_name = sanitizeInput($row['tax_name']);
$tax_name_raw = $row['tax_name'];
$tax_name = sanitizeInput($tax_name_raw);
echo "<tr>"; echo "<tr>";
echo "<td>" . $row['tax_name'] . "</td>"; echo "<td>" . nullable_htmlentities($tax_name_raw) . "</td>";
if ($view == 'monthly') { if ($view == 'monthly') {
for ($i = 1; $i <= 12; $i++) { for ($i = 1; $i <= 12; $i++) {
$monthly_tax = getMonthlyTax($tax_name, $i, $year, $mysqli); $monthly_tax = (float) getMonthlyTax($tax_name, $i, $year, $mysqli);
// Accumulate totals
$monthly_totals[$i] += $monthly_tax;
$grand_total += $monthly_tax;
echo "<td class='text-right'>" . numfmt_format_currency($currency_format, $monthly_tax, $company_currency) . "</td>"; echo "<td class='text-right'>" . numfmt_format_currency($currency_format, $monthly_tax, $company_currency) . "</td>";
} }
// Row total = sum of this tax’s 12 months
$row_total = 0.0;
for ($i = 1; $i <= 12; $i++) {
$row_total += (float) getMonthlyTax($tax_name, $i, $year, $mysqli);
}
echo "<td class='text-right text-bold'>" . numfmt_format_currency($currency_format, $row_total, $company_currency) . "</td>";
} else { } else {
$row_total = 0.0;
for ($q = 1; $q <= 4; $q++) { for ($q = 1; $q <= 4; $q++) {
$quarterly_tax = getQuarterlyTax($tax_name, $q, $year, $mysqli); $quarterly_tax = (float) getQuarterlyTax($tax_name, $q, $year, $mysqli);
// Accumulate totals
$quarterly_totals[$q] += $quarterly_tax;
$grand_total += $quarterly_tax;
$row_total += $quarterly_tax;
echo "<td class='text-right'>" . numfmt_format_currency($currency_format, $quarterly_tax, $company_currency) . "</td>"; echo "<td class='text-right'>" . numfmt_format_currency($currency_format, $quarterly_tax, $company_currency) . "</td>";
} }
echo "<td class='text-right text-bold'>" . numfmt_format_currency($currency_format, $row_total, $company_currency) . "</td>";
} }
// Calculate total for row and echo bold
$total_tax = getTotalTax($tax_name, $year, $mysqli);
echo "<td class='text-right text-bold'>" . numfmt_format_currency($currency_format, $total_tax, $company_currency) . "</td>";
echo "</tr>"; echo "</tr>";
} }
?>
<tr>
<th>Total</th>
<?php
if ($view == 'monthly') {
for ($i = 1; $i <= 12; $i++) {
$monthly_tax = getMonthlyTax($tax_name, $i, $year, $mysqli);
echo "<th class='text-right'>" . numfmt_format_currency($currency_format, $monthly_tax, $company_currency) . "</th>";
}
} else {
for ($q = 1; $q <= 4; $q++) {
$quarterly_tax = getQuarterlyTax($tax_name, $q, $year, $mysqli);
echo "<th class='text-right'>" . numfmt_format_currency($currency_format, $quarterly_tax, $company_currency) . "</th>";
}
}
?>
<td class="text-right"></td>
</tr>
// Totals row
echo "<tr>";
echo "<th>Total</th>";
if ($view == 'monthly') {
for ($i = 1; $i <= 12; $i++) {
echo "<th class='text-right text-bold'>" . numfmt_format_currency($currency_format, $monthly_totals[$i], $company_currency) . "</th>";
}
} else {
for ($q = 1; $q <= 4; $q++) {
echo "<th class='text-right text-bold'>" . numfmt_format_currency($currency_format, $quarterly_totals[$q], $company_currency) . "</th>";
}
}
echo "<th class='text-right text-bold'>" . numfmt_format_currency($currency_format, $grand_total, $company_currency) . "</th>";
echo "</tr>";
?>
</tbody> </tbody>
</table> </table>
</div> </div>