oqs updated

app/models/dining_facility.rb

@@ -9,8 +9,24 @@ class DiningFacility < ApplicationRecord
   scope :active, -> {where(is_active: true)}
 
   def get_current_booking
-    puts "enter booking"
-    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)
+    puts "enter booking"    
+    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)    
+
+    if booking.count > 0 then
+      return booking[0].booking_id
+    else
+      return nil
+    end
+  end
+
+  def get_new_booking
+    # query for new
+    # if status      
+      # to ask when req bill booking_status?
+      booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id is null and checkout_at is null").limit(1)
+    # else 
+    #   booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id not null").limit(1)
+    # end
 
     if booking.count > 0 then
       return booking[0].booking_id

app/models/order_queue_station.rb

@@ -18,19 +18,19 @@ class OrderQueueStation < ApplicationRecord
     oqs_stations.each do |oqs|
       #Get List of items -
       pq_items = JSON.parse(oqs.processing_items)      
-
-      if oqs.id == oqpbz.order_queue_station_id
+      
         #Loop through the processing items
-        pq_items.each do |pq_item|
-          #Processing through the looping items
-          order_items.each  do |order_item|          
-            if (pq_item == order_item.item_code)
+      pq_items.each do |pq_item|
+        #Processing through the looping items
+        order_items.each  do |order_item|          
+          if (pq_item == order_item.item_code)
+            if oqs.id == oqpbz.order_queue_station_id
               #Same Order_items can appear in two location.
-              AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs)            
-            end
+              AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
+            end           
           end
         end
-      end
+      end      
     end
 
     #Print OQS where printing is require