diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 98ccf99..21648b1 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1002,36 +1002,7 @@ class GadaiController extends Controller
         return response()->json(number_format($jumlahPetibesi,2));
     }
 
-    public function bilanganGadaian(Request $request){
-        $cawangan_all = Cawangan::on('mysql7')->get();
-        $penggadai_all = [];
-        foreach($cawangan_all as $index => $cawangan){
-            if($request->method == 'weekly'){
-                $penggadai_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(DISTINCT nokp) AS total_customer,COUNT(norujukan) AS total_norujukan')->addSelect('t_gadai')->groupBy('t_gadai')->orderBy('t_gadai','desc')->get();
-            }elseif($request->method == 'monthly'){
-                $penggadai_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(DISTINCT nokp) AS total_customer,COUNT(norujukan) AS total_norujukan')->addSelect('t_gadai')->groupBy('t_gadai')->orderBy('t_gadai','desc')->get();
-            }elseif($request->method == 'yearly'){
-                $penggadai_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(DISTINCT nokp) AS total_customer,COUNT(norujukan) AS total_norujukan')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->orderBy('t_gadai','desc')->get();
-            }
-            $penggadai_data = [];
-            if($request->method == 'weekly'){
-                for($i=0;$i<7;$i++){
-                    array_push($penggadai_data,['tarikh'=>$penggadai_cawangan[$i]['t_gadai'],'bilangan_penggadai'=>$penggadai_cawangan[$i]['total_customer'],'total_norujukan'=>$penggadai_cawangan[$i]['total_norujukan']]);
-                }
-            }elseif($request->method == 'monthly'){
-                for($i=0;$i<30;$i++){
-                    array_push($penggadai_data,['tarikh'=>$penggadai_cawangan[$i]['t_gadai'],'bilangan_penggadai'=>$penggadai_cawangan[$i]['total_customer'],'total_norujukan'=>$penggadai_cawangan[$i]['total_norujukan']]);
-                }
-            }elseif($request->method == 'yearly'){
-                for($i=0;$i<12;$i++){
-                    array_push($penggadai_data,['tarikh'=>$penggadai_cawangan[$i]['t_gadai'],'bilangan_penggadai'=>$penggadai_cawangan[$i]['total_customer'],'total_norujukan'=>$penggadai_cawangan[$i]['total_norujukan']]);
-                }
-            }
-            array_push($penggadai_all,['cawangan'=>$cawangan['details_caw'],'data_penggadai'=>$penggadai_data]);
-        }
-
-        return response()->json($penggadai_all);
-    }
+    
 
     public function prestasiCawangan(Request $request){
 
@@ -1241,11 +1212,12 @@ class GadaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         foreach($cawangan_all as $index=>$cawangan){
-            $gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=',$current->toDateString()]])->sum('pinjaman');
+            $gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=','2020-10-05']])->sum('pinjaman');
             array_push($array_cawangan,['cawangan'=>$cawangan['details_caw'],'total_gadai'=>$gadai]);
             $total_gadaian_cawangan += $gadai;
            
         }
+        //sorting
         $count_cawangan = sizeof($cawangan_all);
         for($i=0;$i<$count_cawangan;$i++){
             $percent_cawangan = $array_cawangan[$i]['total_gadai'];
@@ -1262,5 +1234,41 @@ class GadaiController extends Controller
 
     }
 
+    public function bilanganTransaksi(Request $request){
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $penggadai_all = [];
+        $current = Carbon::now();
+        $current = new Carbon();
+        foreach($cawangan_all as $index => $cawangan){
+            if($request->method == 'daily'){
+                $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect('t_gadai')->groupBy('t_gadai')->where('t_gadai','=',$current->toDateString())->orderBy('t_gadai','desc')->get();
+                $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect('t_tebus')->groupBy('t_tebus')->where('t_tebus','=',$current->toDateString())->orderBy('t_tebus','desc')->get();
+            }elseif($request->method == 'monthly'){
+                $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->whereMonth('t_gadai','<=',$current->month)->orderBy('t_gadai','desc')->get();
+                $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_tebus,'%Y%m')"))->whereMonth('t_tebus','<=',$current->month)->orderBy('t_tebus','desc')->get();
+            }elseif($request->method == 'yearly'){
+                $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->whereMonth('t_gadai','<=',$current->month)->orderBy('t_gadai','desc')->get();
+                $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_tebus,'%Y%m')"))->whereMonth('t_tebus','<=',$current->month)->orderBy('t_tebus','desc')->get();
+            }
+            $penggadai_data = [];
+            if($request->method == 'daily'){
+                for($i=0;$i<7;$i++){
+                    array_push($penggadai_data,['tarikh'=>$penggadai_cawangan[$i]['t_gadai'],'bilangan_penggadai'=>$penggadai_cawangan[$i]['total_customer'],'total_norujukan'=>$penggadai_cawangan[$i]['total_norujukan']]);
+                }
+            }elseif($request->method == 'monthly'){
+                for($i=0;$i<30;$i++){
+                    array_push($penggadai_data,['tarikh'=>$penggadai_cawangan[$i]['t_gadai'],'bilangan_penggadai'=>$penggadai_cawangan[$i]['total_customer'],'total_norujukan'=>$penggadai_cawangan[$i]['total_norujukan']]);
+                }
+            }elseif($request->method == 'yearly'){
+                for($i=0;$i<12;$i++){
+                    array_push($penggadai_data,['tarikh'=>$penggadai_cawangan[$i]['t_gadai'],'bilangan_penggadai'=>$penggadai_cawangan[$i]['total_customer'],'total_norujukan'=>$penggadai_cawangan[$i]['total_norujukan']]);
+                }
+            }
+            array_push($penggadai_all,['cawangan'=>$cawangan['details_caw'],'data_penggadai'=>$penggadai_data]);
+        }
+
+        return response()->json($penggadai_all);
+    }
+
 
 }
diff --git a/routes/web.php b/routes/web.php
index 1ffc4f9..67cccc9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -271,8 +271,6 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
     $router->get('nilaimarhun/semasa',['uses'=>'GadaiController@nilaiMarhunSemasa']);
     $router->get('vault/semasa',['uses'=>'GadaiController@petiBesiSemasa']);
 
-    $router->post('gadaian',['uses'=>'GadaiController@bilanganGadaian']);
-
     $router->post('prestasi/cawangan',['uses'=>'GadaiController@prestasiCawangan']);
 
     $router->post('peti_besi',['uses'=>'GadaiController@petiBesiCawangan']);
@@ -280,4 +278,6 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
     $router->get('percentCawangan',['uses'=>'GadaiController@percent']);
     $router->get('percentCawanganTop5',['uses'=>'GadaiController@percentTop5']);
     $router->get('totalPinjamanGadaian',['uses'=>'GadaiController@totalPinjamanGadaian']);
+
+    $router->post('gadaiTebusUpah',['uses'=>'GadaiController@bilanganTransaksi']);
 });
\ No newline at end of file