diff --git a/app/Http/Controllers/Api/V1/LaporanController.php b/app/Http/Controllers/Api/V1/LaporanController.php
index 4d0ec3d..b22c9cc 100644
--- a/app/Http/Controllers/Api/V1/LaporanController.php
+++ b/app/Http/Controllers/Api/V1/LaporanController.php
@@ -23,6 +23,7 @@ public function harian(Request $request)
 
         $tanggal = $request->input('tanggal');
         $shift = $request->input('shift');
+        Log::info($shift);
         // $cashless = $request->input('cashless');
 
         $cash = [];
@@ -39,14 +40,19 @@ public function harian(Request $request)
         // Terapkan filter tanggal berdasarkan input
         $totalTrans = 0;
         $totalIncome = 0;
-        $dateField = ($shift == null) ? 'waktu_keluar' : 'pklogin';
+        if ($shift === null || $shift === 0 || $shift === '0') {
+            $dateField = 'waktu_keluar' ;
+        } else { 
+            $dateField = 'pklogin';
+        }
 
+        // Log::info('Memproses permintaan dengan perhitungan : ' . $dateField);
         // Cash payment initialize
         $queryCash = $this->getTrans();
         if ($tanggal) {
             $queryCash->whereDate($dateField, '=', $tanggal);
         }
-        Log::info('Cari data cash dengan tanggal : ' . $tanggal);
+        Log::info('Find cash transaksi with params date : ' . $tanggal . ', and : ' . $dateField);
         $resultCash = $queryCash
             ->where(function ($q) {
                 $q->whereRaw('cara_bayar <> 3')