diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 1810fade..d8642df4 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -11,30 +11,30 @@ class Oqs::HomeController < BaseOqsController
 
     @filter = params[:filter]
 
-    @queue_stations = queue_items_count_query(false,@filter)
-
+    @queue_stations = OrderQueueStation.all
+   
     @queue_completed_item = completed_order(@filter)
-    if !@queue_completed_item.empty?
-      @queue_completed_item.each do |queue_item|
-        if !queue_item.set_menu_items.nil?
-          instance_item_sets = JSON.parse(JSON.parse(queue_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
-          queue_item.set_menu_items = arr_instance_item_sets
-        end
-      end
-    end
-
-    # if !@filter.nil?
-      # @count = queue_items_count_query(false,@filter)
-      # @count.each do |count|
-
-      # end
+    # if !@queue_completed_item.empty?
+    #   @queue_completed_item.each do |queue_item|
+    #     if !queue_item.set_menu_items.nil?
+    #       instance_item_sets = JSON.parse(JSON.parse(queue_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
+    #       queue_item.set_menu_items = arr_instance_item_sets
+    #     end
+    #   end
     # end
 
+    if !@filter.nil?
+      @count = queue_items_count_query(false,@filter)
+      #@count.each do |count|
+
+      #end
+    end
+
     # @queue_stations_items=Array.new
 
     # Calculate Count for each station tab
@@ -211,12 +211,9 @@ class Oqs::HomeController < BaseOqsController
   # end
 
   def queue_items_count_query(status,filter) 
-    query = OrderQueueStation.select("order_queue_stations.is_active as is_active,
-                                  order_queue_stations.id as station_id,
-                                  order_queue_stations.station_name as station_name,
-                                  order_queue_stations.auto_print as auto_print,
-                                  order_queue_stations.id as id,
-                                  count(odt.item_code) as total")
+    # query = OrderQueueStation.all
+    query = OrderQueueStation.select("order_queue_stations.id as station_id,
+                                  (case when (count(odt.item_code)>0) then count(odt.item_code) else 0 end) as total")
     .joins(" left join assigned_order_items as aoi on aoi.order_queue_station_id= order_queue_stations.id
               left join orders as od ON od.order_id = aoi.order_id
               left join order_items as odt ON odt.item_instance_code = aoi.instance_code AND odt.order_id = aoi.order_id
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index d2c89e37..701d0c2f 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index bdf481c2..f64cef88 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 948c1a29..1f25e275 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -36,10 +36,19 @@
             <p class="hidden oqs-id"><%= qsi.id  %></p>
             <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
               <%= qsi.station_name %>
-                <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
-                <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.total %>                
-                </span> 
-              
+              <% if @filter.nil? %>
+              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
+              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
+              </span> 
+              <%else%>
+              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
+               <% @count.each do |c|%>    
+               <% if qsi.id == c.station_id %>
+               <%= c.total %>                
+               <%end %>  
+               <%end %>    
+             </span>
+             <%end%>
              <% if qsi.auto_print %>
              <span>(ap)</span>
              <% end %>