diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index a320644..05f270e 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -96,119 +96,6 @@
 
                     <!-- Right Side Of Navbar -->
                     <ul class="navbar-nav ml-auto">
-                        
-                        @php $auth_user = Auth::user(); @endphp
-                        @if ($auth_user['role_harian'] == 'khazanah')
-                            <li class="nav-item dropdown" style="margin-right:10px;">
-                                <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
-                                    <i id="bell" class="fa fa-bell"></i>
-                                </a>
-
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                    <div id="divbiasa">
-                                        <a class="dropdown-item" href="#">
-                                            {{ __('BlaBla') }}
-                                        </a>
-                                    </div>
-                                </div>
-                            </li>
-
-                            <script>
-
-                                // Enable pusher logging - don't include this in production
-                                Pusher.logToConsole = false;
-                            
-                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                                    cluster: 'ap1',
-                                    encrypted: true
-                                });
-                            
-                                var channel = pusher.subscribe('status-liked');
-                                channel.bind('my-event', function(data) {
-                                    let message = JSON.stringify(data);
-                                    
-                                    $('#bell').css("color", "red");
-                            
-                                    const Toast = Swal.mixin({
-                                    toast: true,
-                                    position: 'top-end',
-                                    showConfirmButton: false,
-                                    timer: 5000,
-                                    timerProgressBar: true,
-                                    didOpen: (toast) => {
-                                        toast.addEventListener('mouseenter', Swal.stopTimer)
-                                        toast.addEventListener('mouseleave', Swal.resumeTimer)
-                                    }
-                                    })
-                            
-                                    Toast.fire({
-                                    icon: 'error',
-                                    title: 'Kelulusan Dipohon Sekarang!'
-                                    })
-                                });
-                            
-                                $("#navbarDropdown").click(function(){
-                                    $('#bell').css("color", "grey");
-                                });
-                            
-                            </script>
-                        @elseif($auth_user['role_harian'] == 'teller') 
-                            <li class="nav-item dropdown" style="margin-right:10px;">
-                                <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
-                                    <i id="bell" class="fa fa-bell"></i>
-                                </a>
-
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                    <div id="divbiasa">
-                                        <a class="dropdown-item" href="#">
-                                            {{ __('BlaBla') }}
-                                        </a>
-                                    </div>
-                                </div>
-                            </li>
-
-                            <script>
-
-                                // Enable pusher logging - don't include this in production
-                                Pusher.logToConsole = false;
-                            
-                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                                    cluster: 'ap1',
-                                    encrypted: true
-                                });
-                            
-                                var channel = pusher.subscribe('notifikasi-pembayaran');
-                                channel.bind('trigger-pembayaran', function(data) {
-                                    let message = JSON.stringify(data);
-                                    
-                                    $('#bell').css("color", "red");
-                            
-                                    const Toast = Swal.mixin({
-                                    toast: true,
-                                    position: 'top-end',
-                                    showConfirmButton: false,
-                                    timer: 5000,
-                                    timerProgressBar: true,
-                                    didOpen: (toast) => {
-                                        toast.addEventListener('mouseenter', Swal.stopTimer)
-                                        toast.addEventListener('mouseleave', Swal.resumeTimer)
-                                    }
-                                    });
-                            
-                                    Toast.fire({
-                                    icon: 'error',
-                                    title: 'Notifikasi Pembayaran!'
-                                    });
-
-                                });
-                            
-                                $("#navbarDropdown").click(function(){
-                                    $('#bell').css("color", "grey");
-                                });
-                            
-                            </script>
-
-                        @elseif($auth_user['roles'] == 'operasi') 
                         <li class="nav-item dropdown" style="margin-right:10px;">
                             <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                                 <i id="bell" class="fa fa-bell"></i>
@@ -217,7 +104,7 @@
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                                 <div id="divbiasa">
                                     <a class="dropdown-item" id="gadailinkz" href="#">
-                                        Tiada Data
+                                        Tiada Notifikasi
                                     </a>
                                 </div>
                             </div>
@@ -264,10 +151,7 @@
                                 $('#bell').css("color", "grey");
                             });
 
-                        </script>    
-
-                            
-                        @endif
+                        </script> 
 
 
 
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index 7b4222e..8327766 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.blade.php
@@ -8,7 +8,7 @@
 <script>
     $(document).ready(function () {
       window.print();
-      window.onfocus=function(){ window.close();}
+      // window.onfocus=function(){ window.close();}
     });
 </script>
 
@@ -23,7 +23,7 @@
     transform: rotate(-90deg);
     font-size:11px;
     margin-left: 200px; 
-    margin-top: -170px;
+    margin-top: -70px;
   }
 
   #customers {
@@ -374,6 +374,24 @@
   #formula{
     border:1px solid black;
   }
+
+  #table_wakalah{
+    border: 1px solid black;
+    width: 100%;
+    border-collapse: collapse;
+  }
+  #box_stuju {
+    background-color: white;
+    width: 20px;
+    border: 1px solid black;
+    padding: 25px;
+    margin: 50px;
+  }
+
+  hr.new2 {
+    border-top: 1px dashed black;
+  }
+
 </style>
 </head>
 
@@ -424,14 +442,8 @@
     <tr>
       <td> ALAMAT</td>
       <td>{{$customer_detail['alamat1']}} </td>
-      <td>TARIKH MATANG</td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-      </td>
+      <td>NILAI MARHUN</td>
+      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
     </tr>
     <tr>
       <td> </td>
@@ -444,18 +456,12 @@
           echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
         @endphp
       </td>
-      <td>NILAI MARHUN</td>
-      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
-    </tr>
-    <tr>
-      <td>NO TELEFON</td>
-      <td>{{$customer_detail['telefon']}} </td>
       <td>NILAI PEMBIAYAAN</td>
       <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
     </tr>
     <tr>
-      <td> </td>
-      <td> </td>
+      <td>NO TELEFON</td>
+      <td>{{$customer_detail['telefon']}} </td>
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
@@ -857,14 +863,8 @@
     <tr>
       <td> ALAMAT</td>
       <td>{{$customer_detail['alamat1']}} </td>
-      <td>TARIKH MATANG</td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-      </td>
+      <td>NILAI MARHUN</td>
+      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
     </tr>
     <tr>
       <td> </td>
@@ -877,18 +877,12 @@
           echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
         @endphp
       </td>
-      <td>NILAI MARHUN</td>
-      <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
-    </tr>
-    <tr>
-      <td>NO TELEFON</td>
-      <td>{{$customer_detail['telefon']}} </td>
       <td>NILAI PEMBIAYAAN</td>
       <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
     </tr>
     <tr>
-      <td> </td>
-      <td> </td>
+      <td>NO TELEFON</td>
+      <td>{{$customer_detail['telefon']}} </td>
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
@@ -1089,78 +1083,69 @@
       <table class="table_table" style="border: 1px solid black;">
         <thead>
           <tr>
-            <th class="table_th" colspan="2">Ujian</th>
+            <th class="table_th" colspan="3">Ujian</th>
           </tr>
         </thead>
         <tbody>
           <tr>
-            <td class="table_td">Mutu</td>
-            <td class="table_td" style="width:180px"></td>
+            <td class="table_td" colspan="2">Mutu</td>
+            <td class="table_td" style="width:50px"></td>
           </tr>
           <tr>
-            <td class="table_td">Ketumpatan</td>
-            <td class="table_td" style="width:180px"></td>
+            <td class="table_td" colspan="2">Ketumpatan</td>
+            <td class="table_td" style="width:50px"></td>
           </tr>
           <tr>
-            <td class="table_td">Peratus (%)</td>
-            <td class="table_td" style="width:180px"></td>
+            <td class="table_td" colspan="2">Peratus (%)</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Kunci/Emas</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Batu Hitam/Asid</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Digital Caliper</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Precious Metel Verifier</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Magnet</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Saya sahkan telah menyemak fizikal saiz, berat dengan teliti mengikut SOP penilai</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td">
+              @if($gadai_detail['penilai'] == '')
+                {{ $auth_username }}
+              @else
+                {{ $gadai_detail['penilai'] }}
+              @endif
+            </td>
+            <td class="table_td">Tandatangan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Saya mengesahkan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" >Pengurus Cawangan</td>
+            <td class="table_td">Tandatangan</td>
+            <td class="table_td" style="width:50px"></td>
           </tr>
         </tbody>
       </table>
     </div>
-    <br>
-    <table>
-      <tr>
-        <td>Penilai</td>
-        <td>
-          @if($gadai_detail['penilai'] == '')
-            {{ $auth_username }}
-          @else
-            {{ $gadai_detail['penilai'] }}
-          @endif
-        </td>
-      </tr>
-      <tr>
-        <td>Tarikh Gadai</td>
-        <td>
-          @php 
-            $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_gadai']);
-            $formattedweddingdate = $myDateTime->format('d-m-Y');
-            echo($formattedweddingdate)
-          @endphp
-        </td>
-      </tr>
-      <tr>
-        <td>Tarikh Matang</td>
-        <td>
-          @php 
-            $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
-            $formattedweddingdate = $myDateTime->format('d-m-Y');
-            echo($formattedweddingdate)
-          @endphp
-        </td>
-      </tr>
-    </table>
-    <br>
-    <p>Nota</p>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
-    <br>
   </div>
   <div class='page-break'>  </div>
   <div class='page-break'>  </div>