Merge branch 'r-1902001-01' into foodcourt

app/controllers/foodcourt/orders_controller.rb

@@ -87,6 +87,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
 
   def current_shift_order_count
     @current_shift = ShiftSale.current_shift
+    status = ['completed', 'void']
     @pending_sales = Sale.where('shift_sale_id = ? AND sale_status NOT IN (?)', @current_shift.id, status)
     @pending_orders = Sale.pending_order('food_court')
     @occupied_table = @pending_sales.length + @pending_orders.length
@@ -97,10 +98,10 @@ class Foodcourt::OrdersController < BaseFoodcourtController
     @cashier_type = "food_court"
     today = DateTime.now
     day = Date.today.wday
-    
+
     @menus    = []
     @menu     = []
-    
+
     if params[:id].include? "BKI"
       @table_id = nil
       @table = nil
@@ -266,7 +267,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
     if ["quick_service", "food_court"].include? order.source
       redirect_to "/foodcourt/sale/#{sale_data.sale_id}/food_court/payment#"
     end
-    # 
+    #
   end
 
   def completed