From db865a453aea8c5a58a87305b921354063677ec9 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 7 Apr 2025 13:30:57 +0800 Subject: [PATCH] Fix online transaction trail data segragations --- .../OnlineTransactionTrailController.php | 5 +- resources/views/online/trail/index.blade.php | 177 +++++++++++++++--- 2 files changed, 156 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/OnlineTransactionTrailController.php b/app/Http/Controllers/OnlineTransactionTrailController.php index e902efe..31d461e 100644 --- a/app/Http/Controllers/OnlineTransactionTrailController.php +++ b/app/Http/Controllers/OnlineTransactionTrailController.php @@ -51,13 +51,10 @@ class OnlineTransactionTrailController extends Controller $transactionTrailKOOP = Http::arrahn_koop()->get('/api/transaction/online/trail', $queries)->json(); - $transactionTrail = array_merge_recursive($transactionTrailPKB, $transactionTrailKOOP); - $branchesKOOP = Http::arrahn_koop()->get('/api/cawangan')->json(); $branchesPKB = Http::arrahn()->get('/api/cawangan')->json(); $branches = array_merge($branchesKOOP, $branchesPKB); - - return view('online.trail.index', compact('transactionTrail', 'startDate', 'endDate', 'norujukan', 'selectedStatus', 'statuses', 'billplzBillId', 'branches', 'selectedBranch')); + return view('online.trail.index', compact('transactionTrailPKB', 'transactionTrailKOOP', 'startDate', 'endDate', 'norujukan', 'selectedStatus', 'statuses', 'billplzBillId', 'branches', 'selectedBranch')); } } diff --git a/resources/views/online/trail/index.blade.php b/resources/views/online/trail/index.blade.php index cb8f2e4..300f718 100644 --- a/resources/views/online/trail/index.blade.php +++ b/resources/views/online/trail/index.blade.php @@ -40,38 +40,48 @@ +
+
+ + +
@php $isGroupedByNorujukan = request()->groupedByNorujukan === 'on' ? true : false; @endphp -
+
+
- - - - @@ -90,7 +100,7 @@ @endphp @if($diffCount !== 0) - @endif @@ -99,45 +109,140 @@ @php $pageVariation = $isGroupedByNorujukan ? 'grouped-by-norujukan' : ''; @endphp -
+
- @include("online.trail.partials.{$pageVariation}.table-transactions-online") + @include("online.trail.pkb.partials.{$pageVariation}.table-transactions-online")
-