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

merge with addorder

Browse Source
This commit is contained in:
Yan
2017-08-17 18:59:22 +06:30
parent fcc5014b49 e448265a48
commit 3160aab399
17 changed files with 563 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/api/restaurant/menu_categories.rb → app/controllers/api/restaurant/menu_categories_controller.rb
View File

@@ -1,11 +1,11 @@
class Api::Restaurant::MenuController < Api::ApiController
class Api::Restaurant::MenuCategoriesController < Api::ApiController
skip_before_action :authenticate
#Description
# Pull the default menu details and also other available (active) menus
# Input Params - order_id
def index
@menus = Menu.all
@current_menu = Menu.current_menu
@menus = MenuCategory.all
@current_menu = MenuCategory.current_menu
end
@@ -21,10 +21,10 @@ class Api::Restaurant::MenuController < Api::ApiController
def menu_detail (menu_id)
if (menu_id)
#Pull this menu
menu = Menu.find_by_id(menu_id)
menu = MenuCategory.find_by_id(menu_id)
return menu
else
Menu.current_menu
MenuCategory.current_menu
end
end

2
app/controllers/api/restaurant/menu_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::Restaurant::MenuController < Api::ApiController
skip_before_action :authenticate
#Description
# Pull the default menu details and also other available (active) menus
# Input Params - order_id