diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ab1de7a..f00a493 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -17,6 +17,7 @@ use App\Tebus;
 use App\Vault;
 use App\Tunai;
 use App\Komuditi;
+use App\KawalanStokLama;
 
 use Illuminate\Http\Request;
 
@@ -924,34 +925,51 @@ class GadaiController extends Controller
 
         $array_kawalanstok = [];
 
+
+        $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+                            ->get();
+
+
         ////////////
         ///GADAI////
         ///////////
 
         $gadai1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',1)
-                ->where('nilaimarhun','<=',400.99)
-                ->get();                
-
-        $gadai2 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 // ->where('t_gadai','<',$tarikh)
                 // ->where('sttebus','=','')
-                // ->where([['t_gadai','<=',$tarikh],['sttebus','=','']])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<=',$tarikh]])
-                ->where('nilaimarhun','>=',401)
-                ->where('nilaimarhun','<=',2000.99)
-                ->get();     
+                // ->where('nilaimarhun','>=',1)
+                // ->where('nilaimarhun','<=',400.99)
+                ->whereBetween('nilaimarhun', [1, 400.99])
+                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
+                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
+                ->get();       
+        
+        
 
-        $gadai3 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+        $gadai2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
+                // ->where('t_gadai','<',$tarikh)
                 // ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                // ->where('nilaimarhun','>=',401)
+                // ->where('nilaimarhun','<=',2000.99)
+                ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
+                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
+                ->get(); 
+                
+        $gadai3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
+                // ->where('t_gadai','<',$tarikh)
+                // ->where('sttebus','=','')
+                // ->where('nilaimarhun','>=',2001)
+                // ->where('nilaimarhun','<=',100000)
+                ->whereBetween('nilaimarhun', [2001, 100000])
+                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
+                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
                 ->get();    
 
 
@@ -961,6 +979,7 @@ class GadaiController extends Controller
                 ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
+                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
                 ->get();                
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
@@ -969,6 +988,7 @@ class GadaiController extends Controller
                 ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
+                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
                 ->get();     
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
@@ -976,9 +996,13 @@ class GadaiController extends Controller
                 ->where('t_gadai','=',$tarikh)
                 ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
-                ->get();    
+                ->where('nilaimarhun','<=',100000)
+                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
+                ->get();  
                 
+                
+
+
         
         ////////////
         ///TEBUS////
@@ -986,7 +1010,7 @@ class GadaiController extends Controller
 
         $tebus1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
@@ -994,7 +1018,7 @@ class GadaiController extends Controller
 
         $tebus2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1002,15 +1026,15 @@ class GadaiController extends Controller
 
         $tebus3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                ->where('nilaimarhun','<=',100000)
                 ->get();    
 
         $tebusini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
@@ -1018,7 +1042,7 @@ class GadaiController extends Controller
 
         $tebusini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1026,13 +1050,13 @@ class GadaiController extends Controller
 
         $tebusini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
-                ->get();    
-
-
+                ->where('nilaimarhun','<=',100000)
+                ->get();   
+                
+                
         //////////////
         ///LELONG/////
         /////////////
@@ -1040,7 +1064,7 @@ class GadaiController extends Controller
 
         $lelong1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
@@ -1048,7 +1072,7 @@ class GadaiController extends Controller
 
         $lelong2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1056,15 +1080,15 @@ class GadaiController extends Controller
 
         $lelong3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                ->where('nilaimarhun','<=',100000)
                 ->get();    
 
         $lelongini1 = Gadai::on($cawangan['mysql'])
             ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-            ->where('t_gadai','=',$tarikh)
+            ->where('t_update','=',$tarikh)
             ->where('sttebus','=','L')
             ->where('nilaimarhun','>=',1)
             ->where('nilaimarhun','<=',400.99)
@@ -1072,7 +1096,7 @@ class GadaiController extends Controller
 
         $lelongini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1080,12 +1104,63 @@ class GadaiController extends Controller
 
         $lelongini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                ->where('nilaimarhun','<=',100000)
                 ->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']);
+
+            $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['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;
+
+            //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']);
+
+            $lelong1[0]['bil'] = $lel1;
+            $lelong1[0]['pinj'] = $lelpinj1;
+            $lelong2[0]['bil'] = $lel2;
+            $lelong2[0]['pinj'] = $lelpinj2;
+            $lelong3[0]['bil'] = $lel3;
+            $lelong3[0]['pinj'] = $lelpinj3;
+
+        }
+
         //////////////////
         ///HAPUS KIRA/////
         //////////////////
diff --git a/app/KawalanStokLama.php b/app/KawalanStokLama.php
new file mode 100644
index 0000000..eaae7d8
--- /dev/null
+++ b/app/KawalanStokLama.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class KawalanStokLama extends Model
+{
+    protected $table = 'kawalanstok_lama';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'bilGad1','bilGad2','bilGad3','bilTeb1','bilTeb2','bilTeb3','bilLel1','bilLel2','bilLel3','pinjGad1','pinjGad2','pinjGad3','pinjTeb1','pinjTeb2','pinjTeb3','pinjLel1','pinjLel2','pinjLel3'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file