Merge branch 'master' into qr_code

2017-09-15 10:06:58 +06:30
parent 77c399d7cd 5c96dcac81
commit f5c32229b7
23 changed files with 1403 additions and 983 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