diff --git a/app/Http/Controllers/TransactionOnlineLogController.php b/app/Http/Controllers/TransactionOnlineLogController.php
index 8d62144..f2caf01 100644
--- a/app/Http/Controllers/TransactionOnlineLogController.php
+++ b/app/Http/Controllers/TransactionOnlineLogController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Services\Loggers\OnlineTransactionLoggerService;
+use App\Transaction;
 use App\TransactionOnlineLog;
 use App\TransactionOnlineStatus;
 use Illuminate\Http\Request;
@@ -30,4 +31,17 @@ class TransactionOnlineLogController extends Controller
 
         return response()->json($transactionOnlineLogs, 200);
     }
+    
+    public function show($bill_id)
+    {
+        $transactionOnlineLogs = TransactionOnlineLog::query()
+            ->where('bill_id', $bill_id)
+            ->get()
+            ->map(function ($x) {
+                $x->status_label = TransactionOnlineStatus::statusLabel($x->status);
+                return $x;
+            });
+
+        return response()->json($transactionOnlineLogs, 200);
+    }
 }
diff --git a/app/Http/Controllers/TransactionOnlineTrailController.php b/app/Http/Controllers/TransactionOnlineTrailController.php
index 927716c..8723995 100644
--- a/app/Http/Controllers/TransactionOnlineTrailController.php
+++ b/app/Http/Controllers/TransactionOnlineTrailController.php
@@ -67,9 +67,6 @@ class TransactionOnlineTrailController extends Controller
             ->when($request->filled('norujukan'), function ($query) use ($request) {
                 return $query->where('norujukan', $request->norujukan);
             })
-            ->when($request->filled('isGroupedByNorujukan') && $request->isGroupedByNorujukan === '1', function ($query) {
-                return $query->groupBy('norujukan')->sortKeysDesc();
-            })
             ->get();
 
         if ($transaction->isEmpty()) {
@@ -78,13 +75,14 @@ class TransactionOnlineTrailController extends Controller
                 ->when($request->filled('norujukan'), function ($query) use ($request) {
                     return $query->where('norujukan', 'LIKE', '%' . $request->norujukan . '%');
                 })
-                ->when($request->filled('isGroupedByNorujukan') && $request->isGroupedByNorujukan === '1', function ($query) {
-                    return $query->groupBy('norujukan')->sortKeysDesc();
-                })
                 ->get();
         }
 
-        return $transaction->sortByDesc('created_at')->toArray();
+        return $transaction
+                ->when($request->filled('isGroupedByNorujukan') && $request->isGroupedByNorujukan === '1', function ($query) {
+                    return $query->groupBy('norujukan')->sortKeysDesc();
+                })
+                ->sortByDesc('created_at')->toArray();
     }
 
     private function getTransaksiKeuntunganQuery($date, $request)
@@ -93,9 +91,6 @@ class TransactionOnlineTrailController extends Controller
             ->when($request->filled('norujukan'), function ($query) use ($request) {
                 return $query->where('norujukan', $request->norujukan);
             })
-            ->when($request->filled('isGroupedByNorujukan') && $request->isGroupedByNorujukan === '1', function ($query) {
-                return $query->groupBy('norujukan')->sortKeysDesc();
-            })
             ->get();
 
         if ($transaksiKeuntungan->isEmpty()) {
@@ -103,13 +98,14 @@ class TransactionOnlineTrailController extends Controller
                 ->when($request->filled('norujukan'), function ($query) use ($request) {
                     return $query->where('norujukan', 'LIKE', '%' . $request->norujukan . '%');
                 })
-                ->when($request->filled('isGroupedByNorujukan') && $request->isGroupedByNorujukan === '1', function ($query) {
-                    return $query->groupBy('norujukan')->sortKeysDesc();
-                })
                 ->get();
         }
 
-        return $transaksiKeuntungan->toArray();
+        return $transaksiKeuntungan
+                ->when($request->filled('isGroupedByNorujukan') && $request->isGroupedByNorujukan === '1', function ($query) {
+                    return $query->groupBy('norujukan')->sortKeysDesc();
+                })
+                ->toArray();
     }
 
     public function getGlDetailQuery($date, $request)