From 958bccf4ed99d728f32cf4c484717e450ac3b4a3 Mon Sep 17 00:00:00 2001
From: rendygaafk <rendibar88@gmail.com>
Date: Thu, 19 Jun 2025 06:51:49 +0700
Subject: [PATCH] Fix filter history bel

---
 .../Controllers/BellHistoryController.php     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/BellHistoryController.php b/app/Http/Controllers/BellHistoryController.php
index 2ac511a..5db0d9e 100644
--- a/app/Http/Controllers/BellHistoryController.php
+++ b/app/Http/Controllers/BellHistoryController.php
@@ -7,30 +7,30 @@
 
 class BellHistoryController extends Controller
 {
-    public function history()
+    public function history(Request $request)
     {
-        $histories = BellHistory::orderBy('ring_time', 'desc')
-                     ->paginate(20);
-        
+        // Use the same filtering logic in both methods
+        $query = BellHistory::query();
+    
+        if ($request->has('hari') && $request->hari != '') {
+            $query->where('hari', $request->hari);
+        }
+    
+        if ($request->has('trigger_type') && $request->trigger_type != '') {
+            $query->where('trigger_type', $request->trigger_type);
+        }
+    
+        $histories = $query->orderBy('ring_time', 'desc')
+                     ->paginate(20)
+                     ->appends(request()->query()); // Preserve filter parameters
+    
         return view('admin.bel.history', compact('histories'));
     }
     
     public function filterHistory(Request $request)
     {
-        $query = BellHistory::query();
-    
-        if ($request->has('hari')) {
-            $query->where('hari', $request->hari);
-        }
-    
-        if ($request->has('trigger_type')) {
-            $query->where('trigger_type', $request->trigger_type);
-        }
-    
-        $histories = $query->orderBy('ring_time', 'desc')
-                     ->paginate(20);
-    
-        return view('admin.bel.history', compact('histories'));
+        // Just call the history method to avoid code duplication
+        return $this->history($request);
     }
     
     public function destroy($id)