activemerchant 1.120.0 → 1.121.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 649ffe0485eeee7fba63fb57ee6f2ccee8ae113d8ad7ec42fb26d7895f5e8c03
-  data.tar.gz: 24dcf747601a2be45ca1938919e0626428be6ea19a22834666166772c8773035
+  metadata.gz: d8bbedca7a5cfd13a87cfcfc7dd7b2eb59a73e6407e5e4df0d0247e9c7e70e0c
+  data.tar.gz: 8ca081c01c837adae8a76bdc357c28753cd899cae9b4467b1c390048c4a2794f
 SHA512:
-  metadata.gz: 72e799731ef457d0f5c9d9995591c692e268265562465ba91023e87dad7fde4b25db3754920a51e24180d052d59ce7ecc33a7b2f2fc80b1e127984c5550122f9
-  data.tar.gz: 6dcc6c4f22b351497233ebd2ef9fc6354113921c75a4279909050e73e509570d6d97b698c9aa98199b7996019a53fb4dbb2daaa8ba1f85732d0af748033022ff
+  metadata.gz: 2115a9d6a83597cef54510ce37cb4f3fbf7afecfc9c3662462c554b16e221fec07c1b6ffd622d2f103daf6b2eea7b03899b7a705d04118579833e1c548bb82ed
+  data.tar.gz: 2c8c426554798d1f91ece60ea4de4013ba79283a0f2171c4e54976d2c561ad9e0f74ade0ca3af144f24596151ba82910f83ab42bf6c943acca32d97f366e8517

data/CHANGELOG

@@ -3,6 +3,15 @@
 == HEAD
 
 
+== Version 1.121 (June 8th, 2021)
+* Braintree: Lift restriction on gem version to allow for backwards compatibility [naashton] #3993
+* Payment Express/Windcave: Send amount on verify calls [cdmackeyfree] #3995
+* Orbital: Use billing_address name as fallback [curiousepic] #3966
+* vPOS: handle shop_process_id correctly [therufs] #3996
+* Checkout v2: Support metadata field [saschakala] #3992
+* Adyen: Support networkTxReference field [naashton] #3997
+* Paypal Express: Enable PayPal express reference transaction request to send merchant session id [janees-e] #3994
+
 == Version 1.120.0 (May 28th, 2021)
 * Braintree: Bump required braintree gem version to 3.0.1
 * Stripe PI: ensure `setup_future_sage` and `off_session` work when using SetupIntents.
@@ -67,7 +76,7 @@
 * Payeezy: support general credit [cdmackeyfree] #3977
 * Ripley and Hipercard: Add BIN ranges [naashton] #3978
 * Adyen: Default card holder name for credit cards [shasum] #3980
-* PaywayDotCom: make `source_id` a required field [dsmcclain] # 3981 
+* PaywayDotCom: make `source_id` a required field [dsmcclain] # 3981
 * Qvalent: remove `pem_password` from required credentials [dsmcclain] #3982
 * Authorize.net: Fix stored credentials [tatsianaclifton] #3971
 * CyberSource: Add support for multiple new fields [dsmcclain] #3984

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

@@ -397,6 +397,7 @@ module ActiveMerchant #:nodoc:
       def add_reference(post, authorization, options = {})
         _, psp_reference, = authorization.split('#')
         post[:originalReference] = single_reference(authorization) || psp_reference
+        post[:networkTxReference] = options[:network_transaction_id] if options[:network_transaction_id]
       end
 
       def add_original_reference(post, authorization, options = {})
@@ -511,6 +512,7 @@ module ActiveMerchant #:nodoc:
           raw_response = e.response.body
           response = parse(raw_response)
         end
+
         success = success_from(action, response, options)
         Response.new(
           success,
@@ -519,6 +521,7 @@ module ActiveMerchant #:nodoc:
           authorization: authorization_from(action, parameters, response),
           test: test?,
           error_code: success ? nil : error_code_from(response),
+          network_transaction_id: network_transaction_id_from(response),
           avs_result: AVSResult.new(code: avs_code_from(response)),
           cvv_result: CVVResult.new(cvv_result_from(response))
         )
@@ -621,6 +624,10 @@ module ActiveMerchant #:nodoc:
         STANDARD_ERROR_CODE_MAPPING[response['errorCode']]
       end
 
+      def network_transaction_id_from(response)
+        response.dig('additionalData', 'networkTxReference')
+      end
+
       def add_browser_info(browser_info, post)
         return unless browser_info
 

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

@@ -7,7 +7,7 @@ rescue LoadError
   raise 'Could not load the braintree gem.  Use `gem install braintree` to install it.'
 end
 
-raise "Need braintree gem >= 3.0.0. Run `gem install braintree --version '~>3.0.0'` to get the correct version." unless Braintree::Version::Major == 3 && Braintree::Version::Minor == 0
+raise 'Need braintree gem >= 2.0.0.' unless Braintree::Version::Major >= 2 && Braintree::Version::Minor >= 0
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -801,7 +801,8 @@ module ActiveMerchant #:nodoc:
                 eci_indicator: credit_card_or_vault_id.eci
               }
             elsif credit_card_or_vault_id.source == :android_pay || credit_card_or_vault_id.source == :google_pay
-              parameters[:google_pay_card] = {
+              Braintree::Version::Major < 3 ? pay_card = :android_pay_card : pay_card = :google_pay_card
+              parameters[pay_card] = {
                 number: credit_card_or_vault_id.number,
                 cryptogram: credit_card_or_vault_id.payment_cryptogram,
                 expiration_month: credit_card_or_vault_id.month.to_s.rjust(2, '0'),

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

@@ -37,12 +37,15 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, amount, options)
         add_customer_data(post, options)
+        add_metadata(post, options)
 
         commit(:capture, post, authorization)
       end
 
       def void(authorization, _options = {})
         post = {}
+        add_metadata(post, options)
+
         commit(:void, post, authorization)
       end
 
@@ -50,6 +53,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, amount, options)
         add_customer_data(post, options)
+        add_metadata(post, options)
 
         commit(:refund, post, authorization)
       end
@@ -82,6 +86,7 @@ module ActiveMerchant #:nodoc:
         add_stored_credential_options(post, options)
         add_transaction_data(post, options)
         add_3ds(post, options)
+        add_metadata(post, options)
       end
 
       def add_invoice(post, money, options)
@@ -97,6 +102,11 @@ module ActiveMerchant #:nodoc:
         post[:metadata][:udf5] = application_id || 'ActiveMerchant'
       end
 
+      def add_metadata(post, options)
+        post[:metadata] = {} unless post[:metadata]
+        post[:metadata].merge!(options[:metadata]) if options[:metadata]
+      end
+
       def add_payment_method(post, payment_method, options)
         post[:source] = {}
         if payment_method.is_a?(NetworkTokenizationCreditCard) && payment_method.source == :network_token

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

@@ -464,7 +464,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! :AVSphoneNum, (address[:phone] ? address[:phone].scan(/\d/).join.to_s[0..13] : nil)
           end
 
-          xml.tag! :AVSname, (payment_source&.name ? payment_source.name[0..29] : nil)
+          xml.tag! :AVSname, billing_name(payment_source, options)
           xml.tag! :AVScountryCode, (avs_supported ? byte_limit(format_address_field(address[:country]), 2) : '')
 
           # Needs to come after AVScountryCode
@@ -472,6 +472,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def billing_name(payment_source, options)
+        if payment_source&.name.present?
+          payment_source.name[0..29]
+        elsif options[:billing_address][:name].present?
+          options[:billing_address][:name][0..29]
+        end
+      end
+
       def add_destination_address(xml, address)
         if address[:dest_zip]
           avs_supported = AVS_SUPPORTED_COUNTRIES.include?(address[:dest_country].to_s)

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

@@ -86,8 +86,8 @@ module ActiveMerchant #:nodoc:
         refund(money, identification, options)
       end
 
-      def verify(payment_source, options = {})
-        request = build_purchase_or_authorization_request(nil, payment_source, options)
+      def verify(money, payment_source, options = {})
+        request = build_purchase_or_authorization_request(money, payment_source, options)
         commit(:validate, request)
       end
 

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

@@ -250,6 +250,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:PaymentType', options[:payment_type] || 'Any'
               add_payment_details(xml, money, currency_code, options)
               xml.tag! 'n2:IPAddress', options[:ip]
+              xml.tag! 'n2:MerchantSessionId', options[:merchant_session_id] if options[:merchant_session_id].present?
             end
           end
         end

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

@@ -34,14 +34,15 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment, options = {})
         commerce = options[:commerce] || @options[:commerce]
         commerce_branch = options[:commerce_branch] || @options[:commerce_branch]
+        shop_process_id = options[:shop_process_id] || @shop_process_id
 
-        token = generate_token(@shop_process_id, 'pay_pci', commerce, commerce_branch, amount(money), currency(money))
+        token = generate_token(shop_process_id, 'pay_pci', commerce, commerce_branch, amount(money), currency(money))
 
         post = {}
         post[:token] = token
         post[:commerce] = commerce.to_s
         post[:commerce_branch] = commerce_branch.to_s
-        post[:shop_process_id] = @shop_process_id
+        post[:shop_process_id] = shop_process_id
         post[:number_of_payments] = options[:number_of_payments] || 1
         post[:recursive] = options[:recursive] || false
 
@@ -52,11 +53,12 @@ module ActiveMerchant #:nodoc:
         commit(:pay_pci_buy_encrypted, post)
       end
 
-      def void(_authorization, options = {})
-        token = generate_token(@shop_process_id, 'rollback', '0.00')
+      def void(authorization, options = {})
+        _, shop_process_id = authorization.to_s.split('#')
+        token = generate_token(shop_process_id, 'rollback', '0.00')
         post = {
           token: token,
-          shop_process_id: @shop_process_id
+          shop_process_id: shop_process_id
         }
         commit(:pci_buy_rollback, post)
       end
@@ -151,7 +153,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
-        response.dig('confirmation', 'authorization_number')
+        authorization_number = response.dig('confirmation', 'authorization_number')
+        shop_process_id = response.dig('confirmation', 'shop_process_id')
+
+        "#{authorization_number}##{shop_process_id}"
       end
 
       def error_code_from(response)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.120.0'
+  VERSION = '1.121.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.120.0
+  version: 1.121.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport