diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index fe074210..63549c23 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -126,7 +126,7 @@ class Origami::HomeController < BaseOrigamiController
     lookup_edit_order = Lookup.collection_of('edit_order')
     if !lookup_edit_order.empty?
       lookup_edit_order.each do |edit_order|
-        if edit_order[0].downcase == "editorderorigami" 
+        if edit_order[0].downcase == "editorderorigami"
           if edit_order[1] == '0' && (current_login_employee.role == 'cashier' || current_login_employee.role == 'waiter')
             @edit_order_origami = false
           end
@@ -139,14 +139,14 @@ class Origami::HomeController < BaseOrigamiController
     lookup_changable_tax = Lookup.collection_of('changable_tax')
     if !lookup_changable_tax.empty?
       lookup_changable_tax.each do |changable_tax|
-        if changable_tax[0].downcase == "change" 
-          if changable_tax[1] == '0' 
+        if changable_tax[0].downcase == "change"
+          if changable_tax[1] == '0'
             @changable_tax = false
           end
         end
       end
     end
-    
+
   end
 
 def check_emp_access_code
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index fee19a31..e0d4fc85 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -3,7 +3,7 @@ require 'cups'
 
 class Printer::PrinterWorker
   attr_accessor :print_settings
-  
+
   def initialize(print_settings)
    self.print_settings = print_settings
   end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index e8074fe2..cfa1df70 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -57,14 +57,14 @@
             <!--- Panel 1 - Table Orders -->
             <div class="tab-pane dining active " id="tables" role="tabpanel">
               <div class="card-columns">
-                <% @tables.each do |table| %>  
+                <% @tables.each do |table| %>
                   <% if table.status == 'occupied' %>
                     <% if table.get_booking.nil? %>
                       <% if table.get_checkout_booking.nil? %>
                         <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                      <% else %>                            
+                      <% else %>
                         <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                      <% end %>                         
+                      <% end %>
                           <div class="card-block">
                             <%= table.name %> <br>
                             <%= table.zone.name %>
@@ -72,12 +72,12 @@
                             <div style="font-size:12px;"></div>
                           </div>
                         </div>
-                    <% else %>         
+                    <% else %>
                       <% if table.get_checkout_booking.nil? %>
                         <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                      <% else %>                       
+                      <% else %>
                         <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                      <% end %>                   
+                      <% end %>
                             <div class="card-block">
                             <%= table.name %> <br>
                             <%= table.zone.name %>
@@ -111,7 +111,7 @@
                       <% end %>
                           <div class="card-block">
                             <%= room.name %> <br>
-                            <%= room.zone.name %> 
+                            <%= room.zone.name %>
                             <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                           </div>
                         </div>
@@ -123,7 +123,7 @@
                       <% end %>
                           <div class="card-block">
                             <%= room.name %> <br>
-                            <%= room.zone.name %> 
+                            <%= room.zone.name %>
                             <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                           </div>
                         </div>
@@ -132,8 +132,8 @@
                       <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
                         <div class="card-block">
                           <%= room.name %> <br>
-                          <%= room.zone.name %> 
-                          <span class="float-right font-12 new_text_<%= room.id %> hide"> 
+                          <%= room.zone.name %>
+                          <span class="float-right font-12 new_text_<%= room.id %> hide">
                         </div>
                       </div>
                     <% end %>
@@ -160,8 +160,8 @@
                         <% else %>
                           <% order_status = order.status %>
                         <% end %>
-                        <%= order.order_id %> 
-                        <% if !order_status.empty? %>| <%= order_status %> 
+                        <%= order.order_id %>
+                        <% if !order_status.empty? %>| <%= order_status %>
                         <% end %>
                       </div>
                     </div>
@@ -193,7 +193,7 @@
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
                         <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>
@@ -245,7 +245,7 @@
               <% else %>
                     <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
               <% end %>
-            </div> 
+            </div>
             <div class="card-block">
               <div class="card-title">
                 <div class="row p-l-5 p-r-5">
@@ -335,8 +335,8 @@
                                 <% end %>
 
                                 <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
-                                  JSON.parse(order_item.set_menu_items).each do |item_instance| 
-                                    set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %> 
+                                  JSON.parse(order_item.set_menu_items).each do |item_instance|
+                                    set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %>
                                     <br>
                                     <span class="font-13">
                                       <%= item_instance["item_instance_name"] %>
@@ -345,17 +345,17 @@
                                              <br><span class="font-13"> <%= set_item_option %></span>
                                           <% end %>
                                       <% end %>
-                                    </span> 
-                                  <% end 
+                                    </span>
+                                  <% end
                                   sub_total += set_item_prices
                                 end %>
                               </td>
                               <td class='item-attr'><%= order_item.qty %></td>
                               <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
-                            </tr>                              
+                            </tr>
                           <%  end %>
                         <%  end %>
-                       <%  end %>                              
+                       <%  end %>
                   </tbody>
                 </table>
               </div>
@@ -431,10 +431,10 @@
                                 <% end %>
                               <% end %>
 
-                              <% if !order_item.set_menu_items.nil?  
-                                JSON.parse(order_item.set_menu_items).each do |item_instance| 
+                              <% if !order_item.set_menu_items.nil?
+                                JSON.parse(order_item.set_menu_items).each do |item_instance|
                                   set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
-                                %> 
+                                %>
                                 <br><span class="font-13">
                                   <%= item_instance["item_instance_name"] %>
                                     <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
@@ -444,8 +444,8 @@
                                         </span>
                                       <% end %>
                                     <% end %>
-                                  </span> 
-                              <% end 
+                                  </span>
+                              <% end
                               sub_total += set_item_prices
                               end %>
                             </td>
@@ -456,7 +456,7 @@
                           end
                         %>
                       </table> -->
-                      
+
                      <!--  <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice</button> -->
                   <% end %>
                   <% if @sale_array.size > 1 %>
@@ -496,7 +496,7 @@
         <!--   <a href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect" style="height: 45px">Customer View</a> -->
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
-          <% if @dining.status != "available" %> 
+          <% if @dining.status != "available" %>
               <% if @status_order == 'order' && @status_sale != 'sale' %>
                   <%if !@order_items.empty? %>
                     <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
@@ -526,7 +526,7 @@
                   <!-- <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> -->
                   <% 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="edit">Edit</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 btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
@@ -535,9 +535,9 @@
                 <% end %>
                 <% if current_login_employee.role != "waiter" %>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
-                <% end %>  
+                <% end %>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
-                
+
                   <% if !@split_bill.nil? %>
                     <% if @split_bill == '1' && (!(@order_items.nil?) || !(@order_items.empty?)) %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
@@ -545,19 +545,19 @@
                   <% end %>
                 <% if current_login_employee.role != "waiter" %>
                    <!-- first bill not used in cloud -->
-                 
+
                     <%if @membership.discount && @obj_sale.customer.membership_id %>
                       <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal" data-order="<%= existing_order %>">First Bill</button>
                     <%else%>
                       <button type="button" id="first_bill" data-order="<%= existing_order %>" class="btn btn-block bg-blue waves-effect">First Bill</button>
-                    <%end%> 
-                 
+                    <%end%>
+
                   <button type="button" id="pay" data-order="<%= existing_order %>" class="btn btn-block bg-blue waves-effect">Pay</button>
 
                   <!-- <button type="button" id="kbz_query" data-order="<%= existing_order %>" class="btn btn-block bg-blue waves-effect">KBZ Query</button> -->
 
                   <!--<% if current_login_employee.role != "waiter" %>
-                   <button type="button" class="btn action-btn bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button> 
+                   <button type="button" class="btn action-btn bg-blue waves-effect" data-toggle="modal" data-target="#waste_spoileModal" > Waste & Spoile</button>
                   <% end %>-->
               <% end %>
             <% end %>
@@ -583,7 +583,7 @@
                       <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
                         <button class='btn btn-md waves-effect btn-link payment-btn-box payment_btn bg-green' data-type='Credit' data-value='Credit'>Credit</button>
                       </div>
-                    
+
                       <% @payment_methods.each_with_index do |pay, pay_index| %>
                         <%if (pay_index+1)%3 == 0 %>
                           <div class="row clearfix"></div>
@@ -625,7 +625,7 @@
             <button type="button" class="btn btn-link bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
-        
+
       </div>
     </div>
   </div>
@@ -638,7 +638,7 @@
       <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"> 
+      <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>
@@ -657,7 +657,7 @@
              <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>
@@ -690,7 +690,7 @@
                   count += 1 %>
 
                   <tr class="<%= @edit_order_origami==true ? 'edit_order' : '' %>" data-id='<%= order_item.order_items_id %>'>
-                    <td><%= count %></td> 
+                    <td><%= count %></td>
                     <td class='item-name'>
                         <%= order_item.item_name %>
                         <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
@@ -701,10 +701,10 @@
                       <% end %>
                       <% end %>
 
-                      <% if !order_item.set_menu_items.nil?  
-                        JSON.parse(order_item.set_menu_items).each do |item_instance| 
+                      <% if !order_item.set_menu_items.nil?
+                        JSON.parse(order_item.set_menu_items).each do |item_instance|
                           set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
-                          %> 
+                          %>
                           <br><span class="font-13">
                           <%= item_instance["item_instance_name"] %>
                           <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
@@ -714,8 +714,8 @@
                         </span>
                         <% end %>
                         <% end %>
-                      </span> 
-                      <% end 
+                      </span>
+                      <% end
                       sub_total += set_item_prices
                       end %>
                     </td>
@@ -823,7 +823,7 @@
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
           receipt_no = ($("#receipt_no").html()).trim();
         }
-        
+
         discount="<%= @membership.discount%>"
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           if (discount) {
@@ -887,7 +887,7 @@
             } else {
                 var sale_id = "<%= @dining.id %>";
             }
-            //var table_id = $('.tables').attr("data-id");            
+            //var table_id = $('.tables').attr("data-id");
             window.location.href = '/origami/' + sale_id +"/"+cashier_type+ "/surveys"
         });
 
@@ -989,22 +989,22 @@
               }
             location.reload();
             }
-          }); 
+          });
         }
-      });          
+      });
     });
 
-    // click select option icon for add 
-    $(document).on('click', '.payment_btn', function(event){ 
+    // click select option icon for add
+    $(document).on('click', '.payment_btn', function(event){
       active     = $(this).hasClass('selected-payment');
       value      = $(this).data('value');
       type       = $(this).data('type');
       group      = $(this).data('group');
       payments    = $(".payment_btn");
 
-      if (active) {      
+      if (active) {
         $(this).removeClass('selected-payment');
-      }else{      
+      }else{
         $(this).addClass('selected-payment');
       }
     }); //End selecct attribute buttom
@@ -1026,7 +1026,7 @@
               if(!location.pathname.includes("credit_payment")){
                 calculate_member_discount(sale_id,"Cash",tax_type);
               }
-            }         
+            }
           }
           var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
           $.ajax({
@@ -1045,7 +1045,7 @@
                   }
                   location.reload();
               }
-          });  
+          });
     });
 
     function calculate_member_discount(sale_id,type,tax_type) {
@@ -1060,10 +1060,10 @@
           url: "/origami/" + sale_id + "/member_discount",
           data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':'cashier','tax_type':tax_type },
           async: false,
-          success:function(result){ 
+          success:function(result){
           }
         });
-      
+
     }
 
     $('#pay').on('click', function () {
@@ -1137,11 +1137,11 @@
                     }
                   });
                 }
-                else {              
+                else {
                   location.reload();
                 }
             }
-        }); 
+        });
       }else{
         swal("Opps","There is no orders!","warning");
       }
@@ -1151,7 +1151,7 @@
     $('#split_bills').click(function(){
       var dining_id = "<%= @dining.id %>";
       window.location.href = '/origami/table/' + dining_id + "/" + cashier_type +"/split_bills";
-    });    
+    });
 
     $('#move').on('click', function () {
       if($('#move').is(":visible")) {
@@ -1236,7 +1236,7 @@
         }else{
           swal("Opps","You are not authorized for void","warning")
         }
-       
+
     });
 
     $('#commissions').on('click', function () {
@@ -1285,7 +1285,7 @@
                 }
             });
           }
-        }); 
+        });
       }else{
         swal("Opps","You are not authorized for void","warning")
       }
@@ -1303,7 +1303,7 @@
         window.location.href = '/origami/addorders/' + dining_id;
     });
 
-    /* check in process */    
+    /* check in process */
     $('#check_in').on('click',function(){
       var dining_id = "<%= @dining.id %>";
 
@@ -1394,7 +1394,7 @@
                 }
             });
           }
-        }); 
+        });
     }
 
   function check_emp_access_code(access_code,type) {
@@ -1460,11 +1460,11 @@
           type: "POST",
           url: "/origami/payment/"+cashier_type+"/change_tax",
           data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: tax_type},
-          success:function(data){ 
+          success:function(data){
             if(data.status){
               localStorage.setItem("tax_type", tax_type);
               window.location.href = '/origami/table/'+dining_id;
-            } 
+            }
           }
         });
       }else{