X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fmodels%2Fproduct.rb;fp=app%2Fmodels%2Fproduct.rb;h=27fbdabe21bba36592467e18883ed7556e0f039f;hb=c445da2b4dc5097fcfddf5e40d74c2965573fc1c;hp=9cc9488c6030d3a2ba776359b759115f1df07e70;hpb=3bcc59a4bdb1841a6d979c416649694bf9a2a479;p=depot.git

diff --git a/app/models/product.rb b/app/models/product.rb
index 9cc9488..27fbdab 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -9,7 +9,7 @@ class Product < ActiveRecord::Base
   
   def self.find_products_for_sale
     find(:all, 
-      :conditions => "date_available <= now()",
+      :conditions => "date_available <= now() and (date_available_until is null or date_available_until >= now())",
       :order => :title)
   end