From 1d0100b382e89609b1a246f7cb407f27925855d3 Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Mon, 24 Feb 2020 19:22:34 +0630 Subject: [PATCH] app order --- app/controllers/foodcourt/food_court_controller.rb | 1 + app/controllers/foodcourt/orders_controller.rb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/foodcourt/food_court_controller.rb b/app/controllers/foodcourt/food_court_controller.rb index 0fd51763..88c8a327 100644 --- a/app/controllers/foodcourt/food_court_controller.rb +++ b/app/controllers/foodcourt/food_court_controller.rb @@ -43,6 +43,7 @@ class Foodcourt::FoodCourtController < ApplicationController end end @app_order_new_count = Booking.select("bookings.*,customers.*") + .joins("JOIN dining_facilities ON dining_facilities.id=bookings.dining_facility_id") .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") diff --git a/app/controllers/foodcourt/orders_controller.rb b/app/controllers/foodcourt/orders_controller.rb index 4b9d6956..f8108b77 100755 --- a/app/controllers/foodcourt/orders_controller.rb +++ b/app/controllers/foodcourt/orders_controller.rb @@ -56,7 +56,8 @@ class Foodcourt::OrdersController < BaseFoodcourtController def app_orders if !params[:booking_id].nil? && !params[:booking_id].blank? @booking = Booking.select("orders.*,bookings.*,customers.*") - .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") + .joins("JOIN dining_facilities ON dining_facilities.id=bookings.dining_facility_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 customers ON orders.customer_id=customers.customer_id") .where("orders.source='app' and bookings.booking_id='#{params[:booking_id]}'").first @@ -66,6 +67,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController @sale_data = Sale.find_by_sale_id(@booking.sale_id) end @bookings = Booking.select("bookings.*,customers.*") + .joins("JOIN dining_facilities ON dining_facilities.id=bookings.dining_facility_id") .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")