diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 09f8870..64d9231 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1112,27 +1112,35 @@ class GadaiController extends Controller
         $gadai3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
-                ->whereBetween('nilaimarhun', [2001, 100000])
+                ->whereBetween('nilaimarhun', [2001, 1000000])
                 ->get();    
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->whereBetween('nilaimarhun', [1, 400.99])
+                // ->whereBetween('nilaimarhun', [1, 400.99])
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
                 ->get();  
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->whereBetween('nilaimarhun', [401, 2000.99])
+                // ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
                 ->get();  
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->whereBetween('nilaimarhun', [2001, 100000])
+                // ->whereBetween('nilaimarhun', [2001, 100000])
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
                 ->get();  
+        
+        // dd($gadaiini3);
                 
                 
 
@@ -1141,53 +1149,47 @@ class GadaiController extends Controller
         ////////////
         ///TEBUS////
         ///////////
-
-        $tebus1 = Gadai::on($cawangan['mysql'])
+                
+        $tebus1 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','<',$tarikh)
-                ->where('sttebus','=','T')
+                ->where('t_tebus','<',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->get();                
+                ->get();
 
-        $tebus2 = Gadai::on($cawangan['mysql'])
+        $tebus2 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','<',$tarikh)
-                ->where('sttebus','=','T')
+                ->where('t_tebus','<',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();     
 
-        $tebus3 = Gadai::on($cawangan['mysql'])
+        $tebus3 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','<',$tarikh)
-                ->where('sttebus','=','T')
+                ->where('t_tebus','<',$tarikh)
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
+                ->where('nilaimarhun','<=',1000000)
                 ->get();    
 
-        $tebusini1 = Gadai::on($cawangan['mysql'])
+        $tebusini1 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','=',$tarikh)
-                ->where('sttebus','=','T')
+                ->where('t_tebus','=',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
                 ->get();                
 
-        $tebusini2 = Gadai::on($cawangan['mysql'])
+        $tebusini2 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','=',$tarikh)
-                ->where('sttebus','=','T')
+                ->where('t_tebus','=',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();     
 
-        $tebusini3 = Gadai::on($cawangan['mysql'])
+        $tebusini3 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','=',$tarikh)
-                ->where('sttebus','=','T')
+                ->where('t_tebus','=',$tarikh)
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
+                ->where('nilaimarhun','<=',1000000)
                 ->get();   
                 
                 
@@ -1196,172 +1198,112 @@ class GadaiController extends Controller
         /////////////
 
 
-        $lelong1 = Gadai::on($cawangan['mysql'])
+        $lelong1 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','<',$tarikh)
-                ->where('sttebus','=','L')
+                ->where('t_jual','<',$tarikh)
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
+                ->get();
+
+
+        $lelong2 = Lelong::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_jual','<',$tarikh)
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->get();     
+
+        $lelong3 = Lelong::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_jual','<',$tarikh)
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->get();    
+
+        $lelongini1 = Lelong::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_jual','=',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
                 ->get();                
 
-        $lelong2 = Gadai::on($cawangan['mysql'])
+        $lelongini2 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','<',$tarikh)
-                ->where('sttebus','=','L')
+                ->where('t_jual','=',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();     
 
-        $lelong3 = Gadai::on($cawangan['mysql'])
+        $lelongini3 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','<',$tarikh)
-                ->where('sttebus','=','L')
+                ->where('t_jual','=',$tarikh)
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
-                ->get();    
-
-        $lelongini1 = Gadai::on($cawangan['mysql'])
-            ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-            ->where('t_update','=',$tarikh)
-            ->where('sttebus','=','L')
-            ->where('nilaimarhun','>=',1)
-            ->where('nilaimarhun','<=',400.99)
-            ->get();                
-
-        $lelongini2 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','=',$tarikh)
-                ->where('sttebus','=','L')
-                ->where('nilaimarhun','>=',401)
-                ->where('nilaimarhun','<=',2000.99)
-                ->get();     
-
-        $lelongini3 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_update','=',$tarikh)
-                ->where('sttebus','=','L')
-                ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
+                ->where('nilaimarhun','<=',1000000)
                 ->get();   
 
         if($kodcaw == 'KB2')
         {
 
-		$kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
-                            ->get();
+		// $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+        //                     ->get();
 
-            foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
-            {
-                //Gadai 
-                $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
-                $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
-                $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
-                $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
-                $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
-                $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
+        //     foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
+        //     {
+        //         //Gadai 
+        //         $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
+        //         $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
+        //         $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
+        //         $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
+        //         $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
+        //         $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
 
-                $gadai1[0]['bil'] = $gad1;
-                $gadai1[0]['pinj'] = $gadpinj1;
-                $gadai2[0]['bil'] = $gad2;
-                $gadai2[0]['pinj'] = $gadpinj2;
-                $gadai3[0]['bil'] = $gad3;
-                $gadai3[0]['pinj'] = $gadpinj3;
+        //         $gadai1[0]['bil'] = $gad1;
+        //         $gadai1[0]['pinj'] = $gadpinj1;
+        //         $gadai2[0]['bil'] = $gad2;
+        //         $gadai2[0]['pinj'] = $gadpinj2;
+        //         $gadai3[0]['bil'] = $gad3;
+        //         $gadai3[0]['pinj'] = $gadpinj3;
 
-                //Tebus
+        //         //Tebus
 
-                $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
-                $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
-                $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
-                $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
-                $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
-                $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
+        //         $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
+        //         $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
+        //         $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
+        //         $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
+        //         $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
+        //         $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
 
-                $tebus1[0]['bil'] = $teb1;
-                $tebus1[0]['pinj'] = $tebpinj1;
-                $tebus2[0]['bil'] = $teb2;
-                $tebus2[0]['pinj'] = $tebpinj2;
-                $tebus3[0]['bil'] = $teb3;
-                $tebus3[0]['pinj'] = $tebpinj3;
+        //         $tebus1[0]['bil'] = $teb1;
+        //         $tebus1[0]['pinj'] = $tebpinj1;
+        //         $tebus2[0]['bil'] = $teb2;
+        //         $tebus2[0]['pinj'] = $tebpinj2;
+        //         $tebus3[0]['bil'] = $teb3;
+        //         $tebus3[0]['pinj'] = $tebpinj3;
 
-                //Lelong
+        //         //Lelong
 
-                $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
-                $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
-                $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
-                $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
-                $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
-                $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
+        //         $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
+        //         $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
+        //         $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
+        //         $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
+        //         $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
+        //         $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
 
-                $lelong1[0]['bil'] = $lel1;
-                $lelong1[0]['pinj'] = $lelpinj1;
-                $lelong2[0]['bil'] = $lel2;
-                $lelong2[0]['pinj'] = $lelpinj2;
-                $lelong3[0]['bil'] = $lel3;
-                $lelong3[0]['pinj'] = $lelpinj3;
-
-            }
-        }else{
-            $kawalanstok = KawalanStok::on($cawangan['mysql'])
-                            ->get();
-
-            foreach($kawalanstok as $indexgad => $gadaikawalanstok)
-            {
-
-                //Gadai 
-                $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilgadc1']);
-                $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilgadc2']);
-                $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilgadc3']);
-                $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc1']);
-                $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc2']);
-                $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc3']);
-
-                $gadai1[0]['bil'] = $gad1;
-                $gadai1[0]['pinj'] = $gadpinj1;
-                $gadai2[0]['bil'] = $gad2;
-                $gadai2[0]['pinj'] = $gadpinj2;
-                $gadai3[0]['bil'] = $gad3;
-                $gadai3[0]['pinj'] = $gadpinj3;
-
-                //Tebus
-
-                $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['biltebc1']);
-                $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['biltebc2']);
-                $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['biltebc3']);
-                $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc1']);
-                $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc2']);
-                $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc3']);
-
-                $tebus1[0]['bil'] = $teb1;
-                $tebus1[0]['pinj'] = $tebpinj1;
-                $tebus2[0]['bil'] = $teb2;
-                $tebus2[0]['pinj'] = $tebpinj2;
-                $tebus3[0]['bil'] = $teb3;
-                $tebus3[0]['pinj'] = $tebpinj3;
-
-                //Lelong
-
-                $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['billelc1']);
-                $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['billelc2']);
-                $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['billelc3']);
-                $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc1']);
-                $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc2']);
-                $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc3']);
-
-                $lelong1[0]['bil'] = $lel1;
-                $lelong1[0]['pinj'] = $lelpinj1;
-                $lelong2[0]['bil'] = $lel2;
-                $lelong2[0]['pinj'] = $lelpinj2;
-                $lelong3[0]['bil'] = $lel3;
-                $lelong3[0]['pinj'] = $lelpinj3;
+        //         $lelong1[0]['bil'] = $lel1;
+        //         $lelong1[0]['pinj'] = $lelpinj1;
+        //         $lelong2[0]['bil'] = $lel2;
+        //         $lelong2[0]['pinj'] = $lelpinj2;
+        //         $lelong3[0]['bil'] = $lel3;
+        //         $lelong3[0]['pinj'] = $lelpinj3;
 
             }
 
-        }
 
         //////////////////
         /////ANSURAN//////
         //////////////////
 
+
         $daterequest = new Carbon($tarikh);
 
         $ansuran1_data = TransaksiKeuntungan::on('mysql7')
@@ -1373,20 +1315,37 @@ class GadaiController extends Controller
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->get();
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('trans.norujukan');
 
         $ansuran1 = [];
 
-        if($ansuran1_data){
-            foreach($ansuran1_data as $index=>$ansuran1Data){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran1Data['norujukan'])->first();
-                if($gadaiData){
-                    if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
-                        array_push($ansuran1,['bayaran_pembiayaan'=>$ansuran1Data['bayaran_pembiayaan']]);
-                    }
-                }
-            }
-        }
+        $ansuran1 = Gadai::on($cawangan['mysql'])
+            ->whereIn('norujukan',$ansuran1_data)
+            // ->whereBetween('nilaimarhun', [1, 400.99])
+            ->where([['nilaimarhun','>=',1],['nilaimarhun','<=',400.99],['sttebus',''],['hargajualan','<>','null']])
+            ->orWhere([['nilaimarhun','>=',1],['nilaimarhun','<=',400.99],['sttebus','!=',''],['t_update','>',$tarikh],['hargajualan','<>','null']])
+            ->pluck('norujukan');
+
+        $transaksi1 = TransaksiKeuntungan::on('mysql7')
+            ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
+            ->whereIn('norujukan',$ansuran1)
+            ->where('kodcaw',$kodcaw)
+            ->where('bayaran_pembiayaan','>',0)
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->get();
+
+
+        // if($ansuran1_data){
+        //     foreach($ansuran1_data as $index=>$ansuran1Data){
+        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran1Data['norujukan'])->first();
+        //         if($gadaiData){
+        //             if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
+        //                 array_push($ansuran1,['bayaran_pembiayaan'=>$ansuran1Data['bayaran_pembiayaan']]);
+        //             }
+        //         }
+        //     }
+        // }
 
         $ansuranharini1_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
@@ -1397,20 +1356,37 @@ class GadaiController extends Controller
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->get();
+                    ->where('trans.kodcaw',$kodcaw) 
+                    ->pluck('trans.norujukan');
 
-        $ansuranharini1 = [];
 
-        if($ansuranharini1_data){
-            foreach($ansuranharini1_data as $index=>$ansuranharini1Data){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini1Data['norujukan'])->first();
-                if($gadaiData){
-                    if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
-                        array_push($ansuranharini1,['bayaran_pembiayaan'=>$ansuranharini1Data['bayaran_pembiayaan']]);
-                    }
-                }
-            }
-        }
+        // $ansuranharini1 = [];
+
+        // if($ansuranharini1_data){
+        //     foreach($ansuranharini1_data as $index=>$ansuranharini1Data){
+        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini1Data['norujukan'])->first();
+        //         if($gadaiData){
+        //             if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
+        //                 array_push($ansuranharini1,['bayaran_pembiayaan'=>$ansuranharini1Data['bayaran_pembiayaan']]);
+        //             }
+        //         }
+        //     }
+        // }
+
+        $ansuran1harini = Gadai::on($cawangan['mysql'])
+                ->whereIn('norujukan',$ansuranharini1_data)
+                // ->whereBetween('nilaimarhun', [1, 400.99])
+                ->where([['nilaimarhun','>=',1],['nilaimarhun','<=',400.99],['sttebus',''],['hargajualan','<>','null']])
+                // ->orWhere([['sttebus','!=',''],['t_update','>',$tarikh],['hargajualan','<>','null']])
+                ->pluck('norujukan');
+
+        $transaksi1harini = TransaksiKeuntungan::on('mysql7')
+                ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
+                ->whereIn('norujukan',$ansuran1harini)
+                ->where('kodcaw',$kodcaw)
+                ->where('bayaran_pembiayaan','>',0)
+                ->get();
+
 
         $ansuran2_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
@@ -1421,20 +1397,37 @@ class GadaiController extends Controller
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->get();
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('trans.norujukan');
 
-        $ansuran2 = [];
 
-        if($ansuran2_data){
-            foreach($ansuran2_data as $index=>$ansuran2Data){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran2Data['norujukan'])->first();
-                if($gadaiData){
-                    if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
-                        array_push($ansuran2,['bayaran_pembiayaan'=>$ansuran2Data['bayaran_pembiayaan']]);
-                    }
-                }
-            }
-        }
+        // $ansuran2 = [];
+
+        // if($ansuran2_data){
+        //     foreach($ansuran2_data as $index=>$ansuran2Data){
+        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran2Data['norujukan'])->first();
+        //         if($gadaiData){
+        //             if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
+        //                 array_push($ansuran2,['bayaran_pembiayaan'=>$ansuran2Data['bayaran_pembiayaan']]);
+        //             }
+        //         }
+        //     }
+        // }
+
+        $ansuran2 = Gadai::on($cawangan['mysql'])
+                ->whereIn('norujukan',$ansuran2_data)
+                // ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->where([['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99],['sttebus',''],['hargajualan','<>','null']])
+                ->orWhere([['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99],['sttebus','!=',''],['t_update','>',$tarikh],['hargajualan','<>','null']])
+                ->pluck('norujukan');
+
+        $transaksi2 = TransaksiKeuntungan::on('mysql7')
+                ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
+                ->whereIn('norujukan',$ansuran2)
+                ->where('tarikh_bayaran' ,'<=', $daterequest)
+                ->where('kodcaw',$kodcaw)
+                ->where('bayaran_pembiayaan','>',0)
+                ->get();
 
         $ansuranharini2_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
@@ -1445,20 +1438,35 @@ class GadaiController extends Controller
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->get();
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('trans.norujukan');
         
-        $ansuranharini2 = [];
+        // $ansuranharini2 = [];
 
-        if($ansuranharini2_data){
-            foreach($ansuranharini2_data as $index=>$ansuranharini2Data){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini2Data['norujukan'])->first();
-                if($gadaiData){
-                    if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
-                        array_push($ansuranharini2,['bayaran_pembiayaan'=>$ansuranharini2Data['bayaran_pembiayaan']]);
-                    }
-                }
-            }
-        }
+        // if($ansuranharini2_data){
+        //     foreach($ansuranharini2_data as $index=>$ansuranharini2Data){
+        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini2Data['norujukan'])->first();
+        //         if($gadaiData){
+        //             if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
+        //                 array_push($ansuranharini2,['bayaran_pembiayaan'=>$ansuranharini2Data['bayaran_pembiayaan']]);
+        //             }
+        //         }
+        //     }
+        // }
+
+        $ansuran2harini = Gadai::on($cawangan['mysql'])
+                ->whereIn('norujukan',$ansuranharini2_data)
+                // ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->where([['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99],['sttebus',''],['hargajualan','<>','null']])
+                // ->orWhere([['sttebus','!=',''],['t_update','>',$tarikh],['hargajualan','<>','null']])
+                ->pluck('norujukan');
+
+        $transaksi2harini = TransaksiKeuntungan::on('mysql7')
+                ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
+                ->whereIn('norujukan',$ansuran2harini)
+                ->where('kodcaw',$kodcaw)
+                ->where('bayaran_pembiayaan','>',0)
+                ->get();
         
         $ansuran3_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
@@ -1469,20 +1477,37 @@ class GadaiController extends Controller
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->get();
+                    ->where('trans.kodcaw',$kodcaw) 
+                    ->pluck('trans.norujukan');
 
-        $ansuran3 = [];
+        // $ansuran3 = [];
+
+        // if($ansuran3_data){
+        //     foreach($ansuran3_data as $index=>$ansuran3Data){
+        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran3Data['norujukan'])->first();
+        //         if($gadaiData){
+        //             if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 1000000){
+        //                 array_push($ansuran3,['bayaran_pembiayaan'=>$ansuran3Data['bayaran_pembiayaan']]);
+        //             }
+        //         }
+        //     }
+        // }
+
+        $ansuran3 = Gadai::on($cawangan['mysql'])
+                ->whereIn('norujukan',$ansuran3_data)
+                // ->whereBetween('nilaimarhun', [2001, 1000000])
+                ->where([['nilaimarhun','>=',2001],['nilaimarhun','<=',1000000],['sttebus',''],['hargajualan','<>','null']])
+                ->orWhere([['nilaimarhun','>=',2001],['nilaimarhun','<=',1000000],['sttebus','!=',''],['t_update','>',$tarikh],['hargajualan','<>','null']])
+                ->pluck('norujukan');
+
+        $transaksi3 = TransaksiKeuntungan::on('mysql7')
+                ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
+                ->whereIn('norujukan',$ansuran3)
+                ->where('tarikh_bayaran' ,'<=', $daterequest)
+                ->where('kodcaw',$kodcaw)
+                ->where('bayaran_pembiayaan','>',0)
+                ->get();
 
-        if($ansuran3_data){
-            foreach($ansuran3_data as $index=>$ansuran3Data){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran3Data['norujukan'])->first();
-                if($gadaiData){
-                    if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 100000){
-                        array_push($ansuran3,['bayaran_pembiayaan'=>$ansuran3Data['bayaran_pembiayaan']]);
-                    }
-                }
-            }
-        }
         
         $ansuranharini3_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
@@ -1493,85 +1518,47 @@ class GadaiController extends Controller
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->get();
-
-        $ansuranharini3 = [];
-
-        if($ansuranharini3_data){
-            foreach($ansuranharini3_data as $index=>$ansuranharini3Data){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini3Data['norujukan'])->first();
-                if($gadaiData){
-                    if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 100000){
-                        array_push($ansuranharini3,['bayaran_pembiayaan'=>$ansuranharini3Data['bayaran_pembiayaan']]);
-                    }
-                }
-            }
-        }
-
-        //Calculation Ansuran guna foreach
-
-        $totalans1 = 0;$totalharinians1 = 0;
-        $countans1 = 0;$countharinians1 = 0;
-        foreach($ansuran1 as $ans1)
-        {
-            $totalans1 += $ans1['bayaran_pembiayaan'];
-            $countans1++;
-        }
-
-        $arrayans1 = ['bil' => $countans1, 'pinj' => $totalans1];
-        
-        foreach($ansuranharini1 as $ansharini1)
-        {
-            $totalharinians1 += $ansharini1['bayaran_pembiayaan'];
-            $countharinians1 ++;
-        }
-
-        $arrayharinians1 = ['bil' => $countharinians1, 'pinj' => $totalharinians1];
-
-        //End 1
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('trans.norujukan');
 
         
-        $totalans2 = 0;$totalharinians2 = 0;
-        $countans2 = 0;$countharinians2 = 0;
-        foreach($ansuran2 as $ans2)
-        {
-            $totalans2 += $ans2['bayaran_pembiayaan'];
-            $countans2++;
-        }
+        // $ansuranharini3 = [];
 
-        $arrayans2 = ['bil' => $countans2, 'pinj' => $totalans2];
+        // if($ansuranharini3_data){
+        //     foreach($ansuranharini3_data as $index=>$ansuranharini3Data){
+        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini3Data['norujukan'])->first();
+        //         if($gadaiData){
+        //             if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 1000000){
+        //                 array_push($ansuranharini3,['bayaran_pembiayaan'=>$ansuranharini3Data['bayaran_pembiayaan']]);
+        //             }
+        //         }
+        //     }
+        // }
+        
 
+        $ansuran3harini = Gadai::on($cawangan['mysql'])
+                ->whereIn('norujukan',$ansuranharini3_data)
+                // ->whereBetween('nilaimarhun', [2001, 1000000])
+                ->where([['nilaimarhun','>=',2001],['nilaimarhun','<=',1000000],['sttebus',''],['hargajualan','<>','null']])
+                // ->orWhere([['sttebus','!=',''],['t_update','>',$tarikh],['hargajualan','<>','null']])
+                ->pluck('norujukan');
 
-        foreach($ansuranharini2 as $ansharini2)
-        {
-            $totalharinians2 += $ansharini2['bayaran_pembiayaan'];
-            $countharinians2 ++;
-        }
-
-        $arrayharinians2 = ['bil' => $countharinians2, 'pinj' => $totalharinians2];
-
-        //End 2
-
-        $totalans3 = 0;$totalharinians3 = 0;
-        $countans3 = 0;$countharinians3 = 0;
-        foreach($ansuran3 as $ans3)
-        {
-            $totalans3 += $ans3['bayaran_pembiayaan'];
-            $countans3++;
-        }
-
-        $arrayans3 = ['bil' => $countans3, 'pinj' => $totalans3];
-
-        foreach($ansuranharini3 as $ansharini3)
-        {
-            $totalharinians3 += $ansharini3['bayaran_pembiayaan'];
-            $countharinians3 ++;
-        }
-
-        $arrayharinians3 = ['bil' => $countharinians3, 'pinj' => $totalharinians3];
-
-        //End 3
+        $transaksi3harini = TransaksiKeuntungan::on('mysql7')
+                ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
+                ->whereIn('norujukan',$ansuran3harini)
+                ->where('kodcaw',$kodcaw)
+                ->where('bayaran_pembiayaan','>',0)
+                ->get();
+        
 
+        ##push in array##
+        $arrayans1 = ['bil' => $transaksi1[0]->bil, 'pinj' => $transaksi1[0]->total];
+        $arrayharinians1 = ['bil' => $transaksi1harini[0]->bil, 'pinj' => $transaksi1harini[0]->total];
+        $arrayans2 = ['bil' => $transaksi2[0]->bil, 'pinj' => $transaksi2[0]->total];
+        $arrayharinians2 = ['bil' => $transaksi2harini[0]->bil, 'pinj' => $transaksi2harini[0]->total];
+        $arrayans3 = ['bil' => $transaksi3[0]->bil, 'pinj' => $transaksi3[0]->total];
+        $arrayharinians3 = ['bil' => $transaksi3harini[0]->bil, 'pinj' => $transaksi3harini[0]->total];
+        
 
         //////////////////
         ///HAPUS KIRA/////
@@ -3063,10 +3050,9 @@ class GadaiController extends Controller
                             ->pluck('norujukan');
 
         $transaksi_kredit_gadai =  Gadai::on($cawangan['mysql'])
-			    ->whereIn('norujukan',$transaksi_data)
-			    //->join('tebus as t','gadai.norujukan','=','t.norujukan')
+                            ->whereIn('norujukan',$transaksi_data)
+                            //->join('tebus as t','gadai.norujukan','=','t.norujukan')
                             ->where([['hargajualan','<>','null']])
-			    //->orWhere([['sttebus','!=',''],['hargajualan','<>','null'],['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])
                             ->pluck('norujukan');
 
         $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
@@ -3077,7 +3063,7 @@ class GadaiController extends Controller
                             })
             ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
             ->where('trans.trans_type','=','A')
-	    ->whereDate('tarikh_bayaran','<=', $request->hingga)
+            ->whereDate('tarikh_bayaran','<=', $request->hingga)
             ->whereDate('tarikh_bayaran','>=', $request->mula)
             // ->whereBetween('tarikh_bayaran',[$from,$to])
             ->sum('bayaran_pembiayaan');
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 0655434..971b114 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -440,7 +440,7 @@ class LaporanController extends Controller
         $rekodkoopquery = Gadai::on($cawangan['mysql'])
                             ->where('tagpalsu','=',0)
                             ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
-                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]);
+                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]]);
                             // ->sum('pinjaman');
 
         $rekodkoop = $rekodkoopquery->sum('pinjaman');
@@ -463,18 +463,13 @@ class LaporanController extends Controller
         $daterequest->addDays(1);
 
             $bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
-            // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-            // ->where('db2.sttebus','=','')
-            // ->where('db2.hargajualan','<>','null')
             ->where('tarikh_bayaran' ,'<=', $daterequest)
             ->where('kodcaw',$request->kodcaw)
-            // ->sum('bayaran_pembiayaan');
-            // ->get();
             ->pluck('norujukan');
         
         $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data)
-            ->where('sttebus' , '')
-            ->whereNotNull('hargajualan')
+            ->where([['sttebus',''],['hargajualan','<>','null']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
             ->pluck('norujukan');
          
         $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 97f4565..aa1a00b 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -20,6 +20,7 @@ use App\Panjar;
 use App\HargaEmas;
 use App\Moratorium;
 use App\Audit;
+use App\LookupWakil;
 
 use Illuminate\Http\Request;
 
@@ -753,6 +754,30 @@ class TebusController extends Controller
             return response(0);
     }
 
+    public function getWakilbyStatus($kodcaw,$status,Request $request){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        if($status == 'hubungan')
+        {
+            $wakil = Wakil::on($cawangan['mysql'])
+                ->where('hubungan','=',$request->hubungan)
+                ->get();
+        }else{
+            $wakil = [];
+        }
+        
+
+        return response()->json($wakil,200);
+    }
+
+    public function LookupWakil()
+    {
+        $lookupwakil = LookupWakil::on('mysql7')->get();
+
+        return response()->json($lookupwakil,200);
+    }
+
+
     public function getWakil($kodcaw,$icno){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -1272,9 +1297,9 @@ class TebusController extends Controller
                 // ->get();
                 ->pluck('norujukan');
 
-            $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
+            $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
 
-            $keuntungan = TransaksiKeuntungan::on('mysql7')
+            $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
                 ->whereIn('norujukan',$gadaiData)
                 ->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
                 ->whereDate('tarikh_bayaran','>=', $dateSM)
diff --git a/app/LookupWakil.php b/app/LookupWakil.php
new file mode 100644
index 0000000..e4d731e
--- /dev/null
+++ b/app/LookupWakil.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LookupWakil extends Model
+{
+    protected $table = 'lookup_wakil';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'recno',
+        'hubungan'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 149481f..2968693 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -358,6 +358,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
     $router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
     $router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']);
+    $router->get('getwakil/{kodcaw}/status/{status}',['uses' => 'TebusController@getWakilbyStatus']);
+    $router->get('lookupwakil',['uses' => 'TebusController@LookupWakil']);
+
+
 
     //update tagterima Tebus
     $router->put('updatetagterima/{kodcaw}/{norujukan}',['uses'=>'TebusController@tagterimaupdate']);