spree_promo 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40582bf42f5cd6675df3f3f3db1480808111213f
-  data.tar.gz: 2868fc07c91b0cecf867536dddcb1af9efaccda0
+  metadata.gz: bb2bcb36b3161c9cc5feb74608068d31d53651d0
+  data.tar.gz: 7cd89e77ada75630528557cc8a61aedd8adce059
 SHA512:
-  metadata.gz: 5c949e94bd1b46aaf8a9240ee90366068676fcce700b5081e7117699b2944823ed22df631707ee6c0670eddbafb9389bda7d8afa2459f9b8316b2f76a30ff6aa
-  data.tar.gz: e82b0b25514add622fa7645073a5a748aaaabb79ba8880f034531c774be28a64bf7ef1854f640624480d51e4fe3f0813505ddcf517acb4c5c523b6142ce4a5e5
+  metadata.gz: 0892f38c4782cb2312fe23d117ac7f763984919c250449d965754cab146166475abd73a7436e58e8ee830596f9055e1c65c0018efa060b976455b401c6475ef4
+  data.tar.gz: 1c1acc85af0985b74a14236917920925e589ed8f6332de2fb5c4b54033a02eaac03dff5e17c053e8528ce6dda81f5246491f10e3ff4a0245a4c3d373d6cd8f0f

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -2,13 +2,16 @@ 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')
-      unless apply_coupon_code
+    if params[:order] && params[:order][:coupon_code]
+      @order.coupon_code = params[:order][:coupon_code]
+      unless status = apply_coupon_code
         respond_with(@order) { |format| format.html { render :edit } }
         return
       end
+    end
+
+    if @order.update_attributes(object_params)
+      fire_event('spree.checkout.update')
 
       if @order.next
         state_callback(:after)

data/app/controllers/spree/orders_controller_decorator.rb

@@ -9,8 +9,9 @@ Spree::OrdersController.class_eval do
 
     if @order.update_attributes(params[:order])
       render :edit and return unless apply_coupon_code
-      
+
       @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+      @order.restart_checkout_flow
       fire_event('spree.order.contents_changed')
       respond_with(@order) do |format|
         format.html do

data/app/models/spree/order_decorator.rb

@@ -27,7 +27,7 @@ Spree::Order.class_eval do
   end
 
   def find_promo_for_coupon_code
-    Spree::Promotion.where("LOWER(code) = '#{normalized_coupon_code}'").first
+    Spree::Promotion.where("LOWER(code) = ?", normalized_coupon_code).first
   end
 
   def normalized_coupon_code

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

@@ -57,8 +57,10 @@ module Spree
           def deals_with_adjustments
             self.adjustments.each do |adjustment|
               if adjustment.adjustable.complete?
-                adjustment.originator = nil
-                adjustment.save
+                adjustment.update_attributes_without_callbacks(
+                  :originator_id => nil,
+                  :originator_type => nil
+                )
               else
                 adjustment.destroy
               end

data/lib/spree/promo/engine.rb

@@ -20,9 +20,12 @@ module Spree
       config.autoload_paths += %W(#{config.root}/lib)
       config.to_prepare &method(:activate).to_proc
 
+      # We need to define promotions rules here so extensions and existing apps
+      # can add their custom classes on their initializer files
       initializer 'spree.promo.environment', :after => 'spree.environment' do |app|
         app.config.spree.add_class('promotions')
         app.config.spree.promotions = Spree::Promo::Environment.new
+        app.config.spree.promotions.rules = []
       end
 
       initializer 'spree.promo.register.promotion.calculators' do |app|
@@ -37,8 +40,12 @@ module Spree
         ]
       end
 
-      initializer 'spree.promo.register.promotions.rules' do |app|
-        app.config.spree.promotions.rules = [
+      # Promotion rules need to be evaluated on after initialize otherwise
+      # Spree.user_class would be nil and users might experience errors related
+      # to malformed model associations (Spree.user_class is only defined on
+      # the app initializer)
+      config.after_initialize do
+        Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,
           Spree::Promotion::Rules::User,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - David North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.5
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -53,6 +53,7 @@ files:
 - app/models/spree/order_updater_decorator.rb
 - app/models/spree/payment_decorator.rb
 - app/models/spree/product_decorator.rb
+- app/models/spree/promotion.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
@@ -60,7 +61,6 @@ files:
 - app/models/spree/promotion/rules/product.rb
 - app/models/spree/promotion/rules/user.rb
 - app/models/spree/promotion/rules/user_logged_in.rb
-- app/models/spree/promotion.rb
 - app/models/spree/promotion_action.rb
 - app/models/spree/promotion_action_line_item.rb
 - app/models/spree/promotion_rule.rb
@@ -94,11 +94,11 @@ files:
 - app/views/spree/products/_promotions.html.erb
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/20120831092359_spree_promo_one_two.rb
+- lib/spree/promo.rb
 - lib/spree/promo/engine.rb
 - lib/spree/promo/environment.rb
-- lib/spree/promo.rb
 - lib/spree_promo.rb
-- db/migrate/20120831092359_spree_promo_one_two.rb
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
@@ -109,18 +109,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Promotion functionality for use with Spree.