shop_bunny 0.8.3 → 0.8.4

data/app/models/coupon.rb

@@ -11,7 +11,7 @@ class Coupon < ActiveRecord::Base
   
   # TODO Add self destruction when coupon has expired?
   
-  scope :valid, lambda {{:conditions => ['(coupons.valid_from IS NULL OR coupons.valid_from <= ?) AND (coupons.valid_until IS NULL OR coupons.valid_until >= ?)', Time.now, Time.now]}}
+  scope :valid, lambda {{:conditions => ['(coupons.valid_from IS NULL OR coupons.valid_from <= ?) AND (coupons.valid_until IS NULL OR coupons.valid_until >= ?) AND coupons.active = ?', Time.now, Time.now, true]}}
   scope :automatically_added_over, lambda {|value| {:conditions => ['value_of_automatic_add <= ?', value]}}
   
   def expired?
@@ -26,6 +26,10 @@ class Coupon < ActiveRecord::Base
   def has_expired?
     Time.now > self.valid_until if self.valid_until 
   end
+
+  def redeemable?
+    !not_yet_valid? && !has_expired? && active?
+  end
   
   protected
   def touch_cart

data/db/migrate/20111123234953_add_active_flag_to_coupon.rb

@@ -0,0 +1,9 @@
+class AddActiveFlagToCoupon < ActiveRecord::Migration
+  def self.up
+    add_column :coupons, :active, :boolean
+  end
+
+  def self.down
+    remove_column :coupons, :active
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shop_bunny
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - kopfmaschine.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +02:00
+date: 2011-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -47,6 +47,7 @@ files:
 - app/models/coupon_use.rb
 - db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
 - db/migrate/20110821124655_add_max_uses_to_coupon.rb
+- db/migrate/20111123234953_add_active_flag_to_coupon.rb
 - db/migrate/20110202235446_add_raw_item_to_cart_items.rb
 - db/migrate/20110203005514_remove_item_id_from_cart_items.rb
 - db/migrate/20100902115757_create_cart_items.rb