diff --git a/app/models/ability.rb b/app/models/ability.rb
index 64f783bd..5b74c312 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -204,6 +204,7 @@ class Ability
         can :item_edit, :sale_edit
 
         can :overall_void, :void
+        can :manage, Sale
 
     elsif user.role == "account"
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 4f007b88..c2317ce5 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -67,6 +67,8 @@ class Customer < ApplicationRecord
                                 'Accept'       => 'application/json; version=3'
                               },
                             :timeout => 10)
+      rescue Errno::ECONNREFUSED
+        response = {status: false, message: "Can't open membership server " }
       rescue HTTParty::Error
         response = {status: false, message: "Server Error"}
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 3c02111e..e7c89f5a 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -649,7 +649,7 @@ class SalePayment < ApplicationRecord
 
       sale.sale_status = "completed"
 
-      if MembershipSetting.find_by_rebate(1) && is_foc == 0 && is_credit == 0
+      if MembershipSetting.find_by_rebate(1) && !is_foc && !is_credit
         response = rebat(sale)
 
          #record an payment in sale-audit
diff --git a/app/views/foodcourt/orders/app_orders.html.erb b/app/views/foodcourt/orders/app_orders.html.erb
index a202958c..5ad4af5d 100644
--- a/app/views/foodcourt/orders/app_orders.html.erb
+++ b/app/views/foodcourt/orders/app_orders.html.erb
@@ -188,38 +188,6 @@
       </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="password" 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>
 <script type="text/javascript">
   $('#back').on('click', function () {
diff --git a/app/views/layouts/_foodcourt_left_sidebar.html.erb b/app/views/layouts/_foodcourt_left_sidebar.html.erb
index 520a3251..e2e728c6 100644
--- a/app/views/layouts/_foodcourt_left_sidebar.html.erb
+++ b/app/views/layouts/_foodcourt_left_sidebar.html.erb
@@ -27,6 +27,9 @@
 			    <span><%= t :transactions %></span>
 			  </a>
 			  <ul class="ml-menu">
+						<li>
+							<a href="<%= transactions_sales_path %>"><%= t :sale %></a>
+						</li>
 			      <li>
 			        <a href="<%= transactions_bookings_path %>"><%= t :bookings %></a>
 			      </li>
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index 0af7b124..f5a92317 100644
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -83,7 +83,6 @@
                 <th><%= t("views.right_panel.detail.grand_total") %></th>
                 <th><%= t :cashier %></th>
                 <th><%= t("views.right_panel.detail.sales_status") %></th>
-                <th><%= t("views.right_panel.detail.remark") %></th>
                 <th><%= t("views.right_panel.detail.receipt_date") %></th>
               </tr>
             </thead>
@@ -109,15 +108,6 @@
                       <td><%= sale.grand_total rescue '-' %></td>
                       <td><%= sale.cashier_name rescue '-' %></td>
                       <td> <%= sale.sale_status %> </td>
-                      <td>
-                        <% if !@sale_audits.nil? %>
-                          <% @sale_audits.each do |audit| %>
-                            <%if audit.include?(sale.sale_id) %>
-                              <%= audit[sale.sale_id] %>
-                            <% end %>
-                          <% end %>
-                        <% end %>
-                      </td>
                       <td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
                     </tr>
                   <% end %>
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 2bff2018..114395d6 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -1,4 +1,6 @@
 <% breadcrumb_add t('sale'), transactions_sales_path, transactions_sales_path, t('details') %>
+<% if can? :menage, Inventory %>
+<% end %>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12">
   <!-- Column One -->
@@ -37,6 +39,10 @@
                     <th>
                       <div class="form-group">
                         <button type="button" class="btn btn-block bg-red waves-effect col-md-5" style="margin-top: 8px;" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
+                  <% else %>
+                    <th>
+                      <div class="form-group">
+                        <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="void" <%= (can? :overall_void, :void)? ' ': 'disabled=' %>> Void</a>
                   <% end %>
                 <% end %>
                 <% if @sale.sale_status == "new" %>
@@ -271,7 +277,38 @@
     </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="password" 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>
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 <span class="hidden" id="member_discount"><%= @membership.discount%></span>
 <span class="hidden" id="membership_id"><%= @sale.customer.membership_id rescue 0%></span>
@@ -445,4 +482,61 @@
     var sale_id = "<%= @sale.sale_id %>";
     window.location = '/origami/sale/'+sale_id+'/transaction/payment';
   });
+  $(document).on('click', '.access_modal', function(event){
+       type = $(this).data("type");
+       $(".ok").attr("data-action",type);
+       $('#AccessCodeModal').modal('show');
+     });
+
+  $(document).on('click', '.access_number', function(event){
+       if(event.handled !== true) {
+         var original_value = $('#access_code').val();
+         var input_type = $(this).attr("data-type");
+
+         switch (input_type) {
+             case 'num':
+               var input_value = $(this).attr("data-value");
+               if (original_value){
+                 $('#access_code').val(original_value + input_value);
+               }else{
+                 $('#access_code').val(original_value + input_value);
+               }
+               break;
+             case 'ok':
+               var type = $(this).attr("data-action");
+               code = $('#access_code').val();
+               check_emp_access_code(code,type)
+               break;
+             case 'clr':
+               $('#access_code').val("");
+               break;
+         }
+         event.handled = true;
+       } else {
+           return false;
+       }
+     });
+
+  function createAccessCode(code) {
+  localStorage.setItem("access_code",code);
+  }
+  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) {
+            if (result.status == true) {
+             createAccessCode(code);
+             if(type == "void"){
+                $('#AccessCodeModal').modal('hide');
+                $('#voidModal').modal('show');
+              }
+            }else{
+              swal("Oops",result.message,"warning");
+            }
+         }
+     });
+  }
 </script>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 08464b45..b8f11cb4 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -64,3 +64,4 @@ Rails.application.config.assets.precompile += %w( reservation.js )
 Rails.application.config.assets.precompile += %w( custom.js )
 
 Rails.application.config.assets.precompile += %w( foodcourt.js )
+Rails.application.config.assets.precompile += %w( foodcourt.css )