diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 3063f89..e476706 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -254,4 +254,23 @@ class AliranTunaiController extends Controller
 
         return view('aliran_tunai.laporan.laporanserahan',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller'));
     }
+
+    public function kemaskiniupah(Request $request)
+    {
+        $auth_user = Auth::user();
+
+        $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
+
+        $requestupah = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+        $requestalirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
+
+        $upah = $requestupah['baki'];
+        $alirantunaisemasa = $requestalirantunai['baki'];
+
+        $totalalirantunai = floatval($upah) + floatval($alirantunaisemasa);
+
+        return response($totalalirantunai);
+    }
+
+
 }
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 1d4fa15..f75358a 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -124,7 +124,7 @@
                     <div class="card-body">
 
 
-                        <a href="{{ route('laporan.serahanteller') }}" class="btn btn-primary">Teller Serahan</a>
+                        <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right" disabled>Kemaskini</button>
                         <nav>
                             <div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
                               <a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-controls="nav-home" aria-selected="true">Tunai</a>
@@ -235,11 +235,11 @@
     var tabletuntutbaki = $('#tabletuntutbaki').DataTable({
     //   "scrollX": true
     });
+    var tele = "{{ $auth_user['name'] }}";
 
     $(document).ready( function () {
         var api = '{{ $api_url }}';
         var kodcaw = "{{ $auth_user['cawangan'] }}";
-        var tele = "{{ $auth_user['name'] }}";
 
         function getData(){
             $.ajax({
@@ -284,6 +284,19 @@
         });
     }
 
+    function kemaskiniupah()
+    {
+        $.ajax({
+                type: 'get',
+                url: "{{ route('kemaskini.upah') }}",
+                data: { "namateller" : tele },
+                success: function(data){
+                    console.log(data);
+                }
+            });
+
+    }
+
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
     let laporanroute = "{{ route('laporan.serahanteller') }}";
 </script>
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 4dd3635..5d54857 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -168,8 +168,8 @@
                         </div>
                         <div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
                             <div class="float-right mb-3">
-                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()">Check All</button>
-                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()">Uncheck All</button>
+                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()" disabled>Check All</button>
+                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()" disabled>Uncheck All</button>
                             </div>
                             <table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
                                 <thead class="thead-dark">
@@ -289,19 +289,26 @@
     });
 
     function checkallfunc(){
-        
+
+        let totalmarhun = 0;
         $(':checkbox').each(function() {
+            let marhun = Number($(this).data("marhun"));
+            totalmarhun += marhun;
             this.checked = true;                        
         });
-
+        $("#btn-serah").prop('disabled', false);
+        $('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
     }
 
     function uncheckallfunc(){
-        
+        let totalmarhun = 0;
         $(':checkbox').each(function() {
+            let marhun = Number($(this).data("marhun"));
+            totalmarhun -= marhun;
             this.checked = false;                        
         });
-
+        $('#marhunpilih').val(0);
+        $("#btn-serah").prop('disabled', true);
     }
 
     function fetchRekodGadaian(){
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index 9857c00..5d1d7e8 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -195,6 +195,19 @@
 <script>
     var api_url = "<?php echo $api_url ?>";
     //modal
+
+    var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({
+        //   "scrollX": true
+        });
+
+    var pengesahanmarhun = $('#table-gadaian-belum-serah').DataTable({
+    //   "scrollX": true
+    });
+
+    $(document).ready(function(){
+        $('#norujukan_barcode').focus();
+    })
+    
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger
         var arraymarhun = button.data('marhun');
diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php
index 6074e54..16d54ad 100644
--- a/resources/views/khazanah/tebus.blade.php
+++ b/resources/views/khazanah/tebus.blade.php
@@ -168,13 +168,17 @@
 var api_url = "<?php echo $api_url ?>";
 
 
-var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
-        "ordering": false
+    var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
+        "ordering": true
     });
     var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
+    $(document).ready(function(){
+        $('#norujukan_barcode').focus();
+    })
+
     //modal
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger
diff --git a/routes/web.php b/routes/web.php
index 5fcb7d3..31f6a3c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,6 +86,9 @@ Route::post('/createwakil',['as'=>'wakil.create','uses'=>'PenebusanController@cr
 Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfirstWakil'])->middleware('auth','teller');
 Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller');
 
+//Kemaskini Upah
+Route::get('/kemaskiniupah',['as'=>'kemaskini.upah','uses'=>'AliranTunaiController@kemaskiniupah'])->middleware('auth','teller');
+
 
 //MAINTENANCE
 Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');