activemerchant 1.20.0 → 1.20.1

data/CHANGELOG

@@ -1,5 +1,11 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.20.1 (December 22, 2011)
+
+* PayflowExpressUk: Fix parsing street2 from response [odorcicd]
+* AuthorizeNet: Support tracking id [odorcicd]
+* SagePay Form: Map billing address to shipping address [jduff]
+
 == Version 1.20.0 (November 14, 2011)
 
 * Add support for USA ePay Advanced SOAP interface [matthewcalebsmith/jduff]

data/lib/active_merchant/billing/gateways/authorize_net.rb

@@ -320,6 +320,7 @@ module ActiveMerchant #:nodoc:
         post[:delim_data]     = "TRUE"
         post[:delim_char]     = ","
         post[:encap_char]     = "$"
+        post[:solution_ID]    = application_id if application_id.present? && application_id != "ActiveMerchant"
 
         request = post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join("&")
         request

data/lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
         {  'name'       => full_name,
            'company'    => nil,
            'address1'   => @params['street'],
-           'address2'   => @params['shiptostreet2'],
+           'address2'   => @params['shiptostreet2'] || @params['street2'],
            'city'       => @params['city'],
            'state'      => @params['state'],
            'country'    => @params['country'],
@@ -36,4 +36,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/integrations/sage_pay_form/helper.rb

@@ -41,17 +41,33 @@ module ActiveMerchant #:nodoc:
           mapping :return_url, 'SuccessURL'
           mapping :description, 'Description'
 
+          def shipping_address(params = {})
+            @shipping_address_set = true unless params.empty?
+
+            params.each do |k, v|
+              field = mappings[:shipping_address][k]
+              add_field(field, v) unless field.nil?
+            end
+          end
+
+          def map_billing_address_to_shipping_address
+            %w(City Address1 Address2 State PostCode Country).each do |field|
+              fields["Delivery#{field}"] = fields["Billing#{field}"]
+            end
+          end
+
           def form_fields
+            map_billing_address_to_shipping_address unless @shipping_address_set
+
             fields['DeliveryFirstnames'] ||= fields['BillingFirstnames']
             fields['DeliverySurname']    ||= fields['BillingSurname']
-            
+
             fields['FailureURL'] ||= fields['SuccessURL']
 
             crypt_skip = ['Vendor', 'EncryptKey', 'SendEmail']
             crypt_skip << 'BillingState'  unless fields['BillingCountry']  == 'US'
             crypt_skip << 'DeliveryState' unless fields['DeliveryCountry'] == 'US'
             crypt_skip << 'CustomerEMail' unless fields['SendEmail']
-            
             key = fields['EncryptKey']
             @crypt ||= create_crypt_field(fields.except(*crypt_skip), key)
             

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.20.0"
+  VERSION = "1.20.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: 
   segments: 
   - 1
   - 20
-  - 0
-  version: 1.20.0
+  - 1
+  version: 1.20.1
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,10 +36,11 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2011-11-14 00:00:00 -05:00
+date: 2011-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,11 +52,11 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  name: activesupport
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: i18n
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +66,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: i18n
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: money
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,11 +82,11 @@ dependencies:
         - 7
         - 1
         version: 3.7.1
-  name: money
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: builder
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +98,11 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  name: builder
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: braintree
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,11 +114,11 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  name: braintree
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: json
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,11 +130,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  name: json
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: active_utils
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,11 +146,11 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  name: active_utils
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id007
 - !ruby/object:Gem::Dependency 
+  name: rake
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +160,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency 
+  name: mocha
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -173,11 +174,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mocha
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id009
 - !ruby/object:Gem::Dependency 
+  name: rails
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,9 +190,8 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  name: rails
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id010
 description: Active Merchant is a simple payment abstraction library used in and sponsored by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim of the project is to feel natural to Ruby users and to abstract as many parts as possible away from the user to offer a consistent interface across all supported gateways.
 email: tobi@leetsoft.com
@@ -421,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activemerchant
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Framework and tools for dealing with credit card transactions.