Fix filter history bel

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')
+        // Use the same filtering logic in both methods
-                     ->paginate(20);
+        $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();
+        // Just call the history method to avoid code duplication
-    
+        return $this->history($request);
-        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'));
     }
     
     public function destroy($id)