diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue
index cf06127..8f252eb 100644
--- a/resources/js/Permohonan/SenaraiMohon.vue
+++ b/resources/js/Permohonan/SenaraiMohon.vue
@@ -1,133 +1,517 @@
 <template>
-<div class="mx-auto">
-
-    <div class="mx-auto flex justify-between mb-4">
-        <h1 class="font-bold flex flex-row justify-end">Permohonan Yang Masih Aktif</h1>
-        <button class="p-2 text-white bg-blue-500 rounded">Rekod Permohonan</button>
+    <div class="mx-auto">
+    
+    
+    
+    
+    
+    
+    
+        <div class="mx-auto flex justify-between mb-4">
+    
+    
+    
+            <h1 class="font-bold flex flex-row justify-end">Permohonan Yang Masih Aktif</h1>
+    
+    
+    
+            <button class="p-2 text-white bg-blue-500 rounded">Rekod Permohonan</button>
+    
+    
+    
+        </div>
+    
+    
+    
+    
+    
+    
+    
+        <table class="min-w-full leading-normal">
+    
+    
+    
+            <thead class="text-center">
+    
+    
+    
+                <tr>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        Cawangan
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        PetiBesi (RM)
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        No Permohonan
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        Tarikh Mohon
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        Jumlah Mohon (RM)
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        Semak
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        Jenis Permohonan
+    
+    
+    
+                    </th>
+    
+    
+    
+                    <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+    
+    
+    
+                        Tindakan
+    
+    
+    
+                    </th>
+    
+    
+    
+                </tr>
+    
+    
+    
+            </thead>
+    
+    
+    
+            <tbody>
+    
+    
+    
+                <tr v-for="(mohon,i) in showpermohonan.data" :key="i">
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <p class="text-gray-900 whitespace-no-wrap" v-text="namacawangan(mohon.kodcaw)">
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.baki_petibesi)">
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <p class="text-gray-900 whitespace-no-wrap" v-text="mohon.nopermohonan">
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <p class="text-gray-900 whitespace-no-wrap" v-text="mohon.tarikh_permohonan">
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.amaun_mohon)">
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <router-link :to="{ name: 'permohonanstatus', params: { mohonid: mohon.mohonid }}">
+    
+    
+    
+                                    <div class="border border-green-600 text-green-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-green-600 hover:text-white transition-all duration-300">
+    
+    
+    
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+    
+        
+    
+                                                <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+    
+        
+    
+                                                <path stroke-linecap="round" stroke-linejoin="round" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
+    
+        
+    
+                                            </svg>
+    
+    
+    
+                                    </div>
+    
+    
+    
+                                </router-link>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div class="ml-3">
+    
+    
+    
+                                <p :class="mohon.jenismohon == 'permohonanwang' ? 'bg-yellow-500' : 'bg-gray-500'" class="text-white whitespace-no-wrap p-2 rounded" v-text="checkjenismohon(mohon.jenismohon)">
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+                    <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+    
+    
+    
+                        <div class="flex items-center">
+    
+    
+    
+                            <div v-if="mohon.tagoperasi == 0" class="ml-3">
+    
+    
+    
+                                <button @click="funcsetuju(mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+    
+        
+    
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+    
+        
+    
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M14 10h4.764a2 2 0 011.789 2.894l-3.5 7A2 2 0 0115.263 21h-4.017c-.163 0-.326-.02-.485-.06L7 20m7-10V5a2 2 0 00-2-2h-.095c-.5 0-.905.405-.905.905 0 .714-.211 1.412-.608 2.006L7 11v9m7-10h-2M7 20H5a2 2 0 01-2-2v-6a2 2 0 012-2h2.5" />
+    
+        
+    
+                                        </svg>
+    
+        
+    
+                                    </button>
+    
+    
+    
+                                <button @click="funcbatal(mohon.mohonid)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
+    
+        
+    
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+    
+        
+    
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M10 14H5.236a2 2 0 01-1.789-2.894l3.5-7A2 2 0 018.736 3h4.018a2 2 0 01.485.06l3.76.94m-7 10v5a2 2 0 002 2h.096c.5 0 .905-.405.905-.904 0-.715.211-1.413.608-2.008L17 13V4m-7 10h2m5-10h2a2 2 0 012 2v6a2 2 0 01-2 2h-2.5" />
+    
+        
+    
+                                        </svg>
+    
+        
+    
+                                    </button>
+    
+    
+    
+                            </div>
+    
+    
+    
+                            <div v-else class="ml-3">
+    
+    
+    
+                                <p class="text-white whitespace-no-wrap p-2 rounded bg-green-500">
+    
+    
+    
+                                    Telah Lulus
+    
+    
+    
+                                </p>
+    
+    
+    
+                            </div>
+    
+    
+    
+                        </div>
+    
+    
+    
+                    </td>
+    
+    
+    
+    
+    
+    
+    
+                </tr>
+    
+    
+    
+            </tbody>
+    
+    
+    
+        </table>
+    
+    
+    
+    
+    
+    
+    
+        <pagination :data="paginate" @clickEvent_="getSenaraiMohon"></pagination>
+    
+    
+    
+    
+    
+    
+    
     </div>
-
-    <table class="min-w-full leading-normal">
-        <thead class="text-center">
-            <tr>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Cawangan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    PetiBesi (RM)
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    No Permohonan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Tarikh Mohon
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Jumlah Mohon (RM)
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Semak
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Jenis Permohonan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Tindakan
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr v-for="(mohon,i) in showpermohonan.data" :key="i">
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <p class="text-gray-900 whitespace-no-wrap" v-text="namacawangan(mohon.kodcaw)">
-                            </p>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.baki_petibesi)">
-                            </p>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <p class="text-gray-900 whitespace-no-wrap" v-text="mohon.nopermohonan">
-                            </p>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <p class="text-gray-900 whitespace-no-wrap" v-text="mohon.tarikh_permohonan">
-                            </p>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.amaun_mohon)">
-                            </p>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <router-link :to="{ name: 'permohonanstatus', params: { mohonid: mohon.mohonid }}">
-                                <div class="border border-green-600 text-green-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-green-600 hover:text-white transition-all duration-300">
-                                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
-                                    </svg>
-                                </div>
-                            </router-link>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div class="ml-3">
-                            <p :class="mohon.jenismohon == 'permohonanwang' ? 'bg-yellow-500' : 'bg-gray-500'" class="text-white whitespace-no-wrap p-2 rounded" v-text="checkjenismohon(mohon.jenismohon)">
-                            </p>
-                        </div>
-                    </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <div class="flex items-center">
-                        <div v-if="mohon.tagoperasi == 0" class="ml-3">
-                            <button @click="funcsetuju(mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M14 10h4.764a2 2 0 011.789 2.894l-3.5 7A2 2 0 0115.263 21h-4.017c-.163 0-.326-.02-.485-.06L7 20m7-10V5a2 2 0 00-2-2h-.095c-.5 0-.905.405-.905.905 0 .714-.211 1.412-.608 2.006L7 11v9m7-10h-2M7 20H5a2 2 0 01-2-2v-6a2 2 0 012-2h2.5" />
-                                </svg>
-                            </button>
-                            <button @click="funcbatal(mohon.mohonid)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M10 14H5.236a2 2 0 01-1.789-2.894l3.5-7A2 2 0 018.736 3h4.018a2 2 0 01.485.06l3.76.94m-7 10v5a2 2 0 002 2h.096c.5 0 .905-.405.905-.904 0-.715.211-1.413.608-2.008L17 13V4m-7 10h2m5-10h2a2 2 0 012 2v6a2 2 0 01-2 2h-2.5" />
-                                </svg>
-                            </button>
-                        </div>
-                        <div v-else class="ml-3">
-                            <p class="text-white whitespace-no-wrap p-2 rounded bg-green-500">
-                                Telah Lulus
-                            </p>
-                        </div>
-                    </div>
-                </td>
-
-            </tr>
-        </tbody>
-    </table>
-
-    <pagination :data="paginate" @clickEvent_="getSenaraiMohon"></pagination>
-
-</div>
 </template>
 
 <script>
@@ -170,7 +554,7 @@ export default {
         namacawangan(cawangannama) {
             let namcaw = '';
             if (this.cawangan.length > 0) {
-                this.cawangan.some(function (value, key) {
+                this.cawangan.some(function(value, key) {
 
                     if (cawangannama === value.kodcaw) {
                         namcaw = value.details_caw
@@ -200,7 +584,7 @@ export default {
                 confirmButtonText: 'Hantar',
                 showCancelButton: true,
                 cancelButtonText: 'Batal',
-                allowOutsideClick: true
+                allowOutsideClick: false
             })
 
             if (katalaluan !== undefined)
@@ -210,10 +594,25 @@ export default {
                     }
                 }).then(response => {
 
-                    if (response.data === 1)
-                        console.log('true', mohonid, katalaluan)
-                    else
-                        console.log('false', mohonid, katalaluan)
+                    if (response.data === 1) {
+                        this.axios.put(this.$hostname + '/admin/permohonan/updateoperasi/', {
+                            params: {
+                                kelulusan: 'Lulus',
+                                mohonid: mohonid,
+                                // namaoperasi: 
+
+                            }
+                        }).then(response => {
+                           if(response.data === 1)
+                           {
+
+                           }else{
+
+                           }
+                        });
+                    } else {
+
+                    }
                 });
 
         },
@@ -227,7 +626,7 @@ export default {
                 confirmButtonText: 'Hantar',
                 showCancelButton: true,
                 cancelButtonText: 'Batal',
-                allowOutsideClick: true
+                allowOutsideClick: false
             })
 
             if (katalaluan !== undefined)
@@ -237,10 +636,25 @@ export default {
                     }
                 }).then(response => {
 
-                    if (response.data === 1)
-                        console.log('true', mohonid, katalaluan)
-                    else
-                        console.log('false', mohonid, katalaluan)
+                    if (response.data === 1) {
+                        this.axios.put(this.$hostname + '/admin/permohonan/updateoperasi/', {
+                            params: {
+                                kelulusan: 'Batal',
+                                mohonid: mohonid,
+                                // namaoperasi: 
+
+                            }
+                        }).then(response => {
+                           if(response.data === 1)
+                           {
+
+                           }else{
+                               
+                           }
+                        });
+                    } else {
+
+                    }
                 });
         }
     }
diff --git a/resources/js/app.js b/resources/js/app.js
index 16b39d4..ebdb9d4 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -120,6 +120,9 @@ Vue.use(require('vue-pusher'), {
 });
 
 Vue.prototype.$api1 = 'http://localhost:8000'
+Vue.prototype.$username = document.querySelector("meta[name='user_name']").getAttribute('content');
+Vue.prototype.$userroles = document.querySelector("meta[name='user_roles']").getAttribute('content');
+
 
 let initial = 'KB2';
 let initialhostname = 'http://localhost:8000';
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index a97045e..3268026 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -13,6 +13,14 @@
     <!-- Routes -->
     @routes
 
+    {{-- Check Authentication --}}
+
+    @if (Auth::check()) 
+        <meta name="user_name" content="{{ Auth::user()->name }}" />
+        <meta name="user_roles" content="{{ Auth::user()->roles }}" />
+
+    @endif
+
     <link href="{{ asset('css/all.min.css') }}" rel="stylesheet">
     
     <!-- Scripts -->