From 47e4b6e17842e52e9f1a203af05ef61d4c9c35d0 Mon Sep 17 00:00:00 2001
From: pand03 <pandu.ariess@gmailcom>
Date: Fri, 17 Apr 2026 17:42:00 +0700
Subject: [PATCH] Perbaikan Menu Laporan per pintu pos

---
 app/Http/Controllers/ReportTransaksiController.php | 12 +++++++-----
 resources/views/report/by-gate.blade.php           |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/ReportTransaksiController.php b/app/Http/Controllers/ReportTransaksiController.php
index 0ffead2..edde08e 100644
--- a/app/Http/Controllers/ReportTransaksiController.php
+++ b/app/Http/Controllers/ReportTransaksiController.php
@@ -81,12 +81,14 @@ public function gateData(Request $request)
             )
 
             // 🔹 Status Transaksi
-            ->when($request->status_transaksi, function ($q) use ($request) {
+            // ->when($request->status_transaksi, function ($q) use ($request) {
+            ->when(isset($request->status_transaksi), function ($q) use ($request) {
 
                 return match ($request->status_transaksi) {
-                    '3'     => $q->where('tp.status_transaksi', '3'),
-                    '0'     => $q->where('tp.status_transaksi', '0'),
-                    '-1' => $q->whereNotNull('alasan'),
+                    '0'     => $q->whereNotIn('tp.status_transaksi', ['3','-1'])->whereNotNull('alasan'),
+                    // '0'     => $q->whereNotIn('tp.status_transaksi', '5')->whereNotNull('alasan'),
+                    '3'     => $q->where('tp.status_transaksi', '3')->whereNull('alasan'),
+                    '-1'    => $q->where('tp.status_transaksi', '-1')->whereNotNull('alasan'),
                     'null'    => $q->whereNull('alasan')
                 };
 
@@ -139,7 +141,7 @@ public function gateData(Request $request)
             ->orderBy('jm.nama')
             ->orderBy('tp.status_transaksi');
 
-
+            
         return response()->json([
             'byGateData' => $query->get()
         ]);
diff --git a/resources/views/report/by-gate.blade.php b/resources/views/report/by-gate.blade.php
index 72033ac..5c98689 100644
--- a/resources/views/report/by-gate.blade.php
+++ b/resources/views/report/by-gate.blade.php
@@ -72,8 +72,8 @@
                                             </div>
                                             <div class="col-sm-12 col-md-2">
                                                 <label class="label" for="status_trans">Status Transaksi</label>
-                                                <select id="status_transaksi" name="status_transaksi" class="form-control select2" data-placeholder="Semua">
-                                                    <option value="">Semua</option>
+                                                <select id="status_transaksi" name="status_transaksi" class="form-control select2">
+                                                    <option value="" selected>Semua</option>
                                                     <option value="0">Casual</option>
                                                     <option value="3">Member</option>
                                                     <option value="-1">Batal</option>