diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 6a6c0c90..a8e2818c 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -74,16 +74,6 @@ class Origami::HomeController < BaseOrigamiController
@date = order.created_at
@booking= booking
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)
# 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?
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 3aa98282..11a7f93d 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -68,16 +68,6 @@ class Origami::RoomsController < BaseOrigamiController
@date = order.created_at
@booking = booking
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)
# 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?
diff --git a/app/models/order.rb b/app/models/order.rb
index 892c218c..02f4b618 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -135,7 +135,7 @@ class Order < ApplicationRecord
#loop to add all items to order
ordered_list.each do |item|
-
+
menu_item = MenuItem.search_by_item_code(item[:item_instance_code])
# For Product while item code not in menu item
@@ -152,7 +152,7 @@ class Order < ApplicationRecord
item[:sub_items].each do |si|
# Retrive instance's Price
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
set_order_items = set_order_items.to_json
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8c2e58bc..accbd5d9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -292,9 +292,26 @@
| <%= count %> |
<%= 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| %>
+
+ <%= option %>
+
+ <% end %>
+ <% end %>
+
<% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
+ JSON.parse(order_item.set_menu_items).each do |item_instance| %>
+
+ <%= item_instance["item_instance_name"] %>
+ <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+ <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+
+ <%= set_item_option %>
+
+ <% end %>
+ <% end %>
+
<% end
end %>
|
@@ -371,9 +388,26 @@
<%= count %>
|
<%= 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| %>
+
+ <%= option %>
+
+ <% end %>
+ <% end %>
+
<% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
+ JSON.parse(order_item.set_menu_items).each do |item_instance| %>
+
+ <%= item_instance["item_instance_name"] %>
+ <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+ <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+
+ <%= set_item_option %>
+
+ <% end %>
+ <% end %>
+
<% end
end %>
|
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1edb07cf..4a21fb24 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -277,9 +277,26 @@
<%= count %> |
<%= 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| %>
+
+ <%= option %>
+
+ <% end %>
+ <% end %>
+
<% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
+ JSON.parse(order_item.set_menu_items).each do |item_instance| %>
+
+ <%= item_instance["item_instance_name"] %>
+ <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+ <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+
+ <%= set_item_option %>
+
+ <% end %>
+ <% end %>
+
<% end
end %>
|
@@ -345,9 +362,26 @@
<%= count %>
|
<%= 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| %>
+
+ <%= option %>
+
+ <% end %>
+ <% end %>
+
<% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
+ JSON.parse(order_item.set_menu_items).each do |item_instance| %>
+
+ <%= item_instance["item_instance_name"] %>
+ <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+ <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+
+ <%= set_item_option %>
+
+ <% end %>
+ <% end %>
+
<% end
end %>
|