diff --git a/app/Http/Controllers/Api/V1/LaporanController.php b/app/Http/Controllers/Api/V1/LaporanController.php
index a542914..4d0ec3d 100644
--- a/app/Http/Controllers/Api/V1/LaporanController.php
+++ b/app/Http/Controllers/Api/V1/LaporanController.php
@@ -11,7 +11,7 @@ class LaporanController extends Controller
 {
     
     private function getTrans() {
-        $query = TransaksiParkir::selectRaw('jm.id, jm.nama as vehicle, COUNT(*) as jml, SUM(bayar_keluar) as VALUE')
+        $query = TransaksiParkir::selectRaw('jm.id, jm.nama as vehicle, COUNT(*) as jml, SUM(bayar_keluar) as total_bayar')
             ->leftJoin('jenis_mobil as jm','jm.id','=','transaksi_parkir.id_kendaraan');
 
         return $query;
@@ -46,18 +46,26 @@ public function harian(Request $request)
         if ($tanggal) {
             $queryCash->whereDate($dateField, '=', $tanggal);
         }
-
-        $resultCash = $queryCash->whereRaw('cara_bayar <> 3')
+        Log::info('Cari data cash dengan tanggal : ' . $tanggal);
+        $resultCash = $queryCash
+            ->where(function ($q) {
+                $q->whereRaw('cara_bayar <> 3')
+                    ->orWhereRaw('cara_bayar is null');
+                })
+                // ->where(function ($q) {
+                //     $q->where('status_transaksi', '-0')
+                //     ->orWhere('status_transaksi', '3');
+                // })
             ->groupByRaw("jm.id, jm.nama")
             ->orderByRaw("jm.id, jm.nama")
             ->get();
-        Log::info($resultCash);
+        // Log::info($resultCash->toSql());
 
         $jmlCash = 0;
         $incomeCash = 0;
         foreach ($resultCash as $row) {
             $jmlCash += $row->jml;
-            $incomeCash += $row->value;
+            $incomeCash += $row->total_bayar;
         }
 
         // Cashless payment initialize
@@ -65,7 +73,14 @@ public function harian(Request $request)
         if ($tanggal) {
             $queryCashless->whereDate($dateField, '=', $tanggal);
         }
-        $resultCashless = $queryCashless->where('cara_bayar', 3)
+        Log::info(' Cari data cashless dengan tanggal : ' . $tanggal);
+
+        $resultCashless = $queryCashless
+            // ->where(function ($q) {
+            //     $q->where('status_transaksi', '-0')
+            //         ->orWhere('status_transaksi','3');
+            // })
+            ->where('cara_bayar', 3) 
             ->groupByRaw("jm.id, jm.nama")
             ->orderByRaw("jm.id, jm.nama")
             ->get();
@@ -76,7 +91,7 @@ public function harian(Request $request)
 
         foreach ($resultCashless as $row) {
             $jmlCashless += $row->jml;
-            $incomeCashless += $row->value;
+            $incomeCashless += $row->total_bayar;
         }