From 7e8b6758b84c60df61311fe45662ef4201b347df Mon Sep 17 00:00:00 2001
From: Zin Moe <zin.moe@code2lab.com>
Date: Wed, 26 Feb 2020 16:38:49 +0630
Subject: [PATCH] fix order table

---
 app/views/foodcourt/addorders/detail.html.erb  |  2 +-
 app/views/foodcourt/orders/app_orders.html.erb | 10 +++++-----
 app/views/foodcourt/payments/show.html.erb     |  7 -------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb
index 481b7929..d640e94c 100644
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -491,7 +491,7 @@ $(document).ready(function () {
     var menu_id = $(this).attr("data-id");
     var name = $(this).attr("data-name");
     var menus = JSON.parse(localStorage.getItem("menus"));
-
+    $('.menu_cache_list').toggle(300);
     if (menus != null) {
       menu_click_cache_append(name,menus,menu_id);
     }else{
diff --git a/app/views/foodcourt/orders/app_orders.html.erb b/app/views/foodcourt/orders/app_orders.html.erb
index 75d4c7c0..f84e1434 100644
--- a/app/views/foodcourt/orders/app_orders.html.erb
+++ b/app/views/foodcourt/orders/app_orders.html.erb
@@ -51,8 +51,8 @@
                 <%= link_to foodcourt_app_order_by_booking_path(booking_id:bk.booking_id), class: 'item-card' do %>
                   <div class="card <%= bk_color %> text-white" data-id ="<%= bk.booking_id %>">
                     <div class="card-block">
-                       Cus Ph :<%= bk.contact_no %><span style="font-size:12px;float:right;line-height:inherit;">Order Time :<%= bk.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span><br>
-                       Order No :<%= bk.orders[0].order_id %><span style="font-size:12px;float:right;line-height:inherit;"><%= bk_status %></span>                  </div>
+                       Cus Ph: <%= bk.contact_no %><span style="font-size:12px;float:right;line-height:inherit;">Order Time: <%= bk.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span><br>
+                       Order No: <%= bk.orders.first.try(:order_id) %><span style="font-size:12px;float:right;line-height:inherit;"><%= bk_status %></span>                  </div>
                   </div>
                 <% end %>
               <% end %>
@@ -79,8 +79,8 @@
               <%= link_to foodcourt_app_order_by_booking_path(booking_id: c.booking_id, active: 'completed'), class: 'item-card' do %>
                 <div class="card <%= bk_color %> text-white" data-id ="<%= c.booking_id %>">
                   <div class="card-block">
-                     Cus Ph :<%= c.contact_no %><span style="font-size:12px;float:right;line-height:inherit;">Order Time :<%= c.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span><br>
-                     Order No :<%= c.orders[0].order_id %><span style="font-size:12px;float:right;line-height:inherit;">competed</span>                  </div>
+                     Cus Ph: <%= c.contact_no %><span style="font-size:12px;float:right;line-height:inherit;">Order Time: <%= c.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span><br>
+                     Order No: <%= c.orders.first.try(:order_id) %><span style="font-size:12px;float:right;line-height:inherit;">competed</span>                  </div>
                 </div>
               <% end %>
             <% end %>
@@ -103,7 +103,7 @@
             </div>
           </div>
           <div class="card-body">
-             <div class="card-text" id="order-detail-slimscroll" data-height="300">
+             <div class="card-text" id="order-detail-slimscroll" data-height="230">
                <table class="table table-striped summary-items">
                  <thead>
                    <tr>
diff --git a/app/views/foodcourt/payments/show.html.erb b/app/views/foodcourt/payments/show.html.erb
index ec031489..d9760aed 100755
--- a/app/views/foodcourt/payments/show.html.erb
+++ b/app/views/foodcourt/payments/show.html.erb
@@ -118,13 +118,6 @@
                 <% else %>
                   No Tax
                 <% end %></strong><br>
-                <%if @sale_payment.nil? && @changable_tax %>
-                  <% if current_login_employee.role == "cashier" %>
-                    <a class="btn btn-link waves-effect bg-info access_modal" data-toggle="modal"  data-type="change_tax"> Change Tax</a>
-                  <% 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>