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

change split bill process

Browse Source
This commit is contained in:
phyusin
2018-02-14 14:14:53 +06:30
parent 13ab1ff5be
commit f19fb769f6
9 changed files with 133 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/views/origami/split_bill/index.html.erb
View File

@@ -59,32 +59,34 @@
</tr>
</thead>
<tbody>
<% if !order.order_items.nil? %>
<% if !@order_items.nil? %>
<% sub_total = 0 %>
<% order.order_items.each do |order_item| %>
<% @order_items.each do |order_item| %>
<% if order_item.include? (order.order_id.to_s) %>
<%
sub_total += order_item.qty*order_item.price
sub_total += order_item[order.order_id.to_s]['qty'].to_f * order_item[order.order_id.to_s]['price'].to_f
%>
<tr class="item-row" id=<%= order_item.order_items_id %> >
<tr class="item-row" id=<%= order_item[order.order_id.to_s]['order_items_id'] %> >
<td style="width:60%; text-align:left">
<span id="item-order-id" class="hidden"><%=order_item.order_id%></span>
<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
<span id="item-order-id" class="hidden"><%=order_item[order.order_id.to_s]['order_id'] %></span>
<span id="item-account-type" class="hidden"><%=order_item[order.order_id.to_s]['account_id'] %></span>
<span id="item-name-price">
<%=order_item.item_name%>
<% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %>
<%=order_item[order.order_id.to_s]['item_name'] %>
<% if !order_item[order.order_id.to_s]['set_menu_items'].nil?
order_item[order.order_id.to_s]['set_menu_items'].each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span>
<% end
end %>
</span>
</td>
<td style="width:20%; text-align:right">
<span id="item-qty"><%=order_item.qty%></span>
<span id="item-qty"><%=order_item[order.order_id.to_s]['qty']%></span>
</td>
<td style="width:20%; text-align:right">
<span id="item-total-price"><%=(order_item.qty*order_item.price)%></span>
<span id="item-total-price"><%=(order_item[order.order_id.to_s]['qty'].to_f * order_item[order.order_id.to_s]['price'].to_f)%></span>
</td>
</tr>
<% end %>
<%
end
%>
@@ -148,9 +150,9 @@
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Action Panel -->
<div>
<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
<button id="order_split" class="btn btn-primary text-center action-btn" style="width:100%">Orders Split</button>
<button id="order_item_split" class="btn btn-primary text-center action-btn">Order Items Split</button>
<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
<button id="order_split" class="btn btn-primary text-center action-btn waves-effect">By Order &nbsp;</button>
<button id="order_item_split" class="btn btn-primary text-center action-btn waves-effect">By Order Item</button>
</div>
</div>
<!-- Column Three -->
@@ -417,6 +419,7 @@ function get_selected_order_items(){
order_item.order_id = $(this).find('#item-order-id').text().trim();
order_item.name = $(this).find('#item-name-price').text().split('@')[0];
order_item.account_id = $(this).find('#item-account-type').text();
order_item.qty = $(this).find('#item-qty').text();
order_item.price = $(this).find('#item-total-price').text();
order_items.push(order_item);
});