From 217febba998ddd92a036f42a765e109b5c75eb7e Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Sun, 6 Oct 2024 10:15:24 +0800 Subject: [PATCH] Add filter cawangan to transaction online trail --- app/Http/Controllers/TransactionOnlineTrailController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/TransactionOnlineTrailController.php b/app/Http/Controllers/TransactionOnlineTrailController.php index 9f55d96..79bb590 100644 --- a/app/Http/Controllers/TransactionOnlineTrailController.php +++ b/app/Http/Controllers/TransactionOnlineTrailController.php @@ -38,6 +38,9 @@ class TransactionOnlineTrailController extends Controller $endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); $transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate]) + ->when($request->filled('branch'), function ($query) use ($request) { + return $query->where('kodcaw', $request->branch); + }) ->when($request->filled('billplzBillId'), function ($query) use ($request) { return $query->where('billplz_id', $request->billplzBillId); }) @@ -48,6 +51,9 @@ class TransactionOnlineTrailController extends Controller if ($transactionOnline->isEmpty()) { $transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate]) + ->when($request->filled('branch'), function ($query) use ($request) { + return $query->where('kodcaw', $request->branch); + }) ->when($request->filled('norujukan'), function ($query) use ($request) { return $query->where('norujukan', 'LIKE', '%' . $request->norujukan . '%'); })