fix some error
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
// ---- Default date range ----
|
||||
$today = date("Y-m-d");
|
||||
$monthStart = date("Y-m-01");
|
||||
$monthEnd = date("Y-m-t"); // Gets last day of current month (e.g., 2023-10-31)
|
||||
$monthEnd = date("Y-m-t"); // Gets last day of current month
|
||||
$dFrom = $_GET['dFrom'] ?? $monthStart;
|
||||
$dTo = $_GET['dTo'] ?? $monthEnd;
|
||||
$dTo = $_GET['dTo'] ?? $monthEnd;
|
||||
?>
|
||||
|
||||
<div class="container mt-4">
|
||||
@@ -37,8 +37,12 @@ function maturity_report($dateFrom, $dateTo) {
|
||||
$conn = new mysqli($GLOBALS['host'], $GLOBALS['user'], $GLOBALS['pass'], $GLOBALS['db']);
|
||||
if ($conn->connect_error) die("Connection failed: " . $conn->connect_error);
|
||||
|
||||
// ---- Next month maturity filter ----
|
||||
$sql = "SELECT * FROM ".$GLOBALS['arif_ac']." WHERE DATE_FORMAT(AA_DATE_MATURE, '%Y-%m-%d') BETWEEN '".$dateFrom."' AND '".$dateTo."' AND AA_TYPE = 'Recurring' ORDER BY AA_DATE_MATURE ASC";
|
||||
// ---- Fetch matured accounts ----
|
||||
$sql = "SELECT * FROM ".$GLOBALS['arif_ac']."
|
||||
WHERE DATE_FORMAT(AA_DATE_MATURE, '%Y-%m-%d')
|
||||
BETWEEN '".$dateFrom."' AND '".$dateTo."'
|
||||
AND AA_TYPE = 'Recurring'
|
||||
ORDER BY AA_DATE_MATURE ASC";
|
||||
|
||||
$result = $conn->query($sql);
|
||||
|
||||
@@ -67,31 +71,27 @@ function maturity_report($dateFrom, $dateTo) {
|
||||
if ($result && $result->num_rows > 0) {
|
||||
while($row = $result->fetch_assoc()) {
|
||||
|
||||
// Calculate installments
|
||||
$paid_installments = floor($row['AA_BAL'] / $row['AA_INSTALLMENT']);
|
||||
// Installment calculation
|
||||
$paid_installments = floor($row['AA_BAL'] / $row['AA_INSTALLMENT']);
|
||||
$pending_installments = $row['AA_NO_OF_PAYMENT'] - $paid_installments;
|
||||
|
||||
if ($pending_installments <= 0) {
|
||||
// Fully matured
|
||||
$payout = $row['AA_MATURE_VALUE'];
|
||||
} else {
|
||||
// Not fully paid, only balance is eligible
|
||||
$payout = $row['AA_BAL'];
|
||||
// ✅ Show only fully paid accounts
|
||||
if ($pending_installments == 0 && $paid_installments == $row['AA_NO_OF_PAYMENT']) {
|
||||
$payout = $row['AA_MATURE_VALUE'];
|
||||
$grandTotal += $payout;
|
||||
|
||||
echo "
|
||||
<tr>
|
||||
<td>".$row['AA_ACNO']."</td>
|
||||
<td>".$row['AA_NAME']."</td>
|
||||
<td>".$row['AA_ACTYPE']."</td>
|
||||
<td>".$row['AA_NO_OF_PAYMENT']."</td>
|
||||
<td>".$paid_installments."</td>
|
||||
<td>".$pending_installments."</td>
|
||||
<td>".number_format($payout,2)."</td>
|
||||
<td>".$row['AA_DATE_MATURE']."</td>
|
||||
</tr>";
|
||||
}
|
||||
|
||||
$grandTotal += $row['AA_MATURE_VALUE'];
|
||||
|
||||
echo "
|
||||
<tr>
|
||||
<td>".$row['AA_ACNO']."</td>
|
||||
<td>".$row['AA_NAME']."</td>
|
||||
<td>".$row['AA_ACTYPE']."</td>
|
||||
<td>".$row['AA_NO_OF_PAYMENT']."</td>
|
||||
<td>".$paid_installments."</td>
|
||||
<td>".$pending_installments."</td>
|
||||
<td>".number_format($payout,2)."</td>
|
||||
<td>".$row['AA_DATE_MATURE']."</td>
|
||||
</tr>";
|
||||
}
|
||||
} else {
|
||||
echo "<tr><td colspan='8' class='text-center text-muted'>No matured accounts found</td></tr>";
|
||||
|
||||
Reference in New Issue
Block a user