Added date_available_from to products, updated conditions in product.find_products_fo...

[depot.git] / app / models / product.rb

diff --git a/app/models/product.rb b/app/models/product.rb
index 9cc9488c6030d3a2ba776359b759115f1df07e70..27fbdabe21bba36592467e18883ed7556e0f039f 100644 (file)
--- 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