activemerchant 1.42.3 → 1.42.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhkNTg2ZGQxMmYxMTJjMGVhNTZhOWJhMmM4NWE5OTEzMDRiZGY0Ng==
+    NThjMjQ4YWE3M2Y3MGUyM2UzMDg2MWQ3ZjJjYjNiMzAyNzUxNTUyYw==
   data.tar.gz: !binary |-
-    ZGI2ZmRkZWVjN2Y5NTYyNDQ2MmQ3NWRiNzg3MWQ2Y2FjMjk4NjY1ZQ==
+    ZTVkZDAwNWUyOGIwZGJmYzQxMmRmOWQ0YTdjODQ1Y2RkZTYxOGU3NA==
 SHA512:
   metadata.gz: !binary |-
-    OGJhMjg0N2JjNDI5ZDk3Y2MyM2ExNzY2NDQ4MmU1MjUwNWNhYTg3NTEyNmQx
-    NjE1MDMxMjcxZjBhNGY1OTQ0NzMwNDkzYTQwMjQzZTY1N2U1ZjhkMzFkNzYy
-    OTQ1YmEwOWVlYjdmNjI4ZmMyYWI4MGIwOGJkNWM1Njk1N2UxMDM=
+    MjBkOGY2OTgzZTg3YzU5YmEwMzQwZjI3ODM2MTcwZDdmODBlYTExMjRiNTVi
+    YzYyMDdlNThkYjBhNTBhMWFjZWM0ZTdkODVlYTI1NGVjNTdjMWU3ZTg1YmYx
+    NTVjYjE5ZTA1ZDYyNDgzYTE2NDY1MDY2NDMyOGQ4ZDRmM2E5OWI=
   data.tar.gz: !binary |-
-    NTlkYjg4NGY2OGE5ZmZhN2ZiZGY3MDhlM2E3NjFlZmNlNzdmMDQxZTgyZWQx
-    NDk5MDQ0OTU2MTYzNDU1YjNlMjIxNzE3NzY3ZGVkNDVkOTVmZDQ3OTA3MDE4
-    NDYzMWIzNWNkOTVjZGFlYzExODcxYTliYzYxYWVhMTY4ZGFkOGY=
+    MmMwZDg4OGJmNzFlOTI4N2ZlNjczYWRkY2ZjM2ZiOGIzZTBmNGQ1M2VkZGRj
+    MWZjOGU0YjEyMDRhMmZmYzBiMDBhMmFmMGNiM2JkMjQ1MDUxMGE4NTc5NDVm
+    NWYyZGI1NWYzZmMzYzgyNTBjZDkyMDc2NTVhMzJmYWE2ZWYxZTY=

data/CHANGELOG

@@ -1,5 +1,12 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.42.4 (January 8th, 2014)
+
+* DataCash: Set 'ecomm' as capturemethod [DavidGeukers]
+* Cybersource: Fix subscriptions with a setup fee [ntalbott]
+* Stripe: Do not pass customer details to the /cards endpoint [michellebu]
+* Stripe: Allow Stripe API version to be initialized with the gateway [odorcicd]
+
 == Version 1.42.3 (December 18th, 2013)
 
 * Balanced: Add support for appears_on_statement_as [duff]

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

@@ -313,7 +313,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_create_subscription_request(payment_method, options)
-        options[:subscription] = (options[:subscription] || {}).merge(:frequency => "on-demand", :amount => 0, :automatic_renew => false)
+        default_subscription_params = {:frequency => "on-demand", :amount => 0, :automatic_renew => false}
+        options[:subscription] = default_subscription_params.update(
+          options[:subscription] || {}
+        )
 
         xml = Builder::XmlMarkup.new :indent => 2
         add_address(xml, payment_method, options[:billing_address], options)
@@ -321,13 +324,18 @@ module ActiveMerchant #:nodoc:
         if card_brand(payment_method) == 'check'
           add_check(xml, payment_method)
           add_check_payment_method(xml)
-          add_check_service(xml, options) if options[:setup_fee]
         else
           add_creditcard(xml, payment_method)
           add_creditcard_payment_method(xml)
-          add_purchase_service(xml, options) if options[:setup_fee]
         end
         add_subscription(xml, options)
+        if options[:setup_fee]
+          if card_brand(payment_method) == 'check'
+            add_check_service(xml, options)
+          else
+            add_purchase_service(xml, options)
+          end
+        end
         add_subscription_create_service(xml, options)
         add_business_rules_data(xml)
         xml.target!

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

@@ -200,6 +200,7 @@ module ActiveMerchant
               xml.tag! :TxnDetails do
                 xml.tag! :merchantreference, format_reference_number(options[:order_id])
                 xml.tag! :amount, amount(money), :currency => options[:currency] || currency(money)
+                xml.tag! :capturemethod, 'ecomm'
               end
             end
           end
@@ -285,6 +286,7 @@ module ActiveMerchant
             xml.tag! :TxnDetails do
               xml.tag! :merchantreference, format_reference_number(options[:order_id])
               xml.tag! :amount, amount(money), :currency => options[:currency] || currency(money)
+              xml.tag! :capturemethod, 'ecomm'
             end
           end
         end

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

@@ -33,6 +33,8 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login)
         @api_key = options[:login]
         @fee_refund_api_key = options[:fee_refund_login]
+        @version = options[:version]
+
         super
       end
 
@@ -69,6 +71,7 @@ module ActiveMerchant #:nodoc:
 
       def refund(money, identification, options = {})
         post = {:amount => amount(money)}
+        post[:refund_application_fee] = true if options[:refund_application_fee]
 
         MultiResponse.run(:first) do |r|
           r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, options) }
@@ -99,20 +102,26 @@ module ActiveMerchant #:nodoc:
       # Note: creating a new credit card will not change the customer's existing default credit card (use :set_default => true)
       def store(creditcard, options = {})
         post = {}
-        add_creditcard(post, creditcard, options)
-        post[:description] = options[:description]
-        post[:email] = options[:email]
+        card_params = {}
+        add_creditcard(card_params, creditcard, options)
+        post[:description] = options[:description] if options[:description]
+        post[:email] = options[:email] if options[:email]
 
         if options[:customer]
           MultiResponse.run(:first) do |r|
-            r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", post, options) }
+            # The /cards endpoint does not update other customer parameters.
+            r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", card_params, options) }
 
-            return r unless options[:set_default] and r.success? and !r.params["id"].blank?
+            if options[:set_default] and r.success? and !r.params['id'].blank?
+              post[:default_card] = r.params['id']
+            end
 
-            r.process { update_customer(options[:customer], :default_card => r.params["id"]) }
+            if post.count > 0
+              r.process { update_customer(options[:customer], post) }
+            end
           end
         else
-          commit(:post, 'customers', post, options)
+          commit(:post, 'customers', post.merge(card_params), options)
         end
       end
 
@@ -252,7 +261,8 @@ module ActiveMerchant #:nodoc:
           :publisher => 'active_merchant'
         })
 
-        key = options[:key] || @api_key
+        key     = options[:key] || @api_key
+        version = options[:version] || @version
 
         headers = {
           "Authorization" => "Basic " + Base64.encode64(key.to_s + ":").strip,
@@ -260,7 +270,7 @@ module ActiveMerchant #:nodoc:
           "X-Stripe-Client-User-Agent" => @@ua,
           "X-Stripe-Client-User-Metadata" => {:ip => options[:ip]}.to_json
         }
-        headers.merge!("Stripe-Version" => options[:version]) if options[:version]
+        headers.merge!("Stripe-Version" => version) if version
         headers
       end
 

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.42.3"
+  VERSION = "1.42.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.42.3
+  version: 1.42.4
 platform: ruby
 authors:
 - Tobias Luetke
@@ -38,7 +38,7 @@ cert_chain:
   U1BPVm5oYkZKM3ZTWFkxdWxQL1I2WFc5dm53CjZra1FpMmZIaFUyMHVnTXpw
   ODgxRWl4citUakMwUnZVZXJMRzdnPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUt
   LS0tLQo=
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport