spree_promo 0.30.2 → 0.40.0

data/app/models/calculator/free_shipping.rb

@@ -5,7 +5,7 @@ class Calculator::FreeShipping < ::Calculator
   end
 
   def self.register
-    super                                
+    super
     Promotion.register_calculator(self)
   end
 

data/app/models/promotion.rb

@@ -6,14 +6,13 @@ class Promotion < ActiveRecord::Base
   has_many :promotion_rules
   accepts_nested_attributes_for :promotion_rules
   alias_method :rules, :promotion_rules
-  
+
   validates :name, :code, :presence => true
 
   MATCH_POLICIES = %w(all any)
 
   scope :automatic, where("code IS NULL OR code = ''")
 
-
   def eligible?(order)
     !expired? && rules_are_eligible?(order)
   end
@@ -21,7 +20,11 @@ class Promotion < ActiveRecord::Base
   def expired?
     starts_at && Time.now < starts_at ||
     expires_at && Time.now > expires_at ||
-    usage_limit && promotion_credits.with_order.count >= usage_limit
+    usage_limit && credits_count >= usage_limit
+  end
+
+  def credits_count
+    credits.with_order.count
   end
 
   def rules_are_eligible?(order)
@@ -34,7 +37,7 @@ class Promotion < ActiveRecord::Base
   end
 
   def create_discount(order)
-    return if order.promotion_credits.reload.detect { |credit| credit.source_id == self.id }
+    return if order.promotion_credit_exists?(self)
     if eligible?(order) and amount = calculator.compute(order)
       amount = order.item_total if amount > order.item_total
       order.promotion_credits.reload.clear unless combine? and order.promotion_credits.all? { |credit| credit.source.combine? }

data/app/models/promotion/rules/first_order.rb

@@ -4,4 +4,4 @@ class Promotion::Rules::FirstOrder < PromotionRule
     order.user && order.user.orders.checkout_complete.count == 0
   end
 
-end
+end

data/app/models/promotion/rules/item_total.rb

@@ -3,12 +3,11 @@ class Promotion::Rules::ItemTotal < PromotionRule
 
   preference :amount, :decimal, :default => 100.00
   preference :operator, :string, :default => '>'
-  
+
   OPERATORS = ['gt', 'gte']
-  
-  
+
   def eligible?(order)
     order.item_total.send(preferred_operator == 'gte' ? :>= : :>, preferred_amount)
   end
 
-end
+end

data/app/models/promotion/rules/product.rb

@@ -16,11 +16,10 @@ class Promotion::Rules::Product < PromotionRule
   
   def eligible?(order)
     return true if eligible_products.empty?
-    order_products = order.line_items.map{|li| li.variant.product}
     if preferred_match_policy == 'all'
-      eligible_products.all? {|p| order_products.include?(p) }
+      eligible_products.all? {|p| order.products.include?(p) }
     else
-      order_products.any? {|p| eligible_products.include?(p) }
+      order.products.any? {|p| eligible_products.include?(p) }
     end
   end
   
@@ -38,4 +37,4 @@ class Promotion::Rules::Product < PromotionRule
     self.product_ids = s.to_s.split(',').map(&:strip)
   end
     
-end
+end

data/app/models/promotion/rules/user.rb

@@ -1,12 +1,11 @@
 class Promotion::Rules::User < PromotionRule
   belongs_to :user
   has_and_belongs_to_many :users, :class_name => '::User', :join_table => 'promotion_rules_users', :foreign_key => 'promotion_rule_id'
-  
+
   def eligible?(order)
     users.none? or users.include?(order.user)
   end
 
-
   def user_ids_string
     user_ids.join(',')
   end
@@ -15,4 +14,4 @@ class Promotion::Rules::User < PromotionRule
     self.user_ids = s.to_s.split(',').map(&:strip)
   end
 
-end
+end

data/lib/spree_promo.rb

@@ -28,6 +28,10 @@ module SpreePromo
         attr_accessor :coupon_code
         before_save :process_coupon_code, :if => "@coupon_code"
 
+        def promotion_credit_exists?(credit)
+          promotion_credits.reload.detect { |c| c.source_id == credit.id }
+        end
+
         def process_coupon_code
           coupon = Promotion.find(:first, :conditions => ["UPPER(code) = ?", @coupon_code.upcase])
           if coupon

data/lib/tasks/install.rake

@@ -11,7 +11,6 @@ namespace :spree_promo do
     task :migrations do
       source = File.join(File.dirname(__FILE__), '..', '..', 'db')
       destination = File.join(Rails.root, 'db')
-      puts "INFO: Mirroring assets from #{source} to #{destination}"
       Spree::FileUtilz.mirror_files(source, destination)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 99
-  prerelease: 
+  hash: 191
+  prerelease: false
   segments: 
   - 0
-  - 30
-  - 2
-  version: 0.30.2
+  - 40
+  - 0
+  version: 0.40.0
 platform: ruby
 authors: 
 - David North
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 Z
+date: 2010-12-22 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 99
+        hash: 191
         segments: 
         - 0
-        - 30
-        - 2
-        version: 0.30.2
+        - 40
+        - 0
+        version: 0.40.0
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -81,6 +82,7 @@ files:
 - db/migrate/20100923095305_update_calculable_type_for_promotions.rb
 - public/javascripts/admin/promotions.js
 - public/stylesheets/admin/promotions.css
+has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_promo
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.