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

oqs updated

Browse Source
This commit is contained in:
Yan
2017-06-18 00:45:39 +06:30
parent 420e1b9cbc
commit 80320b6d3e
5 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,15 +26,29 @@ class Oqs::HomeController < BaseOqsController
def get_order_items
items = []
table_name = params[:table_id]
status = params[:status]
dining = DiningFacility.find_by_name(table_name);
booking_id = dining.get_current_booking
BookingOrder.where("booking_id='#{ booking_id }'").find_each do |bo|
order=Order.find(bo.order_id);
order.order_items.each do |oi|
items.push(oi)
end
oqpz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id)
if status == ""
AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=0").find_each do |aoi|
oi = OrderItem.find_by_item_code(aoi.item_code)
items.push(oi)
end
else
AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=1").find_each do |aoi|
oi = OrderItem.find_by_item_code(aoi.item_code)
items.push(oi)
end
end
# booking_id = dining.get_new_booking
# BookingOrder.where("booking_id='#{ booking_id }'").find_each do |bo|
# order=Order.find(bo.order_id);
# order.order_items.each do |oi|
# items.push(oi)
# end
# end
render :json => items.to_json
end