fix timezone

app/controllers/foodcourt/food_court_controller.rb

@@ -21,7 +21,7 @@ class Foodcourt::FoodCourtController < ApplicationController
     @tables   = Table.active.order('status desc')
     @rooms    = Room.active.order('status desc')
 
-    today = DateTime.now
+    today = Time.current
     day = Date.today.wday
      @menus    = []
      @menu     = []

app/controllers/foodcourt/home_controller.rb

@@ -7,7 +7,7 @@ class Foodcourt::HomeController < BaseFoodcourtController
     @tables   = Table.unscoped.all.active.order('status desc')
     @rooms    = Room.unscoped.all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",Time.current.strftime('%Y-%m-%d')).order('date desc')
 
     @customers = Customer.pluck("customer_id, name")
     @occupied_table = DiningFacility.where("status='occupied'").count
@@ -22,7 +22,7 @@ class Foodcourt::HomeController < BaseFoodcourtController
     @tables = Table.unscoped.all.active.order('status desc')
     @rooms = Room.unscoped.all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.includes("sale_orders").where("DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",Time.current.strftime('%Y-%m-%d')).order('date desc')
     @customers = Customer.pluck("customer_id, name")
     @shift = ShiftSale.current_open_shift(current_user)
 
@@ -33,8 +33,8 @@ class Foodcourt::HomeController < BaseFoodcourtController
     @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}'")
+    @dining_booking = @dining.bookings.active.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '#{Time.current.strftime('%Y-%m-%d')}' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+
     @order_items = Array.new
     @dining_booking.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'

app/controllers/foodcourt/orders_controller.rb

@@ -7,8 +7,8 @@ class Foodcourt::OrdersController < BaseFoodcourtController
 
     @tables   = Table.unscoped.all.active.order('status desc')
     @rooms    = Room.unscoped.all.active.order('status desc')
-    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and sale_status != 'new'",Time.not.utc.strftime('%Y-%m-%d'))
+    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",Time.current.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
     booking = Booking.select('bookings.booking_id, bookings.dining_facility_id')
               .joins(" JOIN booking_orders as bo on bo.booking_id = bookings.booking_id")
@@ -100,7 +100,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
     @rooms    = Room.active.order('status desc')
 
     @cashier_type = "food_court"
-    today = DateTime.now
+    today = Time.current
     day = Date.today.wday
 
     @menus    = []
@@ -214,7 +214,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
               in_duties.each do |in_duty|
                 induty = InDuty.find(in_duty.id)
                 induty.sale_id = sale_data.sale_id
-                induty.out_time = Time.now.utc
+                induty.out_time = Time.now
                 induty.save
               end
             end

app/controllers/foodcourt/sales_controller.rb

@@ -8,7 +8,7 @@ class Foodcourt::SalesController < BaseFoodcourtController
     @tables   = Table.unscoped.all.active.order('status desc')
     @rooms    = Room.unscoped.all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",Time.current.strftime('%Y-%m-%d')).order('date desc')
     @customers = Customer.pluck("customer_id, name")
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
@@ -29,7 +29,7 @@ class Foodcourt::SalesController < BaseFoodcourtController
     sale_data = []
     table = DiningFacility.find(dining)
     existing_booking = Booking.find_by_sale_id(sale_id)
-    table.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}' ").each do |booking|
+    table.bookings.active.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '#{Time.current.strftime('%Y-%m-%d')}' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '#{Date.today.prev_day}' ").each do |booking|
       if booking.sale_id.nil?
           order_array = []
           booking.booking_orders.each do |booking_order|

app/controllers/foodcourt/shifts_controller.rb

@@ -46,7 +46,7 @@ class Foodcourt::ShiftsController < BaseFoodcourtController
     shift_id = params[:shift_id]
     @shift = ShiftSale.find_by_id(shift_id)
     if @shift
-      @shift.shift_closed_at = DateTime.now.utc
+      @shift.shift_closed_at = Time.now
       @shift.closing_balance = closing_balance.to_f
       @shift.save