pull origin master

2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -92,9 +92,9 @@ json.options opt_format
 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)
+  is.item_attributes.each do |ia|
+    # mItemAttr = MenuItemAttribute.find(is)
+    instance_attr.push(ia)
  end
  
    json.id is.id