activemerchant 1.133.0 → 1.138.0

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class AirwallexGateway < Gateway
       self.test_url = 'https://api-demo.airwallex.com/api/v1'
       self.live_url = 'https://pci-api.airwallex.com/api/v1'
@@ -32,7 +32,7 @@ module ActiveMerchant #:nodoc:
         @client_id = options[:client_id]
         @client_api_key = options[:client_api_key]
         super
-        @access_token = setup_access_token
+        @access_token = options[:access_token] || setup_access_token
       end
 
       def purchase(money, card, options = {})
@@ -133,13 +133,27 @@ module ActiveMerchant #:nodoc:
           'x-client-id' => @client_id,
           'x-api-key' => @client_api_key
         }
-        response = ssl_post(build_request_url(:login), nil, token_headers)
-        JSON.parse(response)['token']
+
+        begin
+          raw_response = ssl_post(build_request_url(:login), nil, token_headers)
+        rescue ResponseError => e
+          raise OAuthResponseError.new(e)
+        else
+          response = JSON.parse(raw_response)
+          if (token = response['token'])
+            token
+          else
+            oauth_response = Response.new(false, response['message'])
+            raise OAuthResponseError.new(oauth_response)
+          end
+        end
       end
 
       def build_request_url(action, id = nil)
         base_url = (test? ? test_url : live_url)
-        base_url + ENDPOINTS[action].to_s % { id: id }
+        endpoint = ENDPOINTS[action].to_s
+        endpoint = id.present? ? endpoint % { id: } : endpoint
+        base_url + endpoint
       end
 
       def add_referrer_data(post)
@@ -221,16 +235,23 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_order(post, options)
-        return unless shipping_address = options[:shipping_address]
+        return unless options[:shipping_address] || options[:products]
+
+        if shipping_address = options[:shipping_address]
+          physical_address = build_shipping_address(shipping_address)
+          first_name, last_name = split_names(shipping_address[:name])
+          shipping = {}
+          shipping[:first_name] = first_name if first_name
+          shipping[:last_name] = last_name if last_name
+          shipping[:phone_number] = shipping_address[:phone_number] if shipping_address[:phone_number]
+          shipping[:address] = physical_address
+        end
+
+        order = {}
+        order[:shipping] = shipping if shipping
+        order[:products] = options[:products] if options[:products]
 
-        physical_address = build_shipping_address(shipping_address)
-        first_name, last_name = split_names(shipping_address[:name])
-        shipping = {}
-        shipping[:first_name] = first_name if first_name
-        shipping[:last_name] = last_name if last_name
-        shipping[:phone_number] = shipping_address[:phone_number] if shipping_address[:phone_number]
-        shipping[:address] = physical_address
-        post[:order] = { shipping: shipping }
+        post[:order] = order
       end
 
       def build_shipping_address(shipping_address)
@@ -278,11 +299,11 @@ module ActiveMerchant #:nodoc:
         pm_options = post.dig('payment_method_options', 'card')
 
         external_three_ds = {
-          'version': format_three_ds_version(three_d_secure),
-          'eci': three_d_secure[:eci]
+          version: format_three_ds_version(three_d_secure),
+          eci: three_d_secure[:eci]
         }.merge(three_ds_version_specific_fields(three_d_secure))
 
-        pm_options ? pm_options.merge!('external_three_ds': external_three_ds) : post['payment_method_options'] = { 'card': { 'external_three_ds': external_three_ds } }
+        pm_options ? pm_options.merge!(external_three_ds:) : post['payment_method_options'] = { card: { external_three_ds: } }
       end
 
       def format_three_ds_version(three_d_secure)
@@ -295,14 +316,14 @@ module ActiveMerchant #:nodoc:
       def three_ds_version_specific_fields(three_d_secure)
         if three_d_secure[:version].to_f >= 2
           {
-            'authentication_value': three_d_secure[:cavv],
-            'ds_transaction_id': three_d_secure[:ds_transaction_id],
-            'three_ds_server_transaction_id': three_d_secure[:three_ds_server_trans_id]
+            authentication_value: three_d_secure[:cavv],
+            ds_transaction_id: three_d_secure[:ds_transaction_id],
+            three_ds_server_transaction_id: three_d_secure[:three_ds_server_trans_id]
           }
         else
           {
-            'cavv': three_d_secure[:cavv],
-            'xid': three_d_secure[:xid]
+            cavv: three_d_secure[:cavv],
+            xid: three_d_secure[:xid]
           }
         end
       end
@@ -312,7 +333,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_descriptor(post, options)
-        post[:descriptor] = options[:description] if options[:description]
+        post[:descriptor] = truncate(options[:description], 32) if options[:description]
       end
 
       def parse(body)
@@ -359,7 +380,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
-        response.dig('latest_payment_attempt', 'payment_intent_id')
+        response.dig('latest_payment_attempt', 'payment_intent_id') || response.dig('payment_intent_id')
       end
 
       def error_code_from(response)

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

@@ -1,7 +1,7 @@
 require 'jose'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class AleloGateway < Gateway
       class_attribute :prelive_url
 
@@ -110,8 +110,18 @@ module ActiveMerchant #:nodoc:
           'Content-Type' => 'application/x-www-form-urlencoded'
         }
 
-        parsed = parse(ssl_post(url('captura-oauth-provider/oauth/token'), post_data(params), headers))
-        Response.new(true, parsed[:access_token], parsed)
+        begin
+          raw_response = ssl_post(url('captura-oauth-provider/oauth/token'), post_data(params), headers)
+        rescue ResponseError => e
+          raise OAuthResponseError.new(e)
+        else
+          response = parse(raw_response)
+          if (access_token = response[:access_token])
+            Response.new(true, access_token, response)
+          else
+            raise OAuthResponseError.new(response)
+          end
+        end
       end
 
       def remote_encryption_key(access_token)
@@ -139,14 +149,16 @@ module ActiveMerchant #:nodoc:
         end
 
         {
-          key: key,
-          uuid: uuid,
-          access_token: access_token,
+          key:,
+          uuid:,
+          access_token:,
           multiresp: multiresp.responses.present? ? multiresp : nil
         }
-      rescue ResponseError => error
+      rescue ActiveMerchant::OAuthResponseError => e
+        raise e
+      rescue ResponseError => e
         # retry to generate a new access_token when the provided one is expired
-        raise error unless try_again && %w(401 404).include?(error.response.code) && @options[:access_token].present?
+        raise e unless retry?(try_again, e, :access_token)
 
         @options.delete(:access_token)
         @options.delete(:encryption_key)
@@ -161,7 +173,7 @@ module ActiveMerchant #:nodoc:
         token = JOSE::JWE.block_encrypt(jwk, body.to_json, alg_enc).compact
 
         encrypted_body = {
-          token: token,
+          token:,
           uuid: credentials[:uuid]
         }
 
@@ -206,9 +218,11 @@ module ActiveMerchant #:nodoc:
         multiresp.process { resp }
 
         multiresp
+      rescue ActiveMerchant::OAuthResponseError => e
+        raise OAuthResponseError.new(e)
       rescue ActiveMerchant::ResponseError => e
         # Retry on a possible expired encryption key
-        if try_again && %w(401 404).include?(e.response.code) && @options[:encryption_key].present?
+        if retry?(try_again, e, :encryption_key)
           @options.delete(:encryption_key)
           commit(action, body, options, false)
         else
@@ -217,6 +231,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def retry?(try_again, error, key)
+        try_again && %w(401 404).include?(error.response.code) && @options[key].present?
+      end
+
       def success_from(action, response)
         case action
         when 'capture/transaction/refund'

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class AlliedWalletGateway < Gateway
       self.display_name = 'Allied Wallet'
       self.homepage_url = 'https://www.alliedwallet.com'

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

@@ -85,11 +85,10 @@ module ActiveMerchant
       AVS_REASON_CODES = %w(27 45)
 
       TRACKS = {
-        1 => /^%(?<format_code>.)(?<pan>[\d]{1,19}+)\^(?<name>.{2,26})\^(?<expiration>[\d]{0,4}|\^)(?<service_code>[\d]{0,3}|\^)(?<discretionary_data>.*)\?\Z/,
-        2 => /\A;(?<pan>[\d]{1,19}+)=(?<expiration>[\d]{0,4}|=)(?<service_code>[\d]{0,3}|=)(?<discretionary_data>.*)\?\Z/
+        1 => /^%(?<format_code>.)(?<pan>\d{1,19}+)\^(?<name>.{2,26})\^(?<expiration>\d{0,4}|\^)(?<service_code>\d{0,3}|\^)(?<discretionary_data>.*)\?\Z/,
+        2 => /\A;(?<pan>\d{1,19}+)=(?<expiration>\d{0,4}|=)(?<service_code>\d{0,3}|=)(?<discretionary_data>.*)\?\Z/
       }.freeze
 
-      APPLE_PAY_DATA_DESCRIPTOR = 'COMMON.APPLE.INAPP.PAYMENT'
       PAYMENT_METHOD_NOT_SUPPORTED_ERROR = '155'
       INELIGIBLE_FOR_ISSUING_CREDIT_ERROR = '54'
 
@@ -165,7 +164,7 @@ module ActiveMerchant
             xml.transactionType('refundTransaction')
             xml.amount(amount(amount))
 
-            add_payment_source(xml, payment, options, :credit)
+            add_payment_method(xml, payment, options, :credit)
             xml.refTransId(transaction_id_from(options[:transaction_id])) if options[:transaction_id]
             add_invoice(xml, 'refundTransaction', options)
             add_customer_data(xml, payment, options)
@@ -190,7 +189,7 @@ module ActiveMerchant
         return 100 unless options[:verify_amount].present?
 
         amount = options[:verify_amount]
-        raise ArgumentError.new 'verify_amount value must be an integer' unless amount.is_a?(Integer) && !amount.negative? || amount.is_a?(String) && amount.match?(/^\d+$/) && !amount.to_i.negative?
+        raise ArgumentError.new 'verify_amount value must be an integer' unless (amount.is_a?(Integer) && !amount.negative?) || (amount.is_a?(String) && amount.match?(/^\d+$/) && !amount.to_i.negative?)
         raise ArgumentError.new 'Billing address including zip code is required for a 0 amount verify' if amount.to_i.zero? && !validate_billing_address_values?(options)
 
         amount.to_i
@@ -262,7 +261,7 @@ module ActiveMerchant
         xml.transactionRequest do
           xml.transactionType(transaction_type)
           xml.amount(amount(amount))
-          add_payment_source(xml, payment, options)
+          add_payment_method(xml, payment, options)
           add_invoice(xml, transaction_type, options)
           add_tax_fields(xml, options)
           add_duty_fields(xml, options)
@@ -273,6 +272,7 @@ module ActiveMerchant
           add_market_type_device_type(xml, payment, options)
           add_settings(xml, payment, options)
           add_user_fields(xml, amount, options)
+          add_surcharge_fields(xml, options)
           add_ship_from_address(xml, options)
           add_processing_options(xml, options)
           add_subsequent_auth_information(xml, options)
@@ -287,8 +287,9 @@ module ActiveMerchant
             add_tax_fields(xml, options)
             add_shipping_fields(xml, options)
             add_duty_fields(xml, options)
-            add_payment_source(xml, payment, options)
+            add_payment_method(xml, payment, options)
             add_invoice(xml, transaction_type, options)
+            add_surcharge_fields(xml, options)
             add_tax_exempt_status(xml, options)
           end
         end
@@ -407,20 +408,27 @@ module ActiveMerchant
         end
       end
 
-      def add_payment_source(xml, source, options, action = nil)
-        return unless source
+      def add_payment_method(xml, payment_method, options, action = nil)
+        return unless payment_method
 
-        if source.is_a?(String)
-          add_token_payment_method(xml, source, options)
-        elsif card_brand(source) == 'check'
-          add_check(xml, source)
-        elsif card_brand(source) == 'apple_pay'
-          add_apple_pay_payment_token(xml, source)
+        case payment_method
+        when String
+          add_token_payment_method(xml, payment_method, options)
+        when Check
+          add_check(xml, payment_method)
         else
-          add_credit_card(xml, source, action)
+          if network_token?(payment_method, options, action)
+            add_network_token(xml, payment_method)
+          else
+            add_credit_card(xml, payment_method, action)
+          end
         end
       end
 
+      def network_token?(payment_method, options, action)
+        payment_method.instance_of?(NetworkTokenizationCreditCard) && action != :credit
+      end
+
       def camel_case_lower(key)
         String(key).split('_').inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
       end
@@ -499,7 +507,6 @@ module ActiveMerchant
               xml.cardNumber(truncate(credit_card.number, 16))
               xml.expirationDate(format(credit_card.month, :two_digits) + '/' + format(credit_card.year, :four_digits))
               xml.cardCode(credit_card.verification_value) if credit_card.valid_card_verification_value?(credit_card.verification_value, credit_card.brand)
-              xml.cryptogram(credit_card.payment_cryptogram) if credit_card.is_a?(NetworkTokenizationCreditCard) && action != :credit
             end
           end
         end
@@ -526,17 +533,20 @@ module ActiveMerchant
         xml.customerPaymentProfileId(customer_payment_profile_id)
       end
 
-      def add_apple_pay_payment_token(xml, apple_pay_payment_token)
+      def add_network_token(xml, payment_method)
         xml.payment do
-          xml.opaqueData do
-            xml.dataDescriptor(APPLE_PAY_DATA_DESCRIPTOR)
-            xml.dataValue(Base64.strict_encode64(apple_pay_payment_token.payment_data.to_json))
+          xml.creditCard do
+            xml.cardNumber(truncate(payment_method.number, 16))
+            xml.expirationDate(format(payment_method.month, :two_digits) + '/' + format(payment_method.year, :four_digits))
+            xml.isPaymentToken(true)
+            xml.cryptogram(payment_method.payment_cryptogram)
           end
         end
       end
 
       def add_market_type_device_type(xml, payment, options)
-        return if payment.is_a?(String) || card_brand(payment) == 'check' || card_brand(payment) == 'apple_pay'
+        return unless payment.is_a?(CreditCard)
+        return if payment.is_a?(NetworkTokenizationCreditCard)
 
         if valid_track_data
           xml.retail do
@@ -701,6 +711,16 @@ module ActiveMerchant
         end
       end
 
+      def add_surcharge_fields(xml, options)
+        surcharge = options[:surcharge] if options[:surcharge]
+        if surcharge.is_a?(Hash)
+          xml.surcharge do
+            xml.amount(amount(surcharge[:amount].to_i)) if surcharge[:amount]
+            xml.description(surcharge[:description]) if surcharge[:description]
+          end
+        end
+      end
+
       def add_shipping_fields(xml, options)
         shipping = options[:shipping]
         if shipping.is_a?(Hash)
@@ -754,13 +774,7 @@ module ActiveMerchant
           xml.customerProfileId options[:customer_profile_id]
           xml.paymentProfile do
             add_billing_address(xml, credit_card, options)
-            xml.payment do
-              xml.creditCard do
-                xml.cardNumber(truncate(credit_card.number, 16))
-                xml.expirationDate(format(credit_card.year, :four_digits) + '-' + format(credit_card.month, :two_digits))
-                xml.cardCode(credit_card.verification_value) if credit_card.verification_value
-              end
-            end
+            add_credit_card(xml, credit_card, :cim_store_update)
           end
         end
       end
@@ -776,13 +790,7 @@ module ActiveMerchant
               xml.customerType('individual')
               add_billing_address(xml, credit_card, options)
               add_shipping_address(xml, options, 'shipToList')
-              xml.payment do
-                xml.creditCard do
-                  xml.cardNumber(truncate(credit_card.number, 16))
-                  xml.expirationDate(format(credit_card.year, :four_digits) + '-' + format(credit_card.month, :two_digits))
-                  xml.cardCode(credit_card.verification_value) if credit_card.verification_value
-                end
-              end
+              add_credit_card(xml, credit_card, :cim_store)
             end
           end
         end
@@ -831,8 +839,8 @@ module ActiveMerchant
         end
       end
 
-      def commit(action, options = {}, &payload)
-        raw_response = ssl_post(url, post_data(action, &payload), headers)
+      def commit(action, options = {}, &)
+        raw_response = ssl_post(url, post_data(action, &), headers)
         response = parse(action, raw_response, options)
 
         avs_result_code = response[:avs_result_code].upcase if response[:avs_result_code]
@@ -847,8 +855,8 @@ module ActiveMerchant
             response,
             authorization: authorization_from(action, response),
             test: test?,
-            avs_result: avs_result,
-            cvv_result: cvv_result,
+            avs_result:,
+            cvv_result:,
             fraud_review: fraud_review?(response),
             error_code: map_error_code(response[:response_code], response[:response_reason_code])
           )
@@ -895,7 +903,7 @@ module ActiveMerchant
         doc = Nokogiri::XML(body)
         doc.remove_namespaces!
 
-        response = { action: action }
+        response = { action: }
 
         response[:response_code] = if (element = doc.at_xpath('//transactionResponse/responseCode'))
                                      empty?(element.content) ? nil : element.content.to_i

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # For more information on the Authorize.Net Gateway please visit their {Integration Center}[http://developer.authorize.net/]
     #
     # The login and password are not the username and password you use to
@@ -126,7 +126,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>subscription_id</tt> -- A string containing the +subscription_id+ of the recurring payment already in place
       #   for a given credit card. (REQUIRED)
       def cancel_recurring(subscription_id)
-        request = build_recurring_request(:cancel, subscription_id: subscription_id)
+        request = build_recurring_request(:cancel, subscription_id:)
         recurring_commit(:cancel, request)
       end
 
@@ -139,7 +139,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>subscription_id</tt> -- A string containing the +subscription_id+ of the recurring payment already in place
       #   for a given credit card. (REQUIRED)
       def status_recurring(subscription_id)
-        request = build_recurring_request(:status, subscription_id: subscription_id)
+        request = build_recurring_request(:status, subscription_id:)
         recurring_commit(:status, request)
       end
 
@@ -208,9 +208,9 @@ module ActiveMerchant #:nodoc:
           # The amount to be billed to the customer
           # for each payment in the subscription
           xml.tag!('amount', amount(options[:amount])) if options[:amount]
-          if trial = options[:trial]
+          if trial = options[:trial] && (trial[:amount])
             # The amount to be charged for each payment during a trial period (conditional)
-            xml.tag!('trialAmount', amount(trial[:amount])) if trial[:amount]
+            xml.tag!('trialAmount', amount(trial[:amount]))
           end
           # Contains either the customer’s credit card
           # or bank account payment information
@@ -260,9 +260,9 @@ module ActiveMerchant #:nodoc:
           # Contains information about the interval of time between payments
           add_interval(xml, options)
           add_duration(xml, options)
-          if trial = options[:trial]
+          if trial = options[:trial] && (trial[:occurrences])
             # Number of billing occurrences or payments in the trial period (optional)
-            xml.tag!('trialOccurrences', trial[:occurrences]) if trial[:occurrences]
+            xml.tag!('trialOccurrences', trial[:occurrences])
           end
         end
       end
@@ -393,9 +393,13 @@ module ActiveMerchant #:nodoc:
         test_mode = test? || message =~ /Test Mode/
         success = response[:result_code] == 'Ok'
 
-        Response.new(success, message, response,
+        Response.new(
+          success,
+          message,
+          response,
           test: test_mode,
-          authorization: response[:subscription_id])
+          authorization: response[:subscription_id]
+        )
       end
 
       def recurring_parse(action, xml)

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # ==== Customer Information Manager (CIM)
     #
     # The Authorize.Net Customer Information Manager (CIM) is an optional additional service that allows you to store sensitive payment information on
@@ -695,9 +695,7 @@ module ActiveMerchant #:nodoc:
               add_order(xml, transaction[:order]) if transaction[:order].present?
 
             end
-            if %i[auth_capture auth_only capture_only].include?(transaction[:type])
-              xml.tag!('recurringBilling', transaction[:recurring_billing]) if transaction.has_key?(:recurring_billing)
-            end
+            xml.tag!('recurringBilling', transaction[:recurring_billing]) if %i[auth_capture auth_only capture_only].include?(transaction[:type]) && transaction.has_key?(:recurring_billing)
             tag_unless_blank(xml, 'cardCode', transaction[:card_code]) unless %i[void refund prior_auth_capture].include?(transaction[:type])
           end
         end

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class AxcessmsGateway < Gateway
       self.test_url = 'https://test.ctpe.io/payment/ctpe'
       self.live_url = 'https://ctpe.io/payment/ctpe'
@@ -71,9 +71,13 @@ module ActiveMerchant #:nodoc:
         message = "#{response[:reason]} - #{response[:return]}"
         authorization = response[:unique_id]
 
-        Response.new(success, message, response,
-          authorization: authorization,
-          test: (response[:mode] != 'LIVE'))
+        Response.new(
+          success,
+          message,
+          response,
+          authorization:,
+          test: (response[:mode] != 'LIVE')
+        )
       end
 
       def parse(body)

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

@@ -1,7 +1,7 @@
 require 'json'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # For more information on Balanced visit https://www.balancedpayments.com
     # or visit #balanced on irc.freenode.net
     #

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

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class BamboraApacGateway < Gateway
       self.live_url = 'https://www.bambora.co.nz/interface/api'
       self.test_url = 'https://demo.bambora.co.nz/interface/api'

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

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # For more information visit {Bank Frick Acquiring Services}[http://www.bankfrickacquiring.com/merchantsolutions_en.html]
     #
     # Written by Piers Chambers (Varyonic.com)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class BanwireGateway < Gateway
       URL = 'https://banwire.com/api.pago_pro'
 
@@ -89,11 +89,13 @@ module ActiveMerchant #:nodoc:
           response = json_error(raw_response)
         end
 
-        Response.new(success?(response),
+        Response.new(
+          success?(response),
           response['message'],
           response,
           test: test?,
-          authorization: response['code_auth'])
+          authorization: response['code_auth']
+        )
       end
 
       def success?(response)

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

@@ -1,6 +1,8 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class BarclaycardSmartpayGateway < Gateway
+      version 'v40'
+
       self.test_url = 'https://pal-test.barclaycardsmartpay.com/pal/servlet'
       self.live_url = 'https://pal-live.barclaycardsmartpay.com/pal/servlet'
 
@@ -14,8 +16,6 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://www.barclaycardsmartpay.com/'
       self.display_name = 'Barclaycard Smartpay'
 
-      API_VERSION = 'v40'
-
       def initialize(options = {})
         requires!(options, :company, :merchant, :password)
         super
@@ -257,13 +257,13 @@ module ActiveMerchant #:nodoc:
       def build_url(action)
         case action
         when 'store'
-          "#{test? ? self.test_url : self.live_url}/Recurring/#{API_VERSION}/storeToken"
+          "#{test? ? self.test_url : self.live_url}/Recurring/#{fetch_version}/storeToken"
         when 'finalize3ds'
-          "#{test? ? self.test_url : self.live_url}/Payment/#{API_VERSION}/authorise3d"
+          "#{test? ? self.test_url : self.live_url}/Payment/#{fetch_version}/authorise3d"
         when 'storeDetailAndSubmitThirdParty', 'confirmThirdParty'
-          "#{test? ? self.test_url : self.live_url}/Payout/#{API_VERSION}/#{action}"
+          "#{test? ? self.test_url : self.live_url}/Payout/#{fetch_version}/#{action}"
         else
-          "#{test? ? self.test_url : self.live_url}/Payment/#{API_VERSION}/#{action}"
+          "#{test? ? self.test_url : self.live_url}/Payment/#{fetch_version}/#{action}"
         end
       end
 

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class BarclaysEpdqExtraPlusGateway < OgoneGateway
       self.test_url = 'https://mdepayments.epdq.co.uk/ncol/test/'
       self.live_url = 'https://payments.epdq.co.uk/ncol/prod/'

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

@@ -1,7 +1,7 @@
 require 'digest/sha2'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class Be2billGateway < Gateway
       self.test_url = 'https://secure-test.be2bill.com/front/service/rest/process.php'
       self.live_url = 'https://secure-magenta1.be2bill.com/front/service/rest/process.php'