diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index 336bf7c8..e4030f06 100755 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -154,6 +154,9 @@ class Settings::MenuItemInstancesController < ApplicationController else @item = MenuItem.find(params[:set_menu_item_id]) end + + # To Only show in Menu item selected attrs + @item.item_attributes = MenuItemAttribute.where(id: @item.item_attributes).select("id, name").map { |e| [e.name, e.id] } end # Never trust parameters from the scary internet, only allow the white list through. diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index 13b2c8ad..5fb18eb2 100755 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -11,7 +11,7 @@ <%= f.input :item_instance_name %> <%= f.input :price %> - <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> + <%= f.input :item_attributes, collection: @item.item_attributes, input_html: { multiple: true } %> <%= f.input :is_on_promotion %> <%= f.input :promotion_price %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 22a3a930..79d361df 100755 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -107,7 +107,9 @@ <%= settings_menu_item.item_instance_code %> <%= settings_menu_item.item_instance_name %> - <%= settings_menu_item.item_attributes %> + + <%= MenuItemAttribute.where(id: settings_menu_item.item_attributes).pluck(:name) %> + <%= settings_menu_item.price %> <%= settings_menu_item.promotion_price %>