spree_promo 0.70.3 → 0.70.4

data/app/controllers/checkout_controller_decorator.rb

@@ -0,0 +1,13 @@
+CheckoutController.class_eval do
+  before_filter :apply_pending_promotions
+
+  def apply_pending_promotions
+    # apply all promotions that may have been triggered before theorder had been created
+    if current_user
+      current_user.pending_promotions.each do |promotional|
+        promotional.promotion.activate(:order => @order, :user => current_user)
+        promotional.destroy
+      end
+    end
+  end
+end

data/app/models/pending_promotion.rb

@@ -0,0 +1,4 @@
+class PendingPromotion < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :promotion
+end

data/app/models/promotion.rb

@@ -12,7 +12,7 @@ class Promotion < Activator
     alias_method field, "preferred_#{field}"
     alias_method "#{field}=", "preferred_#{field}="
   end
-  
+
   has_many :promotion_rules, :foreign_key => 'activator_id', :autosave => true, :dependent => :destroy
   alias_method :rules, :promotion_rules
   accepts_nested_attributes_for :promotion_rules
@@ -87,7 +87,7 @@ class Promotion < Activator
   end
 
   def credits
-    Adjustment.where(:originator_id => actions.map(&:id))
+    Adjustment.where(:originator_type => 'Promotion', :originator_id => actions.map(&:id))
   end
 
   def credits_count

data/app/models/user_decorator.rb

@@ -0,0 +1,4 @@
+User.class_eval do
+  has_many :pending_promotions
+  has_many :promotions, :through => :pending_promotions
+end

data/db/migrate/20120119024708_create_pending_promotions.rb

@@ -0,0 +1,11 @@
+class CreatePendingPromotions < ActiveRecord::Migration
+  def change
+    create_table :pending_promotions do |t|
+      t.references :user
+      t.references :promotion
+    end
+
+    add_index :pending_promotions, :user_id
+    add_index :pending_promotions, :promotion_id
+  end
+end

data/lib/spree_promo.rb

@@ -54,5 +54,18 @@ module SpreePromo
         Promotion::Actions::CreateLineItems]
     end
 
+    config.after_initialize do
+      ActiveSupport::Notifications.subscribe('spree.user.signup') do |*args|
+        event_name, start_time, end_time, id, payload = args
+
+        # Used for storing promotions before order has been created
+        # Fixes #836
+        ::Promotion.active.event_name_starts_with('spree.user.signup').each do |activator|
+          if activator.eligible?(nil, payload) && payload[:user]
+            payload[:user].promotions << activator
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 257
+  hash: 271
   prerelease: 
   segments: 
   - 0
   - 70
-  - 3
-  version: 0.70.3
+  - 4
+  version: 0.70.4
 platform: ruby
 authors: 
 - David North
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2012-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -23,12 +23,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 257
+        hash: 271
         segments: 
         - 0
         - 70
-        - 3
-        version: 0.70.3
+        - 4
+        version: 0.70.4
   requirement: *id001
   type: :runtime
   prerelease: false
@@ -39,12 +39,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 257
+        hash: 271
         segments: 
         - 0
         - 70
-        - 3
-        version: 0.70.3
+        - 4
+        version: 0.70.4
   requirement: *id002
   type: :runtime
   prerelease: false
@@ -68,11 +68,13 @@ files:
 - app/controllers/admin/promotion_actions_controller.rb
 - app/controllers/admin/promotion_rules_controller.rb
 - app/controllers/admin/promotions_controller.rb
+- app/controllers/checkout_controller_decorator.rb
 - app/controllers/content_controller_decorator.rb
 - app/controllers/orders_controller_decorator.rb
 - app/models/adjustment_decorator.rb
 - app/models/calculator/free_shipping.rb
 - app/models/order_decorator.rb
+- app/models/pending_promotion.rb
 - app/models/product_decorator.rb
 - app/models/product_group_decorator.rb
 - app/models/promotion/actions/create_adjustment.rb
@@ -87,6 +89,7 @@ files:
 - app/models/promotion_action.rb
 - app/models/promotion_action_line_item.rb
 - app/models/promotion_rule.rb
+- app/models/user_decorator.rb
 - app/overrides/promo_admin_tabs.rb
 - app/overrides/promo_coupon_code_field.rb
 - app/overrides/promo_product_properties.rb
@@ -131,6 +134,7 @@ files:
 - db/migrate/20110331094351_promotion_changes_to_subclass_of_activator.rb
 - db/migrate/20110404123358_create_promotion_actions.rb
 - db/migrate/20110601202923_create_promotion_action_line_items.rb
+- db/migrate/20120119024708_create_pending_promotions.rb
 homepage: http://spreecommerce.com
 licenses: []