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

modify mobile order page

Browse Source
This commit is contained in:
Zin Moe
2020-02-25 17:02:22 +06:30
parent 300779402d
commit b1c5495d95
6 changed files with 144 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ 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")

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

@@ -54,9 +54,11 @@ class Foodcourt::OrdersController < BaseFoodcourtController
end
end
def app_orders
# @pending_orders = Sale.pending_order('food_court')
# @completed = Sale.completed_sale('food_court')
if !params[:booking_id].nil? && !params[:booking_id].blank?
@booking = Booking.select("orders.*,bookings.*,customers.*")
.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")
@@ -66,15 +68,11 @@ class Foodcourt::OrdersController < BaseFoodcourtController
@order_id =@booking.order_id
@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")
.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 sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid',Date.today).order("bookings.created_at desc").uniq
@completed, @bookings = Sale.get_mobile_orders
end
def completed
customer =Customer.find_by_customer_id(params[:customer_id])
phone_number =customer.contact_no