update oqs
This commit is contained in:
@@ -118,7 +118,8 @@ class Oqs::HomeController < BaseOqsController
|
||||
status = params[:status]
|
||||
|
||||
items = queue_items_query(false,oqs_id,filter,table_id,status)
|
||||
|
||||
puts "items0"
|
||||
puts items.to_json
|
||||
if !items.empty?
|
||||
items.each do |item|
|
||||
if !item.set_menu_items.nil?
|
||||
@@ -157,10 +158,10 @@ class Oqs::HomeController < BaseOqsController
|
||||
|
||||
# Query for OQS with delivery status
|
||||
def queue_items_query(status,oqs_id=nil,filter,table_id,delivery_status)
|
||||
if oqs_id == nil
|
||||
oqs = ''
|
||||
if oqs_id != "0"
|
||||
oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
|
||||
else
|
||||
oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
|
||||
oqs = ''
|
||||
end
|
||||
|
||||
if delivery_status == "All"
|
||||
@@ -176,7 +177,7 @@ class Oqs::HomeController < BaseOqsController
|
||||
else
|
||||
table = ''
|
||||
end
|
||||
|
||||
|
||||
query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id,
|
||||
oqs.id as station_id, oqs.station_name,
|
||||
oqs.is_active, oqpz.zone_id,
|
||||
|
||||
Reference in New Issue
Block a user