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

36
app/views/origami/rooms/show.html.erb
View File

@@ -144,25 +144,25 @@
<div class="card-columns">
<% @orders.each do |order| %>
<div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
<div class="card-block">
<%
order_status = ""
sale_order = SaleOrder.find_by_order_id(order)
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
<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
else
order_status = order.status
end
%>
%>
<%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
</div>
</div>
</div>
</div>
<% end %>
</div>
</div>
@@ -360,7 +360,9 @@
<% else %>
No Tax
<% end %></strong><br>
<button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
<%if !@webview %>
<button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
<% end %>
</td>
<td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td>
</tr>