diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index 9c3b6980..ff98f90d 100755
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -6,8 +6,8 @@ class Crm::DiningQueuesController < BaseCrmController
   # GET /crm/dining_queues.json
   def index
       today = Time.current.strftime('%Y-%m-%d')
-     @dining_queues = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status is NULL ", today).order("queue_no asc")
-     @complete_queue = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status = 'Assign' ", today).order("queue_no asc")
+     @dining_queues = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? and status is NULL ", today).order("queue_no asc")
+     @complete_queue = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? and status = 'Assign' ", today).order("queue_no asc")
 
     if params[:term]
       @customer = Customer.order(:name).where('lower(name) LIKE ?', "%#{params[:term].downcase}%")
diff --git a/app/controllers/foodcourt/home_controller.rb b/app/controllers/foodcourt/home_controller.rb
index 48cdb24f..53a90cc0 100755
--- a/app/controllers/foodcourt/home_controller.rb
+++ b/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(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')
+    @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(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')
+    @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,7 +33,7 @@ class Foodcourt::HomeController < BaseFoodcourtController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    @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}' ")
+    @dining_booking = @dining.bookings.active.where("DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '#{Time.current.strftime('%Y-%m-%d')}' OR DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '#{Date.today.prev_day}' ")
 
     @order_items = Array.new
     @dining_booking.each do |booking|
diff --git a/app/controllers/foodcourt/orders_controller.rb b/app/controllers/foodcourt/orders_controller.rb
index d5d55a77..bf48bb2f 100755
--- a/app/controllers/foodcourt/orders_controller.rb
+++ b/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(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')
+    @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")
diff --git a/app/controllers/foodcourt/sales_controller.rb b/app/controllers/foodcourt/sales_controller.rb
index fe37d0d7..3c8cd990 100755
--- a/app/controllers/foodcourt/sales_controller.rb
+++ b/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(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')
+    @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(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|
+    table.bookings.active.where("DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '#{Time.current.strftime('%Y-%m-%d')}' OR DATE_FORMAT(CONVERT_TZ(date, '+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|
diff --git a/app/controllers/origami/credit_sales_controller.rb b/app/controllers/origami/credit_sales_controller.rb
index 9f781d6f..e71a35ce 100644
--- a/app/controllers/origami/credit_sales_controller.rb
+++ b/app/controllers/origami/credit_sales_controller.rb
@@ -8,8 +8,8 @@ class Origami::CreditSalesController < BaseOrigamiController
 
     @tables = Table.unscope(:order).all.active.order('status desc')
     @rooms = Room.unscope(:order).all.active.order('status desc')
-    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and sale_status != 'new'",Time.current.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')
+    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? and sale_status != 'new'",Time.current.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')
     @customers = Customer.pluck("customer_id, name")
 
     @sale = Sale.find_by_sale_id(params[:sale_id])
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index a40485b7..e45a37a6 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -7,7 +7,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables   = Table.unscope(:order).includes(:zone, :current_checkin_booking, :current_checkout_booking, :current_reserved_booking).active.order('status desc')
     @rooms    = Room.unscope(:order).includes(:zone, :current_checkin_booking, :current_checkout_booking, :current_reserved_booking).active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @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')
+    @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")
@@ -24,7 +24,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables = Table.unscope(:order).includes(:zone, :current_checkin_booking, :current_checkout_booking, :current_reserved_booking).all.active.order('status desc')
     @rooms = Room.unscope(:order).includes(:zone, :current_checkin_booking, :current_checkout_booking, :current_reserved_booking).all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @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')
+    @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)
diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index 32ab34c0..af8a2b1e 100755
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -7,14 +7,14 @@ class Origami::MoveroomController < BaseOrigamiController
 
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and sale_status != 'new'",Time.current.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status != 'billed'",Time.current.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.current.strftime('%Y-%m-%d'))
+    @orders = Order.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? and status != 'billed'",Time.current.strftime('%Y-%m-%d')).order('date desc')
 
     @status_order = ""
     @status_sale = ""
     @sale_array = Array.new
     @dining = DiningFacility.find(params[:dining_id])
-    @dining_room = @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.current.prev_day}' ")
+    @dining_room = @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.current.prev_day}' ")
     @dining_room.each do |booking|
          if booking.sale_id.nil?
            @order_items = Array.new
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index eee9270d..4331cb2b 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -7,15 +7,15 @@ class Origami::MovetableController < BaseOrigamiController
 
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and sale_status != 'new'",Time.current.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and status != 'billed'",Time.current.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.current.strftime('%Y-%m-%d'))
+    @orders = Order.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? and status != 'billed'",Time.current.strftime('%Y-%m-%d')).order('date desc')
     @dining = DiningFacility.find(params[:dining_id])
 
     @status_order = ""
     @status_sale = ""
     @sale_array = Array.new
 
-    @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.current.prev_day}' ")
+    @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.current.prev_day}' ")
 
     @dining_booking.each do |booking|
          if booking.sale_id.nil?
@@ -73,7 +73,7 @@ class Origami::MovetableController < BaseOrigamiController
 
     # bookings = Booking.where('dining_facility_id=?',change_from)
 
-    bookings = Booking.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.current.prev_day}')) AND dining_facility_id='#{change_from}'")
+    bookings = Booking.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.current.prev_day}')) AND dining_facility_id='#{change_from}'")
 
     booking_array = Array.new
     order_items = Array.new
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index f3556e7d..37a7b4ed 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -7,8 +7,8 @@ class Origami::OrdersController < BaseOrigamiController
 
     @tables   = Table.unscope(:order).all.active.order('status desc')
     @rooms    = Room.unscope(:order).all.active.order('status desc')
-    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? and sale_status != 'new'",Time.current.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')
+    @complete = Sale.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? and sale_status != 'new'",Time.current.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")
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index f790da34..bf86c2b0 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -1,7 +1,7 @@
 class Origami::PendingOrderController < BaseOrigamiController
   def index
     # @dining= DiningFacility.where("status = 'occupied'")
-    # @order = Order.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 = Order.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'))
     @cashier_type = params[:type]
     @sale = Sale.pending_sale(@cashier_type)
     @order = Sale.pending_order(@cashier_type)
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 8fd847f5..cf8e8b28 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -4,7 +4,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.unscope(:order).all.active.order('status desc')
     @rooms = Room.unscope(:order).all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @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')
+    @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')
     @shift = ShiftSale.current_open_shift(current_user)
     @webview = false
     if check_mobile
@@ -22,7 +22,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.unscope(:order).all.active.order('status desc')
     @rooms = Room.unscope(:order).all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @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')
+    @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")
     @room = DiningFacility.find(params[:room_id])
     @shift = ShiftSale.current_open_shift(current_user)
@@ -34,7 +34,7 @@ class Origami::RoomsController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    @dining_room = @room.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.current.prev_day}' ")
+    @dining_room = @room.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.current.prev_day}' ")
     @order_items = Array.new
     @dining_room.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 424384a2..4ad95183 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -9,7 +9,7 @@ class Origami::SalesController < BaseOrigamiController
     @tables   = Table.unscope(:order).all.active.order('status desc')
     @rooms    = Room.unscope(:order).all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
-    @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')
+    @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
diff --git a/app/models/card_sale_tran.rb b/app/models/card_sale_tran.rb
index 95f8e640..fe188c28 100644
--- a/app/models/card_sale_tran.rb
+++ b/app/models/card_sale_tran.rb
@@ -23,7 +23,7 @@ class CardSaleTran < ApplicationRecord
 
 	    if from.present? && to.present?
 
-	        # cardSale = CardSaleTran.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') >= ?" + " AND DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') <= ? and status IS NULL ", from,to)
+	        # cardSale = CardSaleTran.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >= ?" + " AND DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <= ? and status IS NULL ", from,to)
 	        from_date = from.strftime("%Y-%m-%d")
 	        to_date = to.strftime("%Y-%m-%d")
 	        query  = CardSaleTran.joins("Join sales s ON s.sale_id = card_sale_trans.sale_id"+
@@ -48,7 +48,7 @@ class CardSaleTran < ApplicationRecord
 
 	        query  = CardSaleTran.joins("Join sales s ON s.sale_id = card_sale_trans.sale_id"+
 	        								" JOIN customers c ON c.customer_id = s.customer_id")
-	        cardSale = query.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') <= ? and status = 'Approved'",from,to)
+	        cardSale = query.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <= ? and status = 'Approved'",from,to)
 
 	        if shift.present?
 	        	query1 = cardSale.where("s.shift_sale_id in (?)", shift.to_a)
diff --git a/app/models/card_settle_tran.rb b/app/models/card_settle_tran.rb
index ac64f42a..eb9640e8 100644
--- a/app/models/card_settle_tran.rb
+++ b/app/models/card_settle_tran.rb
@@ -25,7 +25,7 @@ class CardSettleTran < ApplicationRecord
 
 	        query  = CardSettleTran.joins("Join shift_sales ss ON ss.id = card_settle_trans.shift_sale_id"+
 	        								" JOIN employees e ON e.id = ss.employee_id")
-	        cardSettle = query.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') <= ?",from,to)
+	        cardSettle = query.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <= ?",from,to)
 	        query1 = cardSettle.where(keyword)
 	        query2 = query1.where(payment)
 	        query3 = query2.where(status)
@@ -45,14 +45,14 @@ class CardSettleTran < ApplicationRecord
 
 	        query  = CardSettleTran.joins("Join shift_sales ss ON ss.id = card_settle_trans.shift_sale_id"+
 	        								" JOIN employees e ON e.id = ss.employee_id")
-	        cardSettle = query.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') <= ? and status = 'Approved'",from,to)
+	        cardSettle = query.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <= ? and status = 'Approved'",from,to)
 
 	        if shift.present?
 	        	query1 = cardSettle.where("ss.id in (?)", shift.to_a)
 	        elsif shift_sale_range.present?
 	        	query1 = cardSettle.where("ss.id in (?)",shift_sale_range.to_a)
 	        else
-	        	query1 = cardSettle.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') between ? and ?",from,to)
+	        	query1 = cardSettle.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') between ? and ?",from,to)
 	        end
 	        query2 = query1.where(payment)
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 9fe33041..01f96a48 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -389,7 +389,7 @@ class Customer < ApplicationRecord
   def self.search(search)
     if search
       # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
-      where("name LIKE ? OR customer_type LIKE ? OR contact_no LIKE ? OR card_no LIKE ? OR DATE_FORMAT(CONVERT_TZ(date_of_birth,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') LIKE ? OR nrc_no LIKE ? OR gender LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%")
+      where("name LIKE ? OR customer_type LIKE ? OR contact_no LIKE ? OR card_no LIKE ? OR DATE_FORMAT(CONVERT_TZ(date_of_birth, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') LIKE ? OR nrc_no LIKE ? OR gender LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%")
     else
       find(:all)
     end
diff --git a/app/models/dining_queue.rb b/app/models/dining_queue.rb
index d39a2c0f..ae9672a4 100755
--- a/app/models/dining_queue.rb
+++ b/app/models/dining_queue.rb
@@ -2,7 +2,7 @@ class DiningQueue < ApplicationRecord
     belongs_to :dining_facility, :optional => true
 	def self.generate_queue_no
 	    today = Time.current.strftime('%Y-%m-%d')
-        dining_queues = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? ", today).order("queue_no desc")
+        dining_queues = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? ", today).order("queue_no desc")
 		queue_no = dining_queues.count + 1
 		return queue_no	
 	end
diff --git a/app/models/promotion.rb b/app/models/promotion.rb
index 74aed210..08114729 100755
--- a/app/models/promotion.rb
+++ b/app/models/promotion.rb
@@ -31,7 +31,7 @@ class Promotion < ApplicationRecord
   end
 
   def self.is_between_promo_datetime(current_day,current_time) #database is not local time
-    promoList = Promotion.where("(Date_Format(CONVERT_TZ(promo_start_date, '+00:00', Time.zone.formatted_offset), '%Y-%m-%d') <=? AND Date_Format(CONVERT_TZ(promo_start_date, '+00:00', Time.zone.formatted_offset), '%Y-%m-%d') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
+    promoList = Promotion.where("(Date_Format(CONVERT_TZ(promo_start_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <=? AND Date_Format(CONVERT_TZ(promo_start_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
     return promoList
   end
 
diff --git a/install b/install
index 995af93d..0b5539c6 100644
--- a/install
+++ b/install
@@ -4233,7 +4233,7 @@ Processing by Origami::HomeController#index as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.5ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
@@ -4351,7 +4351,7 @@ Processing by Origami::HomeController#show as HTML
   ShiftSale Load (1.1ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.5ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
   MembershipSetting Load (0.5ms)  SELECT  `membership_settings`.* FROM `membership_settings` WHERE `membership_settings`.`id` = 1 LIMIT 1
-  Booking Load (1.8ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 29 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (1.8ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 29 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.5ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -4437,7 +4437,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.5ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.6ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.6ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   PaymentMethodSetting Load (0.4ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (438.3ms)
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
@@ -5358,7 +5358,7 @@ Processing by Origami::HomeController#index as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.3ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.4ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.4ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.5ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
@@ -5557,7 +5557,7 @@ Processing by Origami::HomeController#index as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.6ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.3ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
   CACHE Employee Load (0.0ms)  SELECT  `employees`.* FROM `employees` WHERE `employees`.`token_session` = '20e3649ff22a629a733f' LIMIT 1  [["token_session", "20e3649ff22a629a733f"], ["LIMIT", 1]]
@@ -5675,7 +5675,7 @@ Processing by Origami::HomeController#show as HTML
    (0.7ms)  SELECT customer_id, name FROM `customers`
   ShiftSale Load (1.9ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.7ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
-  Booking Load (5.9ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (5.9ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.7ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.4ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.8ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -5764,7 +5764,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.6ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.6ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.8ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.3ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (421.3ms)
@@ -5880,7 +5880,7 @@ Processing by Origami::HomeController#show as HTML
    (0.3ms)  SELECT customer_id, name FROM `customers`
   ShiftSale Load (0.4ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.3ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
-  Booking Load (1.6ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (1.6ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.3ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -5969,7 +5969,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.6ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.6ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.4ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.4ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (458.3ms)
@@ -6087,7 +6087,7 @@ Processing by Origami::HomeController#show as HTML
   ShiftSale Load (0.5ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.4ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
   MembershipSetting Load (0.3ms)  SELECT  `membership_settings`.* FROM `membership_settings` WHERE `membership_settings`.`id` = 1 LIMIT 1
-  Booking Load (1.5ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (1.5ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.4ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.3ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -6176,7 +6176,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.9ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.3ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (491.2ms)
@@ -6280,7 +6280,7 @@ Processing by Origami::HomeController#show as HTML
   ShiftSale Load (0.4ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.3ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
   MembershipSetting Load (1.0ms)  SELECT  `membership_settings`.* FROM `membership_settings` WHERE `membership_settings`.`id` = 1 LIMIT 1
-  Booking Load (1.1ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (1.1ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.4ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.6ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.3ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -6369,7 +6369,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.5ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.4ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.3ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (549.6ms)
@@ -6471,7 +6471,7 @@ Processing by Origami::HomeController#show as HTML
    (1.2ms)  SELECT customer_id, name FROM `customers`
   ShiftSale Load (0.5ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.3ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
-  Booking Load (1.2ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (1.2ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.4ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.2ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.3ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -6560,7 +6560,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.4ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.4ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.3ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.9ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (441.0ms)
@@ -6678,7 +6678,7 @@ Processing by Origami::HomeController#show as HTML
   ShiftSale Load (0.4ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.4ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
   MembershipSetting Load (0.3ms)  SELECT  `membership_settings`.* FROM `membership_settings` WHERE `membership_settings`.`id` = 1 LIMIT 1
-  Booking Load (3.1ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (3.1ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.3ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -6767,7 +6767,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.4ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.4ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (1.2ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.4ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (595.2ms)
@@ -6872,7 +6872,7 @@ Processing by Origami::HomeController#show as HTML
   ShiftSale Load (0.6ms)  SELECT  `shift_sales`.* FROM `shift_sales` WHERE (shift_started_at is not null and shift_closed_at is null and employee_id = 7) LIMIT 1
   Shop Load (0.3ms)  SELECT  `shops`.* FROM `shops` ORDER BY `shops`.`id` ASC LIMIT 1
   MembershipSetting Load (0.3ms)  SELECT  `membership_settings`.* FROM `membership_settings` WHERE `membership_settings`.`id` = 1 LIMIT 1
-  Booking Load (1.0ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-21' )
+  Booking Load (1.0ms)  SELECT `bookings`.* FROM `bookings` WHERE `bookings`.`dining_facility_id` = 31 AND (booking_status != 'moved') AND (DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' OR DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-21' )
   Lookup Load (0.3ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_time'
   Lookup Load (0.9ms)  SELECT name, value FROM `lookups` WHERE `lookups`.`lookup_type` = 'checkout_alert_time'
   TaxProfile Load (0.3ms)  SELECT `tax_profiles`.* FROM `tax_profiles` WHERE (group_type = 'cashier') ORDER BY order_by asc, order_by ASC
@@ -6961,7 +6961,7 @@ Processing by Origami::HomeController#show as HTML
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   CACHE Zone Load (0.0ms)  SELECT  `zones`.* FROM `zones` WHERE `zones`.`id` = 1 LIMIT 1  [["id", 1], ["LIMIT", 1]]
   Room Load (0.4ms)  SELECT `dining_facilities`.* FROM `dining_facilities` WHERE `dining_facilities`.`type` IN ('Room') AND `dining_facilities`.`is_active` = 1 ORDER BY status desc
-  Order Load (0.9ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
+  Order Load (0.9ms)  SELECT `orders`.* FROM `orders` WHERE (DATE_FORMAT(CONVERT_TZ(date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = '2019-04-22' and status != 'billed' and source != 'quick_service') ORDER BY date desc
   SaleOrder Load (0.3ms)  SELECT `sale_orders`.* FROM `sale_orders` WHERE `sale_orders`.`order_id` = 'ODR-000000040176'
   PaymentMethodSetting Load (0.3ms)  SELECT `payment_method_settings`.* FROM `payment_method_settings`
   Rendered origami/home/show.html.erb within layouts/origami (537.0ms)