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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2018-01-23 14:40:44 +06:30
parent aa8c2621fc 8d2a928456
commit 773e1d2db0
15 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/controllers/oqs/home_controller.rb
View File

@@ -14,7 +14,7 @@ class Oqs::HomeController < BaseOqsController
@queue_completed_item = completed_order(@filter)
if !@queue_completed_item.empty?
@queue_completed_item.each do |queue_item|
if !queue_item.set_menu_items.empty?
if !queue_item.set_menu_items.nil?
instance_item_sets = JSON.parse(queue_item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
@@ -84,8 +84,11 @@ class Oqs::HomeController < BaseOqsController
OrderItem.where("order_id='#{ order_no }'").find_each do |oi|
items.push(oi)
if !items.empty?
items.each do |item|
end
if !items.empty?
items.each do |item|
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
@@ -106,13 +109,15 @@ class Oqs::HomeController < BaseOqsController
items = queue_items_query(false,oqs_id,filter)
if !items.empty?
items.each do |item|
instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end
item.set_menu_items = arr_instance_item_sets
end
end
render :json => items.to_json

2
app/controllers/origami/home_controller.rb
View File

@@ -41,7 +41,7 @@ class Origami::HomeController < BaseOrigamiController
@date = order.created_at
@booking= booking
order.order_items.each do |item|
if !item.set_menu_items.empty?
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|

2
app/controllers/origami/rooms_controller.rb
View File

@@ -35,7 +35,7 @@ class Origami::RoomsController < BaseOrigamiController
@date = order.created_at
@booking = booking
order.order_items.each do |item|
if !item.set_menu_items.empty?
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|