diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 849e6c6..87db736 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -233,7 +233,7 @@ class AdminPageController extends Controller
                     ->groupBy(DB::connection($cawangan['mysql'])
                     ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
                     ->whereYear('t_jual',$current->year)
-                    ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
+                //     ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
                     ->orderBy('t_jual','asc')
                     ->get();
 
@@ -245,14 +245,21 @@ class AdminPageController extends Controller
 
 
         $tebus = Tebus::on($cawangan['mysql'])
-                    ->selectRaw('SUM(bakiupah) AS totalupahsimpan')
-                    ->addSelect(DB::connection($cawangan['mysql'])
-                    ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
-                    ->groupBy(DB::connection($cawangan['mysql'])
-                    ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
-                    ->whereYear('t_tebus',$current->year)
-                    ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
-                    ->orWhere([['jenistebus','=','A'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
+                        ->selectRaw('SUM(bakiupah) AS totalupahsimpan')
+                        ->addSelect(DB::connection($cawangan['mysql'])
+                        ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
+                        ->groupBy(DB::connection($cawangan['mysql'])
+                        ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
+                        ->where(function($query) use ($current){
+                                $query
+                                ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
+                                ->whereYear('t_tebus',$current->year);
+                        })
+                        ->orWhere(function($query) use ($current){
+                                $query
+                                ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
+                                ->whereYear('t_tebus',$current->year);
+                        })
                     ->orderBy('t_tebus','asc')
                     ->get();
 
@@ -264,8 +271,6 @@ class AdminPageController extends Controller
 
 
         $total = $totaltebus + $totallelong;
-        
-        // $total = $lelongupahsimpan + $tebus;
 
         array_push($arrayKeuntungan,['bajet' => $bajetgroup,'total' => $total]);
 
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index b03d07f..bc70015 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -138,47 +138,33 @@ class LaporanController extends Controller
                     ->where('trans.trans_type','!=','A')
                     ->where('trans.teller','<>','Online')
                     ->whereDate('trans.created_at','=',$request->tarikh)
-                    ->where('trans.kodcaw','=',$request->kodcaw)
+                    ->where('trans.kodcaw','=',$request->kodcaw);
                     // ->whereNotNull('db2.hargajualan')
                     // ->sum('keuntungan_rebet');
                     // ->get();
-                    ->pluck('transaksi_keuntungan.norujukan');
+                    // ->pluck('transaksi_keuntungan.norujukan');
 
-        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
+        // dd($total_keuntunganbukanansuran_data_kaunter);
+
+        // $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
 
 
-        $keuntunganbukanansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
-                                    ->selectRaw('sum(keuntungan_rebet) as sum')
-                                    ->whereIn('norujukan',$gadaiDataKaunter)
-                                    ->whereDate('tarikh_bayaran','=',$request->tarikh)
-                                    ->where('kodcaw','=',$request->kodcaw)
-                                    ->where('bayaran_pembiayaan','>', 0)
-                                    ->groupby('norujukan')
-                                    ->pluck('sum');
+        // $keuntunganbukanansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
+        //                             ->selectRaw('sum(keuntungan_rebet) as sum')
+        //                             ->whereIn('norujukan',$gadaiDataKaunter)
+        //                             ->whereDate('tarikh_bayaran','=',$request->tarikh)
+        //                             ->where('kodcaw','=',$request->kodcaw)
+        //                             ->where('bayaran_pembiayaan','>', 0)
+        //                             ->groupby('norujukan')
+        //                             ->pluck('sum');
                                     // ->sum('sum');
-        $sum = 0;
-        $countsum = 0;                    
-        foreach($keuntunganbukanansuran_kaunter_query as $quer)
-        {
-            $sum += $quer;
-            $countsum++;
-        }
                                     
         
-        // $total_keuntunganbukanansuran_kaunter = $keuntunganbukanansuran_kaunter_query->sum('keuntungan_rebet');
-
-        // $bil_keuntunganbukanansuran_kaunter = $keuntunganbukanansuran_kaunter_query->count();
+        $total_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('keuntungan_rebet');
 
+        $bil_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->count();
         
 
-        $total_keuntunganbukanansuran_kaunter = $sum;
-
-        $bil_keuntunganbukanansuran_kaunter = $countsum;
-
-        
-
-        // dd($total_keuntunganbukanansuran_kaunter);
-
         // $total_keuntunganbukanansuran = 0;
 
         // if($total_keuntunganbukanansuran_data){