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

app/views/origami/addorders/get_menu_sub_category.json.jbuilder

@@ -0,0 +1,9 @@
+if @sub_menu
+	json.sub_category @sub_menu.each do |sub_cat|
+		json.id                 sub_cat.id
+		json.code               sub_cat.code
+		json.name               sub_cat.name
+		json.menu_id            sub_cat.menu_id
+		json.menu_category_id   sub_cat.menu_category_id
+	end
+end