diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 818e5c1e..836e0caf 100755 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -78,131 +78,6 @@ class MenuItem < ApplicationRecord end end - - def self.get_items(menu) - item = Array.new - if menu.menu_items - menu.menu_items do |item| - if item.is_available - # Format for attributes json - attr_format = [] - # Format for attributes json - if item.item_attributes.count > 0 - item.item_attributes.each do|attr_id| - menu_attr = MenuItemAttribute.find(attr_id) - if attr_format.count == 0 - attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] }) - next - end - - attr_format.each do |af| - if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]} - if menu_attr.attribute_type == af[:type] - af[:values].push(menu_attr.name) - end - else - new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] } - attr_format.push(new_attr) - break - end - end - end - end - - # Format for option json - opt_format = [] - # Format for attributes json - if item.item_options.count > 0 - item.item_options.each do|opt| - menu_opt = MenuItemOption.find(opt) - if opt_format.count == 0 - opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] }) - next - end - - opt_format.each do |of| - if menu_opt.option_type.in? opt_format.map {|k| k[:type]} - if menu_opt.option_type == of[:type] - of[:values].push(menu_opt.name) - end - else - new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] } - opt_format.push(new_opt) - break - end - end - end - end - - #Menu Item Information - menu_items.id item.id - menu_items.code item.item_code - menu_items.name item.name - menu_items.alt_name item.alt_name - menu_items.image item.image_path.url - menu_items.description item.description - menu_items.information item.information - menu_items.type item.type - menu_items.account_id item.account_id - menu_items.min_qty item.min_qty - menu_items.is_available item.is_available - menu_items.is_sub_item item.is_sub_item - menu_items.unit item.unit - - # Item Sets of Menu Item - item_sets = Array.new() - item.item_sets do |its| - sets.id its.id - sets.name its.name - sets.alt_name its.alt_name - sets.min_selectable_qty its.min_selectable_qty - sets.max_selectable_qty its.max_selectable_qty - instances = Array.new() - its.menu_item_instances do |i| - instan.id i.id - instances.push(instan) - end - item_sets.push(sets) - end - - menu_items.attributes attr_format - menu_items.options opt_format - - instances = Array new() - item.menu_item_instances do |is| - if is.is_available - # Convert id to name for attributes - instance_attr = [] - - is.item_attributes.each do |ia| - # mItemAttr = MenuItemAttribute.find(is) - # instance_attr.push(ia) - mItemAttr = MenuItemAttribute.find(ia).name - instance_attr.push(mItemAttr) - end - - instance.id is.id - instance.code is.item_instance_code - instance.name is.item_instance_name - instance.price is.price - instance.is_available is.is_available - instance.is_default is.is_default - instance.is_on_promotion is.is_on_promotion - instance.promotion_price is.promotion_price - instance.values instance_attr - # json.item_sets is.item_sets - end - instances.push(instance) - end - end - item.push(menu_items) - end - return item - end - end - - - # private # def generate_menu_item_code diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index de9e5750..58011788 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -85,6 +85,7 @@