diff --git a/app/controllers/foodcourt/food_court_controller.rb b/app/controllers/foodcourt/food_court_controller.rb
index 10c4686f..240777a0 100644
--- a/app/controllers/foodcourt/food_court_controller.rb
+++ b/app/controllers/foodcourt/food_court_controller.rb
@@ -17,6 +17,9 @@ class Foodcourt::FoodCourtController < ApplicationController
       end
     end
 
+    @zone     = Zone.all
+    @tables   = Table.active.order('status desc')
+    @rooms    = Room.active.order('status desc')
 
     today = DateTime.now
     day = Date.today.wday
diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb
index 1a07c3b4..d695a106 100644
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -13,6 +13,7 @@
   <input type="hidden" name="link_type" id="link_type" value="<%= @cashier_type %>">
   <input type="hidden" name="display_type" id="display_type" value="<%= @display_type%>">
   <input type="hidden" name="order_id" id="order_id" value= "<%= @order_id %>">
+  <input type="hidden" name="table_id" value="" id="table_id">
   <div class="row m-t--10 h-100">
     <div class="col-lg-2 col-md-2 col-sm-2 hidden d-flex flex-column h-100" id="menu_data">
       <li class="list-menu">
@@ -161,9 +162,12 @@
           <div class="col-md-3 col-lg-3 col-sm-3 m-t-10 d-flex flex-column h-100">
             <div class="card h-100"  style="margin-right: -20px; margin-bottom: 10px;">
               <div class="card-header" style="padding: 0.12rem 0.25rem">
-                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-12" id='app_order'>
+
+                <button type="button" class="btn btn-lg btn-primary waves-effect col-md-8" id='app_order'>
                   Orders
                 </button>
+                <button class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal">Select</button>
+                
                 <div class="row ">
                 <div class="col-md-9 col-lg-9 col-sm-9 ">
                   <strong id="order-title" class="font-14 p-l-10">ORDER DETAILS </strong>
@@ -433,6 +437,82 @@
       </div>
     </div>
   </div>
+
+          <div class="modal fade" id="TableModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                <div class="modal-header" style="margin-top: -1rem;">
+                  <!-- <h4 class="modal-title" id="TableModalLabel">Select Table</h4> -->
+                  <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;">&times;</button>
+                </div>
+                <div class="modal-body" style="margin-top: -0.75rem;padding-top:5px">
+                  <%@zone.each do |zone| %>
+                  <h5>Zone : <%=zone.name%></h5>
+                  <div class="card-columns" style="column-count: 7;">
+                    <%zone.tables.each do |table| %>
+                    <% if table.status == 'occupied' %>
+                    <% if table.get_booking.nil? %>
+                    <% if table.get_checkout_booking.nil? %>
+                    <%  color="red"%>
+                    <% else %>
+                    <%  color="orange"%>
+                    <% end %>
+
+                    <% else %>
+                    <% if table.get_checkout_booking.nil? %>
+                    <%  color="blue"%>
+                    <% else %>
+                    <%  color="orange"%>
+                    <% end %>
+                    <% end %>
+                    <% else %>
+                    <%  color="green"%>
+                    <% end %>
+                    <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
+                      <div class="card-block">
+                        <%= table.name %>
+                      </div>
+                    </div>
+                    <%end%>
+
+                    <%zone.rooms.each do |table| %>
+                    <% if table.status == 'occupied' %>
+                    <% if table.get_booking.nil? %>
+                    <% if table.get_checkout_booking.nil? %>
+                    <%  color="red"%>
+                    <% else %>
+                    <%  color="orange"%>
+                    <% end %>
+                    <% else %>
+                    <% if table.get_checkout_booking.nil? %>
+                    <%  color="blue"%>
+                    <% else %>
+                    <%  color="orange"%>
+                    <% end %>
+                    <% end %>
+                    <% else %>
+                    <%  color="green"%>
+                    <% end %>
+                    <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
+                      <div class="card-block">
+                        <%= table.name %>
+                      </div>
+                    </div>
+                    <%end%>
+                  </div>
+                  <%end%>
+                  <div class="modal-footer  p-r-30">
+                    <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                    &nbsp;  &nbsp;
+                    <button type="button" class="btn btn-link bg-blue waves-effect confirm_table" data-dismiss="modal">Confirm</button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+              
+
+
   <input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
 </div>
 <style type="text/css">
diff --git a/app/views/foodcourt/payments/show.html.erb b/app/views/foodcourt/payments/show.html.erb
index b55a83d0..7e6288b2 100755
--- a/app/views/foodcourt/payments/show.html.erb
+++ b/app/views/foodcourt/payments/show.html.erb
@@ -120,6 +120,13 @@
                 <% else %>
                   No Tax
                 <% end %></strong><br>
+                <%if @changable_tax %>
+                  <% if @current_user.role == 'cashier' %>
+                    <button class="btn btn-link waves-effect bg-info access_modal" data-type = 'change_tax' >Change Tax</button>
+                  <% else %>
+                    <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
+                  <% end %>
+                <% end %>
               </td>
               <td class="item-attr"><strong><span id="total_tax"><%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
             </tr>
diff --git a/app/views/foodcourt/sale_edit/edit.html.erb b/app/views/foodcourt/sale_edit/edit.html.erb
index a97364f3..f7fbdba4 100755
--- a/app/views/foodcourt/sale_edit/edit.html.erb
+++ b/app/views/foodcourt/sale_edit/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
   <!-- Column Two -->
-  <div class="col-lg-11 col-md-11 col-sm-11">
+  <div class="col-lg-7 col-md-7 col-sm-7">
     <div class="card">
       <div class="card-header">
         <div><strong id="order-title">INVOICE DETAILS </strong></div>
@@ -120,6 +120,60 @@
       </div>
     </div>
   </div>
+  <div class="col-md-4 col-lg-4 col-sm-4">
+    
+      <div class="p-l-20">
+              <div class="row bottom">
+              <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="1" data-type="num">1</div>
+                  <div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
+                  <div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
+                </div>
+              </div>
+            </div>
+
+            <div class="row bottom">
+              <div class="col-md-12 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="4" data-type="num">4</div>
+                <div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
+                <div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
+                </div>
+              </div>
+            </div>
+
+            <div class="row bottom">
+              <div class="col-md-12 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="7" data-type="num">7</div>
+                <div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
+                <div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
+                </div>
+              </div>
+            </div>
+
+            <div class="row bottom">
+              <div class="col-md-12 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="0" data-type="num">0</div>
+                <div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
+                <div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
+                </div>
+              </div>
+            </div>
+
+            <div class="row bottom">
+              <div class="col-md-12 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number"></div>
+                <div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
+                <div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
+                </div>
+              </div>
+            </div>
+            </div>
+  </div>
   <!-- <div class="col-md-3">
     <div class="card p-l-15 p-r-15">
       <div class="card-block">