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

update menu json for unscope4

Browse Source
This commit is contained in:
Aung Myo
2018-05-21 15:59:42 +06:30
parent f5ad727c08
commit 80e9f4fc36
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,11 +7,10 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
if (menu.menu_categories)
order_by = Lookup.find_by_lookup_type("order_by")
if !order_by.nil? && order_by.value == "name"
categories = MenuCategory.where("menu_id ='#{menu.id}'").order("name asc")
categories = MenuCategory.unscoped.where("menu_id ='#{menu.id}'").order("name asc")
else
categories = menu.menu_categories
end
byebug
json.categories categories do |category|
menu_category = MenuCategory.find_by_menu_category_id(category.id)
@@ -33,7 +32,7 @@ if (menu.menu_categories)
json.is_available category.is_available
if !order_by.nil? && order_by.value == "name"
menu_items = MenuItem.find_by_menu_category_id(category.id).order("name asc")
menu_items = MenuItem.unscoped.where("menu_category_id = ?",category.id).order("name asc")
else
menu_items = category.menu_items
end