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

check set menu item price

Browse Source
This commit is contained in:
phyusin
2018-06-07 11:12:01 +06:30
parent 2445f43994
commit d9a3a8e59f
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/api/orders/view_orders.json.jbuilder
View File

@@ -36,6 +36,7 @@ if (@booking)
end end
json.order_items order_items do |item| json.order_items order_items do |item|
total_set_menu = 0
# For YGN BBQ # For YGN BBQ
if item.item_code.include? ("PSA_") if item.item_code.include? ("PSA_")
adult_count += item.qty adult_count += item.qty
@@ -46,6 +47,7 @@ if (@booking)
child_spent += (item.price * item.qty) child_spent += (item.price * item.qty)
end end
# End YGN BBQ # End YGN BBQ
json.order_items_id item.order_items_id json.order_items_id item.order_items_id
json.order_id item.order_id json.order_id item.order_id
json.item_code item.item_code json.item_code item.item_code
@@ -57,7 +59,16 @@ if (@booking)
json.options item.options json.options item.options
json.remark item.remark json.remark item.remark
json.item_status item.order_item_status json.item_status item.order_item_status
@total_amount = @total_amount + (item.price * item.qty)
#start set menu item price
if !item.set_menu_items.nil? && item.set_menu_items != '[]'
JSON.parse(item.set_menu_items).each do |item_instance|
total_set_menu += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
end
end
#end set menu item price
@total_amount = @total_amount + (item.price * item.qty) + total_set_menu
end end
end end

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

@@ -284,6 +284,7 @@
unless @order_items.nil? || @order_items.empty? unless @order_items.nil? || @order_items.empty?
count = 0 count = 0
@order_items.each do |order_item| @order_items.each do |order_item|
set_item_prices = 0
count += 1 count += 1
sub_total = sub_total + (order_item.price * order_item.qty) sub_total = sub_total + (order_item.price * order_item.qty)
@@ -301,7 +302,8 @@
<% end %> <% end %>
<% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]' <% 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"> <br><span class="font-13">
<%= item_instance["item_instance_name"] %> <%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && !item_instance["options"].empty? %> <% if !item_instance["options"].nil? && !item_instance["options"].empty? %>
@@ -313,10 +315,11 @@
<% end %> <% end %>
</span> </span>
<% end <% end
sub_total += set_item_prices
end %> end %>
</td> </td>
<td class='item-attr'><%= order_item.qty %></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> </tr>
<% <%

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

@@ -269,8 +269,9 @@
unless @order_items.nil? || @order_items.empty? unless @order_items.nil? || @order_items.empty?
count = 0 count = 0
@order_items.each do |order_item | @order_items.each do |order_item |
count += 1 set_item_prices = 0
sub_total = sub_total + (order_item.price * order_item.qty) count += 1
sub_total = sub_total + (order_item.price * order_item.qty)
# unless order_item.price == 0 %> # unless order_item.price == 0 %>
<tr class="edit_order" data-id='<%= order_item.order_items_id %>'> <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
@@ -286,7 +287,8 @@
<% end %> <% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil?
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"> <br><span class="font-13">
<%= item_instance["item_instance_name"] %> <%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %> <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
@@ -298,10 +300,11 @@
<% end %> <% end %>
</span> </span>
<% end <% end
sub_total += set_item_prices
end %> end %>
</td> </td>
<td class='item-attr'><%= order_item.qty %></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> </tr>
<% <%