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_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