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

change set menu item format in api and origami

Browse Source
This commit is contained in:
phyusin
2018-03-15 15:51:12 +06:30
parent 50c1ca9fd6
commit dcac662c8e
5 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/origami/home_controller.rb
View File

@@ -74,16 +74,6 @@ class Origami::HomeController < BaseOrigamiController
@date = order.created_at @date = order.created_at
@booking= booking @booking= booking
order.order_items.each do |item| order.order_items.each do |item|
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
item.price = item.price.to_f + instance_item["price"].to_f
end
item.set_menu_items = arr_instance_item_sets
end
@order_items.push(item) @order_items.push(item)
# assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id) # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
# if !assigned_order_items.nil? # if !assigned_order_items.nil?

10
app/controllers/origami/rooms_controller.rb
View File

@@ -68,16 +68,6 @@ class Origami::RoomsController < BaseOrigamiController
@date = order.created_at @date = order.created_at
@booking = booking @booking = booking
order.order_items.each do |item| order.order_items.each do |item|
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
item.price = item.price.to_f + instance_item["price"].to_f
end
item.set_menu_items = arr_instance_item_sets
end
@order_items.push(item) @order_items.push(item)
# assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id) # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
# if !assigned_order_items.nil? # if !assigned_order_items.nil?

4
app/models/order.rb
View File

@@ -135,7 +135,7 @@ class Order < ApplicationRecord
#loop to add all items to order #loop to add all items to order
ordered_list.each do |item| ordered_list.each do |item|
menu_item = MenuItem.search_by_item_code(item[:item_instance_code]) menu_item = MenuItem.search_by_item_code(item[:item_instance_code])
# For Product while item code not in menu item # For Product while item code not in menu item
@@ -152,7 +152,7 @@ class Order < ApplicationRecord
item[:sub_items].each do |si| item[:sub_items].each do |si|
# Retrive instance's Price # Retrive instance's Price
set_item = MenuItem.search_by_item_code(si[:item_instance_code]) set_item = MenuItem.search_by_item_code(si[:item_instance_code])
set_order_items.push({"item_instance_code"=>si[:item_instance_code], "item_instance_name"=>set_item[:name], "quantity"=>si[:quantity], "price"=>set_item[:price]}) set_order_items.push({"item_instance_code"=>si[:item_instance_code], "item_instance_name"=>set_item[:name], "quantity"=>si[:quantity], "price"=>set_item[:price], "options"=>si[:options]})
end end
end end
set_order_items = set_order_items.to_json set_order_items = set_order_items.to_json

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

@@ -292,9 +292,26 @@
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %>
<br><span class="font-13">
<%= option %>
</span>
<% end %>
<% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13">
<%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
<% JSON.parse(item_instance["options"]).each do |set_item_option| %>
<br><span class="font-13">
<%= set_item_option %>
</span>
<% end %>
<% end %>
</span>
<% end <% end
end %> end %>
</td> </td>
@@ -371,9 +388,26 @@
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %>
<br><span class="font-13">
<%= option %>
</span>
<% end %>
<% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13">
<%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
<% JSON.parse(item_instance["options"]).each do |set_item_option| %>
<br><span class="font-13">
<%= set_item_option %>
</span>
<% end %>
<% end %>
</span>
<% end <% end
end %> end %>
</td> </td>

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

@@ -277,9 +277,26 @@
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %>
<br><span class="font-13">
<%= option %>
</span>
<% end %>
<% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13">
<%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
<% JSON.parse(item_instance["options"]).each do |set_item_option| %>
<br><span class="font-13">
<%= set_item_option %>
</span>
<% end %>
<% end %>
</span>
<% end <% end
end %> end %>
</td> </td>
@@ -345,9 +362,26 @@
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %>
<br><span class="font-13">
<%= option %>
</span>
<% end %>
<% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13">
<%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
<% JSON.parse(item_instance["options"]).each do |set_item_option| %>
<br><span class="font-13">
<%= set_item_option %>
</span>
<% end %>
<% end %>
</span>
<% end <% end
end %> end %>
</td> </td>