diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 100635cd..a9820011 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -18,9 +18,6 @@ class Origami::AddordersController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-    
-  	today = DateTime.now
-    day = Date.today.wday
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     @table_id = params[:id]
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 5f451408..241fe79c 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -43,46 +43,46 @@
             <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
           </li>
           <% @menu.each do |menu| %>
-          <% if !menu.valid_time.nil? %>
-          <% if menu.menu_category_id.nil? %>
-          <!--if type quick_service or cashier for table -->
-          <% if type %>
-          <% if !menu.code.include? "SPL" %>
-          <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
-            <p class="hidden menu-id"><%= menu.id  %></p> 
-            <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-             <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
-             </ul>
-           </a>
-         </li>
-         <% end%>
-         <!-- else quick_service or cashier for table -->
-         <% else %>
-         <% if @table.get_current_checkout_booking.nil? %>
-         <% if !menu.code.include? "SPL" %>
-         <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%> " data-sub-id="<%=menu.get_sub_category%>">
-          <p class="hidden menu-id"><%= menu.id  %></p> 
-          <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-           </ul>
-         </a>
-       </li>
-       <% end%>
-       <% else %>
-       <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
-        <p class="hidden menu-id"><%= menu.id  %></p> 
-        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-         <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-         </ul>
-       </a>
-     </li>
-     <% end%>
-     <!-- end quick_service or cashier for table -->
-     <% end %>
-     <% end%>
-     <% end %>
-     <%end %>
-   </ul>
+            <% if !menu.valid_time.nil? %>
+              <% if menu.menu_category_id.nil? %>
+              <!--if type quick_service or cashier for table -->
+                <% if type %>
+                  <% if !menu.code.include? "SPL" %>
+                    <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
+                      <p class="hidden menu-id"><%= menu.id  %></p> 
+                      <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                       <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                       </ul>
+                     </a>
+                   </li>
+                  <% end%>
+                <!-- else quick_service or cashier for table -->
+                <% else %>
+                  <% if @table.get_current_checkout_booking.nil? %>
+                    <% if !menu.code.include? "SPL" %>
+                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%> " data-sub-id="<%=menu.get_sub_category%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                         <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                         </ul>
+                        </a>
+                      </li>
+                    <% end%>
+                  <% else %>
+                    <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
+                      <p class="hidden menu-id"><%= menu.id  %></p> 
+                      <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                       <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                       </ul>
+                     </a>
+                    </li>
+                  <% end%>
+                  <!-- end quick_service or cashier for table -->
+                <% end %>
+              <% end%>
+            <% end %>
+          <%end %>
+      </ul>
  </div>
 </div>
 
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 0eaabce1..d5c47376 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -198,13 +198,74 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
-   <% if @sale.sale_status != 'void' %>
-       <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
-   <% end %>
+  <% if @sale.sale_status != 'void' %>
+     <% if current_login_employee.role == "cashier" %>
+        <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+     <% else %>      
+           <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>      
+     <% end %>
+   <% end %> 
    <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
  </div>
 </div>
 </div>
+
+<div class="modal fade" id="AccessCodeModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-sm" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="AccessCodeModalLabel">Enter Access Code</h4>
+      <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#111;">&times;</button>
+      </div>
+      <div class="modal-body" style="padding: 0px 25px 15px 25px !important"> 
+         <input type="text" id="access_code" class="access_code form-control col-md-12 ">
+        <div class="row bottom p-l-15 p-r-15 m-t-10">
+             <div class="col-md-3 access_number border-top border-left" data-value="1" data-type="num">1</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="2" data-type="num">2</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="3" data-type="num">3</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="4" data-type="num">4</div>
+           </div>
+           <div class="row bottom p-l-15 p-r-15">
+             <div class="col-md-3 access_number border-top border-left" data-value="5" data-type="num">5</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="6" data-type="num">6</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="7" data-type="num">7</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="8" data-type="num">8</div>
+           </div>
+           <div class="row bottom p-l-15 p-r-15">
+             <div class="col-md-3 access_number border-top border-left" data-value="9" data-type="num">9</div>
+             <div class="col-md-3 access_number border-top border-left" data-value="0" data-type="num">0</div>
+             <div class="col-md-3 access_number border-top border-left orange" data-type="clr">Clr</div>
+             <div class="col-md-3 access_number ok border-top border-left blue" data-type="ok" data-action="">OK</div>
+              
+           </div>
+      </div>
+    </div>
+  </div>
+</div> 
+
+<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <h4 class="modal-title" id="voidModalLabel">Please Enter Reason for Void</h4>
+      </div>
+      <div class="modal-body">
+         <input type="textarea" name="remark" class="form-control col-md-12 remark" id="remark">
+      </div>
+      <div class="modal-footer ">
+        <div class="row p-r-20">
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-red waves-effect " id="void" active="true">VOID</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
 <script>
 $(document).ready(function(){
   $(".tables").on('click', function(){
@@ -247,7 +308,14 @@ $('#back').on('click',function(){
 //           // });
 //       }
 //   });
+
+$(document).on('click', '.access_modal', function(event){
+      type = $(this).data("type");
+      $(".ok").attr("data-action",type)
+      $('#AccessCodeModal').modal('show');
+  });
  $('#void').on('click', function () {
+  var access_code  = localStorage.getItem("access_code");
         swal({
             title: "Alert",
             text: "Are you sure want to Void?",
@@ -259,10 +327,12 @@ $('#back').on('click',function(){
         }, function (isConfirm) {
           if (isConfirm) {
             var sale_id = $('#sale_id').val();
-            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            var ajax_url = "/origami/sale/" + sale_id +'/'+'cashier'+ '/void';
+            // var ajax_url = "/origami/sale/" + sale_id + '/void';
             $.ajax({
                 type: 'POST',
                 url: ajax_url,
+                data: {'access_code':access_code},
                 success: function () {
                     window.location.href = '/origami/sale/'+sale_id;
                 }
@@ -271,6 +341,48 @@ $('#back').on('click',function(){
         });
     });
 
+ function check_emp_access_code(access_code,type) {
+      var url = "/origami/check_emp_access_code/" + access_code ;
+      $.ajax({
+          type: 'POST',
+          url: url,
+          data: {},
+          success: function (result) {
+            console.log(result)
+             if (result.status == true) {
+              createAccessCode(code);
+               if (type == "edit") {
+                  var dining_id = $('#dining').text();
+                  var sale_id = $('#sale_id').text();
+                  if (dining_id) {
+                    window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
+                  }else{
+                    window.location.href = "/origami/table/sale/" + sale_id + "/"+cashier_type+"/edit";
+                  }
+               }else if(type == "void"){
+                 $('#AccessCodeModal').modal('hide');
+                 $('#voidModal').modal('show');
+                 // overall_void();
+               }else if(type == "waste") {
+                 // $('#AccessCodeModal').modal('hide');
+                 // $('#focModal').modal('show');
+                  waste_and_spoilage("waste")
+               }else if(type == "spoile") {
+                 // $('#AccessCodeModal').modal('hide');
+                 // $('#voidModal').modal('show');
+                  waste_and_spoilage("spoile")
+               }else if(type == "foc"){
+                 $('#AccessCodeModal').modal('hide');
+                 $('#focModal').modal('show');
+                 // overall_foc();
+               }
+             }else{
+               swal("Opps",result.message,"warning")
+             }
+          }
+      });
+  }
+
 $('#re-print').click(function() {
     var sale_id = $('#sale_id').val();
     window.location.href = '/origami/'+ sale_id  + "/reprint"