spree_core 0.40.0 → 0.40.1

data/app/controllers/checkout_controller.rb

@@ -5,6 +5,7 @@ class CheckoutController < Spree::BaseController
   ssl_required
 
   before_filter :load_order
+  rescue_from Spree::GatewayError, :with => :rescue_from_spree_gateway_error
 
   # Updates the order and advances to the next state (when possible.)
   def update
@@ -84,4 +85,9 @@ class CheckoutController < Spree::BaseController
     Country.find Spree::Config[:default_country_id]
   end
 
+  def rescue_from_spree_gateway_error
+    flash[:error] = t('spree_gateway_error_flash_for_checkout')
+    render :edit
+  end
+
 end

data/config/locales/en.yml

@@ -876,6 +876,7 @@ en:
   spree:
     date: Date
     time: Time
+  spree_gateway_error_flash_for_checkout: "There was a problem with your payment information. Please check your information and try again."
   ssl_will_be_used_in_development_and_test_modes: "SSL will be used in development and test mode if necessary."
   ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
   ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."

data/lib/spree/current_order.rb

@@ -6,6 +6,11 @@ module Spree
     def before_save_new_order
     end
 
+    # This should be overridden by an auth-related extension which would then have the opporutnity to store tokens, etc. in the session
+    # after saving.
+    def after_save_new_order
+    end
+
     # The current incomplete order from the session for use in cart and during checkout
     def current_order(create_order_if_necessary = false)
       return @current_order if @current_order
@@ -14,6 +19,7 @@ module Spree
         @current_order = Order.new
         before_save_new_order
         @current_order.save!
+        after_save_new_order
       end
       session[:order_id] = @current_order ? @current_order.id : nil
       @current_order

data/lib/spree_core.rb

@@ -67,7 +67,7 @@ end
 
 module Spree
   def self.version
-    "0.40.0"
+    "0.40.1"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 191
+  hash: 189
   prerelease: false
   segments: 
   - 0
   - 40
-  - 0
-  version: 0.40.0
+  - 1
+  version: 0.40.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2011-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 31
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -56,7 +56,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -72,7 +72,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -88,7 +88,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 17
         segments: 
@@ -104,7 +104,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 51
         segments: 
@@ -120,14 +120,14 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 51
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        - 9
+        - 4
+        version: 0.9.4
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -136,15 +136,14 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 113
+        hash: 19
         segments: 
         - 2
         - 3
-        - 1
-        - 1
-        version: 2.3.1.1
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -167,7 +166,7 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -177,29 +176,13 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: activemerchant
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 7
-        - 1
-        version: 1.7.1
-  type: :runtime
-  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: -1876988247
         segments: 
@@ -208,14 +191,14 @@ dependencies:
         - pre2
         version: 3.0.pre2
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -224,14 +207,14 @@ dependencies:
         - 3
         version: 3.0.3
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: jquery-rails
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -240,7 +223,7 @@ dependencies:
         - 2
         version: 0.2.2
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id013
 description: Required dependancy for Spree
 email: sean@railsdog.com
 executables: []