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

check query and tax for webview

Browse Source
This commit is contained in:
phyusin
2018-07-04 11:42:19 +06:30
parent 4750f03ea8
commit 9de4ca04dc
5 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/origami/home/index.html.erb
View File

@@ -50,8 +50,8 @@
<div class="card tables orange text-white" data-id="<%= table.id %>">
<% end %>
<div class="card-block">
Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat )
Table <%= table.name %> ( <%= table.seater %> Seat ) <br>
Zone <%= table.zone_id %>
</div>
</div>
<% else %>
@@ -61,16 +61,16 @@
<div class="card tables orange text-white" data-id="<%= table.id %>">
<% end %>
<div class="card-block">
Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat )
Table <%= table.name %> ( <%= table.seater %> Seat ) <br>
Zone <%= table.zone_id %>
</div>
</div>
<% end %>
<% else %>
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat )
Table <%= table.name %> ( <%= table.seater %> Seat ) <br>
Zone <%= table.zone_id %>
</div>
</div>
<% end %>
@@ -107,11 +107,26 @@
<div class="tab-pane dining" id="orders" role="tabpanel">
<div class="card-columns">
<% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>">
<div class="card-block">
<%= order.order_id %>
</div>
</div>
<div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
<div class="card-block">
<%
order_status = ""
sale_order = order.sale_orders.first
if sale_order
unless sale_order.sale_id.nil?
sale = Sale.find(sale_order.sale_id)
order_status = sale.sale_status
if order_status == 'new'
order_status = order.status
end
end
else
order_status = order.status
end
%>
<%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
</div>
</div>
<% end %>
</div>
</div>