From c43dd3c625c358590c8cec7e23fdb661fd2d5c6f Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 20 May 2020 00:07:29 +0800
Subject: [PATCH] fix error

---
 app/models/property.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/property.rb b/app/models/property.rb
index e9726d5..39f3c07 100644
--- a/app/models/property.rb
+++ b/app/models/property.rb
@@ -91,7 +91,7 @@ class Property
       available = false
     end
     if available
-      bookings = self.p_hires.where(:recurring_end_date.gte => stime, :recurring => true)
+      bookings = self.p_hires.where(:recurring_end_date.gte => stime, :recurring => true).or(:recurring => false)
       case interval
       when 'week'
         d_step = 1.week
@@ -110,6 +110,9 @@ class Property
         elsif b_interval == 'week'
           b_sdata = booking.start_time.wday*10000 + booking.start_time.hour*100 + booking.start_time.minute
           b_edata = booking.end_time.wday*10000 + booking.end_time.hour*100 + booking.end_time.minute
+        else
+          b_sdata = booking.start_time
+          b_edata = booking.end_time
         end
         while true
           if b_interval == 'month'
@@ -118,6 +121,9 @@ class Property
           elsif b_interval == 'week'
             sdata = stime_tp.wday*10000 + stime_tp.hour*100 + stime_tp.minute
             edata = etime_tp.wday*10000 + etime_tp.hour*100 + etime_tp.minute
+          else
+            sdata = stime_tp
+            edata = etime_tp
           end
           if (sdata <= b_sdata && edata >= b_sdata) || (sdata >= b_sdata && edata <= b_edata) || (sdata <= b_edata && edata >= b_edata)
             available = false