diff --git a/app/Http/Controllers/LevelMenuController.php b/app/Http/Controllers/LevelMenuController.php
new file mode 100644
index 0000000..0227cd2
--- /dev/null
+++ b/app/Http/Controllers/LevelMenuController.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class LevelMenuController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/Parking/ReportTransaksiController.php b/app/Http/Controllers/Parking/ReportTransaksiController.php
index 9a7c2b0..7c8921d 100644
--- a/app/Http/Controllers/Parking/ReportTransaksiController.php
+++ b/app/Http/Controllers/Parking/ReportTransaksiController.php
@@ -11,65 +11,63 @@
 
 class ReportTransaksiController extends Controller
 {
-    public function byGate ()
+    public function byGate()
     {
-        return view ('report.by-gate');
+        return view("report.by-gate");
     }
 
+    //     private function transaksiParkir($isMirror)
+    //     {
+    //         $mirror = DB::table('parkir_transaksi')
+    //         $query = DB::table('transaksi_parkir');
+
+    //         return $table;
+    // }
+
     public function gateData(Request $request)
     {
         Log::info($request->all());
 
-        $awal   = $request->tanggal_mulai;
-        $akhir  = $request->tanggal_selesai;
-        $isShift = $request->shift === 'on';
-        $dateBy = $isShift ? 'pklogin' : 'waktu_keluar';
-        $paymentMethod = $request->payment_method === 'null' ? null : $request->payment_method;
+        $awal = $request->tanggal_mulai;
+        $akhir = $request->tanggal_selesai;
+        $isShift = $request->shift === "on";
+        $dateBy = $isShift ? "pklogin" : "waktu_keluar";
+        $paymentMethod = $request->payment_method === "null" ? null : $request->payment_method;
 
         // 🔹 Base select
         $select = [
-            'np.nama as gate',
-            'tp.id_pintu_keluar',
-            'p.nama as petugas',
-            'tp.id_op_keluar',
-            'jm.nama as kendaraan',
-            'tp.status_transaksi',
-            DB::raw('count(*) as jumlah_transaksi'),
-            DB::raw('sum(tp.bayar_keluar) as income_transaksi'),
+            "np.nama as gate",
+            "tp.id_pintu_keluar",
+            "p.nama as petugas",
+            "tp.id_op_keluar",
+            "jm.nama as kendaraan",
+            "tp.status_transaksi",
+            DB::raw("count(*) as jumlah_transaksi"),
+            DB::raw("sum(tp.bayar_keluar) as income_transaksi"),
         ];
 
         // 🔹 Tambah shift kalau aktif
         if ($isShift) {
-            $select[] = 'tp.id_shift_keluar';
+            $select[] = "tp.id_shift_keluar";
         }
 
         // 🔹 Base group
-        $groupBy = [
-            'tp.id_pintu_keluar',
-            'np.nama',
-            'p.nama',
-            'tp.id_op_keluar',
-            'jm.nama',
-            'tp.status_transaksi',
-        ];
+        $groupBy = ["tp.id_pintu_keluar", "np.nama", "p.nama", "tp.id_op_keluar", "jm.nama", "tp.status_transaksi"];
 
         if ($isShift) {
-            $groupBy[] = 'tp.id_shift_keluar';
+            $groupBy[] = "tp.id_shift_keluar";
         }
 
-        $query = DB::table('transaksi_parkir as tp')
-            ->leftJoin('pegawai as p','p.nomer','=','tp.id_op_keluar')
-            ->leftJoin('nama_pos as np','np.id','=','tp.id_pintu_keluar')
-            ->leftJoin('jenis_mobil as jm','jm.id','=','tp.id_kendaraan')
+        $query = DB::table("transaksi_parkir as tp")
+            ->leftJoin("pegawai as p", "p.nomer", "=", "tp.id_op_keluar")
+            ->leftJoin("nama_pos as np", "np.id", "=", "tp.id_pintu_keluar")
+            ->leftJoin("jenis_mobil as jm", "jm.id", "=", "tp.id_kendaraan")
             ->select($select)
 
             // 🔹 Filter tanggal (dynamic field)
-            ->where('tp.status', 0)
+            ->where("tp.status", 0)
 
-            ->whereBetween($dateBy, [
-                $awal . ' 00:00:00',
-                $akhir . ' 23:59:59'
-            ])
+            ->whereBetween($dateBy, [$awal . " 00:00:00", $akhir . " 23:59:59"])
 
             // // 🔹 STATUS
             // ->when($request->status_transaksi, fn($q, $v) =>
@@ -77,37 +75,31 @@ public function gateData(Request $request)
             // )
 
             // 🔹 PINTU
-            ->when($request->id_pintu_keluar, fn($q, $v) =>
-                $q->whereIn('tp.id_pintu_keluar', (array) $v)
-            )
+            ->when($request->id_pintu_keluar, fn($q, $v) => $q->whereIn("tp.id_pintu_keluar", (array) $v))
 
             // 🔹 Status Transaksi
             // ->when($request->status_transaksi, function ($q) use ($request) {
             ->when(isset($request->status_transaksi), function ($q) use ($request) {
-
                 return match ($request->status_transaksi) {
                     // '0'     => $q->whereNotIn('tp.status_transaksi', ['3','-1'])->whereNotNull('alasan'),
-                    '0'     => $q->where('tp.status_transaksi', '0')->whereNull('alasan'),
-                    '3'     => $q->where('tp.status_transaksi', '3')->whereNull('alasan'),
-                    '-1'    => $q->where('tp.status_transaksi', '-1')->whereNotNull('alasan'),
-                    'null'    => $q->whereNull('alasan')
+                    "0" => $q->where("tp.status_transaksi", "0")->whereNull("alasan"),
+                    "3" => $q->where("tp.status_transaksi", "3")->whereNull("alasan"),
+                    "-1" => $q->where("tp.status_transaksi", "-1")->whereNotNull("alasan"),
+                    "null" => $q->whereNull("alasan"),
                 };
-
             })
 
             // 🔹 CARA BAYAR
             ->when($request->cara_bayar, function ($q) use ($request) {
-
                 return match ($request->cara_bayar) {
-                    'cash'     => $q->where('tp.cara_bayar', '!=', 3),
-                    'cashless' => $q->where('tp.cara_bayar', 3),
-                    default    => $q
+                    "cash" => $q->where("tp.cara_bayar", "!=", 3),
+                    "cashless" => $q->where("tp.cara_bayar", 3),
+                    default => $q,
                 };
-
             })
 
             ->when($paymentMethod, function ($q) use ($paymentMethod) {
-                return $q->where('tp.rep_bank', $paymentMethod);
+                return $q->where("tp.rep_bank", $paymentMethod);
 
                 // return match ($request->payment_method) {
                 //     2   => $q->where('tp.rep_bank', 2),
@@ -117,11 +109,8 @@ public function gateData(Request $request)
                 //     9   => $q->where('tp.rep_bank', 9),
                 //     default    => $q
                 // };
-
             })
 
-
-
             // // 🔹 PETUGAS
             // ->when($request->id_op_keluar, fn($q, $v) =>
             //     $q->whereIn('tp.id_op_keluar', (array) $v)
@@ -134,121 +123,120 @@ public function gateData(Request $request)
 
             ->groupBy($groupBy)
 
-            ->orderBy('tp.id_pintu_keluar')
-            ->when($isShift, fn($q) =>
-                $q->orderBy('tp.id_shift_keluar')
-            )
-            ->orderBy('tp.id_op_keluar')
-            ->orderBy('jm.nama')
-            ->orderBy('tp.status_transaksi');
-
+            ->orderBy("tp.id_pintu_keluar")
+            ->when($isShift, fn($q) => $q->orderBy("tp.id_shift_keluar"))
+            ->orderBy("tp.id_op_keluar")
+            ->orderBy("jm.nama")
+            ->orderBy("tp.status_transaksi");
 
         return response()->json([
-            'byGateData' => $query->get()
+            "byGateData" => $query->get(),
         ]);
     }
 
-    public function allReport ()
+    public function allReport()
     {
-        return view ('report.all-report');
+        return view("report.all-report");
     }
 
     public function allReportData(Request $request)
     {
-        Log::info('== allReportData START ==');
+        return response()->json([
+            "vehicle" => $this->vehicleReport($request),
+            "officer" => $this->reportOfficer($request),
+            "payment" => $this->paymentType($request),
+        ]);
+    }
 
+    public function vehicleReport(Request $request)
+    {
+        Log::info("== allReportData START ==");
         Log::info($request->harian);
         Log::info($request->tanggal);
         $selectDate = $request->tanggal;
         $start = microtime(true);
         $harian = $request->harian ?? 1;
-        // $dateNow = Carbon::now()->format('Y-m-d');
-        $dateNow = '2026-01-25';
-        // $startDate = Carbon::today()->startOfDay();
-        // $endDate   = Carbon::today()->endOfDay();
-        // $startDate = $selectDate . ' 00:00:00';
-        // $endDate   = $selectDate . ' 23:59:59';
+        $dateNow = "2026-01-25";
         $startDate = $selectDate ? $selectDate : $dateNow;
-        $endDate   = $selectDate ? $selectDate : $dateNow;
+        $endDate = $selectDate ? $selectDate : $dateNow;
 
-        Log::info('Tanggal laporan', [
-            'start' => $startDate,
-            'end'   => $endDate
+        Log::info("Tanggal laporan", [
+            "start" => $startDate,
+            "end" => $endDate,
         ]);
 
         // =========================
         // QUERY UTAMA (LEFT JOIN)
         // =========================
-        Log::info('Query transaksi dimulai');
+        Log::info("Query transaksi dimulai");
 
         // $dateColumn = $harian == 1
         //     ? 'tp.waktu_keluar'
         //     : 'tp.pklogin';
         if ($harian == 1) {
             // $dateColumn = ['tp.waktu_masuk', 'tp.waktu_keluar'];
-            $dateColumn = ['tp.waktu_keluar'];
+            $dateColumn = ["tp.waktu_keluar"];
         } else {
             // $dateColumn = ['tp.pmlogin', 'tp.pklogin'];
-            $dateColumn = ['tp.pklogin'];
+            $dateColumn = ["tp.pklogin"];
         }
 
-        $transactions = DB::table('transaksi_parkir as tp')
-            ->leftJoin('jenis_mobil as jm', 'jm.id', '=', 'tp.id_kendaraan')
-            ->leftJoin('pegawai as pm', 'pm.nomer', '=', 'tp.id_op_masuk')
-            ->leftJoin('pegawai as pk', 'pk.nomer', '=', 'tp.id_op_keluar')
+        $transactions = DB::table("transaksi_parkir as tp")
+            ->leftJoin("jenis_mobil as jm", "jm.id", "=", "tp.id_kendaraan")
+            ->leftJoin("pegawai as pm", "pm.nomer", "=", "tp.id_op_masuk")
+            ->leftJoin("pegawai as pk", "pk.nomer", "=", "tp.id_op_keluar")
             ->where(function ($q) use ($dateColumn, $startDate, $endDate, $selectDate) {
-                $q->whereBetween($dateColumn[0], [$startDate . ' 00:00:00', $endDate . ' 23:59:59'])
-                ->orWhereBetween($dateColumn[0], [$startDate . ' 00:00:00', $endDate . ' 23:59:59']);
+                $q->whereBetween($dateColumn[0], [$startDate . " 00:00:00", $endDate . " 23:59:59"])->orWhereBetween(
+                    $dateColumn[0],
+                    [$startDate . " 00:00:00", $endDate . " 23:59:59"],
+                );
                 // $q->whereRaw('DATE(tp.waktu_masuk) = ?', [$selectDate])
                 // ->orWhereRaw('DATE(tp.waktu_keluar) = ?', [$selectDate]);
             })
             // ->whereRaw("DATE($dateColumn) = ?", [$dateNow])
             // ->whereBetween($dateColumn, [$startDate, $endDate])
             ->select(
-                'tp.id',
-                'jm.nama as jenis_mobil',
-                'tp.id_kendaraan',
+                "tp.id",
+                "jm.nama as jenis_mobil",
+                "tp.id_kendaraan",
 
-                'pm.nama as kasir_masuk',
-                'pk.nama as kasir_keluar',
+                "pm.nama as kasir_masuk",
+                "pk.nama as kasir_keluar",
 
-                'tp.id_op_masuk',
+                "tp.id_op_masuk",
 
-                'tp.waktu_masuk',
-                'tp.waktu_keluar',
-                'tp.status',
-                'tp.bayar_masuk',
-                'tp.bayar_keluar',
-                'tp.status_transaksi',
-                'tp.cara_bayar',
+                "tp.waktu_masuk",
+                "tp.waktu_keluar",
+                "tp.status",
+                "tp.bayar_masuk",
+                "tp.bayar_keluar",
+                "tp.status_transaksi",
+                "tp.cara_bayar",
             )
             ->get();
 
-        Log::info('Query transaksi selesai', [
-            'rows' => $transactions->count(),
-            'query_time_ms' => round((microtime(true) - $start) * 1000, 2)
+        Log::info("Query transaksi selesai", [
+            "rows" => $transactions->count(),
+            "query_time_ms" => round((microtime(true) - $start) * 1000, 2),
         ]);
 
         // =========================
         // REKAP PER KENDARAAN
         // =========================
-        Log::info('Rekap kendaraan dimulai');
+        Log::info("Rekap kendaraan dimulai");
 
         $tunai = $transactions
-            ->sortBy('id_kendaraan')
-            ->groupBy('id_kendaraan')
+            ->sortBy("id_kendaraan")
+            ->groupBy("id_kendaraan")
             ->map(function ($items, $idKendaraan) {
-
                 // ======================
                 // PISAH MASUK & KELUAR
                 // ======================
                 // $masuk  = $items->where('status', 1);
                 // $keluar = $items->where('status', 0);
-                $keluar = $items->filter(fn ($r) => (int) $r->status === 0);
+                $keluar = $items->filter(fn($r) => (int) $r->status === 0);
                 // $tunai = $keluar->where('cara_bayar', '!=', 3);
-                $tunai = $keluar->filter(fn ($row) =>
-                    in_array(data_get($row, 'cara_bayar'), [null, 0, '0'], true)
-                );
+                $tunai = $keluar->filter(fn($row) => in_array(data_get($row, "cara_bayar"), [null, 0, "0"], true));
 
                 // ======================
                 // MASUK
@@ -262,32 +250,34 @@ public function allReportData(Request $request)
                 // $keluarCasual = $tunai->where('status_transaksi', '0');
                 // $keluarMember = $tunai->where('status_transaksi', '3');
                 // $keluarLost   = $tunai->where('status_transaksi', '32');
-                $keluarCasual = $tunai->filter(fn ($r) =>
-                    (string) data_get($r, 'status_transaksi') === '0'
-                    && data_get($r, 'id_op_masuk') !== null
+                $keluarCasual = $tunai->filter(
+                    fn($r) => (string) data_get($r, "status_transaksi") === "0" && data_get($r, "id_op_masuk") !== null,
                 );
 
-                $keluarMember = $tunai->filter(fn ($r) => (string) data_get($r, 'status_transaksi') === '3');
+                $keluarMember = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "3");
 
-                $keluarLost = $tunai->filter(fn ($r) => (string) data_get($r, 'status_transaksi') === '32');
+                $keluarLost = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "32");
 
-                $keluarManual = $tunai->filter(fn ($r) => data_get($r, 'id_op_masuk') === null);
+                $keluarManual = $tunai->filter(fn($r) => data_get($r, "id_op_masuk") === null);
 
-                $keluarMasalah = $tunai->filter(fn ($r) => (string) data_get($r, 'status_transaksi') === '-1');
+                $keluarMasalah = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "-1");
 
                 // ======================
                 // PEMBAYARAN (KELUAR)
                 // ======================
                 // $nonTunai = $keluar->where('cara_bayar', 3);
                 // $tunai    = $keluar->where('cara_bayar', '!=', 3);
-                $totalCash = $keluarCasual->sum('bayar_keluar') + $keluarLost->sum('bayar_keluar') + $keluarMember->sum('bayar_keluar') + $keluarManual->sum('bayar_keluar');
-
+                $totalCash =
+                    $keluarCasual->sum("bayar_keluar") +
+                    $keluarLost->sum("bayar_keluar") +
+                    $keluarMember->sum("bayar_keluar") +
+                    $keluarManual->sum("bayar_keluar");
 
                 return [
-                    'id_kendaraan'  => $idKendaraan,
-                    'jenis_mobil'   => $items->first()->jenis_mobil,
-                    'total'         => $items->count(),
-                    'tunaiOut'      => $tunai->count(),
+                    "id_kendaraan" => $idKendaraan,
+                    "jenis_mobil" => $items->first()->jenis_mobil,
+                    "total" => $items->count(),
+                    "tunaiOut" => $tunai->count(),
                     // ========= MASUK =========
                     // 'masuk' => [
                     //     'casual' => [
@@ -301,49 +291,46 @@ public function allReportData(Request $request)
                     // ],
 
                     // ========= KELUAR =========
-                    'keluar' => [
-                        'casual' => [
-                            'jumlah' => $keluarCasual->count(),
-                            'income' => $keluarCasual->sum('bayar_keluar'),
+                    "keluar" => [
+                        "casual" => [
+                            "jumlah" => $keluarCasual->count(),
+                            "income" => $keluarCasual->sum("bayar_keluar"),
                         ],
-                        'lost' => [
-                            'jumlah' => $keluarLost->count(),
-                            'income' => $keluarLost->sum('bayar_keluar'),
+                        "lost" => [
+                            "jumlah" => $keluarLost->count(),
+                            "income" => $keluarLost->sum("bayar_keluar"),
                         ],
-                        'member' => [
-                            'jumlah' => $keluarMember->count(),
-                            'income' => $keluarMember->sum('bayar_keluar'),
+                        "member" => [
+                            "jumlah" => $keluarMember->count(),
+                            "income" => $keluarMember->sum("bayar_keluar"),
                         ],
-                        'manual' => [
-                            'jumlah' => $keluarManual->count(),
-                            'income' => $keluarManual->sum('bayar_keluar'),
+                        "manual" => [
+                            "jumlah" => $keluarManual->count(),
+                            "income" => $keluarManual->sum("bayar_keluar"),
                         ],
-                        'masalah' => [
-                            'jumlah' => $keluarMasalah->count(),
-                            'income' => $keluarMasalah->sum('bayar_keluar'),
+                        "masalah" => [
+                            "jumlah" => $keluarMasalah->count(),
+                            "income" => $keluarMasalah->sum("bayar_keluar"),
                         ],
                     ],
-                    'totalCash'     => $totalCash,
+                    "totalCash" => $totalCash,
                 ];
-            }
-        )->values();
+            })
+            ->values();
 
         $cashless = $transactions
-        ->sortBy('id_kendaraan')
-            ->groupBy('id_kendaraan')
+            ->sortBy("id_kendaraan")
+            ->groupBy("id_kendaraan")
             ->map(function ($items, $idKendaraan) {
-
                 // ======================
                 // PISAH MASUK & KELUAR
                 // ======================
                 // $masuk  = $items->where('status', 1);
                 // $keluar = $items->where('status', 0);
                 // $nonTunai = $keluar->where('cara_bayar', 3);
-                $keluar = $items->filter(fn ($r) => (int) $r->status === 0);
+                $keluar = $items->filter(fn($r) => (int) $r->status === 0);
                 // $tunai = $keluar->where('cara_bayar', '!=', 3);
-                $nonTunai = $keluar->filter(fn ($row) =>
-                    (string) data_get($row, 'cara_bayar') === '3'
-                );
+                $nonTunai = $keluar->filter(fn($row) => (string) data_get($row, "cara_bayar") === "3");
 
                 // ======================
                 // MASUK
@@ -357,25 +344,28 @@ public function allReportData(Request $request)
                 // $keluarCasual = $nonTunai->where('status_transaksi', '0');
                 // $keluarMember = $nonTunai->where('status_transaksi', '3');
                 // $keluarLost   = $nonTunai->where('status_transaksi', '32');
-                $keluarCasual = $nonTunai->filter(fn ($r) =>
-                    (string) data_get($r, 'status_transaksi') === '0'
-                    && data_get($r, 'id_op_masuk') !== null
+                $keluarCasual = $nonTunai->filter(
+                    fn($r) => (string) data_get($r, "status_transaksi") === "0" && data_get($r, "id_op_masuk") !== null,
                 );
-                $keluarMember = $nonTunai->filter(fn ($r) => (string) data_get($r, 'status_transaksi') === '3');
-                $keluarLost = $nonTunai->filter(fn ($r) => (string) data_get($r, 'status_transaksi') === '32');
-                $keluarManual = $nonTunai->filter(fn ($r) => data_get($r, 'id_op_masuk') === null);
+                $keluarMember = $nonTunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "3");
+                $keluarLost = $nonTunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "32");
+                $keluarManual = $nonTunai->filter(fn($r) => data_get($r, "id_op_masuk") === null);
 
-                $totalCashless = $keluarCasual->sum('bayar_keluar') + $keluarLost->sum('bayar_keluar') + $keluarMember->sum('bayar_keluar') + $keluarManual->sum('bayar_keluar');
+                $totalCashless =
+                    $keluarCasual->sum("bayar_keluar") +
+                    $keluarLost->sum("bayar_keluar") +
+                    $keluarMember->sum("bayar_keluar") +
+                    $keluarManual->sum("bayar_keluar");
 
                 // ======================
                 // PEMBAYARAN (KELUAR)
                 // ======================
 
                 return [
-                    'id_kendaraan'  => $idKendaraan,
-                    'jenis_mobil'   => $items->first()->jenis_mobil,
-                    'total'         => $items->count(),
-                    'nonTunaiOut'      => $nonTunai->count(),
+                    "id_kendaraan" => $idKendaraan,
+                    "jenis_mobil" => $items->first()->jenis_mobil,
+                    "total" => $items->count(),
+                    "nonTunaiOut" => $nonTunai->count(),
 
                     // ========= MASUK =========
                     // 'masuk' => [
@@ -390,81 +380,582 @@ public function allReportData(Request $request)
                     // ],
 
                     // ========= KELUAR =========
-                    'keluar' => [
-                        'casual' => [
-                            'jumlah' => $keluarCasual->count(),
-                            'income' => $keluarCasual->sum('bayar_keluar'),
+                    "keluar" => [
+                        "casual" => [
+                            "jumlah" => $keluarCasual->count(),
+                            "income" => $keluarCasual->sum("bayar_keluar"),
                         ],
-                        'lost' => [
-                            'jumlah' => $keluarLost->count(),
-                            'income' => $keluarLost->sum('bayar_keluar'),
+                        "lost" => [
+                            "jumlah" => $keluarLost->count(),
+                            "income" => $keluarLost->sum("bayar_keluar"),
                         ],
-                        'member' => [
-                            'jumlah' => $keluarMember->count(),
-                            'income' => $keluarMember->sum('bayar_keluar'),
+                        "member" => [
+                            "jumlah" => $keluarMember->count(),
+                            "income" => $keluarMember->sum("bayar_keluar"),
                         ],
-                        'manual' => [
-                            'jumlah' => $keluarManual->count(),
-                            'income' => $keluarManual->sum('bayar_keluar'),
+                        "manual" => [
+                            "jumlah" => $keluarManual->count(),
+                            "income" => $keluarManual->sum("bayar_keluar"),
                         ],
                     ],
-                    'totalCashless' => $totalCashless,
+                    "totalCashless" => $totalCashless,
                 ];
-            }
-        )->values();
+            })
+            ->values();
 
-        $transactions = DB::table('transaksi_parkir as tp')
-            ->leftJoin('jenis_mobil as jm', 'jm.id', '=', 'tp.id_kendaraan')
-            ->leftJoin('pegawai as pm', 'pm.nomer', '=', 'tp.id_op_masuk')
-            ->leftJoin('pegawai as pk', 'pk.nomer', '=', 'tp.id_op_keluar')
-            ->whereDate('waktu_masuk', '<', $dateNow)
+        $transactions = DB::table("transaksi_parkir as tp")
+            ->leftJoin("jenis_mobil as jm", "jm.id", "=", "tp.id_kendaraan")
+            ->leftJoin("pegawai as pm", "pm.nomer", "=", "tp.id_op_masuk")
+            ->leftJoin("pegawai as pk", "pk.nomer", "=", "tp.id_op_keluar")
+            ->whereDate("waktu_masuk", "<", $dateNow)
             ->select(
-                'tp.id_kendaraan',
-                'jm.nama as jenis_mobil',
+                "tp.id_kendaraan",
+                "jm.nama as jenis_mobil",
                 DB::raw("SUM(CASE WHEN tp.status = 1 THEN 1 ELSE 0 END) as overnight"),
-                DB::raw("SUM(CASE WHEN tp.status = 3 THEN 1 ELSE 0 END) as onexpired")
+                DB::raw("SUM(CASE WHEN tp.status = 3 THEN 1 ELSE 0 END) as onexpired"),
             )
-            ->groupBy('tp.id_kendaraan', 'jm.nama')
-            ->orderBy('tp.id_kendaraan')
+            ->groupBy("tp.id_kendaraan", "jm.nama")
+            ->orderBy("tp.id_kendaraan")
             // dd($transactions->toSql());
             ->get();
 
-
         $onCheck = $transactions
             // ->sortBy('id_kendaraan')
             // ->groupBy('id_kendaraan')
             ->map(function ($items) {
-
                 // $overNight = $items->filter(fn ($r) => (int) $r->status === 1);
                 // $onExpired = $items->filter(fn ($r) => (int) $r->status === 3);
 
                 return [
-                    'id_kendaraan'  => $items->id_kendaraan,
-                    'jenis_mobil'   => $items->jenis_mobil,
-                    'overNight'     => (int) $items->overnight,
-                    'onExpired'     => (int) $items->onexpired,
+                    "id_kendaraan" => $items->id_kendaraan,
+                    "jenis_mobil" => $items->jenis_mobil,
+                    "overNight" => (int) $items->overnight,
+                    "onExpired" => (int) $items->onexpired,
                 ];
-            }
-        )->values();
+            })
+            ->values();
 
-        Log::info('Rekap kendaraan selesai', [
-            'total_kendaraan' => $tunai->count()
+        Log::info("Rekap kendaraan selesai", [
+            "total_kendaraan" => $tunai->count(),
         ]);
 
-        Log::info('== allReportData END ==', [
-            'total_time_ms' => round((microtime(true) - $start) * 1000, 2)
+        Log::info("== allReportData END ==", [
+            "total_time_ms" => round((microtime(true) - $start) * 1000, 2),
         ]);
 
-
-
-        return response()->json([
+        return [
             // 'date'         => $startDate->format('Y-m-d'),÷
-            'date'      => $startDate,
-            'tunai'     => $tunai,
-            'nontunai'  => $cashless,
-            'overNight' => $onCheck
+            "date" => $startDate,
+            "tunai" => $tunai,
+            "nontunai" => $cashless,
+            "overNight" => $onCheck,
             // 'transactions' => $transactions->groupBy('id_kendaraan')
-        ]);
+        ];
     }
 
+    // ==========###################### Begin Laporan per petugas #######################===============//
+    public function reportOfficer(Request $request)
+    {
+        Log::info("== Officer Report  START ==");
+        Log::info($request->harian);
+        Log::info($request->tanggal);
+        $selectDate = $request->tanggal;
+        $start = microtime(true);
+        $harian = $request->harian ?? 1;
+        // $selectDate = Carbon::createFromFormat("", $tanggalRequest)->format("Y-m-d");
+        // $dateNow = Carbon::now()->format('Y-m-d');
+        $dateNow = "2026-01-25";
+        // $startDate = Carbon::today()->startOfDay();
+        // $endDate   = Carbon::today()->endOfDay();
+        // $startDate = $selectDate . ' 00:00:00';
+        // $endDate   = $selectDate . ' 23:59:59';
+        $startDate = $selectDate ? $selectDate : $dateNow;
+        $endDate = $selectDate ? $selectDate : $dateNow;
+
+        Log::info("Tanggal laporan", [
+            "start" => $startDate,
+            "end" => $endDate,
+        ]);
+
+        // =========================
+        // QUERY UTAMA (LEFT JOIN)
+        // =========================
+        Log::info("Query transaksi dimulai");
+
+        // $dateColumn = $harian == 1
+        //     ? 'tp.waktu_keluar'
+        //     : 'tp.pklogin';
+        if ($harian == 1) {
+            // $dateColumn = ['tp.waktu_masuk', 'tp.waktu_keluar'];
+            $dateColumn = ["tp.waktu_keluar"];
+        } else {
+            // $dateColumn = ['tp.pmlogin', 'tp.pklogin'];
+            $dateColumn = ["tp.pklogin"];
+        }
+
+        $transactions = DB::table("transaksi_parkir as tp")
+            ->leftJoin("pegawai as p", "p.nomer", "=", "tp.id_op_keluar")
+            // ->leftJoin("pegawai as pm", "pm.nomer", "=", "tp.id_op_masuk")
+            // ->leftJoin("pegawai as pk", "pk.nomer", "=", "tp.id_op_keluar")
+            ->where(function ($q) use ($dateColumn, $startDate, $endDate, $selectDate) {
+                $q->whereBetween($dateColumn[0], [$startDate . " 00:00:00", $endDate . " 23:59:59"])->orWhereBetween(
+                    $dateColumn[0],
+                    [$startDate . " 00:00:00", $endDate . " 23:59:59"],
+                );
+                // $q->whereRaw('DATE(tp.waktu_masuk) = ?', [$selectDate])
+                // ->orWhereRaw('DATE(tp.waktu_keluar) = ?', [$selectDate]);
+            })
+            // ->whereRaw("DATE($dateColumn) = ?", [$dateNow])
+            // ->whereBetween($dateColumn, [$startDate, $endDate])
+            ->select(
+                "p.nomer as id_petugas",
+                "p.nama as petugas",
+                // "tp.id_kendaraan",
+
+                // "pm.nama as kasir_masuk",
+                // "pk.nama as kasir_keluar",
+                "tp.id_op_masuk", // ✅ ADA
+                "tp.id_op_keluar",
+
+                "tp.waktu_masuk",
+                "tp.waktu_keluar",
+                "tp.status",
+                "tp.bayar_masuk",
+                "tp.bayar_keluar",
+                "tp.status_transaksi",
+                "tp.cara_bayar",
+            )
+            ->get();
+        // Log::info("Result nya : " . json_encode($transactions));
+
+        Log::info("Query transaksi selesai", [
+            "rows" => $transactions->count(),
+            "query_time_ms" => round((microtime(true) - $start) * 1000, 2),
+        ]);
+
+        // =========================
+        // REKAP PER KENDARAAN
+        // =========================
+        Log::info("Rekap petugas dimulai");
+
+        $tunai = $transactions
+            ->sortBy("id_op_keluar")
+            ->groupBy("id_op_keluar")
+            ->map(function ($items, $id_op_keluar) {
+                // ======================
+                // PISAH MASUK & KELUAR
+                // ======================
+                // $masuk  = $items->where('status', 1);
+                // $keluar = $items->where('status', 0);
+                $keluar = $items->filter(fn($r) => (int) $r->status === 0);
+                // $tunai = $keluar->where('cara_bayar', '!=', 3);
+                $tunai = $keluar->filter(fn($row) => in_array(data_get($row, "cara_bayar"), [null, 0, "0"], true));
+
+                // ======================
+                // MASUK
+                // ======================
+                // $masukCasual = $masuk->where('status_transaksi', '0');
+                // $masukMember = $masuk->where('status_transaksi', '3');
+
+                // ======================
+                // KELUAR
+                // ======================
+                // $keluarCasual = $tunai->where('status_transaksi', '0');
+                // $keluarMember = $tunai->where('status_transaksi', '3');
+                // $keluarLost   = $tunai->where('status_transaksi', '32');
+                $keluarCasual = $tunai->filter(
+                    fn($r) => (string) data_get($r, "status_transaksi") === "0" && data_get($r, "id_op_masuk") !== null,
+                );
+
+                $keluarMember = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "3");
+
+                $keluarLost = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "32");
+
+                $keluarManual = $tunai->filter(fn($r) => data_get($r, "id_op_masuk") === null);
+
+                $keluarMasalah = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "-1");
+
+                // ======================
+                // PEMBAYARAN (KELUAR)
+                // ======================
+                // $nonTunai = $keluar->where('cara_bayar', 3);
+                // $tunai    = $keluar->where('cara_bayar', '!=', 3);
+                $totalCash =
+                    $keluarCasual->sum("bayar_keluar") +
+                    $keluarLost->sum("bayar_keluar") +
+                    $keluarMember->sum("bayar_keluar") +
+                    $keluarManual->sum("bayar_keluar");
+
+                Log::info("Transaksi tunai : ");
+
+                return [
+                    "id_petugas" => $id_op_keluar,
+                    "petugas" => $items->first()->petugas,
+                    "total" => $items->count(),
+                    "tunaiOut" => $tunai->count(),
+                    // ========= MASUK =========
+                    // 'masuk' => [
+                    //     'casual' => [
+                    //         'jumlah' => $masukCasual->count(),
+                    //         'income' => $masukCasual->sum('bayar_masuk'),
+                    //     ],
+                    //     'member' => [
+                    //         'jumlah' => $masukMember->count(),
+                    //         'income' => $masukMember->sum('bayar_masuk'),
+                    //     ],
+                    // ],
+
+                    // ========= KELUAR =========
+                    "keluar" => [
+                        "casual" => [
+                            "jumlah" => $keluarCasual->count(),
+                            "income" => $keluarCasual->sum("bayar_keluar"),
+                        ],
+                        "lost" => [
+                            "jumlah" => $keluarLost->count(),
+                            "income" => $keluarLost->sum("bayar_keluar"),
+                        ],
+                        "member" => [
+                            "jumlah" => $keluarMember->count(),
+                            "income" => $keluarMember->sum("bayar_keluar"),
+                        ],
+                        "manual" => [
+                            "jumlah" => $keluarManual->count(),
+                            "income" => $keluarManual->sum("bayar_keluar"),
+                        ],
+                        "masalah" => [
+                            "jumlah" => $keluarMasalah->count(),
+                            "income" => $keluarMasalah->sum("bayar_keluar"),
+                        ],
+                    ],
+                    "totalCash" => $totalCash,
+                ];
+            })
+            ->values();
+
+        $cashless = $transactions
+            ->sortBy("id_op_keluar")
+            ->groupBy("id_op_keluar")
+            ->map(function ($items, $id_op_keluar) {
+                // ======================
+                // PISAH MASUK & KELUAR
+                // ======================
+                // $masuk  = $items->where('status', 1);
+                // $keluar = $items->where('status', 0);
+                // $nonTunai = $keluar->where('cara_bayar', 3);
+                $keluar = $items->filter(fn($r) => (int) $r->status === 0);
+                // $tunai = $keluar->where('cara_bayar', '!=', 3);
+                $nonTunai = $keluar->filter(fn($row) => (string) data_get($row, "cara_bayar") === "3");
+
+                // ======================
+                // MASUK
+                // ======================
+                // $masukCasual = $masuk->where('status_transaksi', '0');
+                // $masukMember = $masuk->where('status_transaksi', '3');
+
+                // ======================
+                // KELUAR
+                // ======================
+                // $keluarCasual = $nonTunai->where('status_transaksi', '0');
+                // $keluarMember = $nonTunai->where('status_transaksi', '3');
+                // $keluarLost   = $nonTunai->where('status_transaksi', '32');
+                $keluarCasual = $nonTunai->filter(
+                    fn($r) => (string) data_get($r, "status_transaksi") === "0" && data_get($r, "id_op_masuk") !== null,
+                );
+                $keluarMember = $nonTunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "3");
+                $keluarLost = $nonTunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "32");
+                $keluarManual = $nonTunai->filter(fn($r) => data_get($r, "id_op_masuk") === null);
+
+                $totalCashless =
+                    $keluarCasual->sum("bayar_keluar") +
+                    $keluarLost->sum("bayar_keluar") +
+                    $keluarMember->sum("bayar_keluar") +
+                    $keluarManual->sum("bayar_keluar");
+
+                // ======================
+                // PEMBAYARAN (KELUAR)
+                // ======================
+
+                return [
+                    "id_petugas" => $id_op_keluar,
+                    "petugas" => $items->first()->petugas,
+                    "total" => $items->count(),
+                    "nonTunaiOut" => $nonTunai->count(),
+
+                    // ========= MASUK =========
+                    // 'masuk' => [
+                    //     'casual' => [
+                    //         'jumlah' => $masukCasual->count(),
+                    //         'income' => $masukCasual->sum('bayar_masuk'),
+                    //     ],
+                    //     'member' => [
+                    //         'jumlah' => $masukMember->count(),
+                    //         'income' => $masukMember->sum('bayar_masuk'),
+                    //     ],
+                    // ],
+
+                    // ========= KELUAR =========
+                    "keluar" => [
+                        "casual" => [
+                            "jumlah" => $keluarCasual->count(),
+                            "income" => $keluarCasual->sum("bayar_keluar"),
+                        ],
+                        "lost" => [
+                            "jumlah" => $keluarLost->count(),
+                            "income" => $keluarLost->sum("bayar_keluar"),
+                        ],
+                        "member" => [
+                            "jumlah" => $keluarMember->count(),
+                            "income" => $keluarMember->sum("bayar_keluar"),
+                        ],
+                        "manual" => [
+                            "jumlah" => $keluarManual->count(),
+                            "income" => $keluarManual->sum("bayar_keluar"),
+                        ],
+                    ],
+                    "totalCashless" => $totalCashless,
+                ];
+            })
+            ->values();
+
+        // $transactions = DB::table("transaksi_parkir as tp")
+        //     ->leftJoin("pegawai as p", "p.nomer", "=", "tp.id_op_keluar")
+        //     ->leftJoin("pegawai as pm", "pm.nomer", "=", "tp.id_op_masuk")
+        //     ->leftJoin("pegawai as pk", "pk.nomer", "=", "tp.id_op_keluar")
+        //     ->whereDate("waktu_masuk", "<", $dateNow)
+        //     ->select(
+        // "tp.id_kendaraan",
+        // "p.nama as jenis_mobil",
+        //     "tp.id_op_keluar",
+        //     "p.nama as petugas",
+        //     DB::raw("SUM(CASE WHEN tp.status = 1 THEN 1 ELSE 0 END) as overnight"),
+        //     DB::raw("SUM(CASE WHEN tp.status = 3 THEN 1 ELSE 0 END) as onexpired"),
+        // )
+        // ->groupBy("tp.id_op_keluar", "petugas")
+        // ->orderBy("tp.id_op_keluar", "asc")
+        // ->groupBy("p.nomer", "p.nama")
+        // ->orderBy("p.nomer")
+        // dd($transactions->toSql());
+        // ->get();
+
+        // $onCheck = $transactions
+        // ->sortBy('id_kendaraan')
+        // ->groupBy('id_kendaraan')
+        // ->map(function ($items) {
+        // $overNight = $items->filter(fn ($r) => (int) $r->status === 1);
+        // $onExpired = $items->filter(fn ($r) => (int) $r->status === 3);
+
+        //     return [
+        //         "id_petugas" => $items->id_op_keluar,
+        //         "petugas" => $items->petugas,
+        //         "overNight" => (int) $items->overnight,
+        //         "onExpired" => (int) $items->onexpired,
+        //     ];
+        // })
+        // ->values();
+
+        Log::info("Rekap kendaraan selesai", [
+            "total_kendaraan" => $tunai->count(),
+        ]);
+
+        Log::info("== allReportData END ==", [
+            "total_time_ms" => round((microtime(true) - $start) * 1000, 2),
+        ]);
+
+        return [
+            "date" => $startDate,
+            "tunai" => $tunai,
+            "nontunai" => $cashless,
+        ];
+    }
+    // ========== End Laporan per petugas ===============///
+
+    // ==========###################### Begin Laporan per petugas #######################===============//
+    public function paymentType(Request $request)
+    {
+        Log::info("== Officer Report  START ==");
+        Log::info($request->harian);
+        Log::info($request->tanggal);
+        $selectDate = $request->tanggal;
+        $start = microtime(true);
+        $harian = $request->harian ?? 1;
+        $dateNow = "2026-01-25";
+        $startDate = $selectDate ? $selectDate : $dateNow;
+        $endDate = $selectDate ? $selectDate : $dateNow;
+
+        Log::info("Tanggal laporan", [
+            "start" => $startDate,
+            "end" => $endDate,
+        ]);
+        // ============= QUERY UTAMA (LEFT JOIN) =========================
+        Log::info("Query transaksi dimulai");
+
+        if ($harian == 1) {
+            $dateColumn = ["tp.waktu_keluar"];
+        } else {
+            $dateColumn = ["tp.pklogin"];
+        }
+
+        $transactions = DB::table("transaksi_parkir as tp")
+            // ->leftJoin("pegawai as p", "p.nomer", "=", "tp.id_op_keluar")
+            // ->leftJoin("pegawai as pm", "pm.nomer", "=", "tp.id_op_masuk")
+            // ->leftJoin("pegawai as pk", "pk.nomer", "=", "tp.id_op_keluar")
+            ->where(function ($q) use ($dateColumn, $startDate, $endDate, $selectDate) {
+                $q->whereBetween($dateColumn[0], [$startDate . " 00:00:00", $endDate . " 23:59:59"])->orWhereBetween(
+                    $dateColumn[0],
+                    [$startDate . " 00:00:00", $endDate . " 23:59:59"],
+                );
+                // $q->whereRaw('DATE(tp.waktu_masuk) = ?', [$selectDate])
+                // ->orWhereRaw('DATE(tp.waktu_keluar) = ?', [$selectDate]);
+            })
+            // ->whereRaw("DATE($dateColumn) = ?", [$dateNow])
+            // ->whereBetween($dateColumn, [$startDate, $endDate])
+            ->select(
+                "rep_bank as bankType",
+                // "p.nomer as id_petugas",
+                // "p.nama as petugas",
+                // "tp.id_kendaraan",
+
+                // "pm.nama as kasir_masuk",
+                // "pk.nama as kasir_keluar",
+                "tp.id_op_masuk", // ✅ ADA
+                "tp.id_op_keluar",
+
+                "tp.waktu_masuk",
+                "tp.waktu_keluar",
+                "tp.status",
+                "tp.bayar_masuk",
+                "tp.bayar_keluar",
+                "tp.status_transaksi",
+                "tp.cara_bayar",
+            )
+            ->get();
+        Log::info("Query transaksi selesai", [
+            "rows" => $transactions->count(),
+            "query_time_ms" => round((microtime(true) - $start) * 1000, 2),
+        ]);
+
+        Log::info("Rekap payment dimulai");
+
+        $tunai = $transactions
+            ->sortBy("bankType")
+            ->groupBy("bankType")
+            ->map(function ($items, $bankType) {
+                $keluar = $items->filter(fn($r) => (int) $r->status === 0);
+                $tunai = $keluar->filter(fn($row) => in_array(data_get($row, "cara_bayar"), [null, 0, "0"], true));
+                $keluarCasual = $tunai->filter(
+                    fn($r) => (string) data_get($r, "status_transaksi") === "0" && data_get($r, "id_op_masuk") !== null,
+                );
+                $keluarMember = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "3");
+                $keluarLost = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "32");
+                $keluarManual = $tunai->filter(fn($r) => data_get($r, "id_op_masuk") === null);
+                $keluarMasalah = $tunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "-1");
+
+                $totalCash =
+                    $keluarCasual->sum("bayar_keluar") +
+                    $keluarLost->sum("bayar_keluar") +
+                    $keluarMember->sum("bayar_keluar") +
+                    $keluarManual->sum("bayar_keluar");
+
+                Log::info("Transaksi tunai : ");
+
+                return [
+                    "typePayment" => $bankType,
+                    "petugas" => $items->first()->bankType,
+                    "total" => $items->count(),
+                    "tunaiOut" => $tunai->count(),
+                    "keluar" => [
+                        "casual" => [
+                            "jumlah" => $keluarCasual->count(),
+                            "income" => $keluarCasual->sum("bayar_keluar"),
+                        ],
+                        "lost" => [
+                            "jumlah" => $keluarLost->count(),
+                            "income" => $keluarLost->sum("bayar_keluar"),
+                        ],
+                        "member" => [
+                            "jumlah" => $keluarMember->count(),
+                            "income" => $keluarMember->sum("bayar_keluar"),
+                        ],
+                        "manual" => [
+                            "jumlah" => $keluarManual->count(),
+                            "income" => $keluarManual->sum("bayar_keluar"),
+                        ],
+                        "masalah" => [
+                            "jumlah" => $keluarMasalah->count(),
+                            "income" => $keluarMasalah->sum("bayar_keluar"),
+                        ],
+                    ],
+                    "totalCash" => $totalCash,
+                ];
+            })
+            ->values();
+
+        $cashless = $transactions
+            ->sortBy("bankType")
+            ->groupBy("bankType")
+            ->map(function ($items, $bankType) {
+                $keluar = $items->filter(fn($r) => (int) $r->status === 0);
+                $nonTunai = $keluar->filter(fn($row) => (string) data_get($row, "cara_bayar") === "3");
+
+                $keluarCasual = $nonTunai->filter(
+                    fn($r) => (string) data_get($r, "status_transaksi") === "0" && data_get($r, "id_op_masuk") !== null,
+                );
+                $keluarMember = $nonTunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "3");
+                $keluarLost = $nonTunai->filter(fn($r) => (string) data_get($r, "status_transaksi") === "32");
+                $keluarManual = $nonTunai->filter(fn($r) => data_get($r, "id_op_masuk") === null);
+
+                $totalCashless =
+                    $keluarCasual->sum("bayar_keluar") +
+                    $keluarLost->sum("bayar_keluar") +
+                    $keluarMember->sum("bayar_keluar") +
+                    $keluarManual->sum("bayar_keluar");
+
+                // ======================
+                // PEMBAYARAN (KELUAR)
+                // ======================
+
+                return [
+                    "typePayment" => $bankType,
+                    "petugas" => $items->first()->bankType,
+                    "total" => $items->count(),
+                    "nonTunaiOut" => $nonTunai->count(),
+                    "keluar" => [
+                        "casual" => [
+                            "jumlah" => $keluarCasual->count(),
+                            "income" => $keluarCasual->sum("bayar_keluar"),
+                        ],
+                        "lost" => [
+                            "jumlah" => $keluarLost->count(),
+                            "income" => $keluarLost->sum("bayar_keluar"),
+                        ],
+                        "member" => [
+                            "jumlah" => $keluarMember->count(),
+                            "income" => $keluarMember->sum("bayar_keluar"),
+                        ],
+                        "manual" => [
+                            "jumlah" => $keluarManual->count(),
+                            "income" => $keluarManual->sum("bayar_keluar"),
+                        ],
+                    ],
+                    "totalCashless" => $totalCashless,
+                ];
+            })
+            ->values();
+
+        Log::info("Rekap kendaraan selesai", [
+            "total_kendaraan" => $tunai->count(),
+        ]);
+
+        Log::info("== allReportData END ==", [
+            "total_time_ms" => round((microtime(true) - $start) * 1000, 2),
+        ]);
+
+        return [
+            "date" => $startDate,
+            "tunai" => $tunai,
+            "nontunai" => $cashless,
+        ];
+    }
+    // ========== End Laporan payment Type ===============///
 }
diff --git a/app/Http/Controllers/Parking/Setup/UserLevel/LevelMenuController.php b/app/Http/Controllers/Parking/Setup/UserLevel/LevelMenuController.php
new file mode 100644
index 0000000..6ebd7c6
--- /dev/null
+++ b/app/Http/Controllers/Parking/Setup/UserLevel/LevelMenuController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers\Parking\Setup\UserLevel;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class LevelMenuController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/Parking/Setup/UserLevel/LevelUserController.php b/app/Http/Controllers/Parking/Setup/UserLevel/LevelUserController.php
index dffcc12..387cc82 100644
--- a/app/Http/Controllers/Parking/Setup/UserLevel/LevelUserController.php
+++ b/app/Http/Controllers/Parking/Setup/UserLevel/LevelUserController.php
@@ -54,7 +54,7 @@ public function store(Request $request)
      */
     public function show($id)
     {
-        //
+        Log::info($id);
     }
 
     /**
diff --git a/app/Http/Controllers/Parking/Setup/Vehicle/ModifiedVehiclepriceController.php b/app/Http/Controllers/Parking/Setup/Vehicle/ModifiedVehiclepriceController.php
index 13c7548..e14f005 100644
--- a/app/Http/Controllers/Parking/Setup/Vehicle/ModifiedVehiclepriceController.php
+++ b/app/Http/Controllers/Parking/Setup/Vehicle/ModifiedVehiclepriceController.php
@@ -92,9 +92,7 @@ public function update(Request $request, $id)
                     "message" => "Tidak ada perubahan data",
                 ]);
             }
-            Log::info(
-                "Data yang di simpan" . json_encode($dataQuery->getDirty()),
-            );
+            Log::info("Data yang di simpan" . json_encode($dataQuery->getDirty()));
             $dataQuery->save();
 
             return response()->json([
@@ -102,9 +100,7 @@ public function update(Request $request, $id)
                 "message" => "Data berhasil di ubah",
             ]);
         } catch (\Throwable $th) {
-            Log::info(
-                "Data yang di simpan" . json_encode($dataQuery->getDirty()),
-            );
+            Log::info("Data yang di simpan" . json_encode($dataQuery->getDirty()));
 
             // Log::info($request->all());
 
diff --git a/app/Http/Controllers/ParkingSetupUserLevelLevelMenuController.php b/app/Http/Controllers/ParkingSetupUserLevelLevelMenuController.php
new file mode 100644
index 0000000..f88daca
--- /dev/null
+++ b/app/Http/Controllers/ParkingSetupUserLevelLevelMenuController.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ParkingSetupUserLevelLevelMenuController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/public/js/report/report-vehicle.js b/public/js/report/report-vehicle.js
new file mode 100644
index 0000000..3783b25
--- /dev/null
+++ b/public/js/report/report-vehicle.js
@@ -0,0 +1,1173 @@
+let lastResponse = null;
+
+$(document).ready(function () {
+    // $("#modaltanggal").modal("show");
+    // const hariIni = flatpickr("#tanggalCari", {
+    //     dateFormat: "Y-m-d", // ini yang tampil ke user
+    //     altInput: true,
+    //     altFormat: "Y-m-d",
+    //     defaultDate: "today",
+    //     onChange: function (selectedDate, dateStr, instance) {
+    //         loadData();
+    //     },
+    // });
+    //
+    const date = $("#tanggalCari").datepicker({
+        format: "yyyy-mm-dd",
+        autoclose: true,
+        todayHighlight: true,
+    });
+    $("#tanggalCari").datepicker("setDate", new Date());
+    $("#tanggalCari").on("changeDate", function (e) {
+        const tanggalCari = $("#tanggalCari").val();
+        $("#tanggal-trans").text("Tanggal : " + tanggalCari);
+        loadData();
+    });
+
+    const tanggalCari = $("#tanggalCari").val();
+
+    // $("#harianToggle").on("change", loadData);
+    // Set tanggal default ke hari ini
+    // console.log("value asli (ke server):", $("#tanggalCari").val());
+    // console.log("value tampilan:", $("input[data-input]").val()); // tampilan: 30-07-2026
+    // realtime trigger
+    // $("#tanggalCari").on("change", $("#tanggalCari").val());
+    $("#harianToggle").on("change", loadData);
+
+    // var today = Date.now().format("yyyy-mm-dd");
+    // $("#tanggalCari").val();
+    // $("#tanggalCari").val(getToday());
+    loadData();
+
+    // lastResponse = loadData();
+    // $('.btn-export-excel').on('click', function () {
+    $(document).on("click", ".btn-export-excel", function (e) {
+        // e.preventDefault();
+        $("#cash td").each(function () {
+            const raw = $(this).data("value");
+            if (raw !== undefined) {
+                $(this).text(raw);
+            }
+        });
+
+        const table = document.getElementById("cetak");
+        const wb = XLSX.utils.table_to_book(table, { sheet: "Sheet 1" });
+        XLSX.writeFile(wb, `monthlyReport.xlsx`);
+        console.log(e);
+    });
+
+    $(".btn-export-pdf").on("click", async function () {
+        // $('.cetak').css('display','block');
+        // $('.user').css('display','block');
+        // const { jsPDF } = window.jspdf;
+        // const doc = new jsPDF("p", "pt", "a4");
+        // // ambil elemen tabel
+        // const table = document.getElementById("cetak");
+        // const canvas = await html2canvas(table, { scale: 2 });
+        // const imgData = canvas.toDataURL("image/png");
+        // const imgWidth = doc.internal.pageSize.getWidth();
+        // const imgHeight = (canvas.height * imgWidth) / canvas.width;
+        // doc.addImage(imgData, "PNG", 0, 20, imgWidth, imgHeight);
+        // doc.save(`Rekap Harian.pdf`);
+        //
+        // jsPDF Autotable
+        if (!lastResponse) {
+            alert("Data belum tersedia");
+            return;
+        }
+        printPDF(lastResponse.vehicle);
+    });
+    // console.log(document.getElementById("cetak"));
+    // console.log(document.getElementById("date-table"));
+});
+
+function loadData(tanggalMulai, tanggalAkhir) {
+    let tanggal = $("#tanggalCari").val();
+    let harian = $("#harianToggle").is(":checked") ? 1 : 0;
+    if (harian == 1) $("#harian").text("By : Harian");
+    else $("#harian").text("By : Shift");
+    // console.log(harian);
+    // console.log(tanggal);
+
+    if (!tanggal) return;
+
+    // Contoh: Load data dengan AJAX
+    $.ajax({
+        url: "/report/laporan-semua-transaksi/vehicle", // Ganti dengan route Anda
+        type: "GET",
+        data: {
+            tanggal: tanggal,
+            harian: harian,
+        },
+        beforeSend: function () {
+            console.log("Loading data...");
+        },
+        success: function (response) {
+            lastResponse = response; // ✅ tambah ini
+            tableVehicle(response.vehicle);
+            tableOfficer(response.officer);
+            tablePayment(response.payment);
+            // // Update tabel dengan data yang diterima
+            // let html = "";
+            // let onData = "";
+            // let jmlCashCasual = 0;
+            // let incomeCashCasual = 0;
+            // let jmlCashlessCasual = 0;
+            // let incomeCashlessCasual = 0;
+            // let grandTotal = 0;
+            // response.tunai.forEach(function (cash) {
+            //     // cari pasangan non tunai
+            //     let cashless = response.nontunai.find((nt) => String(nt.id_kendaraan) === String(cash.id_kendaraan));
+            //     // fallback aman
+            //     cashless = cashless || {
+            //         nontunai: 0,
+            //         nonTunaiOut: 0,
+            //         keluar: {
+            //             casual: { jumlah: 0, income: 0 },
+            //             lost: { jumlah: 0, income: 0 },
+            //             member: { jumlah: 0, income: 0 },
+            //         },
+            //         totalCashless: 0,
+            //     };
+            //     let casualIn = cash.total;
+            //     let tunaiOut = cash.tunaiOut;
+            //     // ===== DATA TUNAI =====
+            //     let tCasual = cash.keluar.casual;
+            //     let tLost = cash.keluar.lost;
+            //     let tMember = cash.keluar.member;
+            //     let tManual = cash.keluar.manual;
+            //     // ===== DATA NON TUNAI =====
+            //     let nonTunaiOut = cashless.nonTunaiOut;
+            //     let nCasual = cashless.keluar.casual;
+            //     let nLost = cashless.keluar.lost;
+            //     let nMember = cashless.keluar.member;
+            //     let nManual = cashless.keluar.manual;
+            //     let totalTunai = cash.totalCash || 0;
+            //     let totalNonTunai = cashless.totalCashless || 0;
+            //     jmlCashCasual += cash.keluar.casual.jumlah;
+            //     incomeCashCasual += cash.keluar.casual.income;
+            //     jmlCashlessCasual += cashless.keluar.casual.jumlah;
+            //     incomeCashlessCasual += cashless.keluar.casual.income;
+            //     grandTotal += totalTunai + totalNonTunai;
+            //     // let casualCash   = cash.keluar.casual;
+            //     // let lostCash     = cash.keluar.lost;
+            //     // let memberCash   = cash.keluar.member;
+            //     // let casualIn     = cash.total;
+            //     // let casualNon    = cashless ? cashless.keluar.casual : { jumlah: 0, income: 0 };
+            //     // let lostNon      = cashless ? cashless.keluar.lost   : { jumlah: 0, income: 0 };
+            //     // let memberNon    = cashless ? cashless.keluar.member : { jumlah: 0, income: 0 };
+            //     // let totalIncome =
+            //     //     (cash.totalCash || 0);
+            //     // html += `
+            //     // <tr>
+            //     //     <td style="text-align: left;">${cash.jenis_mobil}</td>
+            //     //     <!-- Jenis Transaksi -->
+            //     //     <td>${casualIn}</td>
+            //     //     <td>${cash.tunaiOut}</td>
+            //     //     <!-- Casual -->
+            //     //     <td>${casualCash.jumlah}</td>
+            //     //     <td>${rupiah(casualCash.income)}</td>
+            //     //     <!-- Tiket Hilang -->
+            //     //     <td>${lostCash.jumlah}</td>
+            //     //     <td>${rupiah(lostCash.income)}</td>
+            //     //     <!-- Member -->
+            //     //     <td>${memberCash.jumlah}</td>
+            //     //     <td>${rupiah(memberCash.income)}</td>
+            //     //     <!-- Manual Input -->
+            //     //     <td>0</td>
+            //     //     <td>0</td>
+            //     //     <!-- Manual Mix -->
+            //     //     <td>0</td>
+            //     //     <td>0</td>
+            //     //     <!-- Tiket Masalah -->
+            //     //     <td>0</td>
+            //     //     <td>0</td>
+            //     //     <!-- Pendapatan -->
+            //     //     <td><strong>${rupiah(totalIncome)}</strong></td>
+            //     // </tr>
+            //     // `;
+            //     html += `
+            //     <tr>
+            //         <td rowspan="2" style="text-align: left;"><strong>${cash.jenis_mobil}</strong></td>
+            //         <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+            //         <td>${casualIn}</td>
+            //         <td>${tunaiOut}</td>
+            //         <td>${tCasual.jumlah}</td>
+            //         <td data-value="${tCasual.income}">${rupiah(tCasual.income)}</td>
+            //         <td>${tLost.jumlah}</td>
+            //         <td data-value="${tLost.income}">${rupiah(tLost.income)}</td>
+            //         <td>${tMember.jumlah}</td>
+            //         <td data-value="${tMember.income}">${rupiah(tMember.income)}</td>
+            //         <td>${tManual.jumlah}</td>
+            //         <td data-value="${tManual.income}">${rupiah(tManual.income)}</td>
+            //         <td>0</td>
+            //         <td data-value="0}">0</td>
+            //         <td>0</td>
+            //         <td data-value="0">0</td>
+            //         <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
+            //     </tr>
+            //     <tr>
+            //         <td style="text-align: left;"><span class="badge bg-warning">Non Tunai</span></td>
+            //         <td>${casualIn}</td>
+            //         <td>${nonTunaiOut}</td>
+            //         <td>${nCasual.jumlah}</td>
+            //         <td data-value="${nCasual.income}">${rupiah(nCasual.income)}</td>
+            //         <td>${nLost.jumlah}</td>
+            //         <td>${rupiah(nLost.income)}</td>
+            //         <td>${nMember.jumlah}</td>
+            //         <td>${rupiah(nMember.income)}</td>
+            //         <td>${nManual.jumlah}</td>
+            //         <td data-value="${nManual.income}">${rupiah(nManual.income)}</td>
+            //         <td>0</td>
+            //         <td data-value="0">0</td>
+            //         <td>0</td>
+            //         <td data-value="0">0</td>
+            //         <td data-value="${totalNonTunai}"><strong>${rupiah(totalNonTunai)}</strong></td>
+            //     </tr>
+            //     `;
+            // });
+            // // ===== FOOTER TOTAL =====
+            // html += `
+            // <tr class="table">
+            //     <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+            //     <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+            //     <td>0</td>
+            //     <td>0</td>
+            //     <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
+            //     <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
+            //     <td colspan="11">0</td>
+            // </tr>
+            // <tr>
+            //     <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
+            //      <td>0</td>
+            //     <td>0</td>
+            //     <td>${jmlCashlessCasual}</td>
+            //     <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
+            //     <td colspan="11">0</td>
+            // </tr>
+            // <tr class="table">
+            //     <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
+            //     <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}">${rupiah(incomeCashCasual + incomeCashlessCasual)}</td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td colspan="0"></td>
+            //     <td><strong>${rupiah(grandTotal)}</strong></td>
+            // </tr>
+            // `;
+            // // console.log('TUNAI:', cash.id_kendaraan, cash);
+            // // console.log('CASHLESS FOUND:', cashless);
+            // $("#table-data").html(html);
+            // response.overNight.forEach(function (on) {
+            //     if (!on.jenis_mobil) return;
+            //     let overnight = on.overNight;
+            //     let onExpired = on.onExpired;
+            //     onData += `
+            //         <tr>
+            //             <td style="text-align: left;">${on.jenis_mobil}</td>
+            //             <td>${overnight}</td>
+            //             <td>${onExpired}</td>
+            //             <td>0</td>
+            //         </tr>
+            //     `;
+            // });
+            // $("#table-overnight").html(onData);
+            // console.log(response);
+        },
+        error: function (xhr) {
+            console.log("Error:", xhr);
+            alert("Terjadi kesalahan saat memuat data");
+        },
+    });
+}
+
+function rupiah(angka) {
+    return new Intl.NumberFormat("id-ID").format(angka || 0);
+}
+
+function getToday() {
+    const d = new Date();
+    const tgl = String(d.getDate()).padStart(2, "0");
+    const bulan = String(d.getMonth() + 1).padStart(2, "0");
+    const tahun = d.getFullYear();
+    return `${tgl}-${bulan}-${tahun}`;
+}
+
+function tableVehicle(response) {
+    // Update tabel dengan data yang diterima
+
+    let html = "";
+    let onData = "";
+    let jmlCashCasual = 0;
+    let incomeCashCasual = 0;
+
+    let jmlCashlessCasual = 0;
+    let incomeCashlessCasual = 0;
+
+    let grandTotal = 0;
+
+    response.tunai.forEach(function (cash) {
+        // cari pasangan non tunai
+        let cashless = response.nontunai.find((nt) => String(nt.id_kendaraan) === String(cash.id_kendaraan));
+
+        // fallback aman
+        cashless = cashless || {
+            nontunai: 0,
+            nonTunaiOut: 0,
+            keluar: {
+                casual: { jumlah: 0, income: 0 },
+                lost: { jumlah: 0, income: 0 },
+                member: { jumlah: 0, income: 0 },
+            },
+            totalCashless: 0,
+        };
+
+        let casualIn = cash.total;
+        let tunaiOut = cash.tunaiOut;
+        // ===== DATA TUNAI =====
+        let tCasual = cash.keluar.casual;
+        let tLost = cash.keluar.lost;
+        let tMember = cash.keluar.member;
+        let tManual = cash.keluar.manual;
+
+        // ===== DATA NON TUNAI =====
+        let nonTunaiOut = cashless.nonTunaiOut;
+
+        let nCasual = cashless.keluar.casual;
+        let nLost = cashless.keluar.lost;
+        let nMember = cashless.keluar.member;
+        let nManual = cashless.keluar.manual;
+
+        let totalTunai = cash.totalCash || 0;
+        let totalNonTunai = cashless.totalCashless || 0;
+
+        jmlCashCasual += cash.keluar.casual.jumlah;
+        incomeCashCasual += cash.keluar.casual.income;
+
+        jmlCashlessCasual += cashless.keluar.casual.jumlah;
+        incomeCashlessCasual += cashless.keluar.casual.income;
+
+        grandTotal += totalTunai + totalNonTunai;
+        // let casualCash   = cash.keluar.casual;
+        // let lostCash     = cash.keluar.lost;
+        // let memberCash   = cash.keluar.member;
+        // let casualIn     = cash.total;
+
+        // let casualNon    = cashless ? cashless.keluar.casual : { jumlah: 0, income: 0 };
+        // let lostNon      = cashless ? cashless.keluar.lost   : { jumlah: 0, income: 0 };
+        // let memberNon    = cashless ? cashless.keluar.member : { jumlah: 0, income: 0 };
+
+        // let totalIncome =
+        //     (cash.totalCash || 0);
+
+        // html += `
+        // <tr>
+        //     <td style="text-align: left;">${cash.jenis_mobil}</td>
+
+        //     <!-- Jenis Transaksi -->
+        //     <td>${casualIn}</td>
+        //     <td>${cash.tunaiOut}</td>
+
+        //     <!-- Casual -->
+        //     <td>${casualCash.jumlah}</td>
+        //     <td>${rupiah(casualCash.income)}</td>
+
+        //     <!-- Tiket Hilang -->
+        //     <td>${lostCash.jumlah}</td>
+        //     <td>${rupiah(lostCash.income)}</td>
+
+        //     <!-- Member -->
+        //     <td>${memberCash.jumlah}</td>
+        //     <td>${rupiah(memberCash.income)}</td>
+
+        //     <!-- Manual Input -->
+        //     <td>0</td>
+        //     <td>0</td>
+
+        //     <!-- Manual Mix -->
+        //     <td>0</td>
+        //     <td>0</td>
+
+        //     <!-- Tiket Masalah -->
+        //     <td>0</td>
+        //     <td>0</td>
+
+        //     <!-- Pendapatan -->
+        //     <td><strong>${rupiah(totalIncome)}</strong></td>
+        // </tr>
+        // `;
+        html += `
+            <tr>
+                <td rowspan="2" style="text-align: left;"><strong>${cash.jenis_mobil}</strong></td>
+                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+
+                <td>${casualIn}</td>
+                <td>${tunaiOut}</td>
+
+                <td>${tCasual.jumlah}</td>
+                <td data-value="${tCasual.income}">${rupiah(tCasual.income)}</td>
+
+                <td>${tLost.jumlah}</td>
+                <td data-value="${tLost.income}">${rupiah(tLost.income)}</td>
+
+                <td>${tMember.jumlah}</td>
+                <td data-value="${tMember.income}">${rupiah(tMember.income)}</td>
+
+                <td>${tManual.jumlah}</td>
+                <td data-value="${tManual.income}">${rupiah(tManual.income)}</td>
+
+                <td>0</td>
+                <td data-value="0}">0</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
+            </tr>
+
+            <tr>
+                <td style="text-align: left;"><span class="badge bg-warning">Non Tunai</span></td>
+
+                <td>${casualIn}</td>
+                <td>${nonTunaiOut}</td>
+
+                <td>${nCasual.jumlah}</td>
+                <td data-value="${nCasual.income}">${rupiah(nCasual.income)}</td>
+
+                <td>${nLost.jumlah}</td>
+                <td>${rupiah(nLost.income)}</td>
+
+                <td>${nMember.jumlah}</td>
+                <td>${rupiah(nMember.income)}</td>
+
+                <td>${nManual.jumlah}</td>
+                <td data-value="${nManual.income}">${rupiah(nManual.income)}</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td data-value="${totalNonTunai}"><strong>${rupiah(totalNonTunai)}</strong></td>
+            </tr>
+        `;
+    });
+
+    // ===== FOOTER TOTAL =====
+    html += `
+            <tr class="table">
+                <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
+                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
+                <td colspan="10"></td>
+                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
+            </tr>
+            <tr>
+                <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
+                <td>0</td>
+                <td>0</td>
+                <td>${jmlCashlessCasual}</td>
+                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
+                <td colspan="10"></td>
+                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
+            </tr>
+            <tr class="table">
+                <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+                <td colspan="0"></td>
+                <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
+                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}">${rupiah(incomeCashCasual + incomeCashlessCasual)}</td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td><strong>${rupiah(grandTotal)}</strong></td>
+            </tr>
+        `;
+    // console.log('TUNAI:', cash.id_kendaraan, cash);
+    // console.log('CASHLESS FOUND:', cashless);
+
+    $("#table-data").html(html);
+
+    response.overNight.forEach(function (on) {
+        if (!on.jenis_mobil) return;
+
+        let overnight = on.overNight;
+        let onExpired = on.onExpired;
+
+        onData += `
+        <tr>
+            <td style="text-align: left;">${on.jenis_mobil}</td>
+            <td>${overnight}</td>
+            <td>${onExpired}</td>
+            <td>0</td>
+        </tr>
+    `;
+    });
+
+    $("#table-overnight").html(onData);
+    console.log(response);
+}
+
+function tableOfficer(response) {
+    // Update tabel dengan data yang diterima
+    console.log(response);
+
+    let html = "";
+    let onData = "";
+    let jmlCashCasual = 0;
+    let incomeCashCasual = 0;
+
+    let jmlCashlessCasual = 0;
+    let incomeCashlessCasual = 0;
+
+    let grandTotal = 0;
+
+    response.tunai.forEach(function (cash) {
+        // cari pasangan non tunai
+        let cashless = response.nontunai.find((nt) => String(nt.id_petugas) === String(cash.id_petugas));
+
+        // fallback aman
+        cashless = cashless || {
+            nontunai: 0,
+            nonTunaiOut: 0,
+            keluar: {
+                casual: { jumlah: 0, income: 0 },
+                lost: { jumlah: 0, income: 0 },
+                member: { jumlah: 0, income: 0 },
+            },
+            totalCashless: 0,
+        };
+
+        let petugas = cash.petugas === null ? "NO-OP" : cash.petugas;
+        let casualIn = cash.total;
+        let tunaiOut = cash.tunaiOut;
+        // ===== DATA TUNAI =====
+        let tCasual = cash.keluar.casual;
+        let tLost = cash.keluar.lost;
+        let tMember = cash.keluar.member;
+        let tManual = cash.keluar.manual;
+
+        // ===== DATA NON TUNAI =====
+        let nonTunaiOut = cashless.nonTunaiOut;
+
+        let nCasual = cashless.keluar.casual;
+        let nLost = cashless.keluar.lost;
+        let nMember = cashless.keluar.member;
+        let nManual = cashless.keluar.manual ?? 0;
+
+        let totalTunai = cash.totalCash || 0;
+        let totalNonTunai = cashless.totalCashless || 0;
+
+        jmlCashCasual += cash.keluar.casual.jumlah;
+        incomeCashCasual += cash.keluar.casual.income;
+
+        jmlCashlessCasual += cashless.keluar.casual.jumlah;
+        incomeCashlessCasual += cashless.keluar.casual.income;
+
+        grandTotal += totalTunai + totalNonTunai;
+        // let casualCash   = cash.keluar.casual;
+        // let lostCash     = cash.keluar.lost;
+        // let memberCash   = cash.keluar.member;
+        // let casualIn     = cash.total;
+
+        // let casualNon    = cashless ? cashless.keluar.casual : { jumlah: 0, income: 0 };
+        // let lostNon      = cashless ? cashless.keluar.lost   : { jumlah: 0, income: 0 };
+        // let memberNon    = cashless ? cashless.keluar.member : { jumlah: 0, income: 0 };
+
+        // let totalIncome =
+        //     (cash.totalCash || 0);
+
+        // html += `
+        // <tr>
+        //     <td style="text-align: left;">${cash.jenis_mobil}</td>
+
+        //     <!-- Jenis Transaksi -->
+        //     <td>${casualIn}</td>
+        //     <td>${cash.tunaiOut}</td>
+
+        //     <!-- Casual -->
+        //     <td>${casualCash.jumlah}</td>
+        //     <td>${rupiah(casualCash.income)}</td>
+
+        //     <!-- Tiket Hilang -->
+        //     <td>${lostCash.jumlah}</td>
+        //     <td>${rupiah(lostCash.income)}</td>
+
+        //     <!-- Member -->
+        //     <td>${memberCash.jumlah}</td>
+        //     <td>${rupiah(memberCash.income)}</td>
+
+        //     <!-- Manual Input -->
+        //     <td>0</td>
+        //     <td>0</td>
+
+        //     <!-- Manual Mix -->
+        //     <td>0</td>
+        //     <td>0</td>
+
+        //     <!-- Tiket Masalah -->
+        //     <td>0</td>
+        //     <td>0</td>
+
+        //     <!-- Pendapatan -->
+        //     <td><strong>${rupiah(totalIncome)}</strong></td>
+        // </tr>
+        // `;
+        html += `
+            <tr>
+                <td rowspan="2" style="text-align: left;"><strong>${petugas}</strong></td>
+                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+
+                <td>${casualIn}</td>
+                <td>${tunaiOut}</td>
+
+                <td>${tCasual.jumlah}</td>
+                <td data-value="${tCasual.income}">${rupiah(tCasual.income)}</td>
+
+                <td>${tLost.jumlah}</td>
+                <td data-value="${tLost.income}">${rupiah(tLost.income)}</td>
+
+                <td>${tMember.jumlah}</td>
+                <td data-value="${tMember.income}">${rupiah(tMember.income)}</td>
+
+                <td>${tManual.jumlah}</td>
+                <td data-value="${tManual.income}">${rupiah(tManual.income)}</td>
+
+                <td>0</td>
+                <td data-value="0}">0</td>
+
+                <td>0</td>
+                <td data-value="0"></td>
+
+                <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
+            </tr>
+
+            <tr>
+                <td style="text-align: left;"><span class="badge bg-warning">Non Tunai</span></td>
+
+                <td>${casualIn}</td>
+                <td>${nonTunaiOut}</td>
+
+                <td>${nCasual.jumlah}</td>
+                <td data-value="${nCasual.income}">${rupiah(nCasual.income)}</td>
+
+                <td>${nLost.jumlah}</td>
+                <td>${rupiah(nLost.income)}</td>
+
+                <td>${nMember.jumlah}</td>
+                <td>${rupiah(nMember.income)}</td>
+
+                <td>${nManual.jumlah}</td>
+                <td data-value="${nManual.income}">${rupiah(nManual.income)}</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td data-value="${totalNonTunai}"><strong>${rupiah(totalNonTunai)}</strong></td>
+            </tr>
+        `;
+    });
+
+    // ===== FOOTER TOTAL =====
+    html += `
+            <tr class="table">
+                <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
+                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
+                <td colspan="11">${rupiah(incomeCashCasual)}</td>
+            </tr>
+            <tr>
+                <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
+                <td>0</td>
+                <td>0</td>
+                <td>${jmlCashlessCasual}</td>
+                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
+                <td colspan="11">${rupiah(incomeCashlessCasual)}</td>
+            </tr>
+            <tr class="table">
+                <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+                <td colspan="0"></td>
+                <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
+                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}">${rupiah(incomeCashCasual + incomeCashlessCasual)}</td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td><strong>${rupiah(grandTotal)}</strong></td>
+            </tr>
+        `;
+    // console.log('TUNAI:', cash.id_kendaraan, cash);
+    // console.log('CASHLESS FOUND:', cashless);
+
+    $("#officer-data").html(html);
+
+    // response.overNight.forEach(function (on) {
+    //     if (!on.jenis_mobil) return;
+
+    //     let overnight = on.overNight;
+    //     let onExpired = on.onExpired;
+
+    //     onData += `
+    //     <tr>
+    //         <td style="text-align: left;">${on.jenis_mobil}</td>
+    //         <td>${overnight}</td>
+    //         <td>${onExpired}</td>
+    //         <td>0</td>
+    //     </tr>
+    // `;
+    // });
+
+    // $("#table-overnight").html(onData);
+    // console.log(response);
+}
+
+function tablePayment(response) {
+    // Update tabel dengan data yang diterima
+    console.log(response);
+
+    let html = "";
+    let onData = "";
+    let jmlCashCasual = 0;
+    let incomeCashCasual = 0;
+
+    let jmlCashlessCasual = 0;
+    let incomeCashlessCasual = 0;
+
+    let grandTotal = 0;
+
+    response.tunai.forEach(function (cash) {
+        // cari pasangan non tunai
+        let cashless = response.nontunai.find((nt) => String(nt.typePayment) === String(cash.typePayment));
+
+        // fallback aman
+        cashless = cashless || {
+            nontunai: 0,
+            nonTunaiOut: 0,
+            keluar: {
+                casual: { jumlah: 0, income: 0 },
+                lost: { jumlah: 0, income: 0 },
+                member: { jumlah: 0, income: 0 },
+            },
+            totalCashless: 0,
+        };
+
+        let payment = paymentType(cash.typePayment);
+        // let payment = cash.typePayment;
+        let casualIn = cash.total;
+        let tunaiOut = cash.tunaiOut;
+        // ===== DATA TUNAI =====
+        let tCasual = cash.keluar.casual;
+        let tLost = cash.keluar.lost;
+        let tMember = cash.keluar.member;
+        let tManual = cash.keluar.manual;
+
+        // ===== DATA NON TUNAI =====
+        let nonTunaiOut = cashless.nonTunaiOut;
+
+        let nCasual = cashless.keluar.casual;
+        let nLost = cashless.keluar.lost;
+        let nMember = cashless.keluar.member;
+        let nManual = cashless.keluar.manual ?? 0;
+
+        let totalTunai = cash.totalCash || 0;
+        let totalNonTunai = cashless.totalCashless || 0;
+
+        jmlCashCasual += cash.keluar.casual.jumlah;
+        incomeCashCasual += cash.keluar.casual.income;
+
+        jmlCashlessCasual += cashless.keluar.casual.jumlah;
+        incomeCashlessCasual += cashless.keluar.casual.income;
+
+        grandTotal += totalTunai + totalNonTunai;
+        html += `
+            <tr>
+                <td rowspan="2" style="text-align: left;"><strong>${payment}</strong></td>
+                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+
+                <td>${casualIn}</td>
+                <td>${tunaiOut}</td>
+
+                <td>${tCasual.jumlah}</td>
+                <td data-value="${tCasual.income}">${rupiah(tCasual.income)}</td>
+
+                <td>${tLost.jumlah}</td>
+                <td data-value="${tLost.income}">${rupiah(tLost.income)}</td>
+
+                <td>${tMember.jumlah}</td>
+                <td data-value="${tMember.income}">${rupiah(tMember.income)}</td>
+
+                <td>${tManual.jumlah}</td>
+                <td data-value="${tManual.income}">${rupiah(tManual.income)}</td>
+
+                <td>0</td>
+                <td data-value="0}">0</td>
+
+                <td>0</td>
+                <td data-value="0"></td>
+
+                <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
+            </tr>
+
+            <tr>
+                <td style="text-align: left;"><span class="badge bg-warning">Non Tunai</span></td>
+
+                <td>${casualIn}</td>
+                <td>${nonTunaiOut}</td>
+
+                <td>${nCasual.jumlah}</td>
+                <td data-value="${nCasual.income}">${rupiah(nCasual.income)}</td>
+
+                <td>${nLost.jumlah}</td>
+                <td>${rupiah(nLost.income)}</td>
+
+                <td>${nMember.jumlah}</td>
+                <td>${rupiah(nMember.income)}</td>
+
+                <td>${nManual.jumlah}</td>
+                <td data-value="${nManual.income}">${rupiah(nManual.income)}</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td>0</td>
+                <td data-value="0">0</td>
+
+                <td data-value="${totalNonTunai}"><strong>${rupiah(totalNonTunai)}</strong></td>
+            </tr>
+        `;
+    });
+
+    // ===== FOOTER TOTAL =====
+    html += `
+            <tr class="table">
+                <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
+                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
+                <td colspan="11">${rupiah(incomeCashCasual)}</td>
+            </tr>
+            <tr>
+                <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
+                <td>0</td>
+                <td>0</td>
+                <td>${jmlCashlessCasual}</td>
+                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
+                <td colspan="11">${rupiah(incomeCashlessCasual)}</td>
+            </tr>
+            <tr class="table">
+                <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+                <td colspan="0"></td>
+                <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
+                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}"><strong>${rupiah(incomeCashCasual + incomeCashlessCasual)}</strong></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td colspan="0"></td>
+                <td><strong>${rupiah(grandTotal)}</strong></td>
+            </tr>
+        `;
+    // console.log('TUNAI:', cash.id_kendaraan, cash);
+    // console.log('CASHLESS FOUND:', cashless);
+
+    $("#payment-data").html(html);
+}
+
+function paymentType(value) {
+    switch (value) {
+        case 2:
+            value = "Mandiri";
+            break;
+        case 3:
+            value = "BRIZZI";
+            break;
+        case 4:
+            value = "TapCash";
+            break;
+        case 5:
+            value = "Flazz";
+            break;
+        case 9:
+            value = "QRIS";
+            break;
+        default:
+            value = "Tunai";
+    }
+
+    return value;
+}
+
+function printPDF(vehicle) {
+    const { jsPDF } = window.jspdf;
+    const doc = new jsPDF({
+        orientation: "portait", // portrait kesempitan buat 16 kolom
+        unit: "mm",
+        format: "a4",
+    });
+
+    const pageWidth = doc.internal.pageSize.getWidth();
+
+    // ===== HEADER =====
+    doc.setFont("helvetica", "bold");
+    doc.setFontSize(12);
+    doc.text("MENTENG SQUARE - RAYA PARKING - RAYA Parking", 14, 12);
+
+    doc.setFontSize(11);
+    doc.text("Rekap Transaksi Kendaraan", pageWidth / 2, 18, { align: "center" });
+
+    doc.setFont("helvetica", "normal");
+    doc.setFontSize(9);
+    doc.text("Tanggal : " + (vehicle.date ?? "-"), pageWidth / 2, 23, { align: "center" });
+    doc.text("By : Harian", pageWidth - 14, 12, { align: "right" });
+
+    // ===== SUSUN BODY TABEL =====
+    const body = [];
+    let totalTunaiJml = 0,
+        totalTunaiNilai = 0;
+    let totalNonTunaiJml = 0,
+        totalNonTunaiNilai = 0;
+    let grandTotal = 0;
+
+    vehicle.tunai.forEach(function (cash) {
+        const cashless = vehicle.nontunai.find((nt) => String(nt.id_kendaraan) === String(cash.id_kendaraan)) || {
+            nonTunaiOut: 0,
+            keluar: {
+                casual: { jumlah: 0, income: 0 },
+                lost: { jumlah: 0, income: 0 },
+                member: { jumlah: 0, income: 0 },
+                manual: { jumlah: 0, income: 0 },
+            },
+            totalCashless: 0,
+        };
+        // debugger;
+
+        const tCasual = cash.keluar.casual;
+        const tLost = cash.keluar.lost;
+        const tMember = cash.keluar.member;
+        const tManual = cash.keluar.manual;
+        const tMasalah = cash.keluar.masalah ?? { jumlah: 0, income: 0 };
+        const totalTunai = cash.totalCash || 0;
+
+        const nCasual = cashless.keluar.casual;
+        const nLost = cashless.keluar.lost;
+        const nMember = cashless.keluar.member;
+        const nManual = cashless.keluar.manual;
+        const nMasalah = cashless.keluar.masalah ?? { jumlah: 0, income: 0 };
+        const totalNonTunai = cashless.totalCashless || 0;
+
+        // baris TUNAI
+        body.push([
+            { content: cash.jenis_mobil, rowSpan: 2, styles: { valign: "middle" } },
+            { content: "Tunai", styles: { fillColor: [40, 167, 69], textColor: 255, fontStyle: "bold" } },
+            cash.total,
+            cash.tunaiOut,
+            tCasual.jumlah,
+            rupiah(tCasual.income),
+            tLost.jumlah,
+            rupiah(tLost.income),
+            tMember.jumlah,
+            rupiah(tMember.income),
+            tManual.jumlah,
+            rupiah(tManual.income),
+            0,
+            0,
+            tMasalah.jumlah,
+            rupiah(tMasalah.income),
+            { content: rupiah(cash.totalCash), styles: { valign: "middle", fontStyle: "bold" } },
+        ]);
+
+        // baris NON TUNAI
+        body.push([
+            { content: "Non Tunai", styles: { fillColor: [255, 193, 7], textColor: 0, fontStyle: "bold" } },
+
+            cash.total,
+            cashless.nonTunaiOut,
+
+            nCasual.jumlah,
+            rupiah(nCasual.income),
+
+            nLost.jumlah,
+            // rupiah(nLost.income),
+            cash.totalCashless,
+
+            nMember.jumlah,
+            rupiah(nMember.income),
+
+            nManual.jumlah,
+            rupiah(nManual.income),
+
+            0,
+            0,
+
+            nMasalah.jumlah,
+            rupiah(nMasalah.income),
+
+            { content: rupiah(cashless.totalCashless), styles: { valign: "middle", fontStyle: "bold" } },
+        ]);
+
+        totalTunaiJml += tCasual.jumlah + tLost.jumlah + tMember.jumlah + tManual.jumlah + tMasalah.jumlah;
+        totalTunaiNilai += cash.totalCash || 0;
+        totalNonTunaiJml += nCasual.jumlah + nLost.jumlah + nMember.jumlah + nManual.jumlah + nMasalah.jumlah;
+        totalNonTunaiNilai += cashless.totalCashless || 0;
+        grandTotal += (cash.totalCash || 0) + (cashless.totalCashless || 0);
+    });
+
+    // baris TOTAL & GRAND TOTAL
+    body.push([
+        { content: "TOTAL", rowSpan: 2, styles: { fontStyle: "bold" } },
+        { content: "Tunai", styles: { fillColor: [40, 167, 69], textColor: 255, fontStyle: "bold" } },
+        "",
+        "",
+        { content: totalTunaiJml, styles: { fontStyle: "bold" } },
+        rupiah(totalTunaiNilai),
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        rupiah(totalTunaiNilai),
+    ]);
+    body.push([
+        { content: "NON TUNAI", styles: { fillColor: [255, 193, 7], fontStyle: "bold" } },
+        "",
+        "",
+        { content: totalNonTunaiJml, styles: { fontStyle: "bold" } },
+        rupiah(totalNonTunaiNilai),
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        rupiah(totalNonTunaiNilai),
+    ]);
+    body.push([
+        { content: "GRAND TOTAL", colSpan: 4, styles: { fontStyle: "bold", halign: "center" } },
+        { content: totalTunaiJml + totalNonTunaiJml, styles: { fontStyle: "bold" } },
+        { content: rupiah(totalTunaiNilai + totalNonTunaiNilai), styles: { fontStyle: "bold" } },
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        { content: rupiah(grandTotal), styles: { fontStyle: "bold" } },
+    ]);
+
+    // ===== HEADER 2 BARIS (grouping) =====
+    const head = [
+        [
+            { content: "Jenis Kend", rowSpan: 2, colSpan: 2 },
+            { content: "Jenis Transaksi", colSpan: 2 },
+            { content: "Casual", colSpan: 2 },
+            { content: "Tiket Hilang", colSpan: 2 },
+            { content: "Member", colSpan: 2 },
+            { content: "Manual Input", colSpan: 2 },
+            { content: "Manual Mix", colSpan: 2 },
+            { content: "Tiket Masalah", colSpan: 2 },
+            { content: "Pendapatan", rowSpan: 2 },
+        ],
+        [
+            "Masuk",
+            "Keluar",
+            "JML",
+            "Nilai",
+            "JML",
+            "Nilai",
+            "JML",
+            "Nilai",
+            "JML",
+            "Nilai",
+            "JML",
+            "Nilai",
+            "JML",
+            "Nilai",
+        ],
+    ];
+
+    doc.autoTable({
+        head: head,
+        body: body,
+        startY: 28,
+        theme: "grid",
+        styles: { fontSize: 6, halign: "center", valign: "middle", lineColor: [200, 200, 200] },
+        headStyles: { fillColor: [230, 230, 230], textColor: 0, fontStyle: "bold" },
+        columnStyles: { 0: { halign: "left" } },
+    });
+
+    // ===== TABEL OVER NIGHT (di bawah tabel utama) =====
+    const onBody = vehicle.overNight.map((on) => [
+        on.jenis_mobil ?? "-",
+        on.overNight,
+        on.onExpired,
+        (on.overNight || 0) + (on.onExpired || 0),
+    ]);
+
+    doc.setFont("helvetica", "bold");
+    doc.setFontSize(8);
+    doc.text("Kendaraan yang masih menginap (Over Night)", 14, doc.lastAutoTable.finalY + 10);
+
+    doc.autoTable({
+        head: [["Jenis Kend", "Menginap", "ON (Expired)", "Total"]],
+        body: onBody,
+        startY: doc.lastAutoTable.finalY + 13,
+        theme: "grid",
+        styles: { fontSize: 7, cellPadding: 1 },
+        headStyles: { fontSize: 8, fillColor: [230, 230, 230], textColor: 0 },
+        tableWidth: 100,
+    });
+
+    doc.save(`Rekap Harian - ${vehicle.date}.pdf`);
+}
diff --git a/resources/views/report/all-report.blade.php b/resources/views/report/all-report.blade.php
index 90dd794..a18784f 100644
--- a/resources/views/report/all-report.blade.php
+++ b/resources/views/report/all-report.blade.php
@@ -2,6 +2,7 @@
 
 @section('styles')
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.10.0/css/bootstrap-datepicker3.min.css">
     <style>
         .table th {
             text-align: center;
@@ -24,8 +25,10 @@
                                 <div class="col d-flex align-items-center gap-2">
                                     <div class="col-sm-2">
                                         <input type="date" class="form-control" id="tanggalCari" name="tanggal_mulai" required>
+                                        <!--<input type="text" id="tanggalCari" ... style="display:none">  <!-- asli, hidden, format Y-m-d -->
+                                        <!--<input type="text" class="form-control flatpickr-input" ...>-->
                                     </div>
-                                    <p class="mb-0 me-2 ms-auto">Harian</p> 
+                                    <p class="mb-0 me-2 ms-auto">Harian</p>
                                     <label class="toggle-switch toggle-switch-success">
                                             <input type="checkbox" id="harianToggle" checked>
                                         <span class="toggle-slider round" checked></span>
@@ -89,8 +92,8 @@
                                 <div class="row">
                                     <div class="col-md-5">
                                         <h5 class="card-title text-center">Kendaraan yang masih menginap (Over Night)</h5>
-                                        <div class="table-bordered">
-                                            <table class="table table-on" id="cashless">
+                                        <div class="table-bordered mb-5">
+                                            <table class="table table-on" id="pn">
                                                 <thead>
                                                     <tr>
                                                         <th>Jenis Kend</th>
@@ -105,9 +108,45 @@
                                         </div>
                                     </div>
                                 </div>
-                                {{-- <h5 class="card-title text-center">Rekap Transaksi Kendaraan (Non Tunai)</h5>
+                                <h5 class="card-title text-center">Rekap Transaksi Per Petugas</h5>
+                                <div class="table-bordered mb-5">
+                                    <table class="table table-striped" id="petugas">
+                                        <thead>
+                                            <tr>
+                                                <th rowspan="2" colspan="2">Nama Petugas
+                                                <th colspan="2">Jenis Transaksi</th>
+                                                <th colspan="2">Casual</th>
+                                                <th colspan="2">Tiket Hilang</th>
+                                                <th colspan="2">Member</th>
+                                                <th colspan="2">Manual Input</th>
+                                                <th colspan="2">Manual Mix</th>
+                                                <th colspan="2">Tiket Masalah</th>
+                                                <th rowspan="2">Pendapatan</th>
+                                            </tr>
+                                            <tr>
+                                                <th>Masuk</th>
+                                                <th>Keluar</th>
+                                                <th>JML</th>
+                                                <th>Nilai</th>
+                                                <th>JML</th>
+                                                <th>Nilai</th>
+                                                <th>JML</th>
+                                                <th>Nilai</th>
+                                                <th>JML</th>
+                                                <th>Nilai</th>
+                                                <th>JML</th>
+                                                <th>Nilai</th>
+                                                <th>JML</th>
+                                                <th>Nilai</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody id="officer-data">
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <h5 class="card-title text-center">Rekap Transaksi Per Pembayaran</h5>
                                 <div class="table-bordered">
-                                    <table class="table" id="cashless">
+                                    <table class="table" id="payment">
                                         <thead>
                                             <tr>
                                                 <th rowspan="2">Jenis Kend</th>
@@ -137,10 +176,10 @@
                                                 <th>Nilai</th>
                                             </tr>
                                         </thead>
-                                        <tbody id="table-data">
+                                        <tbody id="payment-data">
                                            </tbody>
                                     </table>
-                                </div> --}}
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -148,351 +187,16 @@
             </div>
         </div>
     </div>
-    <!-- Modal -->
-    <div class="modal fade show" id="modaltanggal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="false">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalLabel">Pilih Tanggal</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form id="formTanggal">
-                        <div class="form-group">
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label for="tanggalMulai">Tanggal pencarian</label>
-                                </div>
-                                <div class="col-sm-6">
-                                    <input type="date" class="form-control" id="tanggalCari" name="tanggal_mulai" required>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
-                    <button type="button" class="btn btn-primary" id="btnTampilkan">Tampilkan</button>
-                </div>
-            </div>
-        </div>
-    </div>
+    <!---->
 @endsection
 
 @section('javascript')
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <!--<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>-->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.10.0/js/bootstrap-datepicker.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/1.4.1/html2canvas.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-    <script>
-        $(document).ready(function () {
-            // $('#modaltanggal').modal('show');
-            
-            // Set tanggal default ke hari ini
-            // realtime trigger
-            $('#tanggalCari').on('change', loadData);
-            $('#harianToggle').on('change', loadData);
-
-            
-            var today = new Date().toISOString().split('T')[0];
-            $('#tanggalCari').val(today);
-            loadData();
-            
-            // $('.btn-export-excel').on('click', function () {
-            $(document).on('click', '.btn-export-excel', function (e) {
-                // e.preventDefault();
-                $('#cash td').each(function () {
-                    const raw = $(this).data('value');
-                    if (raw !== undefined) {
-                        $(this).text(raw);
-                    }
-                });
-
-                const table = document.getElementById('cetak');
-                const wb = XLSX.utils.table_to_book(table, { sheet: 'Sheet 1'});
-                XLSX.writeFile(wb, `monthlyReport.xlsx`);
-                console.log(e);
-            });
-            
-            $('.btn-export-pdf').on('click', async function () {
-                // $('.cetak').css('display','block');
-                // $('.user').css('display','block');
-                const { jsPDF } = window.jspdf;
-                const doc = new jsPDF('l', 'pt', 'a4');
-                // ambil elemen tabel
-                const table = document.getElementById('cetak');
-                const canvas = await html2canvas(table, { scale: 2 });
-                const imgData = canvas.toDataURL('image/png');
-                const imgWidth = doc.internal.pageSize.getWidth();
-                const imgHeight = (canvas.height * imgWidth) / canvas.width;
-                doc.addImage(imgData, 'PNG', 0, 20, imgWidth, imgHeight);
-                doc.save(`Rekap Harian.pdf`);
-            });
-            console.log(document.getElementById('cetak'));
-            console.log(document.getElementById('date-table'));
-        
-        });
-        function loadData(tanggalMulai, tanggalAkhir) {
-            let tanggal = $('#tanggalCari').val();
-            let harian  = $('#harianToggle').is(':checked') ? 1 : 0;
-            if (harian == 1) 
-                $('#harian').text('By : Harian');
-            else 
-                $('#harian').text('By : Shift');
-            // console.log(harian);
-            // console.log(tanggal);
-            $('#tanggal-trans').text('Tanggal : ' + tanggal);
-
-            if (!tanggal) return;
-
-            // Contoh: Load data dengan AJAX
-            $.ajax({
-                url: '{{ route("getData") }}', // Ganti dengan route Anda
-                type: 'GET',
-                data: {
-                    tanggal: tanggal,
-                    harian: harian
-                },
-                beforeSend: function () {
-                    console.log('Loading data...');
-                },
-                success: function(response) {
-                    // Update tabel dengan data yang diterima
-
-                    let html = '';
-                    let onData = '';
-                    let jmlCashCasual = 0;
-                    let incomeCashCasual = 0;
-
-                    let jmlCashlessCasual = 0;
-                    let incomeCashlessCasual = 0;
-
-                    let grandTotal = 0;
-
-                    response.tunai.forEach(function (cash) {
-
-                        // cari pasangan non tunai
-                        let cashless = response.nontunai.find(
-                            nt => String(nt.id_kendaraan) === String(cash.id_kendaraan)
-                        );
-
-                        // fallback aman
-                        cashless = cashless || {
-                            nontunai: 0,
-                            nonTunaiOut: 0,
-                            keluar: {
-                                casual: { jumlah: 0, income: 0 },
-                                lost: { jumlah: 0, income: 0 },
-                                member: { jumlah: 0, income: 0 }
-                            },
-                            totalCashless: 0
-                        };
-
-                        let casualIn     = cash.total;
-                        let tunaiOut     = cash.tunaiOut;
-                        // ===== DATA TUNAI =====
-                        let tCasual = cash.keluar.casual;
-                        let tLost   = cash.keluar.lost;
-                        let tMember = cash.keluar.member;
-                        let tManual = cash.keluar.manual;
-
-                        // ===== DATA NON TUNAI =====
-                        let nonTunaiOut = cashless.nonTunaiOut;
-
-                        let nCasual = cashless.keluar.casual;
-                        let nLost   = cashless.keluar.lost;
-                        let nMember = cashless.keluar.member;
-                        let nManual = cashless.keluar.manual;
-
-                        let totalTunai    = cash.totalCash || 0;
-                        let totalNonTunai = cashless.totalCashless || 0;
-
-                        jmlCashCasual += cash.keluar.casual.jumlah;
-                        incomeCashCasual += cash.keluar.casual.income;
-
-                        jmlCashlessCasual += cashless.keluar.casual.jumlah;
-                        incomeCashlessCasual += cashless.keluar.casual.income;
-
-                        grandTotal += totalTunai + totalNonTunai;
-                        // let casualCash   = cash.keluar.casual;
-                        // let lostCash     = cash.keluar.lost;
-                        // let memberCash   = cash.keluar.member;
-                        // let casualIn     = cash.total;
-
-                        // let casualNon    = cashless ? cashless.keluar.casual : { jumlah: 0, income: 0 };
-                        // let lostNon      = cashless ? cashless.keluar.lost   : { jumlah: 0, income: 0 };
-                        // let memberNon    = cashless ? cashless.keluar.member : { jumlah: 0, income: 0 };
-
-                        // let totalIncome =
-                        //     (cash.totalCash || 0);
-
-                        // html += `
-                        // <tr>
-                        //     <td style="text-align: left;">${cash.jenis_mobil}</td>
-
-                        //     <!-- Jenis Transaksi -->
-                        //     <td>${casualIn}</td>
-                        //     <td>${cash.tunaiOut}</td>
-
-                        //     <!-- Casual -->
-                        //     <td>${casualCash.jumlah}</td>
-                        //     <td>${rupiah(casualCash.income)}</td>
-
-                        //     <!-- Tiket Hilang -->
-                        //     <td>${lostCash.jumlah}</td>
-                        //     <td>${rupiah(lostCash.income)}</td>
-
-                        //     <!-- Member -->
-                        //     <td>${memberCash.jumlah}</td>
-                        //     <td>${rupiah(memberCash.income)}</td>
-
-                        //     <!-- Manual Input -->
-                        //     <td>0</td>
-                        //     <td>0</td>
-
-                        //     <!-- Manual Mix -->
-                        //     <td>0</td>
-                        //     <td>0</td>
-
-                        //     <!-- Tiket Masalah -->
-                        //     <td>0</td>
-                        //     <td>0</td>
-
-                        //     <!-- Pendapatan -->
-                        //     <td><strong>${rupiah(totalIncome)}</strong></td>
-                        // </tr>
-                        // `;
-                        html += `
-                        <tr>
-                            <td rowspan="2" style="text-align: left;"><strong>${cash.jenis_mobil}</strong></td>
-                            <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
-
-                            <td>${casualIn}</td>
-                            <td>${tunaiOut}</td>
-
-                            <td>${tCasual.jumlah}</td>
-                            <td data-value="${tCasual.income}">${rupiah(tCasual.income)}</td>
-
-                            <td>${tLost.jumlah}</td>
-                            <td data-value="${tLost.income}">${rupiah(tLost.income)}</td>
-
-                            <td>${tMember.jumlah}</td>
-                            <td data-value="${tMember.income}">${rupiah(tMember.income)}</td>
-
-                            <td>${tManual.jumlah}</td>
-                            <td data-value="${tManual.income}">${rupiah(tManual.income)}</td>
-
-                            <td>0</td>
-                            <td data-value="0}">0</td>
-                            
-                            <td>0</td>
-                            <td data-value="0">0</td>
-
-                            <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
-                        </tr>
-
-                        <tr>
-                            <td style="text-align: left;"><span class="badge bg-warning">Non Tunai</span></td>
-
-                            <td>${casualIn}</td>
-                            <td>${nonTunaiOut}</td>
-
-                            <td>${nCasual.jumlah}</td>
-                            <td data-value="${nCasual.income}">${rupiah(nCasual.income)}</td>
-
-                            <td>${nLost.jumlah}</td>
-                            <td>${rupiah(nLost.income)}</td>
-
-                            <td>${nMember.jumlah}</td>
-                            <td>${rupiah(nMember.income)}</td>
-
-                            <td>${nManual.jumlah}</td>
-                            <td data-value="${nManual.income}">${rupiah(nManual.income)}</td>
-
-                            <td>0</td>
-                            <td data-value="0">0</td>
-                            
-                            <td>0</td>
-                            <td data-value="0">0</td>
-
-                            <td data-value="${totalNonTunai}"><strong>${rupiah(totalNonTunai)}</strong></td>
-                        </tr>
-                        `;
-                    });
-
-                    // ===== FOOTER TOTAL =====
-                    html += `
-                    <tr class="table">
-                        <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
-                        <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
-                        <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
-                        <td colspan="11">0</td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
-                         <td>0</td>
-                        <td>0</td>
-                        <td>${jmlCashlessCasual}</td>
-                        <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
-                        <td colspan="11">0</td>
-                    </tr>
-                    <tr class="table">
-                        <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
-                        <td colspan="0"></td>
-                        <td colspan="0">${jmlCashCasual+jmlCashlessCasual}</td>
-                        <td colspan="0" data-value="${incomeCashCasual+incomeCashlessCasual}">${rupiah(incomeCashCasual+incomeCashlessCasual)}</td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td colspan="0"></td>
-                        <td><strong>${rupiah(grandTotal)}</strong></td>
-                    </tr>
-                    `;
-                    // console.log('TUNAI:', cash.id_kendaraan, cash);
-                    // console.log('CASHLESS FOUND:', cashless);
-
-                    $('#table-data').html(html);
-
-                    response.overNight.forEach(function (on) {
-                        if (!on.jenis_mobil) return; 
-
-                        let overnight = on.overNight;
-                        let onExpired = on.onExpired;
-
-                        onData += `
-                            <tr>
-                                <td style="text-align: left;">${on.jenis_mobil}</td>
-                                <td>${overnight}</td>
-                                <td>${onExpired}</td>
-                                <td>0</td>
-                            </tr>
-                        `;
-                    });
-
-                    $('#table-overnight').html(onData);
-                    console.log(response);
-                },
-                error: function(xhr) {
-                    console.log('Error:', xhr);
-                    alert('Terjadi kesalahan saat memuat data');
-                }
-            });
-        }
-
-        function rupiah(angka) {
-            return new Intl.NumberFormat('id-ID').format(angka || 0);
-        }
-        // }
-    </script>
-@endsection
\ No newline at end of file
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf-autotable/3.5.31/jspdf.plugin.autotable.min.js"></script>
+    <script src="{{ asset('js/report/report-vehicle.js') }}"></script>
+@endsection
diff --git a/resources/views/report/stiker/stiker-harian.blade.php b/resources/views/report/stiker/stiker-harian.blade.php
index 0c21f72..abda875 100644
--- a/resources/views/report/stiker/stiker-harian.blade.php
+++ b/resources/views/report/stiker/stiker-harian.blade.php
@@ -75,23 +75,23 @@
                                                     </div>
                                                 </div>
                                                 <div class="col-sm-1 d-flex justify-content-center align-items-center">
-                                                    <button type="button" id="btnProses" 
+                                                    <button type="button" id="btnProses"
                                                         class="btn btn-light btn-lg w-100">
                                                         Proses
                                                     </button>
                                                 </div>
-                                                <div class="col-sm-1"> 
+                                                <div class="col-sm-1">
                                                 </div>
-                                                <div class="col-sm-2"> 
+                                                <div class="col-sm-2">
                                                     <div class="form-group">
                                                         <p>Jumlah Pendapatan : </p> <h3 id="pendapatan"></h3><br>
                                                         <p>Jumlah Transaksi : </p> <h3 id="jmlTrans"></h3>
                                                     </div>
                                                 </div>
-                                                <div class="col-sm-1"> 
+                                                <div class="col-sm-1">
                                                     <button type="button" class="btn btn-info btn-icon-text btn-export-pdf">
                                                         Print
-                                                        <i class="mdi mdi-printer btn-icon-append"></i>                                                                              
+                                                        <i class="mdi mdi-printer btn-icon-append"></i>
                                                     </button>
                                                 </div>
                                             {{-- {{ dd($filterSelect['softsetting']) }} --}}
@@ -145,7 +145,7 @@ class="btn btn-light btn-lg w-100">
         $(document).ready(function () {
             let location = @json(collect($locationSettings ?? [])->except('logo'));
             console.log(location?.namaperusahaan);
-            
+
             let awal = '';
             let akhir = '';
             let pendapatan = 0;
@@ -163,7 +163,7 @@ class="btn btn-light btn-lg w-100">
                 const jenisStiker = $('#jenisStiker').val();
                 const nama  = $('#cari_data').val();
                 const nopol = $('#cari_nopol').val();
-                
+
                 awal  = $('#tanggalMulai').val();
                 akhir = $('#tanggalSelesai').val();
 
@@ -225,7 +225,7 @@ class="btn btn-light btn-lg w-100">
                         //     `);
                         // });
 
-                        // initDataTable(); 
+                        // initDataTable();
 
                         // 🔥 sortable aktif
                         if (!response.success) return;
@@ -447,8 +447,8 @@ function rupiah(angka) {
 
                             doc.text(`Jumlah Pendapatan : ${rupiah(pendapatan)}`, marginLeft, 38);
                             doc.text(
-                                `Jumlah Transaksi : ${rupiah(jmlTrans)}`, 
-                                pageWidth - marginRight, 
+                                `Jumlah Transaksi : ${rupiah(jmlTrans)}`,
+                                pageWidth - marginRight,
                                 38,
                                 { align: 'right'}
                             );
@@ -472,69 +472,69 @@ function rupiah(angka) {
                 doc.save('Rekap_Harian.pdf');
             });
         });
-        
+
                     // $('.btn-export-pdf').on('click', async function () {
-        
+
                     //     const { jsPDF } = window.jspdf;
-        
+
                     //     const doc = new jsPDF({
                     //         orientation: 'portrait',
                     //         unit: 'mm',
                     //         format: 'a4'
                     //     });
-        
+
                     //     const element = document.getElementById('cetak');
-        
+
                     //     const canvas = await html2canvas(element, {
                     //         scale: 2,
                     //         useCORS: true
                     //     });
-        
+
                     //     const imgData = canvas.toDataURL('image/png');
-        
+
                     //     const pageWidth = doc.internal.pageSize.getWidth();
                     //     const pageHeight = doc.internal.pageSize.getHeight();
-        
+
                     //     const marginTop = 20;
                     //     const marginBottom = 20;
                     //     const marginLeft = 10;
                     //     const marginRight = 10;
-        
+
                     //     const headerHeight = 45; // ⬅️ ruang judul
                     //     const contentHeight = pageHeight - headerHeight - marginBottom;
-        
+
                     //     const imgWidth = pageWidth - marginLeft - marginRight;
                     //     const imgHeight = (canvas.height * imgWidth) / canvas.width;
-        
+
                     //     let renderedHight = 0;
                     //     let page = 1;
                     //     let renderedHeight = 0;
-        
+
                     //     while (renderedHeight < imgHeight) {
-        
+
                     //         if (page > 1) doc.addPage();
-        
+
                     //         doc.setFont('helvetica', 'bold');
                     //         doc.setFontSize(14);
                     //         doc.text('LAPORAN STIKER HARIAN', pageWidth / 2, 15, { align: 'center' });
-        
+
                     //         // SUB JUDUL
                     //         doc.setFontSize(10);
                     //         doc.setFont('helvetica', 'normal');
                     //         doc.text('PT PARKIR MAJU JAYA', pageWidth / 2, 22, { align: 'center' });
-        
+
                     //         doc.setFontSize(9);
                     //         doc.text(`Periode : ${awal} s/d ${akhir}`, marginLeft, 32);
                     //         doc.text(`Dicetak : ${new Date().toLocaleDateString('id-ID')}`, pageWidth - marginRight, 32, {
                     //             align: 'right'
                     //         });
-        
+
                     //         doc.setFontSize(9);
                     //         doc.text(`Jumlah Pendapatan : ${pendapatan}`, marginLeft, 38);
                     //         doc.text(`Jumlah Pendapatan : 15`, pageWidth - marginRight, 38, {
                     //             align: 'right'
                     //         });
-        
+
                     //         doc.addImage(
                     //             imgData,
                     //             'PNG',
@@ -543,7 +543,7 @@ function rupiah(angka) {
                     //             imgWidth,
                     //             imgHeight
                     //         );
-        
+
                     //         renderedHeight += contentHeight;
                     //         page++;
                     //     }
@@ -583,4 +583,4 @@ function rupiah(angka) {
             //     doc.save(`Rekap Harian.pdf`);
             // });
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/setup/UserLevel/level-user-menu.blade.php b/resources/views/setup/UserLevel/level-user-menu.blade.php
new file mode 100644
index 0000000..3af9e04
--- /dev/null
+++ b/resources/views/setup/UserLevel/level-user-menu.blade.php
@@ -0,0 +1,30 @@
+<div class="modal fade user-menu-modal-lg" id="modal-vehicle" tabindex="-1" role="dialog" data-bs-backdrop="static"  data-keyboard="false">
+    <div class="modal-dialog modal-lg modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="card-title fw-bold title"></h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal">
+                </button>
+            </div>
+            <div class="modal-body">
+                <table class="table">
+                    <thead>
+                        <tr>
+                            <th width="3%">No.</th>
+                            <th width="3%">Tersedia?</th>
+                            <th>Menu</th>
+                            <th>Path</th>
+                        </tr>
+                    </thead>
+                    <tbody id="menuakses">
+                        </tbody>
+                </table>
+
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary simpan" data-url="{{ route('vehicle.update', ':id') }}">Save changes</button>
+                <button type="button" class="btn btn-danger light" data-bs-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/setup/UserLevel/level-user.blade.php b/resources/views/setup/UserLevel/level-user.blade.php
index 19b145b..7e6e8bc 100644
--- a/resources/views/setup/UserLevel/level-user.blade.php
+++ b/resources/views/setup/UserLevel/level-user.blade.php
@@ -1,9 +1,8 @@
 @extends('layouts.master')
-use Carbon\Carbon;
 
 @section('styles')
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css">
-
+<link rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
     <style>
         .card-body label {
             font-size: 13px;
@@ -67,7 +66,6 @@
                                             <th class="p-3" width="3%">No.</th>
                                             <th style="text-align: center;"  width="10%">Level Code</th>
                                             <th style="text-align: center;">Level Pengguna</th>
-                                            <!--<th style="text-align: center;">Dibuat Oleh</th>-->
                                             <th style="text-align: center;">Tanggal Dibuat</th>
                                             <th style="text-align: center;">Hak Akses</th>
                                         </tr>
@@ -79,11 +77,10 @@
                                                 <td class="text-center" hidden>{{ $level->level_id }}</td>
                                                 <td class="text-center" width="7%">{{ $level->level_code }} </td>
                                                 <td>{{ $level->level_name }}</td>
-                                                <!--<td width="10%"></td>-->
                                                 <td class="text-center" width="10%">{{ \Carbon\Carbon::parse($level->create_date)->format('Y-m-d')}}</td>
                                                 <td class="text-center" width="12%">
-                                                    <button type="button" class="bi bi-menu-app btn-xl parameter-button" data-bs-toggle="modal"  title="Izin Akses" data-bs-target=".bd-ubah-modal-lg"></button>
-                                                    <button type="button" class="bi bi-list hardware-button" data-bs-toggle="tooltip" title="Menu Akses" data-id="{{ $level->level_id }}" data-nama="{{ $level->level_name }}"></button>
+                                                    <button type="button" class="user-acess" data-bs-toggle="modal"  title="Izin Akses" data-bs-target=".bd-ubah-modal-lg"><i class="fa-solid fa-user-gear"></i></button>
+                                                    <button type="button" class="user-menu" data-bs-toggle="modal" id="menuakses" title="Menu Akses" data-bs-target=".user-menu-modal-lg"><i class="fa-solid fa-bars"></i></button>
                                                 </td>
                                             </tr>
                                         @endforeach
@@ -98,14 +95,12 @@
                                     <button class="btn btn-danger btn-sm" id="btnDelete">Detail</button>
                                 </div>
                             </div>
-                                <!-- ADD MEMMBER MODAL -->
-                                    {{-- @include('stiker.tambah-stiker')
-                                    @include('stiker.ubah-stiker') --}}
-                                <!-- END MEMMBER MODAL -->
-                            </div>
                         </div>
                     </div>
                     <div class="col-2">
+                        <!-- ADD MEMMBER MODAL -->
+                            @include('setup.UserLevel.level-user-menu')
+                        <!-- END MEMMBER MODAL -->
                     </div>
                 </div>
             </div>
@@ -126,98 +121,14 @@
     <script src="{{asset ('vendor/sweetalert2/dist/sweetalert2.min.js') }}"></script>
     <script src="{{asset ('js/custom.min.js') }}"></script>
 	<script src="{{asset ('js/dlabnav-init.js') }}"></script>
-    <script src="{{asset ('js/member/index.js') }}"></script>
-    <script src="{{asset ('js/member/member-register.js') }}"></script>
     {{-- <script>
         $(document).ready(function () {
 
-            $(document).on('click', '.hardware-button', function () {
-                let row = $(this).closest('tr');
+            $(document).on('click', '.user-menu', function () {
 
-                // kalau sudah ada baris edit, hapus dulu
-                $('.edit-row').remove();
+                let id = $(this).data('id')
 
-                let id   = $(this).data('id');
-                let nama = $(this).data('nama');
-                $.ajax({
-                    url: "{{ route('hardware.show', '') }}/" + id,
-                    type: 'GET',
-                    success: function (r) {
-                        console.log(r);
-
-                        let colSpan = row.children('td').length;
-
-                        // Field yang mau ditampilkan (pilih sendiri mau yang mana)
-                        let fields = [
-                            ['printer1_avail', 'Printer Status'],
-                            ['printer1_conn', 'Printer Connection'],
-                            ['printer1_spd', 'Printer Speed/Baudrate'],
-                            ['video1_avail', 'Kamera Status'],
-                            ['video1_conn', 'Kamera URL/Path'],
-                            ['sound_avail', 'Sound Status'],
-                            ['bg_avail', 'BGate Status'],
-                            ['bg_conn', 'BGate Connection'],
-                            ['bank_reader_avail', 'Reader BANK Status'],
-                            ['bank_reader_comm', 'Reader BANK Connection'],
-                            ['bank_reader_key', 'Reader BANK Key/Parameter'],
-                        ];
-
-                        let rows = '';
-
-                        for (let i = 0; i < fields.length; i ++) {
-
-                            let f1 = fields[i];
-
-                            rows += `
-                                <tr>
-                                    <td class="fw-semibold text-muted text-label"><strong>${f1[1]}</strong></td>
-                                    <td>
-                                        <span class="view-mode">${formatValue(f1[0], r[f1[0]])}</span>
-                                        <input type="text"
-                                            class="form-control form-control-sm edit-mode d-none"
-                                            data-key="${f1[0]}"
-                                            value="${r[f1[0]] ?? ''}">
-                                    </td>
-                                </tr>
-                            `;
-                        }
-
-                        let editHtml = `
-                        <tr class="edit-row" data-id="${id}">
-                            <td colspan="${colSpan}">
-                                <div class="card shadow-sm">
-                                    <div class="card-header d-flex justify-content-between align-items-center">
-                                        <strong>Hardware Configuration</strong>
-                                        <div>
-                                            <button class="btn btn-sm btn-primary btn-edit">Edit</button>
-                                            <button class="btn btn-sm btn-success btn-save d-none">Save</button>
-                                            <button class="btn btn-sm btn-secondary btn-cancel d-none">Cancel</button>
-                                        </div>
-                                    </div>
-                                    <div class="card-body p-2">
-                                        <table class="table table-bordered table-sm align-middle mb-0">
-                                            <thead class="table-light">
-                                                <tr>
-                                                    <th width="15%">Setting</th>
-                                                    <th width="85%">Value</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                ${rows}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        `;
-
-                        row.after(editHtml);
-                    },
-                    error: function (xhr) {
-                        console.error(xhr.responseText);
-                    }
-                });
+                let url = "{{ route() }}"
             });
 
             // MODE EDIT
diff --git a/routes/web.php b/routes/web.php
index 13cb701..54f6e0c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -11,6 +11,7 @@
 use App\Http\Controllers\Parking\Setup\Vehicle\MasterVehicleController;
 use App\Http\Controllers\Parking\Setup\Vehicle\ModifiedVehiclepriceController;
 use App\Http\Controllers\Parking\Setup\UserLevel\LevelUserController;
+use App\Http\Controllers\Parking\Setup\UserLevel\LevelMenuController;
 use App\Http\Controllers\Parking\LostiketController;
 use App\Http\Controllers\Parking\MemberProductController;
 use App\Http\Controllers\Parking\MemberStikerController;
@@ -64,6 +65,7 @@
             Route::resource("vehicle", MasterVehicleController::class);
             Route::resource("price", ModifiedVehiclepriceController::class)->names("vehiclePrice");
             Route::resource("level-user", LevelUserController::class)->names("levelUser");
+            Route::resource("level-menu", LevelMenuController::class)->names("levelMenu");
         });
     });
 
@@ -75,9 +77,12 @@
 
     Route::prefix("report")->group(function () {
         Route::get("/laporan-semua-transaksi", [ReportTransaksiController::class, "allReport"]);
-        Route::get("/laporan-semua-transaksi/data", [ReportTransaksiController::class, "allReportData"])->name(
+        Route::get("/laporan-semua-transaksi/vehicle", [ReportTransaksiController::class, "allReportData"])->name(
             "getData",
         );
+        Route::get("/laporan-semua-transaksi/officer", [ReportTransaksiController::class, "reportOfficer"])->name(
+            "getOfficer",
+        );
         Route::get("/laporan-per-pintu", [ReportTransaksiController::class, "byGate"]);
         Route::get("/laporan-per-pintu/data", [ReportTransaksiController::class, "gateData"])->name("gateData");