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

add zone with oqs and tax calculte method update

Browse Source
This commit is contained in:
Yan
2017-07-01 19:11:04 +06:30
parent 6e8b3afc6c
commit 51a779cbee
4 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/oqs/home/index.html.erb
View File

@@ -22,7 +22,10 @@
<%= qsi[:station_name] %>
<span class="badge badge-pill badge-default" id=<%= qsi[:station_name].gsub(' ', '_') + '_count' %>>
<%= qsi[:item_count] %>
</span>
</span>
<% if qsi[:is_ap] %>
<span>(ap)</span>
<% end %>
</a>
</li>
<% end %>
@@ -34,8 +37,7 @@
<div class="tab-pane active" id="completed" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@queue_completed_item.each do |qid|
if qid.price != 0
@queue_completed_item.each do |qid|
%>
<div class="card queue_station">
<div class="card-block">
@@ -70,8 +72,7 @@
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
</div>
</div>
<%
end
<%
end
%>
</div>
@@ -89,7 +90,7 @@
<%
@queue_items_details.each do |qid|
if qid.price != 0
if qid.station_name == qsi[:station_name]
if qid.zone_id == qsi[:zone_id] && qid.station_name == qsi[:station_name]
%>
<div class="card queue_station">
<div class="card-block">