Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-11-10 14:35:05 +06:30
parent 3a71b86695 8db96beca0
commit 4ad65c5480
7 changed files with 91 additions and 101 deletions
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -33,7 +33,6 @@ class DiningFacility < ApplicationRecord

  def get_current_booking
    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)
-
    if booking.count > 0 then
      return booking[0]
    else