Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-09-19 14:32:52 +06:30
parent a5473503fb f4270ffd87
commit e3a76f7095
33 changed files with 1501 additions and 991 deletions
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -92,6 +92,7 @@ json.options opt_format
 json.instances item.menu_item_instances do |is|
  # Convert id to name for attributes
  instance_attr = []
+
  is.item_attributes.each do |ia|
    # mItemAttr = MenuItemAttribute.find(is)
    # instance_attr.push(ia)
--- a/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
+++ b/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
@@ -0,0 +1,8 @@
+if(@attribute)
+  json.id @attribute.id
+  json.type @attribute.attribute_type
+  json.name @attribute.name
+  json.value @attribute.value
+else
+  json.success false
+end