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

update conflict with addorderjs

Browse Source
This commit is contained in:
Aung Myo
2018-05-09 19:01:38 +06:30
parent 09628b959c 5d870df7f5
commit 1a56109d66
8 changed files with 258 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/origami/addorders_controller.rb
View File

@@ -18,14 +18,17 @@ class Origami::AddordersController < BaseOrigamiController
if check_mobile
@webview = true
end
# if params[:menus].present?
# @menus = JSON.parse(params[:menus], object_class: OpenStruct)
# @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
# else
@menus = Menu.all
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
# end
puts params[:menu]
puts "sssssssssssssssssssssssssss"
if params[:menus].present?
@menus = JSON.parse(params[:menus], object_class: OpenStruct)
@menu = JSON.parse(params[:category], object_class: OpenStruct)
puts @menus.to_json
puts @menu.to_json
else
@menus = Menu.all
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
end
@table_id = params[:id]
@table = DiningFacility.find(@table_id)