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

update form attr name to attr id to instances

Browse Source
This commit is contained in:
Yan
2017-08-31 11:41:38 +06:30
parent f50ca87e59
commit 2399f1d494
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/menu_item_attribute.rb
View File

@@ -1,6 +1,7 @@
class MenuItemAttribute < ApplicationRecord class MenuItemAttribute < ApplicationRecord
validates_presence_of :attribute_type, :name, :value validates_presence_of :attribute_type, :name, :value
def self.collection def self.collection
MenuItemAttribute.select("name").map { |e| [e.name, e.name] } MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] }
# MenuItemAttribute.select("name").map { |e| [e.name, e.name] }
end end
end end

11
app/views/api/restaurant/menu/_menu_item.json.jbuilder
View File

@@ -89,7 +89,14 @@ json.options opt_format
# json.promotion_price = item_instance.promotion_price # json.promotion_price = item_instance.promotion_price
# json.item_attributes = item_instance.item_attributes # json.item_attributes = item_instance.item_attributes
json.instances item.menu_item_instances do |is| json.instances item.menu_item_instances do |is|
# Convert id to name for attributes
instance_attr = []
is.item_attributes do |ia|
mItemAttr = MenuItemAttribute.find(is)
instance_attr.push(ia.name)
end
json.id is.id json.id is.id
json.code is.item_instance_code json.code is.item_instance_code
json.name is.item_instance_name json.name is.item_instance_name
@@ -98,7 +105,7 @@ json.options opt_format
json.is_default is.is_default json.is_default is.is_default
json.is_on_promotion is.is_on_promotion json.is_on_promotion is.is_on_promotion
json.promotion_price is.promotion_price json.promotion_price is.promotion_price
json.values is.item_attributes json.values instance_attr
# json.item_sets is.item_sets # json.item_sets is.item_sets
end end