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 @@