Merge branch 'r-1902001-01' into foodcourt

2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -62,7 +62,6 @@ class Booking < ApplicationRecord
  scope :active, -> {where("booking_status != 'moved'")}
  scope :today, -> {where("created_at >= #{Time.now.utc}")}
  scope :assign, -> { where(booking_status: 'assign')}
-  scope :within_time_limit, -> { where(checkin_at: Lookup.get_checkin_time_limit.hours.ago..DateTime::Infinity.new) }

  def self.sync_booking_records(bookings)
    if !bookings.nil?