diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php index a2e10f6..aae2fce 100644 --- a/app/Http/Controllers/ClientsController.php +++ b/app/Http/Controllers/ClientsController.php @@ -191,35 +191,7 @@ class ClientsController extends Controller }; } - public function fetchDataOld(Request $request) - { - $query = Models\Client::query(); - - if ($request->filled('search')) { - $searchTerm = $request->search; - $query->where(function ($q) use ($searchTerm) { - $q->where('name', 'like', "%{$searchTerm}%") - ->orWhere('email', 'like', "%{$searchTerm}%") - ->orWhere('contact_person', 'like', "%{$searchTerm}%"); - }); - } - - - if ($request->filled('service')) { - // $query->where('services', $request->service); - // $query->whereJsonContains('services', $request->service); - $query->where('services', 'LIKE', '%' . $request->service . '%'); - } - - if ($request->filled('billing')) { - $query->where('pay_mode', $request->billing); - } - - $clients = $query->orderBy('created_at', 'desc')->paginate(30); - - return response()->json($clients); - } - + private function buildFilteredQuery(Request $request) { @@ -250,6 +222,9 @@ class ClientsController extends Controller */ public function fetchData(Request $request) { + if (!auth()->check()) { + return response()->json(['error' => 'Unauthenticated.'], 401); + } $clients = $this->buildFilteredQuery($request)->paginate(30); return response()->json($clients); } diff --git a/resources/views/clients/index.blade.php b/resources/views/clients/index.blade.php index e8e1438..aa7f80a 100644 --- a/resources/views/clients/index.blade.php +++ b/resources/views/clients/index.blade.php @@ -243,6 +243,9 @@ } }, error: function(xhr) { + if (xhr.status === 401) { + window.location.href = base_url + '/login'; + } // Handle Laravel Validation Errors (Status 422) if (xhr.status === 422) { let errors = xhr.responseJSON.errors; diff --git a/routes/web.php b/routes/web.php index 3a08eff..4ea4ead 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,6 +33,3 @@ Route::middleware(['auth'])->group(function () { Route::post('/logout', [App\Http\Controllers\AuthController::class, 'logout'])->name('logout'); }); -//Aegon-Kingsley Kweku Fenyi Banson -//Rhaena Nana Ekua Entsie Banson -//Rickon Akyedze Kofi Asare Banson \ No newline at end of file