diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index b42635e..b1665ae 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -24,19 +24,19 @@ class HomeController extends Controller
     public function index()
     {
         $auth_user = Auth::user();
-        $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();
+        // $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();
 
-        $hargaemasterdahulu = array();
+        // $hargaemasterdahulu = array();
 
-        foreach($harga_emas as $index=>$harga)
-        {
-            $hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json();
+        // foreach($harga_emas as $index=>$harga)
+        // {
+        //     $hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json();
 
-            $percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100;
+        //     $percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100;
 
-            array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]);
+        //     array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]);
 
-        }
+        // }
 
       
         $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
@@ -61,26 +61,26 @@ class HomeController extends Controller
             $bilanganlelong += 1;
         }
 
-        $arraysag = [];
-        $belum_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'belum_tebus')->json();
+        // $arraysag = [];
+        // $belum_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'belum_tebus')->json();
     
-        if(is_array($belum_tebus))
-        {
-            if(sizeof($belum_tebus) > 0)
-            {
-                foreach($belum_tebus as $index=>$bt)
-                {
-                    foreach($bt as $index1=>$bet)
-                    {
-                        array_push($arraysag,$bet);
-                    }
-                }
-            }
-        }
+        // if(is_array($belum_tebus))
+        // {
+        //     if(sizeof($belum_tebus) > 0)
+        //     {
+        //         foreach($belum_tebus as $index=>$bt)
+        //         {
+        //             foreach($bt as $index1=>$bet)
+        //             {
+        //                 array_push($arraysag,$bet);
+        //             }
+        //         }
+        //     }
+        // }
     
-        $belum_tebus = $arraysag;
+        // $belum_tebus = $arraysag;
         $api_url = config('api.url');
 
-        return view('includes.home',compact('api_url','belum_tebus','hargaemasterdahulu','bilangan','sixmonths','total','bilanganlelong'));
+        return view('includes.home',compact('api_url','bilangan','sixmonths','total','bilanganlelong'));
     }
 }
diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index 488fd34..00c2e60 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -78,7 +78,7 @@
                             <i class="fas fa-chart-pie "></i>
                         </div>
                         <br>
-                        <button onclick="filterjumlahpembsemasa()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Susun</button>
+                        <button onclick="filterjumlahpembsemasa()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -98,7 +98,7 @@
                             <i class="fas fas fa-users text-center"></i>
                         </div>
                         <br>
-                        <button onclick="filterpembiayaanaktif()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Susun</button>
+                        <button onclick="filterpembiayaanaktif()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -117,7 +117,7 @@
                             <i class="fas fa-chart-bar"></i>
                         </div>
                         <br>
-                        <button onclick="filterpembiayaan6bulan()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Susun</button>
+                        <button onclick="filterpembiayaan6bulan()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -136,7 +136,7 @@
                             <i class="fas fa-gavel" style="margin-left: 2px;"></i>
                         </div>
                         <br>
-                        <button onclick="filterjumlahpembsemasa()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Susun</button>
+                        <button onclick="filterjumlahpembsemasa()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -166,8 +166,8 @@
                             <th>No Rujukan</th>
                             <th>JBG</th>
                             <th>Keuntungan</th>
-                            <th>T Lanjut</th>
-                            <th>Akan Dilelong</th>
+                            <th>T Matang</th>
+                            <th>Status</th>
                         </tr>
                     </thead>
                     <tbody class="list">
@@ -289,14 +289,25 @@ var hargaemastable = $('#harga_emas').DataTable({
             
             let marh = JSON.stringify(marhun[0]);
             
+
+            var t_matang  = new Date(ps.t_matang);
+
+            var statementlelong = '';
+            if(ps.taglel == 0)
+            {
+                statementlelong = '-';
+            }else{
+                statementlelong = 'Akan Dilelong';
+            }
+
             selepastawarruqtable.row.add([
                 `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
                 namacawangan,
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
                 ps.bakiupah,
-                ps.t_matang,
-                ps.taglel
+                t_matang.toLocaleDateString("en-GB"),
+                statementlelong
             ]).draw();
 
             counter = counter + 1;
@@ -427,14 +438,24 @@ var hargaemastable = $('#harga_emas').DataTable({
 
             let marh = JSON.stringify(marhun[0]);
             
+            var t_matang  = new Date(ps.t_matang);
+            
+            var statementlelong = '';
+            if(ps.taglel == 0)
+            {
+                statementlelong = '-';
+            }else{
+                statementlelong = 'Akan Dilelong';
+            }
+
             selepastawarruqtable.row.add([
                 `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
                 namacawangan,
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
                 ps.bakiupah,
-                ps.t_matang,
-                ps.taglel
+                t_matang.toLocaleDateString("en-GB"),
+                statementlelong
             ]).draw();
 
             counter = counter + 1;
@@ -500,14 +521,24 @@ var hargaemastable = $('#harga_emas').DataTable({
             
             let marh = JSON.stringify(marhun[0]);
             
+            var t_matang  = new Date(ps.t_matang);
+
+            var statementlelong = '';
+            if(ps.taglel == 0)
+            {
+                statementlelong = '-';
+            }else{
+                statementlelong = 'Akan Dilelong';
+            }
+
             selepastawarruqtable.row.add([
                 `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
                 namacawangan,
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
                 ps.bakiupah,
-                ps.t_matang,
-                ps.taglel
+                t_matang.toLocaleDateString("en-GB"),
+                statementlelong
             ]).draw();
 
             counter = counter + 1;
diff --git a/resources/views/includes/main/head.blade.php b/resources/views/includes/main/head.blade.php
index 537ca60..161c7c5 100644
--- a/resources/views/includes/main/head.blade.php
+++ b/resources/views/includes/main/head.blade.php
@@ -112,14 +112,14 @@
 </form>
 @endif
 
-<div class="portalloader">
+{{-- <div class="portalloader">
     <img src="{{ asset('argon/img/brand/bluespinner.gif') }}" alt="loader_photo">
-</div>
+</div> --}}
 
 <script>
-    $(function() {
-        // setTimeout(() => {
-            $(".portalloader").fadeOut(300);
-        // }, 300)
-    })
+    // $(function() {
+    //     // setTimeout(() => {
+    //         $(".portalloader").fadeOut(300);
+    //     // }, 300)
+    // })
 </script>
\ No newline at end of file
diff --git a/resources/views/modal/historybayaran.blade.php b/resources/views/modal/historybayaran.blade.php
index 466ca46..9859142 100644
--- a/resources/views/modal/historybayaran.blade.php
+++ b/resources/views/modal/historybayaran.blade.php
@@ -58,11 +58,15 @@
             </div>
 
             <div class="col-4">
-              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Berat: <span id="berat"></span></b></div></div>
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>T.Matang: <span id="berat"></span></b></div></div>
             </div>
 
-            <div class="col-6">
-              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Kos Keuntungan (12 Bulan): <span id="koskeun"></span></b></div></div>
+            <div class="col-4">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Keuntungan: <span id="koskeun"></span></b></div></div>
+            </div>
+
+            <div class="col-4">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>T.Matang: <span id="berat"></span></b></div></div>
             </div>
           </div>
 
diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php
index c4a0811..5e1a80f 100644
--- a/resources/views/modal/marhun.blade.php
+++ b/resources/views/modal/marhun.blade.php
@@ -21,7 +21,7 @@
 
                 <div class="tab-content">
                     <div class="tab-pane active" id="home" role="tabpanel" aria-labelledby="marhun-tab">
-                        <div class="row">
+                        {{-- <div class="row">
                             <div class="col-4">
                             <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Pembiayaan: <span id="pemb"></span></b></div></div>
                             </div>
@@ -33,7 +33,7 @@
                             <div class="col-4">
                             <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Status: <span id="statuslelong"></span></b></div></div>
                             </div>
-                        </div>
+                        </div> --}}
 
                         <div class="table-responsive table-bordered">
                             <table id="biasa" class="table table-hover text-center" style="width:100%">
@@ -82,11 +82,15 @@
                             </div>
                 
                             <div class="col-4">
-                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Berat: <span id="berat"></span></b></div></div>
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>T.Matang: <span id="berat"></span></b></div></div>
                             </div>
                 
-                            <div class="col-6">
-                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Kos Keuntungan (12 Bulan): <span id="koskeun"></span></b></div></div>
+                            <div class="col-4">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Keuntungan: <span id="koskeun"></span></b></div></div>
+                            </div>
+
+                            <div class="col-4">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>T.Lanjut: <span id="berat"></span></b></div></div>
                             </div>
                           </div>