diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 359df149..9ee77b99 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -457,7 +457,7 @@
           <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" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > 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 %>
@@ -519,6 +519,29 @@
 </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 bg-red waves-effect " id="void" active="true">VOID</button>
+          </div>
+          <div class="col-md-5">
+            <button type="button" class="btn btn-link bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
 <div class="modal fade" id="waste_spoileModal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -979,22 +1002,58 @@ $('#add_invoice').on('click',function(){
     window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/cashier/edit";
   });
 
-  $('#void').on('click',function () {
-      var sure = confirm("Are you sure want to Void");
-      if (sure == true) {
-          var sale_id = $('#sale_id').val();
-          var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
-          $.ajax({
-              type: 'POST',
-              url: ajax_url,
-              success: function () {
-                  window.location.href = '/origami/';
-              }
-          })
-      } else {
+  // $('#void').on('click',function () {
+  //     var sure = confirm("Are you sure want to Void");
+  //     if (sure == true) {
+  //         var sale_id = $('#sale_id').val();
+  //         var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
+  //         $.ajax({
+  //             type: 'POST',
+  //             url: ajax_url,
+  //             success: function () {
+  //                 window.location.href = '/origami/';
+  //             }
+  //         })
+  //     } else {
 
+  //     }
+  // });
+
+  $('#void').on('click', function () {
+       var access_code  = localStorage.getItem("access_code");
+      if ($(this).attr('active')=== "true") {
+        swal({
+            title: "Alert",
+            text: "Are you sure want to Void?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, void it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var sale_id = $('#sale_id').val();
+            var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
+            var remark  = $("#remark").val();
+
+            $.ajax({
+                type: 'POST',
+                url: ajax_url,
+                data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
+                success: function (result) {
+                   // For Server Print - from jade
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                }
+                window.location.href = '/origami/';
+                }
+            });
+          }
+        }); 
+      }else{
+        swal("Opps","You are not authorized for void","warning")
       }
-  });
+    });
 
   $('#commissions').on('click', function () {
         var dining_id = "<%= @room.id %>"
@@ -1081,6 +1140,12 @@ $('#add_invoice').on('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({