X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fmodels%2Fproduct.rb;h=4854ee5c213d4f31da3bae6e6a31466582157667;hb=HEAD;hp=9cc9488c6030d3a2ba776359b759115f1df07e70;hpb=6af7ab424668bc5dce20630e1b112bc611edab63;p=depot.git

diff --git a/app/models/product.rb b/app/models/product.rb
index 9cc9488..4854ee5 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -1,4 +1,7 @@
 class Product < ActiveRecord::Base
+  has_many :line_items
+  has_many :orders, :through => :line_items
+
   validates_presence_of :title, :description, :image_url
   validates_numericality_of :price
   validate :price_must_be_at_least_a_penny
@@ -9,7 +12,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