diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index a5d81f3..477ccce 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2503,6 +2503,24 @@ class GadaiController extends Controller
             case '011412':
                 $tarikhtawarruq = '2021-06-23';
             break;
+	    case '011234':
+                $tarikhtawarruq = '2021-06-28';
+            break;
+            case '020303':
+                $tarikhtawarruq = '2021-06-29';
+            break;
+            case '010618':
+                $tarikhtawarruq = '2021-06-29';
+            break;
+            case '011231':
+                $tarikhtawarruq = '2021-06-24';
+            break;
+            case '011232':
+                $tarikhtawarruq = '2021-06-28';
+            break;
+            case '011233':
+                $tarikhtawarruq = '2021-06-28';
+            break;
           }
 
         $gadai = Gadai::on($cawangan['mysql'])
@@ -2512,9 +2530,9 @@ class GadaiController extends Controller
             ->sum('pinjaman');
 
         $tebus = Gadai::on($cawangan['mysql'])
-            ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
-            ->where('Gadai.tagpalsu','=',0)
-            ->where([['Gadai.t_gadai','<=',$tarikhtawarruq],['Gadai.sttebus','=','T']])
+            ->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]])
             ->sum('teb.pinjaman');
 
@@ -2542,19 +2560,18 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        // $Gadai = Gadai::on($cawangan['mysql'])
-        //     ->where('tagpalsu','=',0)
-        //     ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
-        //     ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
-        //     ->sum('pinjaman');
-
+       // $Gadai = Gadai::on($cawangan['mysql'])
+       //     ->where('tagpalsu','=',0)
+       //     ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
+       //     ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
+       //     ->sum('pinjaman');
         $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
 
-        $Tebus = Tebus::on($cawangan['mysql'])
-            ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
-            ->where('gad.tagpalsu','=',0)
-            ->where([['tebus.t_tebus','>=',$request->mula],['tebus.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']])
-            ->sum('tebus.pinjaman');
+        $Tebus = Gadai::on($cawangan['mysql'])
+            ->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
+            ->where('gadai.tagpalsu','=',0)
+            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']])
+            ->sum('teb.pinjaman');
 
             $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];