From 4508cd55b45f5359a26051e7e010d7ab3cfc2e45 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 24 Sep 2018 10:39:50 +0630 Subject: [PATCH] check query --- app/models/booking.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/booking.rb b/app/models/booking.rb index 1648f255..8ba89bd2 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -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")