git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/origami/dashboard/_menu.json.jbuilder
View File

@@ -5,7 +5,13 @@ json.valid_time_from menu.valid_time_from.strftime("%H:%M")
json.valid_time_to menu.valid_time_to.strftime("%H:%M")
if (menu.menu_categories)
json.categories menu.menu_categories do |category|
order_by = Lookup.find_by_lookup_type("order_by")
if !order_by.nil? && order_by.value == "name"
categories = MenuCategory.unscoped.where("menu_id ='#{menu.id}'").order("name asc")
else
categories = menu.menu_categories
end
json.categories categories do |category|
menu_category = MenuCategory.find_by_menu_category_id(category.id)
if !menu_category.nil?
@@ -25,10 +31,14 @@ if (menu.menu_categories)
json.parent_id category.menu_category_id
json.is_available category.is_available
if !order_by.nil? && order_by.value == "name"
menu_items = MenuItem.unscoped.where("menu_category_id = ?",category.id).order("name asc")
else
menu_items = category.menu_items
end
if category.menu_items
json.items category.menu_items do |item|
json.items menu_items do |item|
if item.is_available
json.partial! 'origami/addorders/menu_item', item: item
end