git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change report filter for shift and checkin api

Browse Source
This commit is contained in:
phyusin
2017-12-08 14:26:13 +06:30
parent 4e5a99eee2
commit 41971dae81
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dining_facility.rb
View File

@@ -67,7 +67,7 @@ class DiningFacility < ApplicationRecord
end
def get_current_checkout_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 reserved_by is not null").limit(1)
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 reserved_by is not null and checkout_by is null").limit(1)
if booking.count > 0 then
return booking[0]
else