diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 195202a..49fb623 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -180,7 +180,7 @@ class CustomersController extends Controller
             'kodkerja'=>$request->pekerjaan,
             'tujuangadai'=>$request->tujuan_gadai,
         ]);
-
+        
         Session::put('customer_info',$customer_info);
         return redirect()->route('customer_info')->with( ['customer_info' => $customer_info] );
     }
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index a0923e7..ad38247 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -276,6 +276,7 @@ class GadaianController extends Controller
     public function printSAG(Request $request){
         $norujukan = $request->norujukan_modal;
         $auth_user = Auth::user();
+        $auth_username = $auth_user['name'];
         $api_url = config('api.url');
 
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$norujukan)->json();
@@ -301,7 +302,7 @@ class GadaianController extends Controller
 
         $pembayaran_segera = "https://e-arrahn.com.my/pembayaransegeraqrreader?norujukan=".$norujukan;
 
-        return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera'));
+        return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username'));
     }
 
     public function resit($id)
diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php
index 91993f9..de1c0f1 100644
--- a/app/Http/Controllers/KakitanganController.php
+++ b/app/Http/Controllers/KakitanganController.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use App\User;
 use App\Role;
+use App\Dashboard;
 
 
 class KakitanganController extends Controller
diff --git a/app/Role.php b/app/Role.php
index 2fa8957..fdb3670 100644
--- a/app/Role.php
+++ b/app/Role.php
@@ -9,6 +9,6 @@ class Role extends Model
     protected $table = 'roles';
 
     protected $fillable = [
-        'keterangan'
+        'keterangan','role_code'
     ];
 }
diff --git a/public/js/main.js b/public/js/main.js
index 943061b..a0ff2e6 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -276,7 +276,7 @@ async function openuptambahdanserah(e)
 
     if(id == 'tambahmodal')
     {
-        const { value: amaun } = await Swal.fire({
+        Swal.fire({
             title: 'Masukkan Amaun Pendahuluan',
             input: 'text',
             inputPlaceholder: 'Amaun',
@@ -301,7 +301,7 @@ async function openuptambahdanserah(e)
                 if (isNaN(amaun)) 
                 {
                     Swal.fire('error','Amaun hendaklah dalam nombor!','error');
-                return false;
+                    return false;
                 }
                 else
                 {
@@ -310,7 +310,7 @@ async function openuptambahdanserah(e)
                         url: api_url + '/api/requestTeller/' + kodcaw,
                         data: {
                             "kodlaluan" : teller,
-                            "modal" : amaun,
+                            "modal" : amaun.value,
                             "serahan" : 0
                         },
                         success:function(data)
@@ -387,9 +387,9 @@ async function openuptambahdanserah(e)
         });
 
         
-        if (amaun) {
-            // Swal.fire(`Entered email: ${amaun}`)
-                if (isNaN(amaun)) 
+            if (amaun.isConfirmed) {
+                // Swal.fire(`Entered email: ${amaun}`)
+                if (isNaN(amaun.value)) 
                 {
                     Swal.fire('error','Amaun hendaklah dalam nombor!','error');
                     return false;
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 72d08bf..6adf42a 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -232,13 +232,13 @@
         urlroute = urlroute.replace(':no_id', arr['no']);
       
         tableaddtunai.row.add([
-                    counter,
-                    arr['tarikh'],
-                    'RM ' + formatter.format(arr['tambah']),
-                    'RM ' + formatter.format(arr['kurang']),
-                    arr['nota']
-                ]).draw();
-                counter = counter + 1;
+            counter,
+            arr['tarikh'],
+            'RM ' + formatter.format(arr['tambah']),
+            'RM ' + formatter.format(arr['kurang']),
+            arr['nota']
+        ]).draw();
+        counter = counter + 1;
 
     });
 }
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index cce618d..be307fe 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -434,7 +434,6 @@
         var customerphone = $('#main_phone').val();
         var customerphone_alternate = $('#alternate_phone').val();
         var age = $('#age').val();
-
         if(age < 18){
             Swal.fire({
                 icon: 'error',
@@ -500,7 +499,7 @@
             event.preventDefault();
             return false;
         }else{
-            if(!(customerphone.length < 9 && customerphone.length >= 12)){
+            if((customerphone.length < 9 || customerphone.length >= 12)){
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -627,7 +626,7 @@
             event.preventDefault();
             return false;
         }else{
-            if(customerphone.length <= 9 && customerphone.length >= 12){
+            if(customerphone.length <= 9 || customerphone.length >= 12){
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index 9fda294..2f26aa0 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -182,7 +182,7 @@
                     </div>
                     <div class="row mt-2 d-flex justify-content-center">
                         <a href="{{ route('laporanscanbarcode') }}" target="_blank" class="btn btn-info mr-md-2">Laporan Scan Barcode Gadaian</a>
-                        <a href="#" class="btn btn-info">Senarai Pembatalan No Rujukan</a>
+                        <!-- <a href="#" class="btn btn-info">Senarai Pembatalan No Rujukan</a> -->
                     </div>
                 </div>
             </div>
diff --git a/resources/views/khazanah/pendahuluan.blade.php b/resources/views/khazanah/pendahuluan.blade.php
index 0b67032..d8f2b00 100644
--- a/resources/views/khazanah/pendahuluan.blade.php
+++ b/resources/views/khazanah/pendahuluan.blade.php
@@ -119,37 +119,41 @@
 
     });
 
-var tablependahuluan = $('#table-pendahuluan').DataTable({
+    var tablependahuluan = $('#table-pendahuluan').DataTable({
       "scrollX": true
     });
 
-function gettable(datala)
-{
-    var counter = 1;
-    tablependahuluan.clear().draw();
-    $.each(datala, function(index,arr){
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
 
-        if(arr['serahan'] == 0 && arr['modal'] > 0)
-        {
+    function gettable(datala)
+    {
+        var counter = 1;
+        tablependahuluan.clear().draw();
+        $.each(datala, function(index,arr){
 
-        var urlroute = "{{ route('pendahuluan.serah', ':no_id') }}";
+            if(arr['serahan'] == 0 && arr['modal'] > 0)
+            {
+
+            var urlroute = "{{ route('pendahuluan.serah', ':no_id') }}";
+            
+            urlroute = urlroute.replace(':no_id', arr['no']);
         
-        urlroute = urlroute.replace(':no_id', arr['no']);
-      
-        tablependahuluan.row.add([
+            tablependahuluan.row.add([
                     counter,
                     arr['kodlaluan'],
                     arr['kodcaw'],
-                    'RM ' + arr['modal'],
-                    'RM ' + arr['serahan'],
+                    'RM ' + formatter.format(arr['modal']),
+                    'RM ' + formatter.format(arr['serahan']),
                     arr['tarikh'],
                     '<a href='+ urlroute + ' class="btn btn-info"><span class="fas fa-plus"></span></a>'
                 ]).draw();
                 counter = counter + 1;
-        }
+            }
 
-    });
-}
+        });
+    }
 
 </script>
 @endsection
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index 79e390d..7b0816e 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -217,7 +217,7 @@
                         <script>
 
                             // Enable pusher logging - don't include this in production
-                            Pusher.logToConsole = true;
+                            Pusher.logToConsole = false;
 
                             var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
                                 cluster: 'ap1',
diff --git a/resources/views/operasi/daftar_kakitangan.blade.php b/resources/views/operasi/daftar_kakitangan.blade.php
index 46a809e..cf5096f 100644
--- a/resources/views/operasi/daftar_kakitangan.blade.php
+++ b/resources/views/operasi/daftar_kakitangan.blade.php
@@ -6,9 +6,8 @@
         <div class="col-md-12">
             <div class="card">
                 <div class="card-header">{{ __('Daftar Kakitangan') }}</div>
-
                 <div class="card-body text-center">
-                    <form action="{{ route('kakitangan.baru') }}" method="post">
+                    <form action="{{ route('kakitangan.baru') }}" method="post" onsubmit="return verifyregister()">
                         @csrf
                         <div class='row form-group'>
                             <div class='col-md-6'>
@@ -38,7 +37,7 @@
                                         @endphp
                                         <select class="form-control" name="cawangan" data-placeholder="Pilih Cawangan" id="cawangan">
                                             <option disabled selected value> -- Pilih Cawangan -- </option>
-                                            <option value="ope">Operasi</option>
+                                            <option value="operasi">Operasi</option>
                                             @foreach($cawangan_all as $cawangan)    
                                                 <option value="{{ $cawangan['kodcaw'] }}">{{ $cawangan['details_caw'] }}</option>
                                             @endforeach
@@ -68,10 +67,10 @@
                                         Jawatan
                                     </div>
                                     <div class='col-md-7'>
-                                        <select class="form-control" name="role" data-placeholder="Pilih Bank" id="role">
+                                        <select class="form-control" name="role" data-placeholder="Pilih Jawatan" id="role">
                                             <option disabled selected> -- Pilih Jawatan -- </option>
                                             @foreach($role as $roles)    
-                                                <option value="{{ $roles['keterangan'] }}">{{ $roles['keterangan'] }}</option>
+                                                <option value="{{ $roles['role_code'] }}">{{ $roles['keterangan'] }}</option>
                                             @endforeach
                                         </select>
                                     </div>
@@ -90,6 +89,141 @@
     </div>
 </div>
 <script>
-
+    function verifyregister(){
+        var cawangan = $('#cawangan').val();
+        var role = $('#role').val();
+        var nama = $('#nama').val();
+        var email = $('#email').val();
+        var nokp = $('#nokp').val();
+        var telefon = $('#telefon').val();
+        if (cawangan == null){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Pilih Cawangan Kakitangan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if (role == null){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Pilih Jawatan Kakitangan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(cawangan == 'operasi'){
+            if(role != 'operasi'){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Jawatan Tidak Sah'
+                });
+                event.preventDefault();
+                return false;
+            }
+        }else{
+            if(role == 'operasi'){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Jawatan Tidak Sah'
+                });
+                event.preventDefault();
+                return false;
+            }
+        }
+        if(nama == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukan Nama Kakitangan'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(nokp == ''){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Masukan No KP Kakitangan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if(isNaN(nokp) == true){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukan Hanya Nombor Pada No KP Kakitangan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }else{
+                    if(nokp.length != 12){
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Amaran!',
+                            text: 'Sila Periksa No KP Kakitangan'
+                        });
+                        event.preventDefault();
+                        return false;
+                    }else{
+                        if(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email) == false){
+                            Swal.fire({
+                                icon: 'error',
+                                title: 'Amaran!',
+                                text: 'Sila Periksa Email Kakitangan'
+                            });
+                            event.preventDefault();
+                            return false;
+                        }else{
+                            if(telefon == ''){
+                                Swal.fire({
+                                    icon: 'error',
+                                    title: 'Amaran!',
+                                    text: 'Sila Masukan No Telefon Kakitangan'
+                                });
+                                event.preventDefault();
+                                return false;
+                            }else{
+                                if(isNaN(telefon) == true){
+                                    Swal.fire({
+                                        icon: 'error',
+                                        title: 'Amaran!',
+                                        text: 'Sila Masukan Hanya Nombor Pada No Telefon Kakitangan'
+                                    });
+                                    event.preventDefault();
+                                    return false;
+                                }else{
+                                    if(telefon.length <= 9 || telefon.length >= 12){
+                                        Swal.fire({
+                                            icon: 'error',
+                                            title: 'Amaran!',
+                                            text: 'Sila Periksa No Telefon Kakitangan'
+                                        });
+                                        event.preventDefault();
+                                        return false;
+                                    }else{
+                                        if(cawangan == null){
+                                            Swal.fire({
+                                                icon: 'error',
+                                                title: 'Amaran!',
+                                                text: 'Sila Pilih Cawangan Kakitangan'
+                                            });
+                                        }else{
+                                            return true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 </script>
 @endsection
diff --git a/resources/views/operasi/komuditi/index.blade.php b/resources/views/operasi/komuditi/index.blade.php
index b5ccab0..70bcf0d 100644
--- a/resources/views/operasi/komuditi/index.blade.php
+++ b/resources/views/operasi/komuditi/index.blade.php
@@ -2,38 +2,38 @@
 
 @section('content')
 <div class="container">
-    <div class="row justify-content-center">
+    <div class="row">
         <div class="col-md-12">
             <div class="card">
                 <div class="card-header">{{ __('Komoditi') }}</div>
-                <div class="card-body text-center">
+                <div class="card-body">
                     <div class="row">
                         <div class="col-2 justify-content-start">
                             <a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
                         </div>
                     </div>
-                    <div class="row form-group justify-content-start" id="maklumat_komuditi">
+                    <div class="row form-group" id="maklumat_komuditi">
                         <div class="col-md-4">
                             <div class="row form-group">
-                                <div class="col-md-4">No Sijil : </div>
+                                <div class="col-md-4 text-right">No Sijil : </div>
                                 <div class="col-md-8"><span id="nosijil_span"></span></div>
                             </div>
                             <div class="row form-group">
-                                <div class="col-md-4">Harga : </div>
+                                <div class="col-md-4 text-right">Harga : </div>
                                 <div class="col-md-8"><span id="harga_span"></span></div>
                             </div>
                         </div>
                         <div class="col-md-8">
                             <div class="row form-group">
-                                <div class="col-md-4">Kod Produk / Diskripsi : </div>
+                                <div class="col-md-4 text-right">Kod Produk / Diskripsi : </div>
                                 <div class="col-md-8"><span id="produk_span"></span></div>
                             </div>
                             <div class="row form-group">
-                                <div class="col-md-4">Unit : </div>
+                                <div class="col-md-4 text-right">Unit : </div>
                                 <div class="col-md-8"><span id="unit_span"></span></div>
                             </div>
                             <div class="row form-group">
-                                <div class="col-md-4">Nilai : </div>
+                                <div class="col-md-4 text-right">Baki Nilai Komoditi : </div>
                                 <div class="col-md-8"><span id="nilai_span"></span></div>
                             </div>
                         </div>
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 2d0bdfb..44276e6 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -60,7 +60,7 @@
                                 <option value="T">T = Tebus</option>
                                 <option value="A">A = Ansuran</option>
                                 <option value="S">S = Separuh</option>
-                                <option value="P">P = Tambah Pinjaman</option>
+                                <option value="P">P = Tambah Pembiayaan</option>
                               </select>
                         </div>
                     </div>
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index 86e1f29..8c6abf8 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.blade.php
@@ -6,10 +6,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 <script>
-  $(document).ready(function () {
-    window.print();
-    window.onfocus=function(){ window.close();}
-  });
+  // $(document).ready(function () {
+  //   window.print();
+  //   window.onfocus=function(){ window.close();}
+  // });
 </script>
 
 <style>
@@ -469,7 +469,7 @@
       <td rowspan="2"> 1</td>
       <td rowspan="2"> Kontrak Jualan Murabahah Secara Tangguh </td>
       <td rowspan="2">
-        Saya bersetuju dan dengan ini membeli komoditi daripada PKB pada Harga Jualan dengan bayaran tangguh sehingga 12 bulan. Komoditi adalah sebagaimana yang dinyatakan di dalam sijil jualbeli komoditi bersekadar (proportionate) jumlah pembiayaan yang diberikan kepada saya.
+        Saya bersetuju dan dengan ini membeli komoditi daripada PKB pada Harga Jualan dengan bayaran tangguh. Komoditi adalah sebagaimana yang dinyatakan di dalam sijil pembekal komoditi mengikut kadar jumlah pembiayaan yang diberikan kepada saya.
       </td>
       <td rowspan="2"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
@@ -478,7 +478,7 @@
       <td rowspan="1"> 2</td>
       <td rowspan="1"> Kontrak Gadaian </td>
       <td rowspan="1">
-        Saya bersetuju untuk menggadaikan Marhun sebagaimana dinyatakan di dalam Surat Akuan Gadaian sebagai cagaran terhadap Harga Jualan yang perlu saya bayar kepada PKB.
+        Saya bersetuju untuk menggadaikan Marhun sebagai cagaran kepada harga komoditi.
       </td>
       <td rowspan="1"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
@@ -640,9 +640,9 @@
 
   <table style="margin-bottom:10px;" id="keuntungan">
     <tr>
-      <th colspan="2"> TANDATANGAN PELANGGAN</th>
-      <th colspan="2">TANDATANGAN PIHAK PKB </th>
-      <th colspan="2">TANDATANGAN SAKSI </th>
+      <th colspan="2">TANDATANGAN PELANGGAN</th>
+      <th colspan="2">TANDATANGAN PIHAK PKB</th>
+      <th colspan="2">TANDATANGAN SAKSI</th>
     </tr>
     <tr>
       <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
@@ -657,7 +657,13 @@
       <td >NAMA</td>
       <td>{{ $gadai_detail['teller'] }}</td>
       <td >NAMA</td>
-      <td > {{ $gadai_detail['penilai'] }}</td>
+      <td>
+        @if($gadai_detail['penilai'] == '')
+          {{ $auth_username }}
+        @else
+          {{ $gadai_detail['penilai'] }}
+        @endif
+      </td>
     </tr>
     <tr>
       <td>TARIKH</td>
@@ -691,7 +697,7 @@
 
   <table id="syarat">
     <tr>
-      <th colspan="7">  Syarat-syarat Pembiayaan  </th>
+      <th colspan="7">Syarat-syarat Pembiayaan</th>
     </tr>
     <tr>
       <td> 1.</td>
@@ -780,6 +786,10 @@
       <td></td>
       <td colspan="6">Jumlah Keuntungan yang perlu dibayar : RM 45</td>
     </tr>
+    <tr>
+      <td>13.</td>
+      <td colspan="6">Pelanggan boleh dikenakan bayaran perkhidmatan sekiranya memohon pindaan jumlah pembiayaan Ar-Rahn Tawarruq selepas transaksi pembelian komoditi sempurna.</td>
+    </tr>
   </table>
 
   <div class='page-break'>  </div>
@@ -979,7 +989,13 @@
       <td >NAMA</td>
       <td>{{ $gadai_detail['teller'] }}</td>
       <td >NAMA</td>
-      <td > {{ $gadai_detail['penilai'] }}</td>
+      <td > 
+        @if($gadai_detail['penilai'] == '')
+          {{ $auth_username }}
+        @else
+          {{ $gadai_detail['penilai'] }}
+        @endif
+      </td>
     </tr>
     <tr>
       <td>TARIKH</td>