diff --git a/app/controllers/foodcourt/home_controller.rb b/app/controllers/foodcourt/home_controller.rb index 354e8163..1888b808 100755 --- a/app/controllers/foodcourt/home_controller.rb +++ b/app/controllers/foodcourt/home_controller.rb @@ -30,11 +30,12 @@ class Foodcourt::HomeController < BaseFoodcourtController @status_sale = "" @sale_array = Array.new - @membership = MembershipSetting.all + @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all + @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ") #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'") - @order_items = Array.new + @order_items = Array.new @dining_booking.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 21530e65..57f2b0c9 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -30,10 +30,10 @@ class Origami::RoomsController < BaseOrigamiController @status_order = "" @status_sale = "" @sale_array = Array.new - @membership = MembershipSetting.all - @payment_methods = PaymentMethodSetting.all + @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all + @dining_room = @room.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ") @order_items = Array.new @dining_room.each do |booking| diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index 7e69ac4b..1326e6bf 100755 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -90,7 +90,7 @@ class Transactions::SalesController < ApplicationController # GET /transactions/sales/1 # GET /transactions/sales/1.json def show - @membership = MembershipSetting.all + @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.where("is_active='1'") @sale = Sale.find(params[:id])