diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 9381385..fe99a89 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -41,6 +41,7 @@ class LaporanController extends Controller
         $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah');
 
         $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->leftJoin('transaction as trans', function($join)
                          {
                              $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -49,12 +50,65 @@ class LaporanController extends Controller
                     ->whereDate('trans.created_at','=',$request->tarikh)
                     ->where('trans.kodcaw','=',$request->kodcaw)
                     ->where('trans.trans_type','=','A')
-                    // ->groupBy('trans.id')
+                    ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
+        $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','!=','A')
+                    ->whereDate('trans.created_at','=',$request->tarikh)
+                    ->where('trans.kodcaw','=',$request->kodcaw)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('keuntungan_rebet');
 
-        // $total_ansuran = number_format($total_ansuran,2);
-        $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
+        $keuntungan = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
+                    ->whereNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+        $upahtebus = Tebus::on($cawangan['mysql'])
+                    ->where('t_tebus','=',$request->tarikh)
+                    ->sum('upahdibayar');
+
+        $upahlelong = Lelong::on($cawangan['mysql'])
+                    ->where('t_jual','=',$request->tarikh)
+                    ->sum('bakiupah');
+
+        $upahansur = Advansur::on($cawangan['mysql'])
+                    ->where('tarikh','=',$request->tarikh)
+                    ->sum('upahdibayar');
+        
+
+        $upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur;
+        $keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran;
+
+
+        $total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar);
+
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('tebus.t_tebus','=',$request->tarikh)
+                ->get();
+
+        $totalpenebusan = 0;
+
+        foreach($tebus as $index1=>$teb)
+        {
+            if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
+            {
+                $totalpenebusan += $teb['gadaibakipjm'];
+            }else{
+                $totalpenebusan += $teb['pinjaman'];
+            }
+        }
 
 
         //b
@@ -183,10 +237,12 @@ class LaporanController extends Controller
         }
 
         //g
-        $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
+        $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0);
+        $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0);
+
+        $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
+        $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
 
-        $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
-        $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -209,7 +265,7 @@ class LaporanController extends Controller
 
         array_push($laporan_harian,[
             'total_gadai'=>$total_gadai,
-            'total_tebus'=>$total_tebus,
+            'total_tebus'=>$totalpenebusan,
             'total_ansuran'=>$total_ansuran,
             'bilangan_gadai'=>$bilangan_gadai,
             'bilangan_tebus'=>$bilangan_tebus,
@@ -316,10 +372,11 @@ class LaporanController extends Controller
         }
 
         //g
-        $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
+        $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0);
+        $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0);
 
-        $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
-        $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
+        $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
+        $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');