activemerchant 1.133.0 → 1.138.0

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

@@ -1,19 +1,20 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SafeChargeGateway < Gateway
       self.test_url = 'https://process.sandbox.safecharge.com/service.asmx/Process'
       self.live_url = 'https://process.safecharge.com/service.asmx/Process'
 
-      self.supported_countries = %w[AT BE BG CY CZ DE DK EE GR ES FI FR GI HK HR HU IE IS IT LI LT LU LV MT MX NL NO PL PT RO SE SG SI SK GB US]
+      self.supported_countries = %w[AT AU BE BG CA CY CZ DE DK EE GR ES FI FR GI HK HR HU IE IS IT LI LT LU LV MT MX NL NO PL PT RO SE SG SI SK GB US]
       self.default_currency = 'USD'
       self.supported_cardtypes = %i[visa master]
 
       self.homepage_url = 'https://www.safecharge.com'
       self.display_name = 'SafeCharge'
 
-      VERSION = '4.1.0'
+      # Define the API version using the Versionable module
+      version '4.1.0'
 
       def initialize(options = {})
         requires!(options, :client_login_id, :client_password)
@@ -88,7 +89,7 @@ module ActiveMerchant #:nodoc:
         add_transaction_data('Credit', post, money, options)
         add_customer_details(post, payment, options)
 
-        post[:sg_CreditType] = 1
+        options[:unreferenced_refund].to_s == 'true' ? post[:sg_CreditType] = 2 : post[:sg_CreditType] = 1
 
         commit(post)
       end
@@ -133,7 +134,7 @@ module ActiveMerchant #:nodoc:
         post[:sg_ClientLoginID] = @options[:client_login_id]
         post[:sg_ClientPassword] = @options[:client_password]
         post[:sg_ResponseFormat] = '4'
-        post[:sg_Version] = VERSION
+        post[:sg_Version] = fetch_version
         post[:sg_ClientUniqueID] = options[:order_id] if options[:order_id]
         post[:sg_UserID] = options[:user_id] if options[:user_id]
         post[:sg_AuthType] = options[:auth_type] if options[:auth_type]
@@ -149,32 +150,54 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment(post, payment, options = {})
-        post[:sg_ExpMonth] = format(payment.month, :two_digits)
-        post[:sg_ExpYear] = format(payment.year, :two_digits)
-        post[:sg_CardNumber] = payment.number
-
-        if payment.is_a?(NetworkTokenizationCreditCard) && payment.source == :network_token
-          post[:sg_CAVV] = payment.payment_cryptogram
-          post[:sg_ECI] = options[:three_d_secure] && options[:three_d_secure][:eci] || '05'
-          post[:sg_IsExternalMPI] = 1
-          post[:sg_ExternalTokenProvider] = 5
-        else
-          post[:sg_CVV2] = payment.verification_value
-          post[:sg_NameOnCard] = payment.name
-          post[:sg_StoredCredentialMode] = (options[:stored_credential_mode] == true ? 1 : 0)
+        case payment
+        when String
+          add_token(post, payment)
+        when CreditCard
+          post[:sg_ExpMonth] = format(payment.month, :two_digits)
+          post[:sg_ExpYear] = format(payment.year, :two_digits)
+          post[:sg_CardNumber] = payment.number
+
+          if payment.is_a?(NetworkTokenizationCreditCard) && payment.source == :network_token
+            add_network_token(post, payment, options)
+          else
+            add_credit_card(post, payment, options)
+          end
         end
       end
 
+      def add_token(post, payment)
+        _, transaction_id, token = payment.split('|')
+
+        post[:sg_TransactionID] = transaction_id
+        post[:sg_CCToken] = token
+      end
+
+      def add_credit_card(post, payment, options)
+        post[:sg_CVV2] = payment.verification_value
+        post[:sg_NameOnCard] = payment.name
+        post[:sg_StoredCredentialMode] = (options[:stored_credential_mode] == true ? 1 : 0)
+      end
+
+      def add_network_token(post, payment, options)
+        post[:sg_CAVV] = payment.payment_cryptogram
+        post[:sg_ECI] = (options[:three_d_secure] && options[:three_d_secure][:eci]) || '05'
+        post[:sg_IsExternalMPI] = 1
+        post[:sg_ExternalTokenProvider] = 5
+      end
+
       def add_customer_details(post, payment, options)
         if address = options[:billing_address] || options[:address]
-          post[:sg_FirstName] = payment.first_name
-          post[:sg_LastName] = payment.last_name
+          post[:sg_FirstName] = payment.first_name if payment.respond_to?(:first_name)
+          post[:sg_LastName] = payment.last_name if payment.respond_to?(:last_name)
           post[:sg_Address] = address[:address1] if address[:address1]
           post[:sg_City] = address[:city] if address[:city]
           post[:sg_State] = address[:state]  if address[:state]
           post[:sg_Zip] = address[:zip] if address[:zip]
           post[:sg_Country] = address[:country] if address[:country]
           post[:sg_Phone] = address[:phone] if address[:phone]
+          post[:sg_middleName] = options[:middle_name] if options[:middle_name]
+          post[:sg_doCardHolderNameVerification] = options[:card_holder_verification] if options[:card_holder_verification]
         end
 
         post[:sg_Email] = options[:email]
@@ -264,9 +287,9 @@ module ActiveMerchant #:nodoc:
         auth_code, transaction_id, token, month, year, original_amount = authorization.split('|')
 
         {
-          auth_code: auth_code,
-          transaction_id: transaction_id,
-          token: token,
+          auth_code:,
+          transaction_id:,
+          token:,
           exp_month: month,
           exp_year: year,
           original_amount: amount(original_amount.to_f * 100)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SageGateway < Gateway
       include Empty
 
@@ -260,11 +260,15 @@ module ActiveMerchant #:nodoc:
         url = url(params, source)
         response = parse(ssl_post(url, post_data(action, params)), source)
 
-        Response.new(success?(response), response[:message], response,
+        Response.new(
+          success?(response),
+          response[:message],
+          response,
           test: test?,
           authorization: authorization_from(response, source),
           avs_result: { code: response[:avs_result] },
-          cvv_result: response[:cvv_result])
+          cvv_result: response[:cvv_result]
+        )
       end
 
       def url(params, source)
@@ -380,8 +384,12 @@ module ActiveMerchant #:nodoc:
             message = success ? 'Succeeded' : 'Failed'
           end
 
-          Response.new(success, message, response,
-            authorization: response[:guid])
+          Response.new(
+            success,
+            message,
+            response,
+            authorization: response[:guid]
+          )
         end
 
         ENVELOPE_NAMESPACES = {

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

@@ -1,13 +1,13 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SagePayGateway < Gateway
       cattr_accessor :simulate
       self.simulate = false
 
       class_attribute :simulator_url
 
-      self.test_url = 'https://test.sagepay.com/gateway/service'
-      self.live_url = 'https://live.sagepay.com/gateway/service'
+      self.test_url = 'https://sandbox.opayo.eu.elavon.com/gateway/service'
+      self.live_url = 'https://live.opayo.eu.elavon.com/gateway/service'
       self.simulator_url = 'https://test.sagepay.com/Simulator'
 
       APPROVED = 'OK'
@@ -78,6 +78,7 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login)
+        @protocol_version = options.fetch(:protocol_version, '3.00')
         super
       end
 
@@ -86,6 +87,9 @@ module ActiveMerchant #:nodoc:
 
         post = {}
 
+        add_override_protocol_version(options)
+        add_three_ds_data(post, options)
+        add_stored_credentials_data(post, options)
         add_amount(post, money, options)
         add_invoice(post, options)
         add_payment_method(post, payment_method, options)
@@ -101,6 +105,9 @@ module ActiveMerchant #:nodoc:
 
         post = {}
 
+        add_three_ds_data(post, options)
+        add_stored_credentials_data(post, options)
+        add_override_protocol_version(options)
         add_amount(post, money, options)
         add_invoice(post, options)
         add_payment_method(post, payment_method, options)
@@ -115,6 +122,7 @@ module ActiveMerchant #:nodoc:
       def capture(money, identification, options = {})
         post = {}
 
+        add_override_protocol_version(options)
         add_reference(post, identification)
         add_release_amount(post, money, options)
 
@@ -124,6 +132,7 @@ module ActiveMerchant #:nodoc:
       def void(identification, options = {})
         post = {}
 
+        add_override_protocol_version(options)
         add_reference(post, identification)
         action = abort_or_void_from(identification)
 
@@ -136,6 +145,7 @@ module ActiveMerchant #:nodoc:
 
         post = {}
 
+        add_override_protocol_version(options)
         add_related_reference(post, identification)
         add_amount(post, money, options)
         add_invoice(post, options)
@@ -150,6 +160,7 @@ module ActiveMerchant #:nodoc:
 
       def store(credit_card, options = {})
         post = {}
+        add_override_protocol_version(options)
         add_credit_card(post, credit_card)
         add_currency(post, 0, options)
 
@@ -158,6 +169,7 @@ module ActiveMerchant #:nodoc:
 
       def unstore(token, options = {})
         post = {}
+        add_override_protocol_version(options)
         add_token(post, token)
         commit(:unstore, post)
       end
@@ -182,6 +194,58 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def add_override_protocol_version(options)
+        @protocol_version = options[:protocol_version] if options[:protocol_version]
+      end
+
+      def add_three_ds_data(post, options)
+        return unless @protocol_version == '4.00'
+        return unless three_ds_2_options = options[:three_ds_2]
+
+        add_pair(post, :ThreeDSNotificationURL, three_ds_2_options[:notification_url])
+        return unless three_ds_2_options[:browser_info]
+
+        add_browser_info(post, three_ds_2_options[:browser_info])
+      end
+
+      def add_browser_info(post, browser_info)
+        add_pair(post, :BrowserAcceptHeader, browser_info[:accept_header])
+        add_pair(post, :BrowserColorDepth, browser_info[:depth])
+        add_pair(post, :BrowserJavascriptEnabled, format_boolean(browser_info[:java]))
+        add_pair(post, :BrowserJavaEnabled, format_boolean(browser_info[:java]))
+        add_pair(post, :BrowserLanguage, browser_info[:language])
+        add_pair(post, :BrowserScreenHeight, browser_info[:height])
+        add_pair(post, :BrowserScreenWidth, browser_info[:width])
+        add_pair(post, :BrowserTZ, browser_info[:timezone])
+        add_pair(post, :BrowserUserAgent, browser_info[:user_agent])
+        add_pair(post, :ChallengeWindowSize, browser_info[:browser_size])
+      end
+
+      def add_stored_credentials_data(post, options)
+        return unless @protocol_version == '4.00'
+        return unless stored_credential = options[:stored_credential]
+
+        initiator = stored_credential[:initiator] == 'cardholder' ? 'CIT' : 'MIT'
+        cof_usage = if stored_credential[:initial_transaction] && initiator == 'CIT'
+                      'FIRST'
+                    elsif !stored_credential[:initial_transaction] && initiator == 'MIT'
+                      'SUBSEQUENT'
+                    end
+
+        add_pair(post, :COFUsage, cof_usage) if cof_usage
+        add_pair(post, :InitiatedTYPE, initiator)
+        add_pair(post, :SchemeTraceID, stored_credential[:network_transaction_id]) if stored_credential[:network_transaction_id]
+
+        reasoning = stored_credential[:reason_type] == 'installment' ? 'instalment' : stored_credential[:reason_type]
+        add_pair(post, :MITType, reasoning.upcase)
+
+        if %w(instalment recurring).any?(reasoning)
+          add_pair(post, :RecurringExpiry, options[:recurring_expiry])
+          add_pair(post, :RecurringFrequency, options[:recurring_frequency])
+          add_pair(post, :PurchaseInstalData, options[:installment_data])
+        end
+      end
+
       def truncate(value, max_size)
         return nil unless value
         return value.to_s if CGI.escape(value.to_s).length <= max_size
@@ -346,14 +410,18 @@ module ActiveMerchant #:nodoc:
       def commit(action, parameters)
         response = parse(ssl_post(url_for(action), post_data(action, parameters)))
 
-        Response.new(response['Status'] == APPROVED, message_from(response), response,
+        Response.new(
+          response['Status'] == APPROVED,
+          message_from(response),
+          response,
           test: test?,
           authorization: authorization_from(response, parameters, action),
           avs_result: {
             street_match: AVS_CODE[response['AddressResult']],
             postal_match: AVS_CODE[response['PostCodeResult']]
           },
-          cvv_result: CVV_CODE[response['CV2Result']])
+          cvv_result: CVV_CODE[response['CV2Result']]
+        )
       end
 
       def authorization_from(response, params, action)
@@ -401,7 +469,7 @@ module ActiveMerchant #:nodoc:
         parameters.update(
           Vendor: @options[:login],
           TxType: TRANSACTIONS[action],
-          VPSProtocol: @options.fetch(:protocol_version, '3.00')
+          VPSProtocol: @protocol_version
         )
 
         parameters.update(ReferrerID: application_id) if application_id && (application_id != Gateway.application_id)
@@ -409,6 +477,12 @@ module ActiveMerchant #:nodoc:
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
+      def format_boolean(value)
+        return if value.nil?
+
+        value ? '1' : '0'
+      end
+
       # SagePay returns data in the following format
       # Key1=value1
       # Key2=value2

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SallieMaeGateway < Gateway
       self.live_url = self.test_url = 'https://trans.salliemae.com/cgi-bin/process.cgi'
 
@@ -120,9 +120,13 @@ module ActiveMerchant #:nodoc:
         end
 
         response = parse(ssl_post(self.live_url, parameters.to_post_data) || '')
-        Response.new(successful?(response), message_from(response), response,
+        Response.new(
+          successful?(response),
+          message_from(response),
+          response,
           test: test?,
-          authorization: response['refcode'])
+          authorization: response['refcode']
+        )
       end
 
       def successful?(response)

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

@@ -1,7 +1,7 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SecureNetGateway < Gateway
-      API_VERSION = '4.0'
+      version '4.0'
 
       TRANSACTIONS = {
         auth_only:            '0000',
@@ -79,11 +79,15 @@ module ActiveMerchant #:nodoc:
         data = ssl_post(url, xml, 'Content-Type' => 'text/xml')
         response = parse(data)
 
-        Response.new(success?(response), message_from(response), response,
+        Response.new(
+          success?(response),
+          message_from(response),
+          response,
           test: test?,
           authorization: build_authorization(response),
           avs_result: { code: response[:avs_result_code] },
-          cvv_result: response[:card_code_response_code])
+          cvv_result: response[:card_code_response_code]
+        )
       end
 
       def build_request(request)

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

@@ -1,7 +1,7 @@
 require 'active_merchant/billing/gateways/authorize_net'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SecurePayGateway < Gateway
       API_VERSION = '3.1'
 
@@ -56,12 +56,16 @@ module ActiveMerchant #:nodoc:
 
         message = message_from(response)
 
-        Response.new(success?(response), message, response,
+        Response.new(
+          success?(response),
+          message,
+          response,
           test: test?,
           authorization: response[:transaction_id],
           fraud_review: fraud_review?(response),
           avs_result: { code: response[:avs_result_code] },
-          cvv_result: response[:card_code])
+          cvv_result: response[:card_code]
+        )
       end
 
       def success?(response)
@@ -75,7 +79,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         fields = split(body)
 
-        results = {
+        {
           response_code: fields[RESPONSE_CODE].to_i,
           response_reason_code: fields[RESPONSE_REASON_CODE],
           response_reason_text: fields[RESPONSE_REASON_TEXT],
@@ -85,7 +89,6 @@ module ActiveMerchant #:nodoc:
           authorization_code: fields[AUTHORIZATION_CODE],
           cardholder_authentication_code: fields[CARDHOLDER_AUTH_CODE]
         }
-        results
       end
 
       def post_data(action, parameters = {})
@@ -101,8 +104,7 @@ module ActiveMerchant #:nodoc:
         post[:encap_char]     = '$'
         post[:solution_ID]    = application_id if application_id
 
-        request = post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join('&')
-        request
+        post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def add_currency_code(post, money, options)

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

@@ -1,10 +1,10 @@
 require 'rexml/document'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SecurePayAuGateway < Gateway
-      API_VERSION = 'xml-4.2'
-      PERIODIC_API_VERSION = 'spxml-3.0'
+      version 'xml-4.2'
+      version 'spxml-3.0', :periodic_api
 
       class_attribute :test_periodic_url, :live_periodic_url
 
@@ -23,9 +23,6 @@ module ActiveMerchant #:nodoc:
       # The name of the gateway
       self.display_name = 'SecurePay'
 
-      class_attribute :request_timeout
-      self.request_timeout = 60
-
       self.money_format = :cents
       self.default_currency = 'AUD'
 
@@ -61,6 +58,10 @@ module ActiveMerchant #:nodoc:
         super
       end
 
+      def request_timeout
+        @options[:request_timeout] || 60
+      end
+
       def purchase(money, credit_card_or_stored_id, options = {})
         if credit_card_or_stored_id.respond_to?(:number)
           requires!(options, :order_id)
@@ -157,7 +158,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'messageID', SecureRandom.hex(15)
             xml.tag! 'messageTimestamp', generate_timestamp
             xml.tag! 'timeoutValue', request_timeout
-            xml.tag! 'apiVersion', API_VERSION
+            xml.tag! 'apiVersion', fetch_version
           end
 
           xml.tag! 'MerchantInfo' do
@@ -181,11 +182,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, request)
-        response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(action, request)))
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(action, request), { 'Content-Type' => 'text/xml; charset=utf-8' }))
 
-        Response.new(success?(response), message_from(response), response,
+        Response.new(
+          success?(response),
+          message_from(response),
+          response,
           test: test?,
-          authorization: authorization_from(response))
+          authorization: authorization_from(response)
+        )
       end
 
       def build_periodic_item(action, money, credit_card, options)
@@ -203,6 +208,7 @@ module ActiveMerchant #:nodoc:
         end
         xml.tag! 'amount', amount(money)
         xml.tag! 'periodicType', PERIODIC_TYPES[action] if PERIODIC_TYPES[action]
+        xml.tag! 'transactionReference', options[:order_id] if options[:order_id]
 
         xml.target!
       end
@@ -215,7 +221,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'messageID', SecureRandom.hex(15)
             xml.tag! 'messageTimestamp', generate_timestamp
             xml.tag! 'timeoutValue', request_timeout
-            xml.tag! 'apiVersion', PERIODIC_API_VERSION
+            xml.tag! 'apiVersion', fetch_version(:periodic_api)
           end
 
           xml.tag! 'MerchantInfo' do
@@ -237,11 +243,15 @@ module ActiveMerchant #:nodoc:
 
       def commit_periodic(request)
         my_request = build_periodic_request(request)
-        response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, my_request))
+        response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, my_request, { 'Content-Type' => 'text/xml; charset=utf-8' }))
 
-        Response.new(success?(response), message_from(response), response,
+        Response.new(
+          success?(response),
+          message_from(response),
+          response,
           test: test?,
-          authorization: authorization_from(response))
+          authorization: authorization_from(response)
+        )
       end
 
       def success?(response)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SecurePayTechGateway < Gateway
       class SecurePayTechPostData < PostData
         self.required_fields = %i[OrderReference CardNumber CardExpiry CardHolderName CardType MerchantID MerchantKey Amount Currency]
@@ -84,9 +84,13 @@ module ActiveMerchant #:nodoc:
       def commit(action, post)
         response = parse(ssl_post(self.live_url, post_data(action, post)))
 
-        Response.new(response[:result_code] == 1, message_from(response), response,
+        Response.new(
+          response[:result_code] == 1,
+          message_from(response),
+          response,
           test: test?,
-          authorization: response[:merchant_transaction_reference])
+          authorization: response[:merchant_transaction_reference]
+        )
       end
 
       def message_from(result)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SecurionPayGateway < Gateway
       self.test_url = 'https://api.securionpay.com/'
       self.live_url = 'https://api.securionpay.com/'
@@ -193,7 +193,8 @@ module ActiveMerchant #:nodoc:
           post[:card] = card
           add_address(post, options)
         elsif creditcard.kind_of?(String)
-          post[:card] = creditcard
+          key = creditcard.match(/^pm_/) ? :paymentMethod : :card
+          post[key] = creditcard
         else
           raise ArgumentError.new("Unhandled payment method #{creditcard.class}.")
         end
@@ -223,24 +224,37 @@ module ActiveMerchant #:nodoc:
         end
 
         response = api_request(url, parameters, options, method)
-        success = !response.key?('error')
+        success = success?(response)
 
-        Response.new(success,
+        Response.new(
+          success,
           (success ? 'Transaction approved' : response['error']['message']),
           response,
           test: test?,
-          authorization: (success ? response['id'] : response['error']['charge']),
-          error_code: (success ? nil : STANDARD_ERROR_CODE_MAPPING[response['error']['code']]))
+          authorization: authorization_from(url, response),
+          error_code: (success ? nil : STANDARD_ERROR_CODE_MAPPING[response['error']['code']])
+        )
+      end
+
+      def authorization_from(action, response)
+        if action == 'customers' && success?(response) && response['cards'].present?
+          response['cards'].first['id']
+        else
+          success?(response) ? response['id'] : (response.dig('error', 'charge') || response.dig('error', 'chargeId'))
+        end
+      end
+
+      def success?(response)
+        !response.key?('error')
       end
 
       def headers(options = {})
         secret_key = options[:secret_key] || @options[:secret_key]
 
-        headers = {
+        {
           'Authorization' => 'Basic ' + Base64.encode64(secret_key.to_s + ':').strip,
           'User-Agent' => "SecurionPay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}"
         }
-        headers
       end
 
       def response_error(raw_response)
@@ -287,8 +301,8 @@ module ActiveMerchant #:nodoc:
         response
       end
 
-      def json_error(raw_response)
-        msg = 'Invalid response received from the SecurionPay API.'
+      def json_error(raw_response, gateway_name = 'SecurionPay')
+        msg = "Invalid response received from the #{gateway_name} API."
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"
         {
           'error' => {
@@ -298,7 +312,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        (@options[:secret_key]&.include?('_test_'))
+        @options[:secret_key]&.include?('_test_')
       end
     end
   end