From 533c22d3af17cfcd804ad8e05adc700dd59abf77 Mon Sep 17 00:00:00 2001
From: mwpn <mwpn@example.com>
Date: Wed, 17 Dec 2025 13:32:31 +0700
Subject: [PATCH] Fix: Fix SQL GROUP BY error in daily/hourly summary
 aggregation - Use COALESCE in GROUP BY to handle NULL tariff amounts - Remove
 invalid is_active check on tariffs table

---
 src/Modules/Retribusi/Summary/DailySummaryService.php  | 2 +-
 src/Modules/Retribusi/Summary/HourlySummaryService.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Modules/Retribusi/Summary/DailySummaryService.php b/src/Modules/Retribusi/Summary/DailySummaryService.php
index 874a2c6..92e0e20 100644
--- a/src/Modules/Retribusi/Summary/DailySummaryService.php
+++ b/src/Modules/Retribusi/Summary/DailySummaryService.php
@@ -58,7 +58,7 @@ class DailySummaryService
                     e.location_code,
                     e.gate_code,
                     e.category,
-                    t.amount
+                    COALESCE(t.amount, 0)
             ";
 
             $stmt = $this->db->prepare($sql);
diff --git a/src/Modules/Retribusi/Summary/HourlySummaryService.php b/src/Modules/Retribusi/Summary/HourlySummaryService.php
index cef5390..cf1d2ed 100644
--- a/src/Modules/Retribusi/Summary/HourlySummaryService.php
+++ b/src/Modules/Retribusi/Summary/HourlySummaryService.php
@@ -54,7 +54,6 @@ class HourlySummaryService
                 LEFT JOIN tariffs t ON e.location_code = t.location_code
                     AND e.gate_code = t.gate_code
                     AND e.category = t.category
-                    AND t.is_active = 1
                 WHERE DATE(e.event_time) = ?
                 GROUP BY 
                     DATE(e.event_time),
@@ -62,7 +61,7 @@ class HourlySummaryService
                     e.location_code,
                     e.gate_code,
                     e.category,
-                    t.amount
+                    COALESCE(t.amount, 0)
             ";
 
             $stmt = $this->db->prepare($sql);