Pull from master
This commit is contained in:
@@ -284,6 +284,7 @@
|
||||
unless @order_items.nil? || @order_items.empty?
|
||||
count = 0
|
||||
@order_items.each do |order_item|
|
||||
set_item_prices = 0
|
||||
count += 1
|
||||
sub_total = sub_total + (order_item.price * order_item.qty)
|
||||
|
||||
@@ -301,7 +302,8 @@
|
||||
<% end %>
|
||||
|
||||
<% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]'
|
||||
JSON.parse(order_item.set_menu_items).each do |item_instance| %>
|
||||
JSON.parse(order_item.set_menu_items).each do |item_instance|
|
||||
set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %>
|
||||
<br><span class="font-13">
|
||||
<%= item_instance["item_instance_name"] %>
|
||||
<% if !item_instance["options"].nil? && !item_instance["options"].empty? %>
|
||||
@@ -313,10 +315,11 @@
|
||||
<% end %>
|
||||
</span>
|
||||
<% end
|
||||
sub_total += set_item_prices
|
||||
end %>
|
||||
</td>
|
||||
<td class='item-attr'><%= order_item.qty %></td>
|
||||
<td class='item-attr'><%= order_item.qty*order_item.price %></td>
|
||||
<td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
|
||||
</tr>
|
||||
<%
|
||||
|
||||
|
||||
Reference in New Issue
Block a user