spree_promo 1.1.3 → 1.1.4

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -7,9 +7,11 @@ Spree::CheckoutController.class_eval do
       fire_event('spree.checkout.update')
 
       if @order.coupon_code.present?
+        event_name = "spree.checkout.coupon_code_added"
+        if Spree::Promotion.exists?(:code       => @order.coupon_code,
+                                    :event_name => event_name)
 
-        if Spree::Promotion.exists?(:code => @order.coupon_code)
-          fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
+          fire_event(event_name, :coupon_code => @order.coupon_code)
           # If it doesn't exist, raise an error!
           # Giving them another chance to enter a valid coupon code
         else

data/app/models/spree/order_decorator.rb

@@ -23,4 +23,8 @@ Spree::Order.class_eval do
     end
     alias_method_chain :update_adjustments, :promotion_limiting
   end
+
+  def promo_total
+    adjustments.promotion.map(&:amount).sum
+  end
 end

data/app/models/spree/payment_decorator.rb

@@ -0,0 +1,5 @@
+Spree::Payment.class_eval do
+  def promo_total
+    order.promo_total * 100
+  end
+end

data/app/views/spree/checkout/_coupon_code_field.html.erb

@@ -1,6 +1,6 @@
 <% if Spree::Promotion.count > 0 %>
-<p>
-  <%= form.label :coupon_code %><br />
-  <%= form.text_field :coupon_code %>
-</p>
+  <p class='field' data-hook='coupon_code'>
+    <%= form.label :coupon_code %><br />
+    <%= form.text_field :coupon_code %>
+  </p>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70299252260320 !ruby/object:Gem::Requirement
+  requirement: &70124633804180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70299252260320
+  version_requirements: *70124633804180
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70299252259720 !ruby/object:Gem::Requirement
+  requirement: &70124633818580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70299252259720
+  version_requirements: *70124633818580
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -55,6 +55,7 @@ files:
 - app/models/spree/adjustment_decorator.rb
 - app/models/spree/calculator/free_shipping.rb
 - app/models/spree/order_decorator.rb
+- app/models/spree/payment_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
 - app/models/spree/promotion/actions/create_line_items.rb
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2084238401508216031
+      hash: 4089934897313968543
 requirements:
 - none
 rubyforge_project: