diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index a9820011..15d896e6 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -20,6 +20,7 @@ class Origami::AddordersController < BaseOrigamiController
     end
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+    
     @table_id = params[:id]
     @table = DiningFacility.find(@table_id)
     @booking = @table.get_booking
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 1c5b5430..0b3b989d 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -5,8 +5,10 @@ class Origami::SaleEditController < BaseOrigamiController
     sale_id     = params[:sale_id]
     if params[:table_id]
       @table_id   = params[:table_id]
+      @table_type = DiningFacility.find(@table_id).type
     else
       @table_id = nil
+      @table_type = nil
     end
     
     @cashier_type = params[:type]
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index a3e26d8d..8fa42403 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1116,7 +1116,7 @@
              if (result.status == true) {
               createAccessCode(code);
                if (type == "edit") {
-                var dining_id = "<%= @dining.id %>";
+                var dining_id = "<%= @dining.id rescue "" %> ";
                   var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
                   window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
                }else if(type == "void"){
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index bf01647e..fb3d9a75 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -452,8 +452,13 @@
         <% if current_login_employee.role != "waiter" %>
           <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
           <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+          <% if current_login_employee.role == "cashier" %>
+          <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"   data-type="edit">Edit</a> 
+          <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+          <% else %>
           <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
-          <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>  active="true"> Void</button>
+          <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
+          <% end %>
           <!-- <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button> -->
         <% end %>
         <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
@@ -539,6 +544,39 @@
   </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>
+
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
@@ -938,7 +976,7 @@ $('#add_invoice').on('click',function(){
   $('#edit').on('click',function(){
     var dining_id = "<%= @room.id %>"
     var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
-    window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit";
+    window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/cashier/edit";
   });
 
   $('#void').on('click',function () {
@@ -1042,4 +1080,34 @@ $('#add_invoice').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 = "<%= @room.id rescue ""%>";
+                  var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+                  window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/cashier/edit";
+               }else if(type == "void"){
+                 $('#AccessCodeModal').modal('hide');
+                 $('#voidModal').modal('show');
+
+                 // overall_void();
+               }else if(type == "waste_and_spoilage"){
+
+               }
+             }else{
+               swal("Opps",result.message,"warning")
+             }
+          }
+      });
+  }
+
 </script>
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index fc19f909..5bd0d068 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -166,8 +166,14 @@
     <%end%> 
   <% end %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
-   <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
+
+   <% if current_login_employee.role == "cashier" %>
+    <a class="btn btn-block bg-deep-purple waves-effect access_modal" data-toggle="modal"  data-type="foc"> FOC</a>
+    <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+  <% else %>
+     <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
    <button type="button" data-toggle="modal" data-target="#voidModal" class="btn bg-danger btn-block" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
+  <% end %> 
  </div>
 </div>
 </div>
@@ -251,6 +257,39 @@
     </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>
 <script>
 $(document).ready(function(){
   /* start check first bill or not*/
@@ -369,6 +408,7 @@ $('#back').on('click',function(){
 });
 
 $('#void').on('click',function () {
+  var access_code  = localStorage.getItem("access_code");
     if ($(this).attr('active')=== "true") {
       swal({
           title: "Alert",
@@ -386,7 +426,7 @@ $('#void').on('click',function () {
           $.ajax({
               type: 'POST',
               url: ajax_url,
-              data: "remark="+ remark + "&sale_id=" + sale_id,
+              data: "remark="+ remark + "&sale_id=" + sale_id + "&access_code=" + access_code ,
               success: function () {
                   window.location.href = '/origami';
               }
@@ -399,6 +439,7 @@ $('#void').on('click',function () {
 });
 
 $('#foc').click(function() {
+  var access_code  = localStorage.getItem("access_code");
   var remark  = $("#foc_remark").val();
   var cash = $('#grand_total').text();
   var sub_total = $('#sub_total').text();
@@ -406,7 +447,7 @@ $('#foc').click(function() {
   if($('.receipt_block > div').hasClass('selected-item')){
     sale_id = $('.receipt_block > div.selected-item').parent().attr('data-id');
   }
-  var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark,'type':'cashier' };
+  var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark,'type':'cashier','access_code':access_code };
   // console.log(sale_id);
   if(sale_id != ''){
     if ($(this).attr('active')=== "true") {  
@@ -430,4 +471,45 @@ $('#foc').click(function() {
     }
   }
 });
+$(document).on('click', '.access_modal', function(event){
+      type = $(this).data("type");
+      $(".ok").attr("data-action",type)
+      $('#AccessCodeModal').modal('show');
+  });
+
+  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") {
+                  
+               }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")
+             }
+          }
+      });
+  }
 </script>