diff --git a/app/models/customer.rb b/app/models/customer.rb
index 949093ea..fcdd7f31 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -143,7 +143,7 @@ class Customer < ApplicationRecord
   def self.update_rebate
     sales    = Sale.where("rebate_status = 'false'")
     sales.each do |sale|
-      if sale.customer.membership_id
+      if sale.customer.membership_id        
           response = self.rebat(Sale.find(sale.sale_id))
            #record an payment in sale-audit
            if !response.nil?
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 1f387be9..8440f354 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -407,8 +407,9 @@
               <% end %>
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
-                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
-                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" active="<%= can? :index, :discount %>">Discount</button>
+                  <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" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
 
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
@@ -424,7 +425,7 @@
                     <%end%> 
                   <% end %> 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
-                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
+                  
               <% end %>
               <!-- Cashier Buttons -->
 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index c6c749cd..385129bf 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -380,8 +380,9 @@
     <% if @status_sale == 'sale' %>
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
-        <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
-        <button type="button" id="discount" class="btn bg-blue btn-block" active="<%= can? :index, :discount %>" >Discount</button>
+        <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" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
@@ -397,7 +398,7 @@
          <%end%>
          <%end%>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
-        <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
+       <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
      <% end %>
             <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
            <span class="hidden" id="member_discount"><%= @membership.discount%></span>