git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix order table

Browse Source
This commit is contained in:
Zin Moe
2020-02-26 16:38:49 +06:30
parent f99f614e32
commit 7e8b6758b8
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/foodcourt/addorders/detail.html.erb
View File

@@ -491,7 +491,7 @@ $(document).ready(function () {
var menu_id = $(this).attr("data-id"); var menu_id = $(this).attr("data-id");
var name = $(this).attr("data-name"); var name = $(this).attr("data-name");
var menus = JSON.parse(localStorage.getItem("menus")); var menus = JSON.parse(localStorage.getItem("menus"));
$('.menu_cache_list').toggle(300);
if (menus != null) { if (menus != null) {
menu_click_cache_append(name,menus,menu_id); menu_click_cache_append(name,menus,menu_id);
}else{ }else{

10
app/views/foodcourt/orders/app_orders.html.erb
View File

@@ -51,8 +51,8 @@
<%= link_to foodcourt_app_order_by_booking_path(booking_id:bk.booking_id), class: 'item-card' do %> <%= 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 <%= bk_color %> text-white" data-id ="<%= bk.booking_id %>">
<div class="card-block"> <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> 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> Order No: <%= bk.orders.first.try(:order_id) %><span style="font-size:12px;float:right;line-height:inherit;"><%= bk_status %></span> </div>
</div> </div>
<% end %> <% end %>
<% 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 %> <%= 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 <%= bk_color %> text-white" data-id ="<%= c.booking_id %>">
<div class="card-block"> <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> 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> Order No: <%= c.orders.first.try(:order_id) %><span style="font-size:12px;float:right;line-height:inherit;">competed</span> </div>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
@@ -103,7 +103,7 @@
</div> </div>
</div> </div>
<div class="card-body"> <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"> <table class="table table-striped summary-items">
<thead> <thead>
<tr> <tr>

7
app/views/foodcourt/payments/show.html.erb
View File

@@ -118,13 +118,6 @@
<% else %> <% else %>
No Tax No Tax
<% end %></strong><br> <% 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>
<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> <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> </tr>