diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 72f861c..ecac955 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -1699,21 +1699,31 @@ class AdminPageController extends Controller
         $gadai_all = [];
         foreach($cawangan_all as $index=>$cawangan){
             if($status == 'belum_tebus' || $status == 'sudah_tebus'){
-                $gadai = Gadai::on($cawangan['mysql'])
-                    ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                    ->get();
+                
+                if($status == 'sudah_tebus')
+                {
+                        $gadai = Gadai::on($cawangan['mysql'])
+                                ->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
+                                ->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
+                                ->orderBy('tebus.t_tebus','desc')
+                                ->get()->toArray();
+                }else{
+                        $gadai = Gadai::on($cawangan['mysql'])
+                                ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
+                                ->orderBy('t_gadai','desc')
+                                ->get()->toArray();
+                }
+               
                 if(sizeof($gadai) != 0){
-                    array_push($gadai_all,$gadai);
-                        $gadai_all[] = $gadai;
+                        $gadai_all += $gadai;
                 }
             }elseif($status == 'lelong'){
                 $gadai = Gadai::on($cawangan['mysql'])
                     ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
                     ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-                    ->get();
+                    ->get()->toArray();
                 if(sizeof($gadai) != 0){
-                //     array_merge($gadai_all,$gadai);
-                        $gadai_all[] = $gadai;
+                        $gadai_all += $gadai;
                 }
             }
         }