diff --git a/app/Http/Controllers/OnlineTransactionTrailController.php b/app/Http/Controllers/OnlineTransactionTrailController.php index 906acd4..7d290f0 100644 --- a/app/Http/Controllers/OnlineTransactionTrailController.php +++ b/app/Http/Controllers/OnlineTransactionTrailController.php @@ -24,21 +24,33 @@ class OnlineTransactionTrailController extends Controller $isGroupedByNorujukan = $request->groupedByNorujukan === 'on' ? true : false; - $status = $request->status ?? ''; + $selectedStatus = $request->selectedStatus ?? ''; + + $selectedBranch = $request->selectedBranch ?? ''; $billplzBillId = $request->billplzBillId ?? ''; + + $statuses = [ + 'PAID', + 'NOT PAID', + 'UNSUCCESSFUL', + ]; + $transactionTrail = Http::arrahn() ->get('/api/transaction/online/trail', [ 'startDate' => $startDate, 'endDate' => $endDate, - 'status' => $status, + 'status' => $selectedStatus, + 'branch' => $selectedBranch, 'billplzBillId' => $billplzBillId, 'norujukan' => $norujukan, 'isGroupedByNorujukan' => $isGroupedByNorujukan, ]) ->json(); + + $branches = Http::arrahn()->get('/api/cawangan')->json(); - return view('online.trail.index', compact('transactionTrail', 'startDate', 'endDate', 'norujukan', 'status', 'billplzBillId' )); + return view('online.trail.index', compact('transactionTrail', 'startDate', 'endDate', 'norujukan', 'selectedStatus', 'statuses', 'billplzBillId', 'branches', 'selectedBranch')); } } diff --git a/resources/views/components/filter-card.blade.php b/resources/views/components/filter-card.blade.php index 92ad755..abb4e95 100644 --- a/resources/views/components/filter-card.blade.php +++ b/resources/views/components/filter-card.blade.php @@ -5,7 +5,10 @@ 'endDate' => '', 'norujukan' => '', 'billplzBillId' => '', - 'status' => 'PAID', + 'statuses' => [], + 'selectedStatus' => 'PAID', + 'branches' => [], + 'selectedBranch' => '', ])