spree 0.11.0 → 0.11.1

data/vendor/extensions/payment_gateway/config/locales/en.yml

@@ -3,4 +3,5 @@ en:
   signature: Signature
   currency_code: "Currency Code"
   pem: PEM
-  secure_profile_api_key: Payment Profile API Key
+  secure_profile_api_key: Payment Profile API Key
+  validate_on_profile_create: Validate card 

data/vendor/extensions/payment_gateway/lib/active_merchant/billing/authorize_net_cim.rb

@@ -465,6 +465,8 @@ module ActiveMerchant #:nodoc:
       def build_create_customer_profile_request(xml, options)
         add_profile(xml, options[:profile])
 
+        xml.tag!('validationMode',CIM_VALIDATION_MODES[options[:validation_mode]]) if options[:validation_mode]
+
         xml.target!
       end
 
@@ -761,7 +763,7 @@ module ActiveMerchant #:nodoc:
         Rails.logger.error("Gateway Error: #{text}") unless success
 
         direct_response_params = parse_direct_response(response_params['direct_response'])
-        
+
         response = Response.new(success, text, response_params,
           :test => test_mode,
           :authorization => response_params['customer_profile_id'] || (response_params['profile'] ? response_params['profile']['customer_profile_id'] : direct_response_params['transaction_id']),
@@ -775,7 +777,7 @@ module ActiveMerchant #:nodoc:
             response.authorization = response.params['direct_response']['transaction_id']
           end
         end
-        
+
         response
       end
 

data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb

@@ -61,7 +61,7 @@ module Spree
         :avs_response => response.avs_result['code']
       )
     rescue ActiveMerchant::ConnectionError => e
-      gateway_error t(:unable_to_connect_to_gateway)
+      gateway_error I18n.t(:unable_to_connect_to_gateway)
     end
 
     def void(payment)

data/vendor/extensions/payment_gateway/lib/tasks/payment_gateway_extension_tasks.rake

@@ -9,8 +9,8 @@ namespace :spree do
           path = file.sub(PaymentGatewayExtension.root, '')
           directory = File.dirname(path)
           puts "Copying #{path}..."
-          mkdir_p RAILS_ROOT + directory
-          cp file, RAILS_ROOT + path
+          mkdir_p Rails.root + directory
+          cp file, Rails.root + path
         end
       end  
     end

data/vendor/extensions/payment_gateway/payment_gateway_extension.rb

@@ -19,6 +19,7 @@ class PaymentGatewayExtension < Spree::Extension
       Gateway::Bogus,
       Gateway::AuthorizeNet,
 			Gateway::AuthorizeNetCim,
+			Gateway::Braintree,
 			Gateway::Eway,
       Gateway::Linkpoint,
       Gateway::PayPal,

data/vendor/extensions/payment_gateway/test/unit/authorize_net_cim_test.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class AuthorizeNetCimTest < Test::Unit::TestCase
 
   def setup
+    Gateway.update_all(:active => false)
     @cim_gateway = ActiveMerchant::Billing::AuthorizeNetCimGateway.new(
       :login => 'x',
       :password => 'y'
@@ -25,7 +26,7 @@ class AuthorizeNetCimTest < Test::Unit::TestCase
     @checkout = Factory(:checkout, :bill_address => @address, :ship_address => @address)
     @payment = Factory(:payment, :source => @creditcard, :payable => @checkout)
     @checkout.payments << @payment
-    @gateway = Gateway::AuthorizeNetCim.create!(:name => 'Authorize.net CIM Gateway')
+    @gateway = Gateway::AuthorizeNetCim.create!(:name => 'Authorize.net CIM Gateway', :active => true)
     @creditcard.reload
     
     @address_options = { 

data/vendor/extensions/payment_gateway/test/unit/braintree_test.rb

@@ -0,0 +1,200 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require "braintree"
+
+class BraintreeTest < Test::Unit::TestCase
+
+  def setup
+    Gateway.update_all(:active => false)
+    @gateway = Gateway::Braintree.create!(:name => "Braintree Gateway", :environment => "test", :active => true)
+
+    # TODO: really need to figure out how preferences work in Spree
+    #       doing configuration this way for now
+    ::Braintree::Configuration.environment = :sandbox
+    ::Braintree::Configuration.merchant_id = "zbn5yzq9t7wmwx42"
+    ::Braintree::Configuration.public_key = "ym9djwqpkxbv3xzt"
+    ::Braintree::Configuration.private_key = "4ghghkyp2yy6yqc8"
+    ::Braintree::Configuration.class_eval do
+      def self.merchant_id=(value); end
+      def self.public_key=(value); end
+      def self.private_key=(value); end
+    end
+
+    with_payment_profiles_off do
+      @country = Factory(:country, :name => "United States", :iso_name => "UNITED STATES", :iso3 => "USA", :iso => "US", :numcode => 840)
+      @address = Factory(:address,
+        :firstname => 'John',
+        :lastname => 'Doe',
+        :address1 => '1234 My Street',
+        :address2 => 'Apt 1',
+        :city =>  'Washington DC',
+        :zipcode => '20123',
+        :phone => '(555)555-5555',
+        :state_name => 'MD',
+        :country => @country
+      )
+      @checkout = Factory(:checkout, :bill_address => @address, :ship_address => @address)
+      @creditcard = Factory(:creditcard, :verification_value => '123', :number => '5105105105105100', :month => 9, :year => Time.now.year + 1, :first_name => 'John', :last_name => 'Doe')
+      @payment = Factory(:payment, :source => @creditcard, :payable => @checkout, :amount => @checkout.order.total)
+    end
+  end
+
+  context "provider_class" do
+    should "be braintree gateway" do
+      @gateway.provider_class.should == ::ActiveMerchant::Billing::BraintreeGateway
+    end
+  end
+
+  context "authorize" do
+    should "return a success response with an authorization code" do
+      result = @gateway.authorize(500, @creditcard)
+      assert_equal true, result.success?
+      assert_match /\A\w{6}\z/, result.authorization
+      assert_equal Braintree::Transaction::Status::Authorized, Braintree::Transaction.find(result.authorization).status
+    end
+
+    should "work through the spree payment interface" do
+      Spree::Config.set :auto_capture => false
+      assert_equal 0, @payment.txns.size
+      @payment.process!
+      assert_equal 1, @payment.txns.size
+      assert_match /\A\w{6}\z/, @payment.txns[0].response_code
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::Authorized, transaction.status
+      assert_equal "510510******5100", transaction.credit_card_details.masked_number
+      assert_equal "09/#{Time.now.year + 1}", transaction.credit_card_details.expiration_date
+      assert_equal "John", transaction.customer_details.first_name
+      assert_equal "Doe", transaction.customer_details.last_name
+    end
+  end
+
+  context "capture" do
+    should "capture a previous authorization" do
+      @payment.process!
+      assert_equal 1, @payment.txns.size
+      assert_match /\A\w{6}\z/, @payment.txns[0].response_code
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::Authorized, transaction.status
+      capture_result = @gateway.capture(@payment.txns.first, :ignored_arg_creditcard, :ignored_arg_options)
+      assert_equal true, capture_result.success?
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::SubmittedForSettlement, transaction.status
+    end
+
+    should "raise an error if capture fails using spree interface" do
+      Spree::Config.set :auto_capture => false
+      assert_equal 0, @payment.txns.size
+      @payment.process!
+      assert_equal 1, @payment.txns.size
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::Authorized, transaction.status
+      @payment.source.capture(@payment) # as done in PaymentsController#fire
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::SubmittedForSettlement, transaction.status
+      assert_raises(Spree::GatewayError, "Cannot submit for settlement unless status is authorized. (91507)") do
+        @payment.source.capture(@payment) # as done in PaymentsController#fire
+      end
+    end
+
+    should "work using the spree interface" do
+      Spree::Config.set :auto_capture => false
+      assert_equal 0, @payment.txns.size
+      @payment.process!
+      assert_equal 1, @payment.txns.size
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::Authorized, transaction.status
+      @payment.source.capture(@payment) # as done in PaymentsController#fire
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::SubmittedForSettlement, transaction.status
+    end
+  end
+
+  context "purchase" do
+    should "return a success response with an authorization code" do
+      result = @gateway.purchase(500, @creditcard)
+      assert_equal true, result.success?
+      assert_match /\A\w{6}\z/, result.authorization
+      assert_equal Braintree::Transaction::Status::SubmittedForSettlement, Braintree::Transaction.find(result.authorization).status
+    end
+
+    should "work through the spree payment interface with payment profiles" do
+      purchase_using_spree_interface
+      transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_match /\A\w{4}\z/, transaction.credit_card_details.token
+    end
+
+    should "work through the spree payment interface without payment profiles" do
+      with_payment_profiles_off do
+        purchase_using_spree_interface
+        transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+        assert_equal nil, transaction.credit_card_details.token
+      end
+    end
+  end
+
+  context "credit" do
+    should "work through the spree interface" do
+      purchase_using_spree_interface
+      credit_using_spree_interface
+    end
+  end
+
+  context "void" do
+    should "work through the spree creditcard / payment interface" do
+      assert_equal 0, @payment.txns.size
+      @payment.process!
+      assert_equal 1, @payment.txns.size
+      assert_match /\A\w{6}\z/, @payment.txns[0].response_code
+      transaction = Braintree::Transaction.find(@payment.txns[0].response_code)
+      assert_equal Braintree::Transaction::Status::SubmittedForSettlement, transaction.status
+      @creditcard.void(@payment)
+      transaction = Braintree::Transaction.find(transaction.id)
+      assert_equal Braintree::Transaction::Status::Voided, transaction.status
+    end
+  end
+
+  def credit_using_spree_interface
+    @payment.order.payments << @payment
+    assert_equal 1, @payment.txns.size
+    @payment.source.credit(@payment) # as done in PaymentsController#fire
+    assert_equal 2, @payment.txns.size
+    assert_match /\A\w{6}\z/, @payment.txns[1].response_code
+    transaction = ::Braintree::Transaction.find(@payment.txns[1].response_code)
+    assert_equal Braintree::Transaction::Type::Credit, transaction.type
+    assert_equal Braintree::Transaction::Status::SubmittedForSettlement, transaction.status
+    assert_equal "510510******5100", transaction.credit_card_details.masked_number
+    assert_equal "09/#{Time.now.year + 1}", transaction.credit_card_details.expiration_date
+    assert_equal "John", transaction.customer_details.first_name
+    assert_equal "Doe", transaction.customer_details.last_name
+  end
+
+  def purchase_using_spree_interface
+    Spree::Config.set :auto_capture => true
+    @payment.send(:create_payment_profile)
+    assert_equal 0, @payment.txns.size
+    @payment.process! # as done in PaymentsController#create
+    assert_equal 1, @payment.txns.size
+    assert_match /\A\w{6}\z/, @payment.txns[0].response_code
+    transaction = ::Braintree::Transaction.find(@payment.txns[0].response_code)
+    assert_equal Braintree::Transaction::Status::SubmittedForSettlement, transaction.status
+    assert_equal "510510******5100", transaction.credit_card_details.masked_number
+    assert_equal "09/#{Time.now.year + 1}", transaction.credit_card_details.expiration_date
+    assert_equal "John", transaction.customer_details.first_name
+    assert_equal "Doe", transaction.customer_details.last_name
+  end
+
+  def with_payment_profiles_off(&block)
+    Gateway::Braintree.class_eval do
+      def payment_profiles_supported?
+        false
+      end
+    end
+    yield
+  ensure
+    Gateway::Braintree.class_eval do
+      def payment_profiles_supported?
+        true
+      end
+    end
+  end
+end
+

data/vendor/extensions/theme_default/Rakefile

@@ -67,7 +67,7 @@ namespace :spec do
   # desc "Translate specs from pre-0.9 to 0.9 style"
   # task :translate do
   #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
+  #   dir = Rails.root + '/spec'
   #   translator.translate(dir, dir)
   # end
 
@@ -91,7 +91,7 @@ namespace :spec do
       task :load => :environment do
         require 'active_record/fixtures'
         ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(Rails.root.join('spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
         end
       end

data/vendor/extensions/theme_default/app/stylesheets/_buttons.less

@@ -29,7 +29,12 @@ button, a.button, input.button {
 
 button.primary, a.button.primary, input.button.primary {
   font-weight: bold;
-  color: #000; 
+  color: #000;
+}
+
+button.disabled, a.button.disabled, input.button.disabled{
+  font-weight: bold;
+  color: #999;
 }
 
 button:hover, a.button:hover, input.button:hover {
@@ -71,5 +76,5 @@ button::-moz-focus-inner {
 }
 
 p a.button img, p button img {
-  margin: 0 5px 0 0; 
+  margin: 0 5px 0 0;
 }

data/vendor/extensions/theme_default/app/stylesheets/_colors.less

@@ -2,7 +2,7 @@
 @black: #000;
 @input_border: #BBB;
 @default_border_color: #DDD;
-@link_hover_color: #eee;
+@link_hover_color: #3C7DFB;
 @lighter_text_color: #666;
 @medium_blue: #2E6AB1;
 @lightest_blue: #BBDAFD;

data/vendor/extensions/theme_default/app/stylesheets/_layout.less

@@ -2,8 +2,13 @@
 @import "_mixins";
 
 body {
-  margin-top: 10px;
-  background: #fff url(../images/body-back.png) top left repeat-x;
+  margin-top: 0px;
+  background: #ffffff url(../images/tile-slider.png) top left repeat-x;
+}
+
+.container_bg{
+  width:100%;
+  background:url(../images/tile-header.png) top left repeat-x;
 }
 
 div.left { .leftie; }

data/vendor/extensions/theme_default/app/views/admin/payment_methods/_form.html.erb

@@ -16,7 +16,7 @@
   <tr>
     <td><label><%=t("display")%></label></td>
     <td>
-      <%= select(:payment_method, :display, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
+      <%= select(:payment_method, :display_on, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
     </td>
   </tr>
   <tr>
@@ -41,11 +41,10 @@
   <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => "gtwy-type"}) %>
 
   <% unless @object.new_record? %>
-
     <%= preference_fields(@object, f) %>
 
     <% if @object.respond_to?(:preferences) %>
       <div id="gateway-settings-warning" style="color:#FF0000"><%= t('provider_settings_warning')%></div>
-      <% end %>
     <% end %>
- </div>
+  <% end %>
+</div>

data/vendor/extensions/theme_default/app/views/admin/payment_methods/index.html.erb

@@ -32,7 +32,7 @@
           <td width="120px"><%= method.name %></td>
           <td width="140px"><%= method.type %></td>
           <td width="100px"><%= method.environment.to_s.titleize %></td>
-          <td width="60px"><%= method.display.blank? ? "Both" : t(method.display) %></td>
+          <td width="60px"><%= method.display_on.blank? ? "Both" : t(method.display_on) %></td>
           <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
         <% end %>
         <td width="140px">

data/vendor/extensions/theme_default/app/views/admin/shared/_additional_field.html.erb

@@ -1,5 +1,5 @@
 <p>
-  <%= label controller.controller_name.singularize, t("activerecord.attributes.variant." + field[:name].downcase, :default => field[:name].titleize)%><br />
+  <%= label controller.controller_name.singularize, field[:name], t("activerecord.attributes.variant." + field[:name].downcase, :default => field[:name].titleize)%><br />
   <%= additional_field_for(controller, field) %>
   <%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
 </p>

data/vendor/extensions/theme_default/app/views/admin/shared/_calculator_fields.html.erb

@@ -4,13 +4,13 @@
   <%= f.collection_select(:calculator_type, @calculators, :to_s, :description, {}, {:id => "calc-type"}) %>
 
   <% if !@object.new_record? %>
-    <% f.fields_for :calculator do |calculator_form| %>
-      <div class="calculator-settings">
-        <%= preference_fields(@object.calculator, calculator_form) %>
-      </div>
-    <% end %>
+    <div class="calculator-settings">
+      <% f.fields_for :calculator do |calculator_form| %>      
+        <%= preference_fields(@object.calculator, calculator_form) %>      
+      <% end %>
+    </div>
     <% if @object.calculator.respond_to?(:preferences) %>
       <div id="calculator-settings-warning"><%= t('calculator_settings_warning')%></div>
     <% end %>
   <% end %>
-</div>
+</div>

data/vendor/extensions/theme_default/app/views/admin/shared/_configuration_menu.html.erb

@@ -1,22 +1,22 @@
 <% content_for :sidebar do %>
 
-  <h3><%= t("configurations") -%></h3>
+  <h3><%= t("configurations") %></h3>
   <br class="clear" />
 
   <ul class="sidebar">
     <% hook :admin_configurations_sidebar_menu do %>
-    <li<%= ' class="active"' if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'mail_settings' %>><%= link_to t("mail_server_settings"), admin_mail_settings_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'payment_methods' %>><%= link_to t("payment_methods"), admin_payment_methods_path %></li>
-    <li<%= ' class="active"' if ['taxonomies', 'taxons'].include? controller.controller_name %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'shipping_methods' %>><%= link_to t("shipping_methods"), admin_shipping_methods_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
-    <li<%= ' class="active"' if controller.controller_name == 'trackers' %>><%= link_to t("analytics_trackers"), admin_trackers_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'mail_settings' %>><%= link_to t("mail_server_settings"), admin_mail_settings_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'payment_methods' %>><%= link_to t("payment_methods"), admin_payment_methods_path %></li>
+    <li<%= raw(' class="active"') if ['taxonomies', 'taxons'].include? controller.controller_name %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'shipping_methods' %>><%= link_to t("shipping_methods"), admin_shipping_methods_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'trackers' %>><%= link_to t("analytics_trackers"), admin_trackers_path %></li>
     <% end %>
-    <li<%= ' class="active"' if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
   </ul>
 
-<% end %>
+<% end %>