diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index bea74e4..0579528 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1136,10 +1136,7 @@ class GadaiController extends Controller
         $array_kawalanstok = [];
 
 
-        ////////////
-        ///GADAI////
-        ///////////
-
+        /* Gadai */
         $gadai1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
@@ -1193,44 +1190,63 @@ class GadaiController extends Controller
         ///TEBUS////
         ///////////
 
-        $tebus1 = Tebus::on($cawangan['mysql'])
+        $tebus1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_tebus','<',$tarikh)
+                ->where('sttebus','T')
+                // ->where('t_update','<',$tarikh)
+                ->where(function ($query) use($tarikh){
+                    $query->where('t_update','<',$tarikh)
+                    ->orWhereNull('t_update');
+                })
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
                 ->get();
 
-        $tebus2 = Tebus::on($cawangan['mysql'])
+        $tebus2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_tebus','<',$tarikh)
+                ->where('sttebus','T')
+                // ->where('t_update','<',$tarikh)
+                ->where(function ($query) use($tarikh){
+                    $query->where('t_update','<',$tarikh)
+                    ->orWhereNull('t_update');
+                })
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();
 
-        $tebus3 = Tebus::on($cawangan['mysql'])
+
+        $tebus3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_tebus','<',$tarikh)
+                ->where('sttebus','T')
+                // ->where('t_update','<',$tarikh)
+                ->where(function ($query) use($tarikh){
+                    $query->where('t_update','<',$tarikh)
+                    ->orWhereNull('t_update');
+                })
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
                 ->get();
 
-        $tebusini1 = Tebus::on($cawangan['mysql'])
+        $tebusini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_tebus','=',$tarikh)
+                ->where('sttebus','T')
+                ->where('t_update','=',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
                 ->get();
 
-        $tebusini2 = Tebus::on($cawangan['mysql'])
+        $tebusini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_tebus','=',$tarikh)
+                ->where('sttebus','T')
+                ->where('t_update','=',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();
 
-        $tebusini3 = Tebus::on($cawangan['mysql'])
+        $tebusini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_tebus','=',$tarikh)
+                ->where('sttebus','T')
+                ->where('t_update','=',$tarikh)
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
                 ->get();
@@ -1241,45 +1257,63 @@ class GadaiController extends Controller
         /////////////
 
 
-        $lelong1 = Lelong::on($cawangan['mysql'])
+        $lelong1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_jual','<',$tarikh)
+                ->where('sttebus','L')
+                // ->where('t_update','<',$tarikh)
+                ->where(function ($query) use($tarikh){
+                    $query->where('t_update','<',$tarikh)
+                    ->orWhereNull('t_update');
+                })
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
                 ->get();
 
 
-        $lelong2 = Lelong::on($cawangan['mysql'])
+        $lelong2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_jual','<',$tarikh)
+                ->where('sttebus','L')
+                // ->where('t_update','<',$tarikh)
+                ->where(function ($query) use($tarikh){
+                    $query->where('t_update','<',$tarikh)
+                    ->orWhereNull('t_update');
+                })
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();
 
-        $lelong3 = Lelong::on($cawangan['mysql'])
+        $lelong3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_jual','<',$tarikh)
+                ->where('sttebus','L')
+                // ->where('t_update','<',$tarikh)
+                ->where(function ($query) use($tarikh){
+                    $query->where('t_update','<',$tarikh)
+                    ->orWhereNull('t_update');
+                })
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
                 ->get();
 
-        $lelongini1 = Lelong::on($cawangan['mysql'])
+        $lelongini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_jual','=',$tarikh)
+                ->where('sttebus','L')
+                ->where('t_update','=',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
                 ->get();
 
-        $lelongini2 = Lelong::on($cawangan['mysql'])
+        $lelongini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_jual','=',$tarikh)
+                ->where('sttebus','L')
+                ->where('t_update','=',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
                 ->get();
 
-        $lelongini3 = Lelong::on($cawangan['mysql'])
+        $lelongini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_jual','=',$tarikh)
+                ->where('sttebus','L')
+                ->where('t_update','=',$tarikh)
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
                 ->get();