diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 082406a..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index abf1a47..64d9231 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -23,6 +23,8 @@ use App\KawalanStok;
 use App\Moratorium;
 use App\Audit;
 use App\Customer;
+use App\KomuditiPurchase;
+use App\KomuditiTransaksi;
 
 use Illuminate\Http\Request;
 
@@ -1110,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);
                 
                 
 
@@ -1139,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();   
                 
                 
@@ -1194,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')
@@ -1371,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)
@@ -1395,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)
@@ -1419,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)
@@ -1443,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)
@@ -1467,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)
@@ -1491,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/////
@@ -1639,18 +1628,24 @@ class GadaiController extends Controller
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
+        $harini = $current->toDateString();
+        $lastweek = $current->subWeek()->toDateString();
         $gadaiToday = 0;
+        $gadaiLastweek = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$current->toDateString())->get();
-            if(sizeof($gadai) != 0){
-                foreach($gadai as $gadaiall)
-                {
-                    $gadaiToday += $gadaiall['pinjaman'];
-                }
-            }
+            $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman');
+            $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman');
+            $gadaiLastweek += $gadai_last_week;
+            $gadaiToday += $gadai;
         }
+        $diffGadaiPercent = 0;
+        if($gadaiLastweek != 0){
+            $diffGadaiPercent = (($gadaiToday - $gadaiLastweek)/$gadaiLastweek)*100;
+        }
+        $dataGadai = [];
+        array_push($dataGadai,['gadaiToday'=>$gadaiToday,'percentDiff'=>$diffGadaiPercent]);
 
-        return response()->json(number_format($gadaiToday,2));
+        return response()->json($dataGadai);
 
     }
 
@@ -1659,17 +1654,24 @@ class GadaiController extends Controller
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
+        $harini = $current->toDateString();
+        $lastweek = $current->subWeek()->toDateString();
         $tebusToday = 0;
+        $tebusLastWeek = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$current->toDateString())->get();
-            if(sizeof($tebus) != 0){
-                foreach($tebus as $tebusall)
-                {
-                    $tebusToday += $tebusall['pinjaman'];
-                }
-            }
+            $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm');
+            $tebus_last_week = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakipjm');
+            
+            $tebusToday += $tebus;
+            $tebusLastWeek += $tebus_last_week;
         }
-        return response()->json(number_format($tebusToday,2));
+        $diffTebusPercent = 0;
+        if($tebusLastWeek != 0){
+            $diffTebusPercent = (($tebusToday - $tebusLastWeek)/$tebusLastWeek)/100;
+        }
+        $dataTebus = [];
+        array_push($dataTebus,['tebusToday'=>$tebusToday,'percentDiff'=>$diffTebusPercent]);
+        return response()->json($dataTebus);
     }
 
     public function showAllVariasiToday(){
@@ -1677,46 +1679,64 @@ class GadaiController extends Controller
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
-        $variasiToday = 0;
+        $harini = $current->toDateString();
+        $lastweek = $current->subWeek()->toDateString();
         $tebusToday = 0;
-        foreach($cawangan_all as $index=>$cawangan){
-            $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$current->toDateString())->get();
-            if(sizeof($tebus) != 0){
-                foreach($tebus as $tebusall)
-                {
-                    $tebusToday += $tebusall['pinjaman'];
-                }
-            }
-        }
         $gadaiToday = 0;
+        $tebusLastWeek = 0;
+        $gadaiLastWeek = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$current->toDateString())->get();
-            if(sizeof($gadai) != 0){
-                foreach($gadai as $gadaiall)
-                {
-                    $gadaiToday += $gadaiall['pinjaman'];
-                }
-            }
+            $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm');
+            $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman');
+            $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman');
+            $tebus_last_week = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakipjm');
+
+            $tebusToday += $tebus;
+            $gadaiToday += $gadai;
+            $tebusLastWeek += $tebus_last_week;
+            $gadaiLastWeek += $gadai_last_week;
         }
         $variasiToday = $gadaiToday - $tebusToday;
-        return response()->json(number_format($variasiToday,2));
+        $variasiLastWeek = $gadaiLastWeek - $tebusLastWeek;
+        $percentDiffVariasi = 0;
+        if($variasiLastWeek != 0){
+            $percentDiffVariasi = (($variasiToday - $variasiLastWeek)/$variasiLastWeek)*100;
+        }
+        $dataVariasi = [];
+        array_push($dataVariasi,['variasiToday'=>$variasiToday,'percentVariasi'=>$percentDiffVariasi]);
+        return response()->json($dataVariasi);
     }
     public function showAllUpahToday(){
 
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
+        $harini = $current->toDateString();
+        $lastweek = $current->subWeek()->toDateString();
         $upahToday = 0;
+        $upahLastWeek = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $upah = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$current->toDateString())->get();
-            if(sizeof($upah) != 0){
-                foreach($upah as $upahall)
-                {
-                    $upahToday += $upahall['bakiupah'];
-                }
-            }
+            $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah');
+            $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar');
+            
+            $upah_tebus_lastweek = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakiupah');
+            $upah_lastweek = Advansur::on($cawangan['mysql'])->where('tarikh',$lastweek)->sum('upahDibayar');
+
+            $upahToday = $upahToday + $upah_tebus_today + $upah_today;
+            $upahLastWeek = $upahLastWeek + $upah_tebus_lastweek + $upah_lastweek;
         }
-        return response()->json(number_format($upahToday,2));
+        $ansuran_today = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$harini . ' 00:00:00'],['tarikh_bayaran','<=',$harini . ' 23:59:59']])->sum('bayaran_keuntungan');
+        $ansuran_lastweek = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$lastweek . ' 00:00:00'],['tarikh_bayaran','<=',$lastweek . ' 23:59:59']])->sum('bayaran_keuntungan');
+
+        $upahToday = $upahToday + $ansuran_today;
+        $upahLastWeek = $upahLastWeek + $ansuran_lastweek;
+        $diffUpah = 0;
+        if($upahLastWeek != 0){
+            $diffUpah = (($upahToday - $upahLastWeek)/$upahLastWeek)*100;
+        }
+        $upahData = [];
+        array_push($upahData,['upahToday'=>$upahToday,'percentDiff'=>$diffUpah]);
+        return response()->json($upahData);
     }
     public function showAllGadaiTerkumpul(){
         $cawangan_all = Cawangan::on('mysql7')->get();
@@ -1791,12 +1811,92 @@ class GadaiController extends Controller
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
+        $harini = $current->toDateString();
+        $lastweek = $current->subWeek()->toDateString();
         $outstandingSemasa = 0;
+        $outstandingLastWeek = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $gadaiterkumpul = Gadai::on($cawangan['mysql'])->where('sttebus','=','')->sum('pinjaman');
-            $outstandingSemasa += $gadaiterkumpul;
+            $gadaiactivetawarruq = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','<>',null]])->sum('bakipjm');
+            $gadaiactivearrahn = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan',null]])->sum('pinjaman');
+
+            $gadaiactivetawarruqLastWeek = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','<>',null],['t_gadai','<=',$lastweek]])->sum('bakipjm');
+            $gadaiactivearrahnLastWeek = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan',null],['t_gadai','<=',$lastweek]])->sum('pinjaman');
+
+            $totalgadaiactive = $gadaiactivetawarruq + $gadaiactivearrahn;
+            $totalgadaiactiveLastWeek = $gadaiactivetawarruqLastWeek + $gadaiactivearrahnLastWeek;
+
+            $outstandingSemasa += $totalgadaiactive;
+            $outstandingLastWeek += $totalgadaiactiveLastWeek;
         }
-        return response()->json(number_format($outstandingSemasa,2));
+        $percentDiffOutstanding = 0;
+        if($outstandingLastWeek != 0){
+            $percentDiffOutstanding = (($outstandingSemasa - $outstandingLastWeek)/$outstandingLastWeek)*100;
+        }
+        $dataOutstanding = [];
+        array_push($dataOutstanding,['outstandingToday'=>$outstandingSemasa,'percentOutstanding'=>$percentDiffOutstanding]);
+        return response()->json($dataOutstanding);
+    }
+
+    public function oneWeekData(){
+        $weekly = Carbon::now();
+        $weekly = new Carbon();
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $dataOneWeek = [];
+        for($i=0;$i<7;$i++){
+            if($i == 0){
+                $weekly_array_date = $weekly->subDays(0);
+            }else{
+                $weekly_array_date = $weekly->subDays(1);
+            }
+            array_push($dataOneWeek,['tarikh'=>$weekly_array_date->toDateString(),'totalpembiayaan'=>0,'totaltebus'=>0,'totalupah'=>0, 'totalkomoditi'=>0,'totalnilaimarhun'=>0,'onlinepayment'=>0,'hargaemas'=>0]);
+        }
+
+        foreach($dataOneWeek as $index=>$oneWeek){
+            $totalGadai = 0;
+            $totalTebus = 0;
+            $totalUpah = 0;
+            $totalKomoditi = 0;
+            $totalNilaiMarhun = 0;
+            $totalOnline = 0;
+            $upah = 0;
+
+            foreach($cawangan_all as $index2=>$cawangan){
+                $gadaiCawangan = Gadai::on($cawangan['mysql'])->where('t_gadai',$oneWeek['tarikh'])->sum('pinjaman');
+                $tebusCawangan = Tebus::on($cawangan['mysql'])->where('t_tebus',$oneWeek['tarikh'])->sum('bakipjm');
+                $upahTebusCawangan = Tebus::on($cawangan['mysql'])->where('t_tebus',$oneWeek['tarikh'])->sum('bakiupah');
+                $nilaiMarhunCawangan = Gadai::on($cawangan['mysql'])->where('t_gadai',$oneWeek['tarikh'])->sum('nilaimarhun');
+                $upahCawangan = Advansur::on($cawangan['mysql'])->where('tarikh',$oneWeek['tarikh'])->sum('upahDibayar');
+
+                $totalGadai += $gadaiCawangan;
+                $totalTebus += $tebusCawangan;
+                $totalNilaiMarhun += $nilaiMarhunCawangan;
+                $upah_cawangan = $upahTebusCawangan + $upahCawangan;
+                $upah += $upah_cawangan;
+            }
+            $totalOnline = TransactionOnline::on('mysql7')->where([['tarikh',$oneWeek['tarikh']],['status','PAID']])->sum('total_payment');
+            $totalKomoditi = KomuditiTransaksi::on('mysql7')->where('tarikh',$oneWeek['tarikh'])->sum('unit_komuditi');
+            $ansuran = TransaksiKeuntungan::on('mysql7')->join('transaction as trans', function($join){
+                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+            })
+            ->where('trans.teller','<>','Online')
+            ->where([['transaksi_keuntungan.tarikh_bayaran','>=',$oneWeek['tarikh'] . ' 00:00:00'],['transaksi_keuntungan.tarikh_bayaran','<=',$oneWeek['tarikh'] . ' 23:59:59']])
+            ->sum('bayaran_keuntungan');
+
+            $harga_emas = HistoryEmasSandaran::on('mysql7')->where([['t_efektif','<=',$oneWeek['tarikh']],['karat','22.0K']])->orderBy('t_efektif','desc')->first();
+
+            $totalUpah = $ansuran + $upah;
+
+            $dataOneWeek[$index]['totalpembiayaan'] = $totalGadai;
+            $dataOneWeek[$index]['totaltebus'] = $totalTebus;
+            $dataOneWeek[$index]['totalupah'] = $totalUpah;
+            $dataOneWeek[$index]['totalkomoditi'] = $totalKomoditi;
+            $dataOneWeek[$index]['totalnilaimarhun'] = $totalNilaiMarhun;
+            $dataOneWeek[$index]['onlinepayment'] = $totalOnline;
+            $dataOneWeek[$index]['hargaemas'] = $harga_emas['harga'];
+        }
+
+        return response()->json($dataOneWeek);
     }
 
     public function nilaiMarhunSemasa()
@@ -1999,6 +2099,14 @@ class GadaiController extends Controller
             Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
 
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+            $gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$gadai[0]['historygadaian']],['norujukan','<>',$gadai[0]['historygadaian']]])->pluck('norujukan');
+
+            if($gadaiDouble){
+                Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
+                Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
+                $this->batalKomuditi($gadai[0]['historygadaian'],$cawangan['mysql']);
+            }
     
             return response('Deleted Successfully', 200);
         }
@@ -2043,6 +2151,26 @@ class GadaiController extends Controller
        
     }
 
+    public function batalKomuditi($norujukan,$cawangan_mysql){
+
+        $gadaiDouble = Gadai::on($cawangan_mysql)->where([['historygadaian',$norujukan],['norujukan','<>',$norujukan]])->pluck('norujukan');
+
+        $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first();
+
+        $transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$gadaiDouble)->sum('unit_komuditi');
+
+
+        $update_unit = $unit_current + $transaksi_asal['unit_komuditi'];
+
+        $update_komuditi = KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([
+            'unit_komuditi' => $update_unit
+        ]);
+
+        $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->whereIn('norujukan',$gadaiDouble)->delete();
+
+        return 'success';
+    }
+
     public function TebusHapus($kodcaw,$norujukan,Request $request)
     {
         $current = Carbon::now();
@@ -2725,7 +2853,7 @@ class GadaiController extends Controller
             ->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
             ->where('gadai.tagpalsu','=',0)
             ->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']])
-            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
+	    ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
             ->sum('teb.pinjaman');
 
        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
@@ -2928,23 +3056,24 @@ class GadaiController extends Controller
                             ->pluck('norujukan');
 
         $transaksi_kredit = 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');
-                    })
-        ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
-        ->where('trans.trans_type','=','A')
-        ->whereDate('tarikh_bayaran','<=', $request->hingga)
-        ->whereDate('tarikh_bayaran','>=', $request->mula)
-        // ->whereBetween('tarikh_bayaran',[$from,$to])
-        ->sum('bayaran_pembiayaan');
+	      ->leftJoin('transaction as trans', function($join)
+                            {
+                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                            })
+            ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
+            ->where('trans.trans_type','=','A')
+            ->whereDate('tarikh_bayaran','<=', $request->hingga)
+            ->whereDate('tarikh_bayaran','>=', $request->mula)
+            // ->whereBetween('tarikh_bayaran',[$from,$to])
+            ->sum('bayaran_pembiayaan');
 
-        // $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
-        //                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-        //                     ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //                     ->sum('bayaran_pembiayaan');
 
+         //$transaksi_kredit = TransaksiKeuntungan::on('mysql7')
+         //                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+         //                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+         //                    ->sum('bayaran_pembiayaan');
+	//dd($transaksi_kredit);
 
         $tebus = Gadai::on($cawangan['mysql'])
                     ->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan')
@@ -2964,7 +3093,7 @@ class GadaiController extends Controller
             }
         }
 
-        // dd($arraytebus);
+        //dd($arraytebus);
 
         $transaksi_debit = TransaksiKeuntungan::on('mysql7')
                             ->leftJoin('transaction as trans', function($join)
@@ -2973,7 +3102,7 @@ class GadaiController extends Controller
                                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                             })
                             ->where('trans.trans_type','=','A')
-                            ->where('trans.norujukan',$arraytebus)
+                            ->whereIn('trans.norujukan',$arraytebus)
                             ->sum('bayaran_pembiayaan');
 
         $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit];
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/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php
index 5e5cf7d..d857b52 100644
--- a/app/Http/Controllers/TacExpressPaymentController.php
+++ b/app/Http/Controllers/TacExpressPaymentController.php
@@ -21,13 +21,13 @@ class TacExpressPaymentController extends Controller
             'expired_at' => $expired_at
         ]);
 
-        $mobileno = '6'.$request->mobileno;
-        // $mobileno = '60189025461';
-        $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request';
+        // $mobileno = '6'.$request->mobileno;
+        $mobileno = '60139321786';
+        $messages = 'AR-RAHN PKB ' . $request->cawangan . ' : TAC: ' . $request->otp_token . ' ' . $currentDateTime . '. AR-RAHN CARELINE CENTRE 1300-22-4343';
 
-        $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[
-            'apiusername' => 'APIQ4LP5EMKXM',
-            'apipassword' => 'APIQ4LP5EMKXM7CQOX',
+        $status = Http::get('http://gateway.onewaysms.com.my:10001/api.aspx',[
+            'apiusername' => 'APIUK330HDAFO',
+            'apipassword' => 'APIUK330HDAFOUK330',
             'senderid' => 'INFO',
             'mobileno' => $mobileno,
             'message'=> $messages,
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index c08a04e..aa1a00b 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1297,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/routes/web.php b/routes/web.php
index e19a1e3..2968693 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,6 +22,14 @@ $router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use
     $router->get('logs', 'LogViewerController@index');
 });
 
+$router->get('_/phpinfo', function () {
+        ob_start();
+        phpinfo();
+        $response = ob_get_contents();
+        ob_get_clean();
+        return $response;
+    });
+
 $router->group(['prefix'=>'api'], function () use ($router){
     //Customer API
     $router->get('customers',['uses'=>'CustomerController@showAllCustomers']);
@@ -566,6 +574,8 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
     $router->get('nilaimarhun/semasa',['uses'=>'GadaiController@nilaiMarhunSemasa']);
     $router->get('vault/semasa',['uses'=>'GadaiController@petiBesiSemasa']);
 
+    $router->get('oneweekdata',['uses'=>'GadaiController@oneWeekData']);
+
     $router->post('prestasi/cawangan',['uses'=>'GadaiController@prestasiCawangan']);
 
     $router->post('peti_besi',['uses'=>'GadaiController@petiBesiCawangan']);
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore
old mode 100644
new mode 100755