diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index d29163d..2ef5b2c 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2885,30 +2885,31 @@ class GadaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-
         $transaksi_data = TransaksiKeuntungan::on('mysql7')
             ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-            ->where('kodcaw',$request->kodcaw)
+            ->where('kodcaw',$kodcaw)
             ->pluck('norujukan');
         
         $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
             ->where([['sttebus',''],['hargajualan','<>','null']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']])
             ->pluck('norujukan');
 
-
         $transaksi = TransaksiKeuntungan::on('mysql7')
             ->whereIn('norujukan',$gadaiData)
             ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
             ->sum('bayaran_pembiayaan');
 
-        // $transaksi_data = TransaksiKeuntungan::on('mysql7')
-        //             ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //             // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-        //             // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //             // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //             // ->sum('bayaran_pembiayaan');
-        //             ->get();
+
+        $transaksi_data = TransaksiKeuntungan::on('mysql7')
+                    // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->sum('bayaran_pembiayaan');
+                    // ->get();
+
+        dd($transaksi_data);
         
         // $transaksi = 0;
         // if($transaksi_data){
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 8fc8512..575c67d 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -18,6 +18,7 @@ use App\Tunai;
 use App\Denominasi;
 use App\HapusKira;
 use App\GlCode;
+use App\GlDetail;
 use Carbon\Carbon;
 
 class LaporanController extends Controller
@@ -35,12 +36,37 @@ class LaporanController extends Controller
         //a
         $total_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->sum('pinjaman');
         $total_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('pinjaman');
-        $total_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->sum('duit_masuk');
+        $bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at',$request->tarikh)->where('teller','=','Online')->where('kodcaw',$request->kodcaw);
+
+        $bayaranonline = $bayaranonlinequery->sum('duit_masuk');
+        $bilbayaranonline = $bayaranonlinequery->count();
+        
+        $ansurankaunter = TransaksiKeuntungan::on('mysql7') 
+                        ->leftJoin('transaction as trans', function($join)
+                        {
+                            $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                            $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                        })
+                        ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) = ?',[$request->tarikh])
+                        ->where([['trans.trans_type','=','A'],['teller','<>','Online'],['trans.kodcaw','=',$request->kodcaw]]);
+           
+        $ansuranonline = TransaksiKeuntungan::on('mysql7') 
+                        ->leftJoin('transaction as trans', function($join)
+                        {
+                            $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                            $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                        })
+                        ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) = ?',[$request->tarikh])
+                        ->where([['trans.trans_type','=','A'],['teller','=','Online'],['trans.kodcaw','=',$request->kodcaw]]);
+
+        $total_ansuran = $ansurankaunter->sum('transaksi_keuntungan.bayaran_pembiayaan');
+        $total_ansuranonline = $ansuranonline->sum('transaksi_keuntungan.bayaran_pembiayaan');
+
         // $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
         $total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar');
         $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah');
 
-        $total_keuntunganansuran_data = TransaksiKeuntungan::on('mysql7')
+        $total_keuntunganansuran_data_kaunter = TransaksiKeuntungan::on('mysql7')
                     // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->leftJoin('transaction as trans', function($join)
                          {
@@ -48,7 +74,7 @@ class LaporanController extends Controller
                              $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                          })
                     ->whereDate('trans.created_at','=',$request->tarikh)
-                    ->where('trans.kodcaw','=',$request->kodcaw)
+                    ->where('trans.teller','<>','Online')
                     ->where('trans.trans_type','=','A')
                     ->where('trans.kodcaw',$request->kodcaw)
                     // ->whereNotNull('db2.hargajualan')
@@ -56,9 +82,15 @@ class LaporanController extends Controller
                     // ->get();
                     ->pluck('transaksi_keuntungan.norujukan');
     
-        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data)->whereNotNull('hargajualan')->pluck('norujukan');
+        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
 
-        $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');        
+        $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
+                                            ->whereIn('norujukan',$gadaiDataKaunter)
+                                            ->whereDate('tarikh_bayaran','=',$request->tarikh);
+                                            
+                                            
+        $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan');
+        $bil_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->count();
 
         // $total_keuntunganansuran = 0;
         // if($total_keuntunganansuran_data){
@@ -70,7 +102,29 @@ class LaporanController extends Controller
         //     }
         // }
 
-        $total_keuntunganbukanansuran_data = TransaksiKeuntungan::on('mysql7')
+        $total_keuntunganansuran_data_online = 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');
+             })
+        ->whereDate('trans.created_at','=',$request->tarikh)
+        ->where('trans.teller','=','Online')
+        ->where('trans.trans_type','=','A')
+        ->where('trans.kodcaw',$request->kodcaw)
+        ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntunganansuran_online_query = TransaksiKeuntungan::on('mysql7')
+                                        ->whereIn('norujukan',$gadaiDataOnline)
+                                        ->whereDate('tarikh_bayaran','=',$request->tarikh);
+                                        
+        $total_keuntunganansuran_online = $keuntunganansuran_online_query->sum('bayaran_keuntungan');
+        $bil_keuntunganansuran_online = $keuntunganansuran_online_query->count();
+
+        $total_keuntunganbukanansuran_data_kaunter = TransaksiKeuntungan::on('mysql7')
                     // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->leftJoin('transaction as trans', function($join)
                     {
@@ -78,6 +132,7 @@ class LaporanController extends Controller
                         $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                     })
                     ->where('trans.trans_type','!=','A')
+                    ->where('trans.teller','<>','Online')
                     ->whereDate('trans.created_at','=',$request->tarikh)
                     ->where('trans.kodcaw','=',$request->kodcaw)
                     // ->whereNotNull('db2.hargajualan')
@@ -85,15 +140,15 @@ class LaporanController extends Controller
                     // ->get();
                     ->pluck('transaksi_keuntungan.norujukan');
 
-        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data)->whereNotNull('hargajualan')->pluck('norujukan');
+        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
 
-        $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('keuntungan_rebet');  
-
-        $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7')
-                                    ->whereIn('norujukan',$gadaiData)
-                                    ->whereDate('tarikh_bayaran','=',$request->tarikh)
-                                    ->sum('keuntungan_rebet');
+        $keuntunganbukanansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
+                                    ->whereIn('norujukan',$gadaiDataKaunter)
+                                    ->whereDate('tarikh_bayaran','=',$request->tarikh);
         
+        $total_keuntunganbukanansuran_kaunter = $keuntunganbukanansuran_kaunter_query->sum('keuntungan_rebet');
+        $bil_keuntunganbukanansuran_kaunter = $keuntunganbukanansuran_kaunter_query->count();
+
         // $total_keuntunganbukanansuran = 0;
 
         // if($total_keuntunganbukanansuran_data){
@@ -105,20 +160,54 @@ class LaporanController extends Controller
         //     }
         // }
 
-        // dd($total_keuntunganbukanansuran);
+        $total_keuntunganbukanansuran_data_online = 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')
+            ->where('trans.teller','=','Online')
+            ->whereDate('trans.created_at','=',$request->tarikh)
+            ->where('trans.kodcaw','=',$request->kodcaw)
+            ->pluck('transaksi_keuntungan.norujukan');
 
-        $keuntungan_data = TransaksiKeuntungan::on('mysql7')
+        $gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        // $total_keuntunganbukanansuran_kaunter = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiDataKaunter)->sum('keuntungan_rebet');  
+
+        $keuntunganbukanansuran_online_query = TransaksiKeuntungan::on('mysql7')
+                                ->whereIn('norujukan',$gadaiDataOnline)
+                                ->whereDate('tarikh_bayaran','=',$request->tarikh);
+                                
+
+        $total_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->sum('keuntungan_rebet');
+        $bil_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->count();
+
+        $keuntungan_data_kaunter = 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');
+                    })
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
+                    ->where('trans.teller','<>','Online')
                     // ->whereNull('db2.hargajualan')
                     // ->sum('bayaran_keuntungan');
                     // ->get();
-                    ->pluck('norujukan');
+                    ->pluck('transaksi_keuntungan.norujukan');
 
+        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data_kaunter)->whereNull('hargajualan')->pluck('norujukan');
 
-        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
+        $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7')
+                            ->whereIn('norujukan',$gadaiDataKaunter);
+                               
+        
+        $keuntungan_kaunter = $keuntungan_kaunter_query->sum('bayaran_keuntungan'); 
+        $bil_keuntungan_kaunter = $keuntungan_kaunter_query->count(); 
 
-        $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');    
         
         // $keuntungan = 0;
 
@@ -139,17 +228,30 @@ class LaporanController extends Controller
                     ->where('t_jual','=',$request->tarikh)
                     ->sum('bakiupah');
 
-        $upahansur = Advansur::on($cawangan['mysql'])
+        $upahansurKaunter = Advansur::on($cawangan['mysql'])
+                    ->where('teller','<>','Online')
                     ->where('tarikh','=',$request->tarikh)
                     ->sum('upahdibayar');
+
+        $upahansurOnlineQuery = Advansur::on($cawangan['mysql'])
+                    ->where('teller','=','Online')
+                    ->where('tarikh','=',$request->tarikh);
+
+        $upahansurOnline = $upahansurOnlineQuery->sum('upahdibayar');
+        $bilupahansurOnline = $upahansurOnlineQuery->count();
+
         
+        $upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter;
+        $keuntungansebenarkaunter = $total_keuntunganansuran_kaunter;
 
-        $upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur;
-        $keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran;
+        $upahsimpanonline = $upahtebus + $upahlelong + $upahansurOnline;
+        $keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online;
 
+        $total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter);
+        $total_keuntungan_online = floatval($upahsimpanonline) + floatval($keuntungansebenaronline);
 
-        $total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar);
-
+        $totalbayaranonline = floatval($bayaranonline) + floatval($upahansurOnline);
+        $biltotalbayaranonline =  $bilbayaranonline + $bilupahansurOnline;
 
         $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')
@@ -173,7 +275,8 @@ class LaporanController extends Controller
         //b
         $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->where('pinjaman','>',0)->count();
         $bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count();
-        $bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count();
+        $bilangan_ansuran = $ansurankaunter->count();
+        $bilangan_ansuranonline = $ansuranonline->count();
         $bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count();
 
         //c
@@ -220,18 +323,26 @@ class LaporanController extends Controller
         //e
         /* Imbang Duga */
 
-        $rekodkoop = Gadai::on($cawangan['mysql'])
+        $rekodkoopquery = Gadai::on($cawangan['mysql'])
                             ->where('tagpalsu','=',0)
                             ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
-                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
-                            ->sum('pinjaman');
+                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]);
+                            // ->sum('pinjaman');
+
+        $rekodkoop = $rekodkoopquery->sum('pinjaman');
+        $rekodkoopnilaimarhun = $rekodkoopquery->sum('nilaimarhun');
+        $rekodkoopbil = $rekodkoopquery->count();
+
 
         if($request->tarikh > '2021-04-13'){
-            $rekodtawarruq = Gadai::on($cawangan['mysql'])
+            $rekodtawarruqquery = Gadai::on($cawangan['mysql'])
                 ->where('tagpalsu','=',0)
                 ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
-                ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
-                ->sum('pinjaman');
+                ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]);
+
+            $rekodtawarruq = $rekodtawarruqquery->sum('pinjaman');
+            $rekodtawarruqnilaimarhun = $rekodtawarruqquery->sum('nilaimarhun');
+            $rekodtawarruqbil = $rekodtawarruqquery->count();
             }
 
         $daterequest = new Carbon($request->tarikh);
@@ -344,13 +455,133 @@ class LaporanController extends Controller
 
         $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
 
+        //i serahan dan pendahuluan
+
+        $serahanpkb = '1000/020';
+        $serahanjmc = '1000/026';
+        $pendahuluanpkb = '7000/102';
+        $pendahuluanjmc = '7000/106';
+        $serahankoperasi = '1000/090';
+
+        $serahanpkbTawarruq = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$serahanpkb)
+            ->where('descpt','not like', 'SERAHAN BAYAR ONLINE%')
+            ->where('tarikh','=', $request->tarikh)
+            ->where('tarikh','>','2021-03-24')
+            ->sum('serahan');
+
+        $serahanbayaranOnline = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$serahanpkb)
+            ->where('descpt','like', 'SERAHAN BAYAR ONLINE%')
+            ->where('tarikh','=', $request->tarikh)
+            ->where('tarikh','>','2021-03-24')
+            ->sum('serahan');
+
+         //Sebelum Tawarruq
+        if($request->kodcaw == 'KB2' || $request->kodcaw == 'WCY' || $request->kodcaw == '1STOP' || $request->kodcaw == 'ARM' || $request->kodcaw == 'APM' || $request->kodcaw == '010621' || $request->kodcaw == '010915')
+        {
+            $serahanpkb = GlDetail::on($cawangan['mysql'])
+                ->where('dtacct','=',$serahanpkb)
+                ->where('tarikh','=', $request->tarikh)
+                ->where('tarikh','>','2013-12-31')
+                ->sum('amaun');
+
+            $serahanJMC = GlDetail::on($cawangan['mysql'])
+                ->where('dtacct','=',$serahanjmc)
+                ->where('tarikh','=', $request->tarikh)
+                ->where('tarikh','>','2013-12-31')
+                ->sum('amaun');
+
+
+            if($request->tarikh <= '2013-12-31')
+            {
+                $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
+                ->sum('serahan_pkb');
+
+                $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
+                ->sum('serahan_jmc');
+
+                $totaljmc = $serahanJMC + $serahanjmclama;
+                $totalpkb = $serahanpkb + $serahanpkblama;
+        
+                $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+                
+            }else{
+    
+                $totalserahan = $serahanpkbTawarruq + $serahanJMC + $serahanpkb;
+            }
+            
+        
+        }else{
+
+            if($kodcaw == '020301')
+                $serahanbaru = '1000/030';
+            else
+                $serahanbaru = '1000/026';
+
+            $serahanpkb = GlDetail::on($cawangan['mysql'])
+                ->where('dtacct','=',$serahanpkb)
+                ->where('tarikh','=', $request->tarikh)
+                ->sum('amaun');
+
+            $serahanJMC = GlDetail::on($cawangan['mysql'])
+                ->where('dtacct','=',$serahanbaru)
+                ->where('tarikh','=', $request->tarikh)
+                ->sum('amaun');
+
+            $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
+        }
+
+
+         //Selepas Tawarruq
+
+        $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$pendahuluanpkb)
+            ->where([['tarikh','=', $request->tarikh],['tarikh','>','2021-03-24']])
+            ->sum('pendahuluan');
+
+        //Sebelum Tawarruq
+
+        $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$pendahuluanpkb)
+            ->where([['tarikh','=', $request->tarikh],['tarikh','>','2013-12-31']])
+            ->sum('amaun');
+
+        $pendahuluanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=','7000/106')
+            ->where([['tarikh','=', $request->tarikh],['tarikh','>','2013-12-31']])
+            ->sum('amaun');
+
+        if($request->tarikh <= '2013-12-31')
+        {
+        $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('pendahuluan_pkb');
+
+        $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('pendahuluan_jmc');
+
+        $totalpendahuluan = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
+
+        $pindahkekpkb = GlCode::on($cawangan['mysql'])
+            ->where('glcode','=',$serahankoperasi)
+            ->sum('amaun');
+        }else{
+
+            $totalpendahuluan = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC;
+
+            $pindahkekpkb = 0;
+        }
+
+
         array_push($laporan_harian,[
             'total_gadai'=>$total_gadai,
             'total_tebus'=>$totalpenebusan,
             'total_ansuran'=>$total_ansuran,
+            'total_ansuranonline'=>$total_ansuranonline,
             'bilangan_gadai'=>$bilangan_gadai,
             'bilangan_tebus'=>$bilangan_tebus,
             'bilangan_ansuran'=>$bilangan_ansuran,
+            'bilangan_ansuranonline'=>$bilangan_ansuranonline,
             'bilangan_customer_baru'=>$bilangan_customer_baru,
             'bayar_baki_lelong'=>$bayar_baki_lelong,
             'bayar_rugi_lelong'=>$bayar_rugi_lelong,
@@ -374,15 +605,29 @@ class LaporanController extends Controller
             'jumlah_lelong'=>$jumlah_lelong,
             'baki_lelong'=>$baki_lelong,
             'rugi_lelong'=>$rugi_lelong,
-            'total_keuntungan'=>floatval($total_keuntungan),
+            'total_keuntungan_kaunter'=>floatval($total_keuntungan_kaunter),
+            'total_keuntungan_online'=>floatval($total_keuntungan_online),
+            'totalbayaranonline' => floatval($totalbayaranonline),
+            'biltotalbayaranonline' => $biltotalbayaranonline,
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
             'stokauditpembiayaan'=>$totalstokaudit,
             'stokauditnilaimarhun'=>$stokauditnilaimarhun,
             'stokauditcount'=>$stokauditcount,
             'petibesiimbangduga'=>$totalbakiakhirtunai,
-            'outstandingimbangduga'=>$outstandingimbangduga
-
+            'outstandingimbangduga'=>$outstandingimbangduga,
+            'rekodpinj' => floatval($rekodkoop),
+            'rekodpinjnm' => floatval($rekodkoopnilaimarhun),
+            'rekodpinjbil' => floatval($rekodkoopbil),
+            'rekodpemb' => floatval($rekodtawarruq),
+            'rekodpembnm' => floatval($rekodtawarruqnilaimarhun),
+            'rekodpembbil' => floatval($rekodtawarruqbil),
+            'bayaranpend' => floatval($bayaranpendahuluan),
+            'upahsimpankaunter' => floatval($upahsimpankaunter),
+            'keuntungansebenarkaunter' => floatval($keuntungansebenarkaunter),
+            'totalserahan' => floatval($totalserahan),
+            'serahanbayaranOnline' => floatval($serahanbayaranOnline),
+            'totalpendahuluan' => floatval($totalpendahuluan),
             ]);
             
         return response()->json($laporan_harian);