Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001

2018-05-16 17:16:23 +06:30
parent c386fcfa03 95e94bd0fd
commit 02ff79a68c
8 changed files with 49 additions and 13 deletions
--- a/app/views/origami/dashboard/_menu.json.jbuilder
+++ b/app/views/origami/dashboard/_menu.json.jbuilder
@@ -29,7 +29,9 @@ if (menu.menu_categories)

    if category.menu_items
      json.items category.menu_items do |item|
-        json.partial! 'origami/addorders/menu_item', item: item
+        if item.is_available
+          json.partial! 'origami/addorders/menu_item', item: item
+        end
      end
    end
  end