diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 8ff287b..32e10b7 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -382,7 +382,7 @@ class KhazanahController extends Controller
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
-        $kelulusan = Http::get(config('api.url') . '/api/SenaraiDahLulus/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
+        $kelulusan = Http::get(config('api.url') . '/api/ListLatestLulus/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
 
         if(sizeof($kelulusan) > 0)
         {
@@ -458,11 +458,22 @@ class KhazanahController extends Controller
 
         $norujukan = $request->norujukan;
 
+
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
+        $getsiri = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
+
+        if(isset($getsiri['siri']))
+        {
+            $siri = $getsiri['siri'] + 1;
+        }else{
+            $siri = 1; 
+        }
+        
         $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/khazanah', [
             'komen' => $request->komen,
             'dategadai' => $current->toDateString(),
+            'siri' => $siri,
             'bilgadai' => 1,
             'jumpinjam' => $request->jumpinjam,
             'jenistebus' => "G",
diff --git a/public/js/main.js b/public/js/main.js
index fb4d648..93d03c9 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -123,6 +123,42 @@ function totalkey(datakeyin)
       
 }
 
+function totalkeyserahan(datakeyin)
+{
+    var idkey = $(datakeyin).attr('id');
+    var valkey = $(datakeyin).val();
+    var amount = 0;
+
+
+    var validate = parseFloat($('#amt').data('amaun'));
+    
+    $.each(arrayambilan, function( index, arr ){
+        if(arr[0] == idkey)
+        {
+
+            arrayambilan[index][1] = totalamount(idkey,valkey);
+        }
+            
+        amount += arr[1];
+      });
+
+
+      if(amount > validate)
+      {
+        $('#' + idkey).val(0);
+        Swal.fire({
+            icon: 'error',
+            title: 'Amaran',
+            text: 'Jumlah Melebihi kadar',
+        });
+      }
+      else
+      {
+        $('#amt').val(amount);
+      }
+      
+}
+
 
 function kiraan(datakeyin)
 {
@@ -153,7 +189,9 @@ function kiraan(datakeyin)
       }
       else
       {
+        
         $('#amaunkiraan').val(amount);
+
       }
 
       switch(idkey) {
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index bfa3fb4..ed4fadc 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -614,7 +614,8 @@
                 tebusaz['norujukan'], 
                 tebusaz['jenistebus'],
                 tebusaz['jbg'],
-                tebusaz['t_tebus']
+                tebusaz['t_tebus'],
+                '<a class="btn btn-info" target="_blank">Cetak</a>'
             ]).draw();
             counter = counter + 1;
         });
diff --git a/resources/views/khazanah/khazanahserahan.blade.php b/resources/views/khazanah/khazanahserahan.blade.php
index 40f19bb..9ba06e1 100644
--- a/resources/views/khazanah/khazanahserahan.blade.php
+++ b/resources/views/khazanah/khazanahserahan.blade.php
@@ -69,31 +69,31 @@
           <tr>
             <td>RM1</td>
             <td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['0']['bd1'] }}" readonly/></td> 
-            <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" data-jenis="serahan" value="{{ $array_reqteller['bd1'] }}" onkeyup="totalkey(this)"/> </td>
+            <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" value="{{ $array_reqteller['bd1'] }}" onkeyup="totalkeyserahan(this)"/> </td>
             <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['0']['b1'] }}" readonly/> </td>
             <td> RM20</td>
             <td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['0']['bd20'] }}" readonly/> </td>
-            <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" data-jenis="serahan" value="{{ $array_reqteller['bd20'] }}" onkeyup="totalkey(this)"/> </td>
+            <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" value="{{ $array_reqteller['bd20'] }}" onkeyup="totalkeyserahan(this)"/> </td>
             <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['0']['b20'] }}" readonly/> </td>
         </tr>
         <tr>
             <td>RM5</td>
             <td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['0']['bd5'] }}" readonly/> </td>
-            <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" data-jenis="serahan" value="{{ $array_reqteller['bd5'] }}" onkeyup="totalkey(this)"/> </td>
+            <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" value="{{ $array_reqteller['bd5'] }}" onkeyup="totalkeyserahan(this)"/> </td>
             <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['0']['b5'] }}" readonly/> </td>
             <td>RM50</td> 
             <td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['0']['bd50'] }}" readonly/> </td>
-            <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" data-jenis="serahan" value="{{ $array_reqteller['bd50'] }}" onkeyup="totalkey(this)"/> </td>
+            <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" value="{{ $array_reqteller['bd50'] }}" onkeyup="totalkeyserahan(this)"/> </td>
             <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['0']['b50'] }} " readonly/> </td>
         </tr>
         <tr>
             <td>RM10</td>
             <td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['0']['bd10'] }}" readonly/> </td>
-            <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" data-jenis="serahan" value="{{ $array_reqteller['bd10'] }}" onkeyup="totalkey(this)"/> </td>
+            <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" value="{{ $array_reqteller['bd10'] }}" onkeyup="totalkeyserahan(this)"/> </td>
             <td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['0']['b10'] }}" readonly/> </td>
             <td>RM100 </td> <td>
             <input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['0']['bd100'] }}" readonly/> </td>
-            <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" data-jenis="serahan" value="{{ $array_reqteller['bd100'] }}" onkeyup="totalkey(this)"/> </td>
+            <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" value="{{ $array_reqteller['bd100'] }}" onkeyup="totalkeyserahan(this)"/> </td>
             <td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['0']['b100'] }}" readonly/> </td>
         </tr>
           </table>
@@ -129,51 +129,51 @@
         
         <td>RM0.01</td>
         <td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td> 
-        <td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-jenis="serahan" value="{{ $array_reqteller['txtsen1'] }}" onkeyup="totalkey(this)"/> </td>
+        <td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" onkeyup="totalkeyserahan(this)"/> </td>
         <td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td>
         <td>RM1</td>
         <td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td> 
-        <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-jenis="serahan" value="{{ $array_reqteller['txtring1'] }}" onkeyup="totalkey(this)"/> </td>
+        <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" onkeyup="totalkeyserahan(this)"/> </td>
         <td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td>
     </tr>
     <tr>
         <td>RM0.05</td>
         <td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td>
-        <td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-jenis="serahan" value="{{ $array_reqteller['txtsen5'] }}" onkeyup="totalkey(this)"/> </td>
+        <td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" onkeyup="totalkeyserahan(this)"/> </td>
         <td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td>
         <td>RM5</td>
         <td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td>
-        <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-jenis="serahan" value="{{ $array_reqteller['txtring5'] }}" onkeyup="totalkey(this)"/> </td>
+        <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" onkeyup="totalkeyserahan(this)"/> </td>
         <td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td>
     </tr>
     <tr>
         <td>RM0.10</td>
         <td><input type="text" name="rekodsen10" class="form-control"  value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td>
-        <td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-jenis="serahan" value="{{ $array_reqteller['txtsen10'] }}" onkeyup="totalkey(this)"/> </td>
+        <td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" onkeyup="totalkeyserahan(this)"/> </td>
         <td><input type="text" name="totalsen10" class="form-control"  value=" {{ $denominasi['0']['k010'] }}" readonly/> </td>
         <td>RM10</td>
         <td><input type="text" name="rekodring10" class="form-control"  value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td>
-        <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-jenis="serahan" value="{{ $array_reqteller['txtring10'] }}" onkeyup="totalkey(this)"/> </td>
+        <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" onkeyup="totalkeyserahan(this)"/> </td>
         <td><input type="text" name="totalring10" class="form-control"  value=" {{ $denominasi['0']['k10'] }}" readonly/> </td>
     </tr>
     <tr>
       <td>RM0.20</td>
       <td><input type="text" name="rekodsen20" class="form-control"  value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td>
-      <td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-jenis="serahan" value="{{ $array_reqteller['txtsen20'] }}" onkeyup="totalkey(this)"/> </td>
+      <td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" onkeyup="totalkeyserahan(this)"/> </td>
       <td><input type="text" name="totalsen20" class="form-control"  value=" {{ $denominasi['0']['k020'] }}" readonly/> </td>
       <td> RM20</td>
       <td><input type="text" name="rekodring20" class="form-control"  value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td>
-      <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-jenis="serahan" value="{{ $array_reqteller['txtring20'] }}" onkeyup="totalkey(this)"/> </td>
+      <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" onkeyup="totalkeyserahan(this)"/> </td>
       <td><input type="text" name="totalring20" class="form-control"  value=" {{ $denominasi['0']['k20'] }}" readonly/> </td>
   </tr>
   <tr>
     <td>RM0.50</td>
     <td><input type="text" name="rekodsen50" class="form-control"  value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td>
-    <td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-jenis="serahan" value="{{ $array_reqteller['txtsen50'] }}" onkeyup="totalkey(this)"/> </td>
+    <td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" onkeyup="totalkeyserahan(this)"/> </td>
     <td><input type="text" name="totalsen50" class="form-control"  value=" {{ $denominasi['0']['k050'] }}" readonly/> </td>
     <td>RM50</td> 
     <td><input type="text" name="rekodring50" class="form-control"  value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td>
-    <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-jenis="serahan" value="{{ $array_reqteller['txtring50'] }}" onkeyup="totalkey(this)"/> </td>
+    <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" onkeyup="totalkeyserahan(this)"/> </td>
     <td><input type="text" name="totalring50" class="form-control"  value=" {{ $denominasi['0']['k50'] }}" readonly/> </td>
 </tr>
 <tr>
@@ -183,7 +183,7 @@
   <td></td>
   <td>RM100 </td> 
   <td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td>
-  <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" onkeyup="totalkey(this)"/> </td>
+  <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" onkeyup="totalkeyserahan(this)"/> </td>
   <td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}"  readonly/> </td>
 </tr>
       </table>
diff --git a/resources/views/khazanah/pendahuluanserah.blade.php b/resources/views/khazanah/pendahuluanserah.blade.php
index 8d0428c..09ac009 100644
--- a/resources/views/khazanah/pendahuluanserah.blade.php
+++ b/resources/views/khazanah/pendahuluanserah.blade.php
@@ -12,7 +12,7 @@
 
                 <div class="card-body text-center">
                   
-                <form id="form-pendahuluan" action="{{ route('khazanah.kemaskiniPendahuluan') }}" method="post">
+                <form id="form-pendahuluan" action="{{ route('khazanah.kemaskiniPendahuluan') }}" onsubmit="return validateamaun()" method="post">
 @csrf
 <div class="row mb-2">
   <div class="col-2">Tarikh</div>
@@ -347,6 +347,28 @@
     $('#form-pendahuluan').trigger('submit');
   }
 
+
+  function validateamaun()
+  {
+    let amaun = parseFloat($('#amt').val());
+    let amaunkiraan = parseFloat($('#amaunkiraan').val().replace(/[^0-9.-]+/g,""));
+
+    if(amaun != amaunkiraan)
+    {
+      Swal.fire(
+      'Amaran',
+      'Sila Cukupkan baki amaun kiraan sama dengan amaun sebenar!',
+      'error'
+      )
+
+      event.preventDefault();
+      return false;
+    }else{
+      return true;
+    }
+
+  }
+
 </script>
 
 <script type="text/javascript" src="{{ asset('js/main.js') }}"></script>
diff --git a/resources/views/modal/historytebus.blade.php b/resources/views/modal/historytebus.blade.php
index 1606d6b..6500422 100644
--- a/resources/views/modal/historytebus.blade.php
+++ b/resources/views/modal/historytebus.blade.php
@@ -10,14 +10,14 @@
         </div>
         <div class="modal-body">
           <div class="row">
-            <div class="col-12">
-              <div>Harga Jualan : <span id="hargajualanmodal"></span></div>
+            <div class="col-4">
+              <div class="small-box bg-info text-center"><div class="inner"><b>Harga Jualan : <span id="hargajualanmodal"></span></b></div></div>
             </div>
-            <div class="col-12">
-              <div>Pembiayaan : <span id="pembiayaanmodal"></span></div>
+            <div class="col-4">
+              <div class="small-box bg-info text-center"><div class="inner"><b>Pembiayaan : <span id="pembiayaanmodal"></span></b></div></div>
             </div>
-            <div class="col-12">
-              <div>Nilai Marhun : <span id="nilaimarhunmodal"></span></div>
+            <div class="col-4">
+              <div class="small-box bg-info text-center"><div class="inner"><b>Nilai Marhun : <span id="nilaimarhunmodal"></span></b></div></div>
             </div>
           </div>
           <ul class="nav nav-tabs" id="custom-tabs-one-tab" role="tablist">
@@ -56,6 +56,7 @@
                     <th>Jenis Tebus</th>
                     <th>JBG</th>
                     <th>Tarikh Tebus</th>
+                    <th>Action</th>
                   </tr>
                 </thead>
                 <tbody>
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 481b17a..4e50af5 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -143,7 +143,7 @@
                                         BAKI HARGA JUALAN(RM)
                                     </div>
                                     <div class="col-8">
-                                        <input type="text" id="bakihargajualan" value="{{ $gadai['bakihargajualan'] }}" class="form-control" readonly/>
+                                        <input type="text" id="bakihargajualan" value="{{ number_format($gadai['bakihargajualan'],2) }}" class="form-control" readonly/>
                                     </div>
                                 </div>
 
@@ -152,7 +152,7 @@
                                         BAKI PEMBIAYAAN(RM)
                                     </div>
                                     <div class="col-8">
-                                        <input type="text" id="pinjaman" value="{{ $gadai['bakipjm'] }}" class="form-control" readonly/>
+                                        <input type="text" id="pinjaman" value="{{ number_format($gadai['bakipjm'],2) }}" class="form-control" readonly/>
                                     </div>
                                 </div>   
                             </div>
@@ -164,7 +164,7 @@
                                         PEMBIAYAAN ASAL(RM)
                                     </div>
                                     <div class="col-8">
-                                        <input type="text" id="pinjamanasal" value="{{ $gadai['pinjaman'] }}" class="form-control" readonly/>
+                                        <input type="text" id="pinjamanasal" value="{{ number_format($gadai['pinjaman'],2) }}" class="form-control" readonly/>
                                     </div>
                                 </div>  
                             </div>
@@ -241,9 +241,9 @@
                                         PINJAMAN BARU(RM)
                                     </div>
                                     <div class="col-8 input-group mb-3">
-                                        <input type="text" id="pinjamanbaru" value="{{ $gadai['pinjaman'] }}" class="form-control" aria-describedby="basic-addon2" readonly/>
+                                        <input type="text" id="pinjamanbaru" value="{{ number_format($gadai['pinjaman'],2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
                                         <div class="input-group-append">
-                                        <span class="input-group-text" id="basic-addon2">{{ $gadai['percentpinj']}}</span>
+                                        <span class="input-group-text" id="basic-addon2">{{ $gadai['percentpinj'] }}</span>
                                           </div>
                                     </div>
                                 </diV>
@@ -275,6 +275,10 @@
 
 <script>
 
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+
     $('form input').keydown(function (e) {
         if (e.keyCode == 13) {
             e.preventDefault();
@@ -359,7 +363,7 @@
                 url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(data){
-                    $('#jumlahupah').val(data.toFixed(2));
+                    $('#jumlahupah').val(formatter.format(data.toFixed(2)));
                     $('#bayaranditerima').val(data);
                 }
             });
@@ -370,7 +374,7 @@
                 url: api + '/api/tebustawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(harga_tebus){
-                    $('#perludibayar').val(harga_tebus.toFixed(2));
+                    $('#perludibayar').val(formatter.format(harga_tebus.toFixed(2)));
                 }
             });
 
@@ -378,7 +382,7 @@
         }else if(tarikhgadai < tarikhtawarruq){
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['pinjaman'] }}";
 
-            $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));
+            $('#tambahpinjamsebenar').val(formatter.format(Number(maxgadaila).toFixed(2)));
 
             $('#divpembiayaanasal').show();
             $('#divbakihargajualan').hide();
@@ -489,16 +493,16 @@
                     "array_recno" : array_recno
                     },
                     success:function(success){
-                        let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
+                        let bayarz = $('#bayaran').val(formatter.format(Number(success.toFixed(2))));
 
                         bayaranseparuhasal = Number(success.toFixed(2));
 
-                        let bakihargajual = $('#bakihargajualan').val();
+                        let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,"");
 
-                        $('#perludibayar').val(Number(success.toFixed(2)) +  parseFloat($('#jumlahupah').val()));
+                        $('#perludibayar').val(formatter.format(Number(success.toFixed(2)) +  parseFloat($('#jumlahupah').val())));
 
-                        let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
-                        $('#bakipinjaman').val(totalbakipinjam.toFixed(2));
+                        let totalbakipinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - success;
+                        $('#bakipinjaman').val(formatter.format(totalbakipinjam.toFixed(2)));
 
                     },error:function(xhr, textStatus, errorThrown){
                         console.log(xhr.responseText);