diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index d5bf1e72..e3c9376a 100755 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -106,11 +106,11 @@ class Settings::MenusController < ApplicationController i=0 if mi.item_attributes.length > 0 mi.item_attributes.each do |mia| - # attribute = MenuItemAttribute.find(mia) + attribute = MenuItemAttribute.find(mia) if i == mi.item_attributes.length - 1 - attributes = attributes + mia.name + attributes = attributes + attribute.name else - attributes = attributes + mia.name + "," + attributes = attributes + attribute.name + "," end i = i + 1 end @@ -119,8 +119,8 @@ class Settings::MenusController < ApplicationController options = "" i=0 if mi.item_options.length > 0 - mi.item_options.each do |mia| - option = MenuItemOption.find(mia) + mi.item_options.each do |mio| + option = MenuItemOption.find(mio) if i == mi.item_options.length - 1 options = options + option.name else @@ -133,7 +133,7 @@ class Settings::MenusController < ApplicationController mi.menu_item_instances.each do |mii| attribute = "" if mii.item_attributes.length > 0 - attribute = MenuItemAttribute.find(mii.item_attributes[0]) + attribute = MenuItemAttribute.find(mii.item_attributes[0]).name end sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, attributes, options, mii.item_instance_code, mii.item_instance_name, attribute, mii.price, mii.is_default], :style=>wrap_text end