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

check query

Browse Source
This commit is contained in:
phyusin
2018-09-24 10:39:50 +06:30
parent 1aa23adc4f
commit 4508cd55b4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/booking.rb
View File

@@ -51,7 +51,7 @@ class Booking < ApplicationRecord
if from.present? && to.present?
booking = Booking.joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")
.where("DATE_FORMAT(created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(created_at,'%d-%m-%Y') <= ? and NOT booking_status = 'void' ", from,to)
.where("DATE_FORMAT(bookings.created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(bookings.created_at,'%d-%m-%Y') <= ? and NOT bookings.booking_status = 'void' ", from,to)
query = booking.where(keyword)
else
joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")