activemerchant 1.137.0 → 1.138.0

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class AdyenGateway < Gateway
       # we recommend setting up merchant-specific endpoints.
       # https://docs.adyen.com/developers/api-manual#apiendpoints
@@ -10,15 +10,16 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'USD'
       self.currencies_without_fractions = %w(CVE DJF GNF IDR JPY KMF KRW PYG RWF UGX VND VUV XAF XOF XPF)
       self.currencies_with_three_decimal_places = %w(BHD IQD JOD KWD LYD OMR TND)
-      self.supported_cardtypes = %i[visa master american_express diners_club jcb dankort maestro discover elo naranja cabal unionpay]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb dankort maestro discover elo naranja cabal unionpay patagonia_365 tarjeta_sol]
 
       self.money_format = :cents
 
       self.homepage_url = 'https://www.adyen.com/'
       self.display_name = 'Adyen'
 
-      PAYMENT_API_VERSION = 'v68'
-      RECURRING_API_VERSION = 'v68'
+      version 'v68', :payment_api
+      version 'v68', :payout_api
+      version 'v68', :recurring_api
 
       STANDARD_ERROR_CODE_MAPPING = {
         '0' => STANDARD_ERROR_CODE[:processing_error],
@@ -63,7 +64,7 @@ module ActiveMerchant #:nodoc:
         add_3ds(post, options)
         add_3ds_authenticated_data(post, options)
         add_splits(post, options)
-        add_recurring_contract(post, options)
+        add_recurring_contract(post, options, payment)
         add_network_transaction_reference(post, options)
         add_application_info(post, options)
         add_level_2_data(post, options)
@@ -71,6 +72,10 @@ module ActiveMerchant #:nodoc:
         add_data_airline(post, options)
         add_data_lodging(post, options)
         add_metadata(post, options)
+        add_recurring_detail_reference(post, options)
+        add_fund_source(post, options)
+        add_fund_destination(post, options)
+        post[:localizedShopperStatement] = options[:localized_shopper_statement] if options[:localized_shopper_statement]
         commit('authorise', post, options)
       end
 
@@ -90,6 +95,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization, options)
         add_splits(post, options)
         add_network_transaction_reference(post, options)
+        add_shopper_statement(post, options)
         commit('refund', post, options)
       end
 
@@ -115,7 +121,7 @@ module ActiveMerchant #:nodoc:
           post[:dateOfBirth] = options[:date_of_birth] if options[:date_of_birth]
           post[:nationality] = options[:nationality] if options[:nationality]
         end
-
+        add_recurring_detail_reference(post, options)
         commit(action, post, options)
       end
 
@@ -132,6 +138,7 @@ module ActiveMerchant #:nodoc:
         add_invoice_for_modification(post, money, options)
         add_reference(post, authorization, options)
         add_extra_data(post, nil, options)
+        add_recurring_detail_reference(post, options)
         commit('adjustAuthorisation', post, options)
       end
 
@@ -247,8 +254,7 @@ module ActiveMerchant #:nodoc:
 
       def add_extra_data(post, payment, options)
         post[:telephoneNumber] = (options[:billing_address][:phone_number] if options.dig(:billing_address, :phone_number)) || (options[:billing_address][:phone] if options.dig(:billing_address, :phone)) || ''
-        post[:selectedBrand] = options[:selected_brand] if options[:selected_brand]
-        post[:selectedBrand] ||= NETWORK_TOKENIZATION_CARD_SOURCE[payment.source.to_s] if payment.is_a?(NetworkTokenizationCreditCard)
+        post[:selectedBrand] = options[:selected_brand] if options[:selected_brand] && !post[:selectedBrand]
         post[:deliveryDate] = options[:delivery_date] if options[:delivery_date]
         post[:merchantOrderReference] = options[:merchant_order_reference] if options[:merchant_order_reference]
         post[:captureDelayHours] = options[:capture_delay_hours] if options[:capture_delay_hours]
@@ -274,12 +280,12 @@ module ActiveMerchant #:nodoc:
         post[:additionalData] ||= {}
         post[:additionalData][:overwriteBrand] = normalize(options[:overwrite_brand]) if options[:overwrite_brand]
         post[:additionalData][:customRoutingFlag] = options[:custom_routing_flag] if options[:custom_routing_flag]
-        post[:additionalData]['paymentdatasource.type'] = NETWORK_TOKENIZATION_CARD_SOURCE[payment.source.to_s] if payment.is_a?(NetworkTokenizationCreditCard)
         post[:additionalData][:authorisationType] = options[:authorisation_type] if options[:authorisation_type]
         post[:additionalData][:adjustAuthorisationData] = options[:adjust_authorisation_data] if options[:adjust_authorisation_data]
         post[:additionalData][:industryUsage] = options[:industry_usage] if options[:industry_usage]
         post[:additionalData][:RequestedTestAcquirerResponseCode] = options[:requested_test_acquirer_response_code] if options[:requested_test_acquirer_response_code] && test?
         post[:additionalData][:updateShopperStatement] = options[:update_shopper_statement] if options[:update_shopper_statement]
+        post[:additionalData][:manualCapture] = options[:manual_capture] if options[:manual_capture]
       end
 
       def extract_and_transform(mapper, from)
@@ -293,8 +299,8 @@ module ActiveMerchant #:nodoc:
         return unless options[:level_2_data].present?
 
         mapper = {
-          "enhancedSchemeData.totalTaxAmount": 'total_tax_amount',
-          "enhancedSchemeData.customerReference": 'customer_reference'
+          'enhancedSchemeData.totalTaxAmount': 'total_tax_amount',
+          'enhancedSchemeData.customerReference': 'customer_reference'
         }
         post[:additionalData].merge!(extract_and_transform(mapper, options[:level_2_data]))
       end
@@ -302,13 +308,13 @@ module ActiveMerchant #:nodoc:
       def add_level_3_data(post, options)
         return unless options[:level_3_data].present?
 
-        mapper = { "enhancedSchemeData.freightAmount": 'freight_amount',
-          "enhancedSchemeData.destinationStateProvinceCode": 'destination_state_province_code',
-          "enhancedSchemeData.shipFromPostalCode": 'ship_from_postal_code',
-          "enhancedSchemeData.orderDate": 'order_date',
-          "enhancedSchemeData.destinationPostalCode": 'destination_postal_code',
-          "enhancedSchemeData.destinationCountryCode": 'destination_country_code',
-          "enhancedSchemeData.dutyAmount": 'duty_amount' }
+        mapper = { 'enhancedSchemeData.freightAmount': 'freight_amount',
+          'enhancedSchemeData.destinationStateProvinceCode': 'destination_state_province_code',
+          'enhancedSchemeData.shipFromPostalCode': 'ship_from_postal_code',
+          'enhancedSchemeData.orderDate': 'order_date',
+          'enhancedSchemeData.destinationPostalCode': 'destination_postal_code',
+          'enhancedSchemeData.destinationCountryCode': 'destination_country_code',
+          'enhancedSchemeData.dutyAmount': 'duty_amount' }
 
         post[:additionalData].merge!(extract_and_transform(mapper, options[:level_3_data]))
 
@@ -362,6 +368,26 @@ module ActiveMerchant #:nodoc:
           post[:additionalData].merge!(extract_and_transform(leg_data, options[:additional_data_airline][:leg]))
         end
 
+        # temporary duplication with minor modification (:legs array with nested hashes instead of a single :leg hash)
+        # this should preserve backward-compatibility with :leg logic above until it is deprecated/removed
+        if options[:additional_data_airline][:legs].present?
+          options[:additional_data_airline][:legs].each_with_index do |leg, number|
+            leg_data = %w[
+              carrier_code
+              class_of_travel
+              date_of_travel
+              depart_airport
+              depart_tax
+              destination_code
+              fare_base_code
+              flight_number
+              stop_over_code
+            ].each_with_object({}) { |value, hash| hash["airline.leg#{number + 1}.#{value}"] = value }
+
+            post[:additionalData].merge!(extract_and_transform(leg_data, leg))
+          end
+        end
+
         if options[:additional_data_airline][:passenger].present?
           passenger_data = %w[
             date_of_birth
@@ -403,11 +429,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_shopper_statement(post, options)
-        return unless options[:shopper_statement]
-
-        post[:additionalData] = {
-          shopperStatement: options[:shopper_statement]
-        }
+        post[:additionalData] ||= {}
+        post[:additionalData][:shopperStatement] = options[:shopper_statement] if options[:shopper_statement]
+        post[:additionalData][:localizedShopperStatement] = options[:localized_shopper_statement] if options[:localized_shopper_statement]
       end
 
       def add_merchant_data(post, options)
@@ -435,16 +459,17 @@ module ActiveMerchant #:nodoc:
 
         splits = []
         split_data.each do |split|
-          amount = {
-            value: split['amount']['value']
-          }
-          amount[:currency] = split['amount']['currency'] if split['amount']['currency']
+          if split['amount']
+            amount = {}
+            amount[:value] = split['amount']['value'] if split['amount']['value']
+            amount[:currency] = split['amount']['currency'] if split['amount']['currency']
+          end
 
           split_hash = {
-            amount: amount,
             type: split['type'],
             reference: split['reference']
           }
+          split_hash[:amount] = amount unless amount.nil?
           split_hash['account'] = split['account'] if split['account']
           splits.push(split_hash)
         end
@@ -465,9 +490,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_shopper_interaction(post, payment, options = {})
-        if  (options.dig(:stored_credential, :initial_transaction) && options.dig(:stored_credential, :initiator) == 'cardholder') ||
-            (payment.respond_to?(:verification_value) && payment.verification_value && options.dig(:stored_credential, :initial_transaction).nil?) ||
-            payment.is_a?(NetworkTokenizationCreditCard)
+        if ecommerce_shopper_interaction?(payment, options)
           shopper_interaction = 'Ecommerce'
         else
           shopper_interaction = 'ContAuth'
@@ -510,9 +533,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_billing_address(post, options, address)
+        address[:address1] = 'NA' if address[:address1].blank?
+        address[:address2] = 'NA' if address[:address2].blank?
+
         post[:billingAddress] = {}
-        post[:billingAddress][:street] = options[:address_override] == true ? address[:address2] : address[:address1] || 'NA'
-        post[:billingAddress][:houseNumberOrName] = options[:address_override] == true ? address[:address1] : address[:address2] || 'NA'
+        post[:billingAddress][:street] = options[:address_override] == true ? address[:address2] : address[:address1]
+        post[:billingAddress][:houseNumberOrName] = options[:address_override] == true ? address[:address1] : address[:address2]
         post[:billingAddress][:postalCode] = address[:zip] if address[:zip]
         post[:billingAddress][:city] = address[:city] || 'NA'
         post[:billingAddress][:stateOrProvince] = get_state(address)
@@ -532,7 +558,7 @@ module ActiveMerchant #:nodoc:
         currency = options[:currency] || currency(money)
         amount = {
           value: localized_amount(money, currency),
-          currency: currency
+          currency:
         }
 
         post[:amount] = amount
@@ -542,24 +568,33 @@ module ActiveMerchant #:nodoc:
         currency = options[:currency] || currency(money)
         amount = {
           value: localized_amount(money, currency),
-          currency: currency
+          currency:
         }
         post[:modificationAmount] = amount
       end
 
       def add_payment(post, payment, options, action = nil)
-        if payment.is_a?(String)
+        case payment
+        when String
           _, _, recurring_detail_reference = payment.split('#')
           post[:selectedRecurringDetailReference] = recurring_detail_reference
           options[:recurring_contract_type] ||= 'RECURRING'
-        elsif payment.is_a?(Check)
+        when Check
           add_bank_account(post, payment, options, action)
         else
-          add_mpi_data_for_network_tokenization_card(post, payment, options) if payment.is_a?(NetworkTokenizationCreditCard)
+          add_network_tokenization_card(post, payment, options) if network_tokenization_payment?(payment, options)
           add_card(post, payment)
         end
       end
 
+      def network_tokenization_payment?(payment, options)
+        payment.is_a?(NetworkTokenizationCreditCard) || options[:wallet_type] == :google_pay
+      end
+
+      def add_recurring_detail_reference(post, options)
+        post[:selectedRecurringDetailReference] = options[:recurring_detail_reference] if options[:recurring_detail_reference].present?
+      end
+
       def add_bank_account(post, bank_account, options, action)
         bank = {
           bankAccountNumber: bank_account.account_number,
@@ -617,25 +652,44 @@ module ActiveMerchant #:nodoc:
         post[:originalReference] = original_reference
       end
 
-      def add_mpi_data_for_network_tokenization_card(post, payment, options)
-        return if options[:skip_mpi_data] == 'Y'
+      def add_network_tokenization_card(post, payment, options)
+        selected_brand = NETWORK_TOKENIZATION_CARD_SOURCE[options[:wallet_type]&.to_s || payment.source.to_s]
+        if selected_brand
+          post[:selectedBrand] = selected_brand
+          post[:additionalData] = {} unless post[:additionalData]
+          post[:additionalData]['paymentdatasource.type'] = selected_brand
+          post[:additionalData]['paymentdatasource.tokenized'] = options[:wallet_type] ? 'false' : 'true' if selected_brand == 'googlepay'
+        end
+
+        return if skip_mpi_data?(payment, options)
+
+        post[:mpiData] = {
+          authenticationResponse: 'Y',
+          directoryResponse: 'Y',
+          eci: payment.eci || '07'
+        }
 
-        post[:mpiData] = {}
-        post[:mpiData][:authenticationResponse] = 'Y'
-        post[:mpiData][:cavv] = payment.payment_cryptogram
-        post[:mpiData][:directoryResponse] = 'Y'
-        post[:mpiData][:eci] = payment.eci || '07'
+        cryptogram_field = payment.try(:network_token?) ? :tokenAuthenticationVerificationValue : :cavv
+        post[:mpiData][cryptogram_field] = payment.payment_cryptogram
       end
 
-      def add_recurring_contract(post, options = {})
-        return unless options[:recurring_contract_type]
+      def add_recurring_contract(post, options = {}, payment = nil)
+        return unless options[:recurring_contract_type] || payment.try(:network_token?)
 
-        post[:recurring] = {}
-        post[:recurring][:contract] = options[:recurring_contract_type]
+        post[:recurring] ||= {}
+        post[:recurring][:contract] = options[:recurring_contract_type] if options[:recurring_contract_type]
         post[:recurring][:recurringDetailName] = options[:recurring_detail_name] if options[:recurring_detail_name]
         post[:recurring][:recurringExpiry] = options[:recurring_expiry] if options[:recurring_expiry]
         post[:recurring][:recurringFrequency] = options[:recurring_frequency] if options[:recurring_frequency]
         post[:recurring][:tokenService] = options[:token_service] if options[:token_service]
+
+        if payment.try(:network_token?)
+          post[:recurring][:contract] = 'EXTERNAL'
+          post[:recurring][:tokenService] = case payment.brand
+                                            when 'visa' then 'VISATOKENSERVICE'
+                                            else 'MCTOKENSERVICE'
+                                            end
+        end
       end
 
       def add_application_info(post, options)
@@ -736,6 +790,7 @@ module ActiveMerchant #:nodoc:
 
         post[:fundSource] = {}
         post[:fundSource][:additionalData] = fund_source[:additional_data] if fund_source[:additional_data]
+        post[:fundSource][:shopperEmail] = fund_source[:shopper_email] if fund_source[:shopper_email]
 
         if fund_source[:first_name] && fund_source[:last_name]
           post[:fundSource][:shopperName] = {}
@@ -748,6 +803,13 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_fund_destination(post, options)
+        return unless fund_destination = options[:fund_destination]
+
+        post[:fundDestination] = {}
+        post[:fundDestination][:additionalData] = fund_destination[:additional_data] if fund_destination[:additional_data]
+      end
+
       def add_metadata(post, options = {})
         return unless options[:metadata]
 
@@ -819,11 +881,11 @@ module ActiveMerchant #:nodoc:
       def endpoint(action)
         case action
         when 'disable', 'storeToken'
-          "Recurring/#{RECURRING_API_VERSION}/#{action}"
+          "Recurring/#{fetch_version(:recurring_api)}/#{action}"
         when 'payout'
-          "Payout/#{PAYMENT_API_VERSION}/#{action}"
+          "Payout/#{fetch_version(:payout_api)}/#{action}"
         else
-          "Payment/#{PAYMENT_API_VERSION}/#{action}"
+          "Payment/#{fetch_version(:payment_api)}/#{action}"
         end
       end
 
@@ -889,8 +951,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorize_message_from(response, options = {})
-        return raw_authorize_error_message(response) if options[:raw_error_message]
-
         if response['refusalReason'] && response['additionalData'] && (response['additionalData']['merchantAdviceCode'] || response['additionalData']['refusalReasonRaw'])
           "#{response['refusalReason']} | #{response['additionalData']['merchantAdviceCode'] || response['additionalData']['refusalReasonRaw']}"
         else
@@ -898,14 +958,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def raw_authorize_error_message(response)
-        if response['refusalReason'] && response['additionalData'] && response['additionalData']['refusalReasonRaw']
-          "#{response['refusalReason']} | #{response['additionalData']['refusalReasonRaw']}"
-        else
-          response['refusalReason'] || response['resultCode'] || response['message'] || response['result']
-        end
-      end
-
       def authorization_from(action, parameters, response)
         return nil if response['pspReference'].nil?
 
@@ -968,6 +1020,30 @@ module ActiveMerchant #:nodoc:
       def card_not_stored?(response)
         response.authorization ? response.authorization.split('#')[2].nil? : true
       end
+
+      def skip_mpi_data?(payment, options = {})
+        return true if options[:shopper_interaction] == 'ContAuth' && options[:recurring_processing_model] == 'Subscription'
+        return true if options.dig(:stored_credential, :initiator) == 'merchant' && payment.is_a?(NetworkTokenizationCreditCard)
+
+        # Skips adding the NT mpi data if it is explicitly skipped in options, or if it is MIT and not the initial transaction.
+        options[:wallet_type] || (!options.dig(:stored_credential, :initial_transaction) && options.dig(:stored_credential, :initiator) == 'merchant')
+      end
+
+      def ecommerce_shopper_interaction?(payment, options)
+        return true if payment.is_a?(NetworkTokenizationCreditCard) && options.dig(:stored_credential, :initiator) != 'merchant'
+        return true unless (stored_credential = options[:stored_credential])
+
+        cardholder_shopper_interaction?(stored_credential) ||
+          (payment.respond_to?(:verification_value) && payment.verification_value && stored_credential[:initial_transaction])
+      end
+
+      def cardholder_shopper_interaction?(stored_credential)
+        if stored_credential[:reason_type] == 'unscheduled'
+          stored_credential[:initial_transaction] && stored_credential[:initiator] == 'cardholder'
+        else
+          stored_credential[:initiator] == 'cardholder'
+        end
+      end
     end
   end
 end

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'
@@ -152,7 +152,7 @@ module ActiveMerchant #:nodoc:
       def build_request_url(action, id = nil)
         base_url = (test? ? test_url : live_url)
         endpoint = ENDPOINTS[action].to_s
-        endpoint = id.present? ? endpoint % { id: id } : endpoint
+        endpoint = id.present? ? endpoint % { id: } : endpoint
         base_url + endpoint
       end
 
@@ -235,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)
@@ -296,7 +303,7 @@ module ActiveMerchant #:nodoc:
           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)
@@ -326,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)
@@ -373,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
 
@@ -149,9 +149,9 @@ module ActiveMerchant #:nodoc:
         end
 
         {
-          key: key,
-          uuid: uuid,
-          access_token: access_token,
+          key:,
+          uuid:,
+          access_token:,
           multiresp: multiresp.responses.present? ? multiresp : nil
         }
       rescue ActiveMerchant::OAuthResponseError => e
@@ -173,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]
         }
 

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

@@ -189,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
@@ -839,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]
@@ -855,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])
           )
@@ -903,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
 

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

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'
@@ -75,7 +75,7 @@ module ActiveMerchant #:nodoc:
           success,
           message,
           response,
-          authorization: authorization,
+          authorization:,
           test: (response[:mode] != 'LIVE')
         )
       end

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'