spree_core 0.40.2 → 0.40.3

data/app/helpers/checkout_helper.rb

@@ -1,7 +1,11 @@
 module CheckoutHelper
 
   def checkout_progress
-    states = %w(address delivery payment confirm complete)
+    if Gateway.current and Gateway.current.payment_profiles_supported?
+      states = %w(address delivery payment confirm complete)
+    else
+      states = %w(address delivery payment complete)
+    end
     items = states.map do |state|
       text = t("order_state.#{state}").titleize
 

data/app/models/creditcard.rb

@@ -120,7 +120,7 @@ class Creditcard < ActiveRecord::Base
   end
 
   def void(payment)
-    response = payment_gateway.void(payment.response_code, self, minimal_gateway_options(payment))
+    response = payment_gateway.void(payment.response_code, minimal_gateway_options(payment))
     record_log payment, response
 
     if response.success?

data/app/models/order.rb

@@ -78,10 +78,11 @@ class Order < ActiveRecord::Base
       transition :from => 'cart', :to => 'address'
       transition :from => 'address', :to => 'delivery'
       transition :from => 'delivery', :to => 'payment'
-      transition :from => 'payment', :to => 'confirm'
       transition :from => 'confirm', :to => 'complete'
+      # note: some payment methods will not support a confirm step
+      transition :from => 'payment', :to => 'confirm', :if => Proc.new { Gateway.current and Gateway.current.payment_profiles_supported? }
+      transition :from => 'payment', :to => 'complete'
     end
-    #TODO - add conditional confirmation step (only when gateway supports it, etc.)
 
     event :cancel do
       transition :to => 'canceled', :if => :allow_cancel?

data/app/views/checkout/payment/_gateway.html.erb

@@ -4,7 +4,7 @@
 <p class="field">
   <label for=""><%= t("card_number") %></label><br />
   <% options_hash = Rails.env.production? ? {:autocomplete => "off"} : {} %>
-  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:class => 'required', :size => 19, :maxlength => 19) %>
+  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19) %>
   <span class="req">*</span>
   &nbsp;
   <span id="card_type" style="display:none;">
@@ -19,9 +19,9 @@
   <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
   <span class="req">*</span>
 </p>
-<p class="field">           
+<p class="field">
   <label for=""><%= t("card_code") %></label><br />
-  <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:class => 'required', :size => 5) %>
+  <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
   <span class="req">*</span>
   <a href="/content/cvv" target="_blank" onclick="window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
     (<%= t("whats_this") %>)

data/lib/spree_core.rb

@@ -67,7 +67,7 @@ end
 
 module Spree
   def self.version
-    "0.40.2"
+    "0.40.3"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 187
+  hash: 185
   prerelease: 
   segments: 
   - 0
   - 40
-  - 2
-  version: 0.40.2
+  - 3
+  version: 0.40.3
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -05:00
+date: 2011-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -217,12 +217,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency