update menu json for unscope4
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -20,11 +20,11 @@ class ActionController::Base
|
||||
end
|
||||
else
|
||||
#check for license file
|
||||
if check_license
|
||||
current_license(ENV["SX_PROVISION_URL"])
|
||||
else
|
||||
redirect_to activate_path
|
||||
end
|
||||
# if check_license
|
||||
# current_license(ENV["SX_PROVISION_URL"])
|
||||
# else
|
||||
# redirect_to activate_path
|
||||
# end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user