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

add split bill for order item in room

Browse Source
This commit is contained in:
phyusin
2018-02-06 17:46:58 +06:30
parent d416f788cb
commit 7a055470e8
6 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/origami/home/show.html.erb
View File

@@ -116,7 +116,22 @@
<% @orders.each do |order| %>
<div class="card orders red text-white" data-id="<%= order.order_id %>">
<div class="card-block">
<%= order.order_id %>
<%
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
end
end
else
order_status = order.status
end
%>
<%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
</div>
</div>
<% end %>
@@ -678,7 +693,7 @@
if(lookup_split_bill == '1'){
swal({
title: "Alert",
text: "Do you want to Split bill?",
text: "Are you sure, you want to Split bill?",
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",