spree_promo 1.3.0 → 1.3.1

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -5,25 +5,28 @@ Spree::CheckoutController.class_eval do
     if @order.update_attributes(object_params)
 
       fire_event('spree.checkout.update')
-      render :edit and return unless apply_coupon_code
+      unless apply_coupon_code
+        respond_with(@order) { |format| format.html { render :edit } }
+        return
+      end
 
       if @order.next
         state_callback(:after)
       else
         flash[:error] = t(:payment_processing_failed)
-        redirect_to checkout_state_path(@order.state)
+        respond_with(@order, :location => checkout_state_path(@order.state))
         return
       end
 
       if @order.state == 'complete' || @order.completed?
         flash.notice = t(:order_processed_successfully)
         flash[:commerce_tracking] = 'nothing special'
-        redirect_to completion_route
+        respond_with(@order, :location => completion_route)
       else
-        redirect_to checkout_state_path(@order.state)
+        respond_with(@order, :location => checkout_state_path(@order.state))
       end
     else
-      render :edit
+      respond_with(@order) { |format| format.html { render :edit } }
     end
   end
 

data/app/models/spree/promotion.rb

@@ -8,30 +8,31 @@ module Spree
 
     has_many :promotion_rules, :foreign_key => :activator_id, :autosave => true, :dependent => :destroy
     alias_method :rules, :promotion_rules
-    accepts_nested_attributes_for :promotion_rules
 
     has_many :promotion_actions, :foreign_key => :activator_id, :autosave => true, :dependent => :destroy
     alias_method :actions, :promotion_actions
-    accepts_nested_attributes_for :promotion_actions
 
-    validates_associated :rules
+    accepts_nested_attributes_for :promotion_actions, :promotion_rules
 
     attr_accessible :name, :event_name, :code, :match_policy,
                     :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
-    def save_rules_and_actions
-      (rules + actions).each &:save
-    end
+    validates_associated :rules
 
     validates :name, :presence => true
     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 }
 
+    # 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
+      (rules + actions).each &:save
+    end
+
     def self.advertised
       where(:advertise => true)
     end
@@ -77,7 +78,9 @@ module Spree
 
     # Products assigned to all product rules
     def products
-      @products ||= rules.of_type('Spree::Promotion::Rules::Product').map(&:products).flatten.uniq
+      @products ||= self.rules.all.inject([]) do |products, rule|
+        rule.respond_to?(:products) ? products << rule.products : products
+      end.flatten.uniq
     end
 
     def usage_limit_exceeded?(order = nil)
@@ -100,6 +103,5 @@ module Spree
     def code=(coupon_code)
       write_attribute(:code, (coupon_code.downcase.strip rescue nil))
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70356031603360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70356031603360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -118,11 +123,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1788889926812188579
+      hash: -3509403428169566053
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.