diff --git a/app/Http/Controllers/OnlineTransactionTrailController.php b/app/Http/Controllers/OnlineTransactionTrailController.php index a7c2c2d..906acd4 100644 --- a/app/Http/Controllers/OnlineTransactionTrailController.php +++ b/app/Http/Controllers/OnlineTransactionTrailController.php @@ -9,22 +9,36 @@ class OnlineTransactionTrailController extends Controller { public function __invoke(Request $request) { - if ($request->has('selectedDate') && request()->selectedDate == null) { - return redirect()->back()->with('errormessage', 'Sila pilih tarikh!'); + if ($request->has('startDate') && request()->startDate == null) { + return redirect()->back()->with('errormessage', 'Sila pilih tarikh mula!'); + } + + if ($request->has('endDate') && request()->endDate == null) { + return redirect()->back()->with('errormessage', 'Sila pilih tarikh akhir!'); } - $date = $request->selectedDate ?? Carbon::now()->toDateString(); + $startDate = $request->startDate ?? Carbon::now()->toDateString(); + $endDate = $request->endDate ?? Carbon::now()->toDateString(); + $norujukan = $request->norujukan ?? ''; + $isGroupedByNorujukan = $request->groupedByNorujukan === 'on' ? true : false; - + + $status = $request->status ?? ''; + + $billplzBillId = $request->billplzBillId ?? ''; + $transactionTrail = Http::arrahn() ->get('/api/transaction/online/trail', [ - 'date' => $date, + 'startDate' => $startDate, + 'endDate' => $endDate, + 'status' => $status, + 'billplzBillId' => $billplzBillId, 'norujukan' => $norujukan, 'isGroupedByNorujukan' => $isGroupedByNorujukan, ]) ->json(); - return view('online.trail.index', compact('transactionTrail', 'date', 'norujukan')); + return view('online.trail.index', compact('transactionTrail', 'startDate', 'endDate', 'norujukan', 'status', 'billplzBillId' )); } } diff --git a/resources/views/components/filter-card.blade.php b/resources/views/components/filter-card.blade.php index bbfb237..92ad755 100644 --- a/resources/views/components/filter-card.blade.php +++ b/resources/views/components/filter-card.blade.php @@ -1,63 +1,158 @@ @props([ 'title' => '', 'action' => '', - 'selectedDate' => '', + 'startDate' => '', + 'endDate' => '', 'norujukan' => '', + 'billplzBillId' => '', + 'status' => 'PAID', ])
-
+
{{ $title }}
- -
- Pada - - - - Nombor Rujukan - - +
+
+
-
- -
+
+
+
@push('additional_scripts') + @endpush diff --git a/resources/views/components/table/data-link.blade.php b/resources/views/components/table/data-link.blade.php index 6c7432f..afe7178 100644 --- a/resources/views/components/table/data-link.blade.php +++ b/resources/views/components/table/data-link.blade.php @@ -1,12 +1,17 @@ -@props(['content', 'url']) +@props(['content', 'url', 'searchId' => ''])
- merge(['colspan' => '']) }}>
-
- - {{ $content }} +
+ {{ $content }} + + @if ($searchId != '') + + + + @endif
diff --git a/resources/views/online/trail/index.blade.php b/resources/views/online/trail/index.blade.php index 611a9bc..4e1d30d 100644 --- a/resources/views/online/trail/index.blade.php +++ b/resources/views/online/trail/index.blade.php @@ -7,8 +7,15 @@
- + @if (Session::has('errormessage'))