tax

app/controllers/foodcourt/food_court_controller.rb

@@ -43,11 +43,12 @@ class Foodcourt::FoodCourtController < ApplicationController
       end
     end
     @app_order_new_count = Booking.select("bookings.*,customers.*")
+              .joins(" JOIN sales ON bookings.sale_id=sales.sale_id")
               .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
               .joins("JOIN orders ON orders.order_id=booking_orders.order_id")
               .joins("JOIN order_items ON orders.order_id=order_items.order_id")
               .joins("JOIN customers ON orders.customer_id=customers.customer_id")
-              .where("orders.source='app' and DATE(bookings.created_at) = '#{Date.today}' and bookings.booking_status='assign'").uniq.length
+              .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid',Date.today).order("bookings.created_at desc").uniq.length
     render "foodcourt/addorders/detail"
   end
 

app/controllers/foodcourt/orders_controller.rb

@@ -71,7 +71,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
              .joins("JOIN orders ON orders.order_id=booking_orders.order_id")
              .joins("JOIN order_items ON orders.order_id=order_items.order_id")
              .joins("JOIN customers ON orders.customer_id=customers.customer_id")
-             .where("sales.sale_status !=? and orders.source='app' and DATE(bookings.created_at)=?",'void',Date.today).order("bookings.created_at desc").uniq
+             .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid',Date.today).order("bookings.created_at desc").uniq
   end
   def completed
     customer =Customer.find_by_customer_id(params[:customer_id])