spree_promo 1.0.7 → 1.1.0.rc1

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

@@ -1,25 +1,3 @@
-
-var initProductRuleSourceField = function(){
-
-  $products_source_field = jQuery('.products_rule_products_source_field input');
-  $products_source_field.click(function() {
-    $rule_container = jQuery(this).parents('.promotion_rule');
-    if(this.checked){
-      if(this.value == 'manual'){
-        $rule_container.find('.products_rule_products').show();
-        $rule_container.find('.products_rule_product_group').hide();
-      } else {
-        $rule_container.find('.products_rule_products').hide();
-        $rule_container.find('.products_rule_product_group').show();
-      }
-    }
-  });
-  $products_source_field.each(function() {
-    $(this).triggerHandler('click');
-  });
-
-};
-
 var initProductActions = function(){
 
   $("#add_product_name").product_autocomplete();
@@ -100,7 +78,6 @@ var initProductActions = function(){
 }
 
 $(document).ready(function() {
-  initProductRuleSourceField();
   initProductActions();
 
   // toggle fields for specific events

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

@@ -3,7 +3,11 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
 
   def create
     @promotion = Spree::Promotion.find(params[:promotion_id])
-    @promotion_rule = params[:promotion_rule][:type].constantize.new(params[:promotion_rule])
+    # Remove type key from this hash so that we don't attempt
+    # to set it when creating a new record, as this is raises
+    # an error in ActiveRecord 3.2.
+    promotion_rule_type = params[:promotion_rule].delete(:type)
+    @promotion_rule = promotion_rule_type.constantize.new(params[:promotion_rule])
     @promotion_rule.promotion = @promotion
     if @promotion_rule.save
       flash.notice = I18n.t(:successfully_created, :resource => I18n.t(:promotion_rule))

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

@@ -6,9 +6,14 @@ module Spree
 
       protected
         def build_resource
-          @promotion = Promotion.new(params[:promotion])
-          if params[:promotion] && params[:promotion][:calculator_type]
-            @promotion.calculator = params[:promotion][:calculator_type].constantize.new
+          if params[:promotion]
+            calculator_type = params[:promotion].delete(:calculator_type)
+            @promotion = Promotion.new(params[:promotion])
+            if calculator_type
+              @promotion.calculator = calculator_type.constantize.new
+            end
+          else
+            @promotion = Promotion.new
           end
           @promotion
         end
@@ -22,4 +27,4 @@ module Spree
         end
     end
   end
-end
+end

data/app/models/spree/product_decorator.rb

@@ -2,8 +2,7 @@ Spree::Product.class_eval do
   has_and_belongs_to_many :promotion_rules, :join_table => 'spree_products_promotion_rules'
 
   def possible_promotions
-    rules_with_matching_product_groups = product_groups.map(&:promotion_rules).flatten
-    all_rules = promotion_rules + rules_with_matching_product_groups
+    all_rules = promotion_rules
     promotion_ids = all_rules.map(&:activator_id).uniq
     Spree::Promotion.advertised.where(:id => promotion_ids)
   end

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

@@ -21,13 +21,12 @@ module Spree
     # 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
-      }, :without_protection => true)
+      params = { :amount => amount,
+                :source => calculable,
+                :originator => self,
+                :label => label,
+                :mandatory => mandatory }
+      target.adjustments.create(params, :without_protection => true)
     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

@@ -23,10 +23,7 @@ module Spree
       value.to_s.split(',').each do |str|
         variant_id, quantity = str.split('x')
         if variant_id && quantity && variant = Variant.find_by_id(variant_id)
-          promotion_action_line_items.create({
-            :variant => variant,
-            :quantity => quantity.to_i,
-          }, :without_protection => true)
+          promotion_action_line_items.create({:variant => variant, :quantity => quantity.to_i}, :without_protection => true)
         end
       end
     end

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

@@ -4,6 +4,8 @@ module Spree
     preference :amount, :decimal, :default => 100.00
     preference :operator, :string, :default => '>'
 
+    attr_accessible :preferred_amount, :preferred_operator
+
     OPERATORS = ['gt', 'gte']
 
     def eligible?(order, options = {})

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

@@ -3,7 +3,6 @@
 # Valid products either come from assigned product group or are assingned directly to the rule.
 module Spree
   class Promotion::Rules::Product < PromotionRule
-    belongs_to :product_group
     has_and_belongs_to_many :products, :class_name => '::Spree::Product', :join_table => 'spree_products_promotion_rules', :foreign_key => 'promotion_rule_id'
 
     MATCH_POLICIES = %w(any all)
@@ -11,7 +10,7 @@ module Spree
 
     # scope/association that is used to test eligibility
     def eligible_products
-      product_group ? product_group.products : products
+      products
     end
 
     def eligible?(order, options = {})
@@ -23,12 +22,6 @@ module Spree
       end
     end
 
-    def products_source=(source)
-      if source.to_s == 'manual'
-        self.product_group_id = nil
-      end
-    end
-
     def product_ids_string
       product_ids.join(',')
     end

data/app/models/spree/promotion.rb

@@ -15,9 +15,9 @@ module Spree
     accepts_nested_attributes_for :promotion_actions
 
     attr_accessible :name, :event_name, :code, :match_policy,
-                :path, :advertise, :description, :usage_limit,
-                :starts_at, :expires_at, :promotion_rules_attributes,
-                :promotion_actions_attributes
+                    :path, :advertise, :description, :usage_limit,
+                    :starts_at, :expires_at, :promotion_rules_attributes,
+                    :promotion_actions_attributes
 
     # 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
@@ -30,17 +30,15 @@ module Spree
     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
-        where(:advertise => true)
-      end
+    def self.advertised
+      where(:advertise => true)
     end
 
     # TODO: Remove that after fix for https://rails.lighthouseapp.com/projects/8994/tickets/4329-has_many-through-association-does-not-link-models-on-association-save
     # is provided
     def save(*)
       if super
-        promotion_rules.each { |p| p.save }
+        promotion_rules.each(&:save)
       end
     end
 

data/app/models/spree/promotion_action.rb

@@ -6,8 +6,6 @@ module Spree
 
     scope :of_type, lambda {|t| {:conditions => {:type => t}}}
 
-    attr_accessible :line_items_string, :calculator_type, :calculator_attributes
-
     # This method should be overriden in subclass
     # Updates the state of the order or performs some other action depending on the subclass
     # options will contain the payload from the event that activated the promotion. This will include

data/app/models/spree/promotion_rule.rb

@@ -8,7 +8,7 @@ module Spree
     validate :promotion, :presence => true
     validate :unique_per_activator, :on => :create
 
-    attr_accessible :preferred_operator, :preferred_amount, :product, :product_ids_string, :preferred_match_policy
+    attr_accessible :preferred_operator, :preferred_amount
 
     def eligible?(order, options = {})
       raise 'eligible? should be implemented in a sub-class of Promotion::PromotionRule'

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

@@ -1,7 +1,6 @@
 $('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
 $('#<%= dom_id @promotion_rule %>').hide();
 $('#<%= dom_id @promotion_rule %>').fadeIn();
-initProductRuleSourceField();
 $('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
 $('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();
 

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

@@ -7,17 +7,17 @@
   <% end %>
 
   <%= f.field_container :event_name do %>
-    <%= f.label :event_name, t(:event) %><br />
+    <%= f.label :event_name %><br />
     <%= f.select :event_name, Spree::Activator.event_names.map{|name| [t("events.#{name}"), name] } %>
   <% end %>
 
   <%= f.field_container :code do %>
-    <%= f.label :code, t(:code) %><br />
+    <%= f.label :code %><br />
     <%= f.text_field :code %>
   <% end %>
 
   <%= f.field_container :path do %>
-    <%= f.label :path, t(:path) %><br />
+    <%= f.label :path %><br />
     <%= f.text_field :path %>
   <% end %>
 
@@ -28,7 +28,7 @@
 
   <%= f.field_container :advertise do %>
     <%= f.check_box :advertise %>
-    <%= f.label :advertise, t(:advertise) %>
+    <%= f.label :advertise %>
   <% end %>
 
 </fieldset>
@@ -36,7 +36,7 @@
 <fieldset id="expiry_fields">
   <legend><%= t(:expiry) %></legend>
   <p>
-    <%= f.label :usage_limit, t(:usage_limit) %><br />
+    <%= f.label :usage_limit %><br />
     <%= f.text_field :usage_limit %>
   </p>
 

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

@@ -15,7 +15,7 @@
     <div class="settings">
       <% promotion_action.calculator.preferences.keys.map do |key| %>
         <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
-        <%= label_tag field_name, key.to_s.titleize %>
+        <%= label_tag field_name, t(key.to_s) %>
         <%= preference_field_tag(field_name,
                                  promotion_action.calculator.get_preference(key),
                                  :type => promotion_action.calculator.preference_type(key)) %>
@@ -24,4 +24,4 @@
     </div>
   <% end %>
 
-</div>
+</div>

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

@@ -36,9 +36,8 @@
       <%= text_field_tag :add_quantity, 1 %>
     </div>
     <div style="float:left; width:j0%">
-      <button class="add small">
-        <span><%= t(:add) %></span>
-      </button>
+      &nbsp;<br />
+      <button class="add small"> <%= t(:add) %></button>
     </div>
   </fieldset>
 </div>

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

@@ -22,7 +22,7 @@
   </thead>
   <tbody>
     <% @promotions.each do |promotion| %>
-      <tr id="<%= dom_id promotion %>">
+      <tr id="<%= spree_dom_id promotion %>">
         <td><%= promotion.name %></td>
         <td><%= promotion.code %></td>
         <td><%= promotion.description %></td>

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -1,19 +1,10 @@
-<p class="field products_rule_products_source_field">
-  <label><%= radio_button_tag "#{param_prefix}[products_source]", :manual, promotion_rule.product_group.nil? %> <%= t "product_rule.product_source.manual" %></label> &nbsp;
-  <label><%= radio_button_tag "#{param_prefix}[products_source]", :group, promotion_rule.product_group.present? %> <%= t('product_rule.product_source.group') %></label>
-</p>
-<p class="field products_rule_product_group">
-  <label><%= t(:product_group) %><br />
-    <%= select_tag "#{param_prefix}[product_group_id]", options_from_collection_for_select(Spree::ProductGroup.all, :id, :name, promotion_rule.product_group_id), { :include_blank => true } %></label>
-</p>
 <p class="field products_rule_products">
   <label>
     <%= t('product_rule.choose_products') %><br />
     <%= product_picker_field "#{param_prefix}[product_ids_string]", promotion_rule.product_ids_string %>
-  </label>
 </p>
 <p>
   <label>
-    <%= t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy))).html_safe %>
+    <%= t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy)), :include_blank => true).html_safe %>
   </label>
 </p>

data/config/locales/en.yml

@@ -1,17 +1,19 @@
 ---
 en:
-  activemodel:
+  activerecord:
     attributes:
-      promotion:
-        name: Name
-        description: Description
+      spree/promotion:
+        advertise: Advertise
         code: Code
-        usage_limit: Usage limit
-        starts_at: Starts at
-        expires_at: Expires at
+        description: Description
+        event_name: Event Name
+        expires_at: Expires At
+        name: Name
+        path: Path
+        starts_at: Starts At
+        usage_limit: Usage Limit
   add_action_of_type: Add action of type
   add_rule_of_type: Add rule of type
-  advertise: Advertise
   coupon: Coupon
   coupon_code: Coupon code
   editing_promotion: Editing Promotion
@@ -23,17 +25,26 @@ en:
         visited: Visit static content page
   expiry: Expiry
   free_shipping: Free Shipping
+  item_total_rule:
+    operators:
+      gt: greater than
+      gte: greater than or equal to
+  landing_page_rule:
+    path: Path
   new_promotion: New Promotion
   no_rules_added: No rules added
+  product_rule:
+    choose_products: Choose products
+    label: "Order must contain %{select} of these products"
+    match_any: at least one
+    match_all: all
+    product_source:
+      group: From product group
+      manual: Manually choose
   promotion_not_found: The coupon code you entered doesn't exist. Please try again.
   promotion: Promotion
+  promotion_action: Promotion Action
   promotion_actions: Actions
-  promotions: Promotions
-  promotion_form:
-    match_policies:
-      all: Match all of these rules
-      any: Match any of these rules
-  promotions_description: Manage offers and coupons with promotions
   promotion_action_types:
     create_adjustment:
       name: Create adjustment
@@ -44,43 +55,35 @@ en:
     give_store_credit:
       name: Give store credit
       description: Gives the user store credit of the amount specified
+  promotion_form:
+    match_policies:
+      all: Match all of these rules
+      any: Match any of these rules
+  promotions: Promotions
+  promotions_description: Manage offers and coupons with promotions
+  promotion_rule: Promotion Rule
   promotion_rule_types:
-    user:
-      name: User
-      description: Available only to the specified users
-    product:
-      name: Product(s)
-      description: Order includes specified product(s)
-    item_total:
-      name: Item total
-      description: Order total meets these criteria
     first_order:
       name: First order
       description: "Must be the customer's first order"
+    item_total:
+      name: Item total
+      description: Order total meets these criteria
     landing_page:
       name: Landing Page
       description: Customer must have visited the specified page
+    product:
+      name: Product(s)
+      description: Order includes specified product(s)
+    user:
+      name: User
+      description: Available only to the specified users
     user_logged_in:
       name: User Logged In
       description: Available only to logged in users
-  product_rule:
-    choose_products: Choose products
-    label: "Order must contain %{select} of these products"
-    match_any: at least one
-    match_all: all
-    product_source:
-      group: From product group
-      manual: Manually choose
   rules: Rules
   spree/order:
     coupon_code: Coupon Code
   user_rule:
     choose_users: Choose users
-  item_total_rule:
-    operators:
-      gt: greater than
-      gte: greater than or equal to
-  landing_page_rule:
-    path: Path
-  promotion_action: Promotion Action
-  promotion_rule: Promotion Rule
+

data/db/migrate/20101026184833_migrate_adjustments.rb

@@ -1,7 +1,7 @@
 class MigrateAdjustments < ActiveRecord::Migration
   def up
     execute "UPDATE spree_adjustments SET amount = 0.0 WHERE amount IS NULL"
-    execute "UPDATE spree_adjustments SET mandatory = 't' WHERE locked = 't'"
+    execute "UPDATE spree_adjustments SET mandatory = #{quoted_true} WHERE locked = #{quoted_true}"
   end
 
   def down

data/lib/spree/promo/engine.rb

@@ -8,6 +8,13 @@ module Spree
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
+
+        # Include list of visited paths in notification payload hash
+        Spree::Core::ControllerHelpers.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)

metadata

@@ -1,48 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - David North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70127245898980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
+  version_requirements: *70127245898980
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70127245915000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
+  version_requirements: *70127245915000
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -66,7 +56,6 @@ files:
 - app/models/spree/calculator/free_shipping.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/product_decorator.rb
-- app/models/spree/product_group_decorator.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
 - app/models/spree/promotion/actions/create_line_items.rb
 - app/models/spree/promotion/rules/first_order.rb
@@ -138,16 +127,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 558996978230033383
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.

data/app/models/spree/product_group_decorator.rb

@@ -1,3 +0,0 @@
-Spree::ProductGroup.class_eval do
-  has_many :promotion_rules
-end