git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app order

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-02-24 19:22:34 +06:30
parent 4440d00dc3
commit 1d0100b382
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/foodcourt/food_court_controller.rb
View File

@@ -43,6 +43,7 @@ class Foodcourt::FoodCourtController < ApplicationController
end end
end end
@app_order_new_count = Booking.select("bookings.*,customers.*") @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 sales ON bookings.sale_id=sales.sale_id")
.joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_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 orders ON orders.order_id=booking_orders.order_id")

4
app/controllers/foodcourt/orders_controller.rb
View File

@@ -56,7 +56,8 @@ class Foodcourt::OrdersController < BaseFoodcourtController
def app_orders def app_orders
if !params[:booking_id].nil? && !params[:booking_id].blank? if !params[:booking_id].nil? && !params[:booking_id].blank?
@booking = Booking.select("orders.*,bookings.*,customers.*") @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 orders ON orders.order_id=booking_orders.order_id")
.joins("JOIN customers ON orders.customer_id=customers.customer_id") .joins("JOIN customers ON orders.customer_id=customers.customer_id")
.where("orders.source='app' and bookings.booking_id='#{params[:booking_id]}'").first .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) @sale_data = Sale.find_by_sale_id(@booking.sale_id)
end end
@bookings = Booking.select("bookings.*,customers.*") @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 sales ON bookings.sale_id=sales.sale_id")
.joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_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 orders ON orders.order_id=booking_orders.order_id")