diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 55d9e2a..bb36bc1 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -2727,7 +2727,7 @@ class AdminPageController extends Controller
                                 'prkod' => "01",
                                 'teller' => "DM",
                                 'bakipjm' => ($lel['bakipjm']) ? $lel['bakipjm'] : 0,
-                                'bakiupah' => $lel['bakiupah'],
+                                'bakiupah' => ($lel['bakiupah']) ? $lel['bakiupah'] : 0,
                                 'cajlain' => '0.00',
                                 'cajlelong' => $lel['cajlelong'],
                                 'kodgl' => '',
@@ -2749,7 +2749,7 @@ class AdminPageController extends Controller
                                 't_jual' =>  $lel['t_jual'],
                                 'hargajual' =>  $lel['hargajual'],
                                 'pinjaman' =>  $lel['pinjaman'],
-                                'bakiupah' =>  $lel['bakiupah'],
+                                'bakiupah' =>  ($lel['bakiupah']) ? $lel['bakiupah'] : 0,
                                 'cajlelong' =>  $lel['cajlelong'],
                                 'gst_cl' => $lel['gst_cl'],
                                 'baki' => $lel['baki'],
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 82acd19..23300c9 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -974,11 +974,23 @@ $date = new Carbon($request->tarikh);
     
         $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
 
+        // $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
+        //                                     ->whereIn('norujukan',$gadaiDataKaunter)
+        //                                     ->whereDate('tarikh_bayaran','>=',$request->mula)
+        //                                     ->whereDate('tarikh_bayaran','<=',$request->akhir);
+        // //new update
         $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
-                                            ->whereIn('norujukan',$gadaiDataKaunter)
-                                            ->whereDate('tarikh_bayaran','>=',$request->mula)
-                                            ->whereDate('tarikh_bayaran','<=',$request->akhir);
-
+                    ->leftJoin('transaction as trans', function($join)
+                         {
+                             $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                             $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                         })
+                    ->whereDate('trans.created_at','>=',$request->mula)
+                    ->whereDate('trans.created_at','<=',$request->akhir)
+                    ->where('trans.teller','<>','Online')
+                    ->where('trans.trans_type','=','A')
+                    ->where('trans.kodcaw',$request->kodcaw)
+                    ->pluck('transaksi_keuntungan.norujukan');
                                             
                                             
         $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan');