diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 849d915..8f533d2 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -14,7 +14,7 @@ use App\Lelong;
 use App\WTD;
 use App\HapusKira;
 use App\Tebus;
-use App\Laptebus;
+use App\Vault;
 
 use Illuminate\Http\Request;
 
@@ -883,12 +883,12 @@ class GadaiController extends Controller
     public function showAllGadaiTerkumpul()
     {
         $cawangan_all = Cawangan::on('mysql7')->get();
-       
+        $current = Carbon::now();
+        $current = new Carbon();
         $gadaiTerkumpul = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $gadaiterkumpul = gadai::on($cawangan['mysql'])->where('sttebus','=','')->get();
+            $gadaiterkumpul = Gadai::on($cawangan['mysql'])->where('sttebus','=','')->whereYear('t_gadai','=',$current->year)->get();
             if(sizeof($gadaiterkumpul) != 0){
-                $gadaicawangan=0;
                 foreach($gadaiterkumpul as $gadaiterkumpulall)
                 {
                     $gadaiTerkumpul += $gadaiterkumpulall['pinjaman'];
@@ -919,9 +919,7 @@ class GadaiController extends Controller
         $current = new Carbon();
         $upahTerkumpul = 0;
         foreach($cawangan_all as $index=>$cawangan){
-            $upah = Tebus::on($cawangan['mysql'])->whereYear('t_tebus','=','2020')->get();
-            // dd($upah);
-            // $upahTerkumpul += $upah;
+            $upah = Tebus::on($cawangan['mysql'])->whereYear('t_tebus','=',$current->year)->get();
             if(sizeof($upah) != 0){
                 foreach($upah as $upahall)
                 {
@@ -947,4 +945,39 @@ class GadaiController extends Controller
 
         return response()->json($total_pembiayaan);
     }
+
+    public function outstandingSemasa()
+    {
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $outstandingSemasa = 0;
+        foreach($cawangan_all as $index=>$cawangan){
+            $gadaiterkumpul = Gadai::on($cawangan['mysql'])->where('sttebus','=','')->sum('pinjaman');
+            $outstandingSemasa += $gadaiterkumpul;
+        }
+        return response()->json(number_format($outstandingSemasa,2));
+    }
+
+    public function nilaiMarhunSemasa()
+    {
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $nilaiMarhunSemasa = 0;
+        foreach($cawangan_all as $index=>$cawangan){
+            $nilaiMarhunterkumpul = Gadai::on($cawangan['mysql'])->where('sttebus','=','')->sum('nilaimarhun');
+            $nilaiMarhunSemasa += $nilaiMarhunterkumpul;
+        }
+        return response()->json(number_format($nilaiMarhunSemasa,2));
+    }
+
+    public function petiBesiSemasa(){
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $jumlahPetibesi = 0;
+
+        foreach($cawangan_all as $index=>$cawangan){
+            $petibesi = Vault::on('mysql6')->orderBy('Tarikh','desc')->first();
+            $jumlahPetibesi += $petibesi['BakiEod'];
+        }
+        return response()->json(number_format($jumlahPetibesi,2));
+    }
 }
diff --git a/routes/web.php b/routes/web.php
index cbf9d99..212cd77 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -245,4 +245,7 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
 
     $router->get('tebus/terkumpul',['uses'=>'GadaiController@showTebusTerkumpul']);
     $router->get('upah/terkumpul',['uses'=>'GadaiController@showUpahTerkumpul']);
+    $router->get('outstanding/semasa',['uses'=>'GadaiController@outstandingSemasa']);
+    $router->get('nilaimarhun/semasa',['uses'=>'GadaiController@nilaiMarhunSemasa']);
+    $router->get('vault/semasa',['uses'=>'GadaiController@petiBesiSemasa']);
 });
\ No newline at end of file