spree_promo 1.0.0.rc2 → 1.0.0.rc3

data/app/assets/javascripts/admin/promotions.js

@@ -22,6 +22,8 @@ var initProductRuleSourceField = function(){
 
 var initProductActions = function(){
 
+  $("#add_product_name").product_autocomplete();
+
   $('.calculator-fields').each(function(){
     var $fields_container = $(this);
     var $type_select = $fields_container.find('.type-select');
@@ -43,7 +45,6 @@ var initProductActions = function(){
     });
   });
 
-
   //
   // CreateLineItems Promotion Action
   //
@@ -76,7 +77,7 @@ var initProductActions = function(){
     };
     setupRemoveLineItems();
     // Add line item to list
-    $(".promotion_action.create_line_items button.add").live('click',function(e){
+    $(".promotion_action.create_line_items button.add").unbind('click').click(function(e){
       var $container = $(this).parents('.promotion_action');
       var product_name = $container.find("input[name='add_product_name']").val();
       var variant_id = $container.find("input[name='add_variant_id']").val();
@@ -86,7 +87,7 @@ var initProductActions = function(){
         var newRow = "<tr><td>" + product_name + "</td><td>" + quantity + "</td><td><img src='/assets/admin/icons/cross.png' /></td></tr>";
         $container.find('table').append(newRow);
         // Add to serialized string in hidden text field
-        var $hiddenField = $container.find("input[type='hidden']");
+        var $hiddenField = $container.find(".line_items_string");
         $hiddenField.val($hiddenField.val() + "," + variant_id + "x" + quantity);
         setupRemoveLineItems();
         hideOrShowItemTables();
@@ -101,6 +102,14 @@ var initProductActions = function(){
 $(document).ready(function() {
   initProductRuleSourceField();
   initProductActions();
+
+  // toggle fields for specific events
+  $('#promotion_event_name').change(function() {
+    $('#promotion_code_field').toggle($('#promotion_event_name').val() == 'spree.checkout.coupon_code_added');
+    $('#promotion_path_field').toggle($('#promotion_event_name').val() == 'spree.content.visited');
+  });
+  $('#promotion_event_name').change();
+
 });
 
 

data/app/controllers/spree/admin/promotion_rules_controller.rb

@@ -1,4 +1,6 @@
 class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
+  helper 'spree/promotion_rules'
+
   def create
     @promotion = Spree::Promotion.find(params[:promotion_id])
     @promotion_rule = params[:promotion_rule][:type].constantize.new(params[:promotion_rule])

data/app/controllers/spree/admin/promotions_controller.rb

@@ -2,6 +2,7 @@ module Spree
   module Admin
     class PromotionsController < ResourceController
       before_filter :load_data
+      helper 'spree/promotion_rules'
 
       protected
         def build_resource
@@ -21,4 +22,4 @@ module Spree
         end
     end
   end
-end
+end

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -1,19 +1,17 @@
 Spree::CheckoutController.class_eval do
+
+  #TODO 90% of this method is duplicated code. DRY
   def update
     if @order.update_attributes(object_params)
 
       fire_event('spree.checkout.update')
 
       if @order.coupon_code.present?
-        # Promotion codes are stored in the preference table
-        # Therefore we need to do a lookup there and find if one exists
-        #
-        # TODO: The ActiveRecord::Base.connection.quote_column_name stuff is a bit long...
-        # TODO: Is there a better way to do that?
-        if Spree::Preference.where(:value => @order.coupon_code).where("#{ActiveRecord::Base.connection.quote_column_name("key")} LIKE 'spree/promotion/code/%'").present?
+
+        if Spree::Promotion.exists?(:code => @order.coupon_code)
           fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
-        # If it doesn't exist, raise an error!
-        # Giving them another chance to enter a valid coupon code
+          # If it doesn't exist, raise an error!
+          # Giving them another chance to enter a valid coupon code
         else
           flash[:error] = t(:promotion_not_found)
           render :edit and return
@@ -39,4 +37,5 @@ Spree::CheckoutController.class_eval do
       respond_with(@order) { |format| format.html { render :edit } }
     end
   end
+
 end

data/app/controllers/spree/content_controller_decorator.rb

@@ -1,10 +1,7 @@
-# Keep a record ot all static page paths visited for promotions that require them
 Spree::ContentController.class_eval do
-  after_filter :store_visited_path
+  after_filter :fire_visited_event
 
-  def store_visited_path
-    session[:visited_paths] ||= []
-    path = "content/#{params[:action]}"
-    session[:visited_paths] = (session[:visited_paths]  << path).compact.uniq
+  def fire_visited_event
+    fire_event('spree.content.visited', :path => path = "content/#{params[:action]}")
   end
 end

data/app/helpers/spree/promotion_rules_helper.rb

@@ -0,0 +1,13 @@
+module Spree
+  module PromotionRulesHelper
+
+    def options_for_promotion_rule_types(promotion)
+      existing = promotion.rules.map { |rule| rule.class.name }
+      rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
+      options = rule_names.map { |name| [ t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
+      options_for_select(options)
+    end
+ 
+  end
+end
+

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -10,13 +10,22 @@ module Spree
       return unless order = options[:order]
       # Nothing to do if the promotion is already associated with the order
       return if order.promotion_credit_exists?(promotion)
-      if amount = calculator.compute(order)
-        amount = BigDecimal.new(amount.to_s)
-        amount = order.item_total if amount > order.item_total
-        order.adjustments.promotion.reload.clear
-        order.update!
-        create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
-      end
+
+      order.adjustments.promotion.reload.clear
+      order.update!
+      create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
+    end
+
+    # override of CalculatedAdjustments#create_adjustment so promotional
+    # adjustments are added all the time. They will get their eligability
+    # set to false if the amount is 0
+    def create_adjustment(label, target, calculable, mandatory=false)
+      amount = compute_amount(calculable)
+      target.adjustments.create(:amount => amount,
+                                :source => calculable,
+                                :originator => self,
+                                :label => label,
+                                :mandatory => mandatory)
     end
 
     # Ensure a negative amount which does not exceed the sum of the order's item_total and ship_total

data/app/models/spree/promotion/actions/create_line_items.rb

@@ -7,7 +7,10 @@ module Spree
     def perform(options = {})
       return unless order = options[:order]
       promotion_action_line_items.each do |item|
-        order.add_variant(item.variant, item.quantity)
+        current_quantity = order.quantity_of(item.variant)
+        if current_quantity < item.quantity
+          order.add_variant(item.variant, item.quantity - current_quantity)
+        end
       end
     end
 

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

@@ -1,7 +1,8 @@
 module Spree
   class Promotion::Rules::FirstOrder < PromotionRule
     def eligible?(order, options = {})
-      order.user && order.user.orders.complete.count == 0
+      user = order.try(:user) || options[:user]
+      !!(user && user.orders.complete.count == 0)
     end
   end
 end

data/app/models/spree/promotion.rb

@@ -1,16 +1,10 @@
 module Spree
   class Promotion < Spree::Activator
     MATCH_POLICIES = %w(all any)
+    UNACTIVATABLE_ORDER_STATES = ["complete", "awaiting_return", "returned"]
 
-    preference :usage_limit, :integer
-    preference :match_policy, :string, :default => MATCH_POLICIES.first
-    preference :code, :string
-    preference :advertise, :boolean, :default => false
-
-    [:usage_limit, :match_policy, :code, :advertise].each do |field|
-      alias_method field, "preferred_#{field}"
-      alias_method "#{field}=", "preferred_#{field}="
-    end
+    Activator.event_names << 'spree.checkout.coupon_code_added'
+    Activator.event_names << 'spree.content.visited'
 
     has_many :promotion_rules, :foreign_key => 'activator_id', :autosave => true, :dependent => :destroy
     alias_method :rules, :promotion_rules
@@ -20,8 +14,6 @@ module Spree
     alias_method :actions, :promotion_actions
     accepts_nested_attributes_for :promotion_actions
 
-    after_create :update_preferences
-
     # TODO: This shouldn't be necessary with :autosave option but nested attribute updating of actions is broken without it
     after_save :save_rules_and_actions
     def save_rules_and_actions
@@ -29,24 +21,9 @@ module Spree
     end
 
     validates :name, :presence => true
-    #validates :preferred_code, :presence => true, :if => lambda{|r| r.event_name == 'spree.checkout.coupon_code_added' }
-
-    %w(usage_limit match_policy code advertise).each do |pref|
-      method_name = pref.to_sym
-      define_method method_name do
-        get_preference(pref.to_sym)
-      end
-
-      method_name = "#{pref}=".to_sym
-      define_method method_name do |value|
-        unless new_record?
-          pref = value
-        else
-          @preferences_hash ||= {}
-          @preferences_hash[pref.to_sym] = value
-        end
-      end
-    end
+    validates :code, :presence => true, :if => lambda{|r| r.event_name == 'spree.checkout.coupon_code_added' }
+    validates :path, :presence => true, :if => lambda{|r| r.event_name == 'spree.content.visited' }
+    validates :usage_limit, :numericality => { :greater_than => 0, :allow_nil => true }
 
     class << self
       def advertised
@@ -67,28 +44,30 @@ module Spree
     end
 
     def activate(payload)
-      # Since multiple promotions could be listening we need to make sure the
-      # event applies to this one.
-      if eligible?(payload[:order], payload)
-        actions.each do |action|
-          action.perform(payload)
-        end
+      return unless order_activatable? payload[:order]
+
+      if code.present?
+        event_code = payload[:coupon_code].to_s.strip.downcase
+        return unless event_code == self.code.to_s.strip.downcase
       end
-    end
 
-    # Whether the promotion is eligible for this particular order.
-    def eligible?(order, options = {})
-      return false if expired? || usage_limit_exceeded?(order)
+      if path.present?
+        return unless path == payload[:path]
+      end
 
-      event_code = options[:coupon_code].to_s.strip.downcase
-      return false unless event_code == self.code.to_s.strip.downcase
+      actions.each do |action|
+        action.perform(payload)
+      end
+    end
 
-      rules_are_eligible?(order, options)
+    # called anytime order.update! happens
+    def eligible?(order)
+      return false if expired? || usage_limit_exceeded?(order)
+      rules_are_eligible?(order, {})
     end
 
     def rules_are_eligible?(order, options = {})
       return true if rules.none?
-
       eligible = lambda { |r| r.eligible?(order, options) }
       if match_policy == 'all'
         rules.all?(&eligible)
@@ -97,13 +76,19 @@ module Spree
       end
     end
 
+    def order_activatable?(order)
+      order &&
+      created_at.to_i < order.created_at.to_i &&
+      !UNACTIVATABLE_ORDER_STATES.include?(order.state)
+    end
+
     # Products assigned to all product rules
     def products
       @products ||= rules.of_type('Promotion::Rules::Product').map(&:products).flatten.uniq
     end
 
     def usage_limit_exceeded?(order = nil)
-      preferred_usage_limit.present? && preferred_usage_limit.to_i > 0 && adjusted_credits_count(order) >= preferred_usage_limit.to_i
+      usage_limit.present? && usage_limit > 0 && adjusted_credits_count(order) >= usage_limit
     end
 
     def adjusted_credits_count(order)
@@ -119,16 +104,5 @@ module Spree
       credits.count
     end
 
-
-    private
-
-    def update_preferences
-      if @preferences_hash.present? && !@preferences_hash.empty?
-        @preferences_hash.each do |key, value|
-          pref_key = "spree/promotion/#{key}/#{self.id}"
-          Spree::Preference.create(:value => value, :key => pref_key)
-        end
-      end
-    end
   end
 end

data/app/models/spree/promotion_rule.rb

@@ -5,8 +5,19 @@ module Spree
 
     scope :of_type, lambda {|t| {:conditions => {:type => t}}}
 
+    validate :promotion, :presence => true
+    validate :unique_per_activator, :on => :create
+
     def eligible?(order, options = {})
       raise 'eligible? should be implemented in a sub-class of Promotion::PromotionRule'
     end
+
+    private
+    def unique_per_activator
+      if Spree::PromotionRule.exists?(:activator_id => activator_id, :type => self.class.name)
+        errors[:base] << "Promotion already contains this rule type"
+      end
+    end
+ 
   end
 end

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,4 +1,5 @@
-$('#actions_container').html('<%= escape_javascript( render(:partial => 'spree/admin/promotions/actions') ) %>');
+$('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_action', :object => @promotion_action) ) %>');
+
 initProductActions();
 
 $('#<%= dom_id @promotion_action %>').hide();

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -4,3 +4,5 @@ $('#<%= dom_id @promotion_rule %>').fadeIn();
 initProductRuleSourceField();
 $('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
 $('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();
+
+$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');

data/app/views/spree/admin/promotion_rules/destroy.js.erb

@@ -1 +1,3 @@
 $('#<%= dom_id @promotion_rule %>').fadeOut().remove();
+$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
+

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -4,12 +4,7 @@
   <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
     <div id="actions" class="filter_list">
       <% if @promotion.actions.any? %>
-        <%#= render :partial => 'promotion_action', :collection => @promotion.actions, :locals => {:f => f} %>
-
-        <%= f.fields_for :promotion_actions do |action_form| %>
-          <%= render :partial => 'spree/admin/promotions/promotion_action', :locals => { :action_form => action_form } %>
-        <% end %>
-
+        <%= render :partial => 'promotion_action',  :collection => @promotion.actions %>
       <% else %>
         <!-- <p><%= t(:no_actions_added) %></p> -->
       <% end %>

data/app/views/spree/admin/promotions/_form.html.erb

@@ -16,6 +16,11 @@
     <%= f.text_field :code %>
   <% end %>
 
+  <%= f.field_container :path do %>
+    <%= f.label :path, t(:path) %><br />
+    <%= f.text_field :path %>
+  <% end %>
+
   <%= f.field_container :description do %>
     <%= f.label :description %><br />
     <%= f.text_area :description, :style => 'height:50px;' %>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -1,12 +1,11 @@
-<% promotion_action = action_form.object %>
-<div class="promotion_action <%= promotion_action.type.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
+<div class="promotion_action <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
   <span class="delete">
     <%= link_to_with_icon 'cross', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete %>
   </span>
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
-  <%#= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
+  <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
   <p><%= t("promotion_action_types.#{type_name}.description") %></p>
-
-  <%= render :partial => "spree/admin/promotions/actions/#{type_name}", :locals => { :action_form => action_form, :promotion_action => promotion_action, :param_prefix => param_prefix } %>
-</div>
+  <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
+             :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
+</div>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -4,7 +4,7 @@
   <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
     <p>
       <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-        <label><%= f.radio_button :preferred_match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label> &nbsp;
+        <label><%= f.radio_button :match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label> &nbsp;
       <% end %>
     </p>
     <div id="rules" class="filter_list">
@@ -21,10 +21,10 @@
 
   <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true,
                                                                  :id => 'new_product_rule_form' do %>
-    <% options = options_for_select( Rails.application.config.spree.promotions.rules.map(&:name).map {|name| [ t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] } ) %>
+
     <p>
       <%= label_tag :promotion_rule_type, t(:add_rule_of_type) %>
-      <%= select_tag('promotion_rule[type]', options) %>
+      <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion)) %>
       <%= submit_tag t(:add) %>
     </p>
   <% end %>

data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb

@@ -1,8 +1,11 @@
 <div class="calculator-fields">
 
   <p class="field">
-    <%= action_form.label :calculator_type, t(:calculator) %>
-    <%= action_form.collection_select :calculator_type, @calculators, :to_s, :description, {}, {:class => 'type-select'} %>
+    <% field_name = "#{param_prefix}[calculator_type]" %>
+    <%= label_tag field_name, t(:calculator) %>
+    <%= select_tag field_name,
+                   options_from_collection_for_select(@calculators, :to_s, :description, promotion_action.calculator.type),
+                   :class => 'type-select' %>
     <% if promotion_action.calculator.respond_to?(:preferences) %>
       &nbsp; <span class="warning"><%= t(:calculator_settings_warning) %></span>
     <% end %>
@@ -10,10 +13,15 @@
 
   <% unless promotion_action.new_record? %>
     <div class="settings">
-      <%= action_form.fields_for :calculator, promotion_action.calculator do |calculator_form| %>
-        <%= preference_fields(promotion_action.calculator, calculator_form) %>
-      <% end %>
+      <% promotion_action.calculator.preferences.keys.map do |key| %>
+        <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
+        <%= label_tag field_name, key.to_s.titleize %>
+        <%= preference_field_tag(field_name,
+                                 promotion_action.calculator.get_preference(key),
+                                 :type => promotion_action.calculator.preference_type(key)) %>
+        <% end %>
+        <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
     </div>
   <% end %>
 
-</div>
+</div>

data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb

@@ -19,7 +19,8 @@
   <% end %>
 </table>
 
-<%= action_form.hidden_field :line_items_string %>
+<%= hidden_field_tag "#{param_prefix}[line_items_string]", promotion_action.line_items_string,
+                     :class => 'line_items_string' %>
 
 <div class="add-line-item">
   <fieldset>
@@ -38,6 +39,5 @@
       &nbsp;<br />
       <button class="add small"> <%= t(:add) %></button>
     </div>
-
   </fieldset>
 </div>

data/config/locales/en.yml

@@ -19,6 +19,8 @@ en:
     spree:
       checkout:
         coupon_code_added: Coupon code added
+      content:
+        visited: Visit static content page
   expiry: Expiry
   free_shipping: Free Shipping
   new_promotion: New Promotion

data/db/migrate/20120119024707_namespace_promo_tables.rb

@@ -0,0 +1,65 @@
+class NamespacePromoTables < ActiveRecord::Migration
+  def self.up
+    # namespace promo tables
+    rename_table :promotion_actions, :spree_promotion_actions
+    rename_table :promotion_rules, :spree_promotion_rules
+    rename_table :promotion_rules_users, :spree_promotion_rules_users
+    rename_table :promotion_action_line_items, :spree_promotion_action_line_items
+    rename_table :products_promotion_rules, :spree_products_promotion_rules
+
+    # add old promo preferences as columns
+    add_column :spree_activators, :usage_limit, :integer
+    add_column :spree_activators, :match_policy, :string, :default => 'all'
+    add_column :spree_activators, :code, :string
+    add_column :spree_activators, :advertise, :boolean, :default => false
+
+    Spree::Promotion.class_eval do
+      preference :usage_limit, :integer
+      preference :match_policy, :string, :default => 'all'
+      preference :code, :string
+      preference :advertise, :boolean, :default => false
+    end
+
+    # manually update old promotions to use the new promotion style
+    Spree::Preference.where(:owner_type => 'Spree::Activator').group_by(&:owner_id).each do |key, pref_group|
+      @promo = Spree::Promotion.new
+      pref_group.each do |pref|
+        case pref.name
+        when 'code'
+          @promo.code = pref.value.to_s
+          @promo.name = pref.value.to_s
+        when 'advertise'
+          @promo.advertise = pref.value
+        when 'usage_limit'
+          @promo.usage_limit = pref.value
+        when 'match_policy'
+          @promo.match_policy = pref.value
+        end
+        @promo.event_name = Spree::Promotion.find(pref.owner_id).event_name
+      end
+      @promo.save!
+    end
+
+    # Remove old promotions
+    Spree::Promotion.where(:code => nil).delete_all
+
+    # This *should* be in the new_preferences migration inside of Core but...
+    # This is migration needs to have these keys around so that
+    # we can convert the promotions over correctly.
+    # So they hang around until we're *finally* done with them, since promo's
+    # migrations are copied over *after* core, and then we ditch them.
+    remove_column :spree_preferences, :name
+    remove_column :spree_preferences, :owner_id
+    remove_column :spree_preferences, :owner_type
+    remove_column :spree_preferences, :group_id
+    remove_column :spree_preferences, :group_type
+  end
+
+  def self.down
+    rename_table :spree_promotion_actions, :promotion_actions
+    rename_table :spree_promotion_rules, :promotion_rules
+    rename_table :spree_promotion_rules_users, :promotion_rules_users
+    rename_table :spree_promotion_action_line_items, :promotion_action_line_items
+    rename_table :spree_products_promotion_rules, :products_promotion_rules
+  end
+end

data/db/migrate/20120119024708_create_spree_pending_promotions.rb

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

data/db/migrate/20120119024721_content_visited_event.rb

@@ -0,0 +1,29 @@
+# LandingPage used to support static pages, we've moved to a static
+# event. This adds path to promotions then migrates the old LandingPage rules
+class ContentVisitedEvent < ActiveRecord::Migration
+
+  # Removed Class for Migrations
+  class Spree::Promotion::Rules::LandingPage < Spree::PromotionRule
+    preference :path, :string
+    def eligible?(order, options = {})
+      true
+    end
+  end
+
+  def up
+    add_column :spree_activators, :path, :string
+
+    Spree::Promotion::Rules::LandingPage.all.each do |promotion_rule|
+      promotion = promotion_rule.promotion
+      say "migrating #{promotion.name} promotion to use 'spree.content.visited' event"
+      promotion.event_name = 'spree.content.visited'
+      promotion.path = promotion_rule.preferred_path
+      promotion.promotion_rules.delete promotion_rule
+      promotion.save(:validate => false)
+    end
+  end
+
+  def down
+    remove_column :spree_activators, :path
+  end
+end

data/lib/spree/promo/engine.rb

@@ -13,12 +13,6 @@ module Spree
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
 
-        # Include list of visited paths in notification payload hash
-        Spree::Core::ControllerHelpers::InstanceMethods.class_eval do
-          def default_notification_payload
-            { :user => current_user, :order => current_order, :visited_paths => session[:visited_paths] }
-          end
-        end
       end
 
       config.autoload_paths += %W(#{config.root}/lib)
@@ -46,7 +40,6 @@ module Spree
           Spree::Promotion::Rules::Product,
           Spree::Promotion::Rules::User,
           Spree::Promotion::Rules::FirstOrder,
-          Spree::Promotion::Rules::LandingPage,
           Spree::Promotion::Rules::UserLoggedIn]
       end
 
@@ -54,6 +47,7 @@ module Spree
         app.config.spree.promotions.actions = [Spree::Promotion::Actions::CreateAdjustment,
           Spree::Promotion::Actions::CreateLineItems]
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70362724534240 !ruby/object:Gem::Requirement
+  requirement: &70260369514180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70362724534240
+  version_requirements: *70260369514180
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70362724533380 !ruby/object:Gem::Requirement
+  requirement: &70260369513500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70362724533380
+  version_requirements: *70260369513500
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -52,6 +52,7 @@ files:
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/content_controller_decorator.rb
 - app/controllers/spree/orders_controller_decorator.rb
+- app/helpers/spree/promotion_rules_helper.rb
 - app/models/spree/adjustment_decorator.rb
 - app/models/spree/calculator/free_shipping.rb
 - app/models/spree/order_decorator.rb
@@ -61,7 +62,6 @@ files:
 - app/models/spree/promotion/actions/create_line_items.rb
 - app/models/spree/promotion/rules/first_order.rb
 - app/models/spree/promotion/rules/item_total.rb
-- app/models/spree/promotion/rules/landing_page.rb
 - app/models/spree/promotion/rules/product.rb
 - app/models/spree/promotion/rules/user.rb
 - app/models/spree/promotion/rules/user_logged_in.rb
@@ -84,7 +84,6 @@ files:
 - app/views/spree/admin/promotions/_tab.html.erb
 - app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
 - app/views/spree/admin/promotions/actions/_create_line_items.html.erb
-- app/views/spree/admin/promotions/actions/_give_store_credit.html.erb
 - app/views/spree/admin/promotions/edit.html.erb
 - app/views/spree/admin/promotions/index.html.erb
 - app/views/spree/admin/promotions/new.html.erb
@@ -112,7 +111,9 @@ 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/20111013155037_namespace_promo_tables.rb
+- db/migrate/20120119024707_namespace_promo_tables.rb
+- db/migrate/20120119024708_create_spree_pending_promotions.rb
+- db/migrate/20120119024721_content_visited_event.rb
 homepage: http://spreecommerce.com
 licenses: []
 post_install_message: 

data/app/models/spree/promotion/rules/landing_page.rb

@@ -1,16 +0,0 @@
-# A rule to limit a promotion to a specific user.
-module Spree
-  class Promotion::Rules::LandingPage < PromotionRule
-    preference :path, :string
-
-    def eligible?(order, options = {})
-      if options.has_key?(:visited_paths)
-        options[:visited_paths].to_a.any? do |path|
-          path == preferred_path
-        end
-      else
-        true
-      end
-    end
-  end
-end

data/app/views/spree/admin/promotions/actions/_give_store_credit.html.erb

@@ -1,6 +0,0 @@
-<p class="field">
-  <label for="<%= "#{param_prefix}_preferred_amount" %>">
-    <%= t(:amount) %>
-    <%= action_form.text_field :preferred_amount, :size => 10 %>
-  </label>
-</p>

data/db/migrate/20111013155037_namespace_promo_tables.rb

@@ -1,9 +0,0 @@
-class NamespacePromoTables < ActiveRecord::Migration
-  def change
-    rename_table :promotion_actions, :spree_promotion_actions
-    rename_table :promotion_rules, :spree_promotion_rules
-    rename_table :promotion_rules_users, :spree_promotion_rules_users
-    rename_table :promotion_action_line_items, :spree_promotion_action_line_items
-    rename_table :products_promotion_rules, :spree_products_promotion_rules
-  end
-end