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

2017-12-22 16:37:09 +06:30
parent 11d9912401 dad83a1f83
commit 1ec0754d0d
43 changed files with 955 additions and 202 deletions
--- a/app/views/api/restaurant/menu/_menu.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu.json.jbuilder
@@ -7,6 +7,8 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 if (menu.menu_categories)
  json.categories  menu.menu_categories do |category|
    json.id category.id
+    json.code category.code
+    json.order_by category.order_by
    json.name category.name
    json.alt_name category.alt_name
    json.order_by category.order_by