update oqs

app/controllers/oqs/home_controller.rb

@@ -69,6 +69,12 @@ class Oqs::HomeController < BaseOqsController
     render :json => items.to_json
   end
 
+  def get_items_by_oqs
+    oqs_id = params[:id]
+    items = queue_items_query(false,oqs_id)
+    render :json => items.to_json
+  end
+
   def show
   end
 
@@ -88,8 +94,15 @@ class Oqs::HomeController < BaseOqsController
     render :json => removed_item.to_json
   end
 
+
+
   # Query for OQS with delivery status
-  def queue_items_query(status) 
+  def queue_items_query(status,oqs_id=nil) 
+    if oqs_id == nil
+       oqs = ''
+    else
+      oqs = " and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
+    end
     AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
@@ -99,8 +112,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'")
-    .group("assigned_order_items.assigned_order_item_id")
+    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'#{oqs}")
     .order("assigned_order_items.created_at")
   end