diff --git a/public/argon/js/dataTables.dataTables.min.js b/public/argon/js/dataTables.dataTables.min.js
new file mode 100644
index 0000000..85329ce
--- /dev/null
+++ b/public/argon/js/dataTables.dataTables.min.js
@@ -0,0 +1,5 @@
+/*!
+ DataTables styling integration
+ ©2018 SpryMedia Ltd - datatables.net/license
+*/
+(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return c(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);b&&b.fn.dataTable||(b=require("datatables.net")(a,b).$);return c(b,a,a.document)}:c(jQuery,window,document)})(function(c,a,b,d){return c.fn.dataTable});
diff --git a/public/argon/js/jquery.backDetect.js b/public/argon/js/jquery.backDetect.js
new file mode 100644
index 0000000..a6495b7
--- /dev/null
+++ b/public/argon/js/jquery.backDetect.js
@@ -0,0 +1,80 @@
+/* eslint-env es5 */
+/* eslint no-undef: 0 */
+/* eslint no-var: 0 */
+/* eslint prefer-template: 0 */
+/* eslint prefer-arrow-callback: 0 */
+
+
+(function backDection(jQuery) {
+  var $ = jQuery;
+  var win = typeof window !== 'undefined' && window;
+  var backDetectValues = {
+    frameLoaded: 0,
+    frameTry: 0,
+    frameTime: 0,
+    frameDetect: null,
+    frameSrc: null,
+    frameCallBack: null,
+    frameThis: null,
+    frameNavigator: window.navigator.userAgent,
+    frameDelay: 0,
+    frameDataSrc: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC',
+  };
+
+  /**
+   * Back Detect
+   *
+   * @param function callback
+   * @param int delay
+   */
+  $.fn.backDetect = function detectBackClick(callback, delay) {
+    backDetectValues.frameThis = this;
+    backDetectValues.frameCallBack = callback;
+    if (delay !== null) {
+      backDetectValues.frameDelay = delay;
+    }
+    if (backDetectValues.frameNavigator.indexOf('MSIE ') > -1 || backDetectValues.frameNavigator.indexOf('Trident') > -1) {
+      setTimeout(function loadFrameIE() {
+        $('<iframe src="' + backDetectValues.frameDataSrc + '?loading" style="display:none;" id="backDetectFrame" onload="jQuery.fn.frameInit();""></iframe>').appendTo(backDetectValues.frameThis);
+      }, backDetectValues.frameDelay);
+    } else {
+      setTimeout(function loadFrame() {
+        $("<iframe src='about:blank?loading' style='display:none;' id='backDetectFrame' onload='jQuery.fn.frameInit();'></iframe>").appendTo(backDetectValues.frameThis);
+      }, backDetectValues.frameDelay);
+    }
+  };
+
+  /**
+   * Initialize Frame
+   */
+  $.fn.frameInit = function initFrame() {
+    backDetectValues.frameDetect = document.getElementById('backDetectFrame');
+    if (backDetectValues.frameLoaded > 1) {
+      if (backDetectValues.frameLoaded === 2) {
+        backDetectValues.frameCallBack.call(this);
+        win.history.go(-1);
+      }
+    }
+    backDetectValues.frameLoaded += 1;
+    if (backDetectValues.frameLoaded === 1) {
+      backDetectValues.frameTime = setTimeout(function beginFrameSetup() {
+        jQuery.fn.setupFrames();
+      }, 500);
+    }
+  };
+
+  /**
+   * Frame Setup
+   */
+  $.fn.setupFrames = function frameSetup() {
+    clearTimeout(backDetectValues.frameTime);
+    backDetectValues.frameSrc = backDetectValues.frameDetect.src;
+    if (backDetectValues.frameLoaded === 1 && backDetectValues.frameSrc.indexOf('historyLoaded') === -1) {
+      if (backDetectValues.frameNavigator.indexOf('MSIE ') > -1 || backDetectValues.frameNavigator.indexOf('Trident') > -1) {
+        backDetectValues.frameDetect.src = backDetectValues.frameDataSrc + '?historyLoaded';
+      } else {
+        backDetectValues.frameDetect.src = 'about:blank?historyLoaded';
+      }
+    }
+  };
+}(jQuery));
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 4e173f3..ea84e42 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -47,9 +47,6 @@
                     </div>
                 </div>
 
-                <a href="#" class="linktarget" style="color:black;" data-toggle="modal" data-target="#sessionModal">modal</a>
-
-
                 <div class="col-xl-2 col-sm-12">
                     <div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
                     <a href="{{ route('pembayaransag') }}" onclick="loadingbtn();"><div class="card mb-sm-0 mb-4 mb-xl-0 ml-sm-0 mt-2 bg-primary">
@@ -186,31 +183,6 @@
             });
         }
 
- 
-
-        function d(el){
-                return document.getElementById(el);
-            }
-
-        setInterval(function(){
-            var info = ifvisible.getIdleInfo();
-
-            // console.log(info);
-            // Give 3% margin to stabilaze user output
-            if(info.timeLeftPer < 3){
-                console.log('masuk');
-                info.timeLeftPer = 0;
-                info.timeLeft = ifvisible.getIdleDuration();
-            }
-            // console.log(info.timeLeft);
-            d("seconds").innerHTML = parseInt(info.timeLeft / 1000), 10;
-            // d("idlebar").style.width = info.timeLeftPer+'%';
-        }, 100);
-
-        var dur = (ifvisible.getIdleDuration() / 1000);
-            d('seconds').innerHTML =  dur;
-            // d('idleTime').innerHTML = dur + " seconds";
-       
       </script>
 
 @endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index e577bc4..e38276d 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -24,18 +24,20 @@
         <link type="text/css" href="{{ asset('argon') }}/css/argon.css?v=1.0.0" rel="stylesheet">
 
         <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.css"/>
-
+        {{-- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.min.css"/> --}}
         <script src="{{ asset('argon') }}/vendor/jquery/dist/jquery.min.js"></script>
         <script src="{{ asset('argon') }}/vendor/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 
         <script src="{{ asset('argon') }}/js/ifvisible.js"></script>
+        <script src="{{ asset('argon') }}/js/jquery.backDetect.js"></script>
         <script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 
         
         <script type="text/javascript" src="{{ asset('argon') }}/js/main.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
-        {{-- <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script> --}}
+        <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script>
+        {{-- <script type="text/javascript" src="{{ asset('argon') }}/js/dataTables.dataTables.min.js"></script> --}}
         <link
         rel="stylesheet"
         href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
@@ -43,7 +45,7 @@
         <script src="{{ asset('argon') }}/js/bootstrap-notify.js"></script>
 
         <script>
-            ifvisible.setIdleDuration(10);
+            ifvisible.setIdleDuration(100);
 
             // ifvisible.idle(function(){
             //     $('#sessionModal').modal('show');
@@ -54,12 +56,6 @@
             // Display pop-up
             console.log('visible');
         }
-
-        ifvisible.on("idle", function(){
-            $('#sessionModal').modal('show');
-        console.log('reload');
-        });
-
      
         </script>
     <style>
@@ -300,6 +296,58 @@
     </head>
     <body class="{{ $class ?? '' }}">
         @auth()
+
+        <script>       
+            var timeLeft = 30;
+            var elem = document.getElementById('seconds');
+            var timerId;
+
+
+            // ifvisible.on("focus", function(){
+            //     clearTimeout(timerId);
+            //     timeLeft = 30;
+            // });
+            
+
+            ifvisible.on("idle", function(){
+                timerId = setInterval(countdown, 1000);
+                $('#sessionModal').modal('show', {backdrop: 'static', keyboard: false});
+            });
+
+
+            ifvisible.on("wakeup", function(){
+               clearTimeout(timerId);
+               timeLeft=30;
+            });
+        
+
+            function countdown() {
+                if (timeLeft == -1) {
+                    clearTimeout(timerId);
+                    $('#logout-form').submit();
+
+                }else{
+                    document.getElementById("seconds").innerHTML = timeLeft;
+                    timeLeft--;
+                }
+            }
+
+            console.log(window.performance);
+
+            if (document.addEventListener) {
+            window.addEventListener('pageshow', function (event) {
+                if (event.persisted || window.performance && window.performance.navigation.type == 2) 
+                {
+                    $('#logout-form').submit();
+                    // location.reload();
+                }
+            },
+            false);
+            }
+
+         
+        </script>
+
             @if(Auth::user()->hasVerifiedEmail())
                 <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
                     @csrf
diff --git a/resources/views/modal/sessionmodal.blade.php b/resources/views/modal/sessionmodal.blade.php
index 95f92dd..ee40be0 100644
--- a/resources/views/modal/sessionmodal.blade.php
+++ b/resources/views/modal/sessionmodal.blade.php
@@ -12,7 +12,7 @@
             <div class="modal-body">
                 <i class="fas fa-exclamation-triangle text-danger fa-1x"></i><span class="ml-2 mt-2">Sesi dalam talian anda akan tamat tempoh dalam</span>
                 
-                <div class="text-warning mx-auto text-center display-4">
+                <div class="text-warning mx-auto text-center display-4 mt-3 mb-3">
                     <span class="label label-warning" id="seconds">00</span><span>Saat</span>
                     {{-- <span id="idleTime" class="label label-warning">00 seconds</span> --}}
                 </div>
@@ -23,8 +23,8 @@
 
           <!-- Modal footer -->
           <div class="modal-footer mx-auto text-center">
-            <button type="button" class="btn btn-primary" data-dismiss="modal">Teruskan</button>
-              <button type="button" class="btn btn-danger" data-dismiss="modal">Keluar</button>
+            <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="clearTimeout(timerId);">Teruskan</button>
+                <button type="button" class="btn btn-danger" data-dismiss="modal" onclick="$('#logout-form').submit();">Keluar</button>
           </div>
 
       </div>
diff --git a/resources/views/pembayaran/checkout.blade.php b/resources/views/pembayaran/checkout.blade.php
index 9f15743..0b9b3c0 100644
--- a/resources/views/pembayaran/checkout.blade.php
+++ b/resources/views/pembayaran/checkout.blade.php
@@ -129,8 +129,9 @@
                           <tr>
                             <th>No</th>
                             <th>No Rujukan</th>
-                            <th>Pembiayaan</th>
+                            <th>Pembiayaan Asal</th>
                             <th>B. Pembiayaan</th>
+                            <th>Tempoh</th>
                             <th>Keuntungan</th>
                             <th width="20%">Bayaran</th>
                           </tr>
@@ -152,6 +153,9 @@
                               <td>
                                 {{ number_format($bayar['bakipjm'],2) }}
                               </td>
+                              <td>
+                                {{ $bayar['tempoh'] }}
+                              </td>
                               <td>
                                 @php 
                                 $upahtawarruq = Http::get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json();