activemerchant 1.133.0 → 1.138.0

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

@@ -0,0 +1,224 @@
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
+    class SumUpGateway < Gateway
+      version 'v0.1'
+      self.live_url = "https://api.sumup.com/#{fetch_version}/"
+
+      self.supported_countries = %w(AT BE BG BR CH CL CO CY CZ DE DK EE ES FI FR
+                                    GB GR HR HU IE IT LT LU LV MT NL NO PL PT RO
+                                    SE SI SK US)
+      self.currencies_with_three_decimal_places = %w(EUR BGN BRL CHF CZK DKK GBP
+                                                     HUF NOK PLN SEK USD)
+      self.default_currency = 'USD'
+
+      self.homepage_url = 'https://www.sumup.com/'
+      self.display_name = 'SumUp'
+
+      STANDARD_ERROR_CODE_MAPPING = {
+        multiple_invalid_parameters: 'MULTIPLE_INVALID_PARAMETERS'
+      }
+
+      def initialize(options = {})
+        requires!(options, :access_token, :pay_to_email)
+        super
+      end
+
+      def purchase(money, payment, options = {})
+        MultiResponse.run do |r|
+          r.process { create_checkout(money, payment, options) } unless options[:checkout_id]
+          r.process { complete_checkout(options[:checkout_id] || r.params['id'], payment, options) }
+        end
+      end
+
+      def refund(money, authorization, options = {})
+        transaction_id = authorization.split('#').last
+        post = money ? { amount: amount(money) } : {}
+        add_merchant_data(post, options)
+
+        commit('me/refund/' + transaction_id, post)
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Bearer )\w+), '\1[FILTERED]').
+          gsub(%r(("pay_to_email\\?"\s*:\s*\\?")[^"]*)i, '\1[FILTERED]').
+          gsub(%r(("number\\?"\s*:\s*\\?")[^"]*)i, '\1[FILTERED]').
+          gsub(%r(("cvv\\?"\s*:\s*\\?")[^"]*)i, '\1[FILTERED]')
+      end
+
+      private
+
+      def create_checkout(money, payment, options)
+        post = {}
+
+        add_merchant_data(post, options)
+        add_invoice(post, money, options)
+        add_address(post, options)
+        add_customer_data(post, payment, options)
+        add_3ds_data(post, options)
+
+        commit('checkouts', post)
+      end
+
+      def complete_checkout(checkout_id, payment, options = {})
+        post = {}
+
+        add_payment(post, payment, options)
+
+        commit('checkouts/' + checkout_id, post, :put)
+      end
+
+      def add_customer_data(post, payment, options)
+        post[:customer_id]      = options[:customer_id]
+        post[:personal_details] = {
+          email:      options[:email],
+          first_name: payment&.first_name,
+          last_name:  payment&.last_name,
+          tax_id:     options[:tax_id]
+        }
+      end
+
+      def add_merchant_data(post, options)
+        # Required field: pay_to_email
+        # Description: Email address of the merchant to whom the payment is made.
+        post[:pay_to_email] = @options[:pay_to_email]
+      end
+
+      def add_address(post, options)
+        post[:personal_details] ||= {}
+        if address = (options[:billing_address] || options[:shipping_address] || options[:address])
+          post[:personal_details][:address] = {
+            city:        address[:city],
+            state:       address[:state],
+            country:     address[:country],
+            line_1:      address[:address1],
+            postal_code: address[:zip]
+          }
+        end
+      end
+
+      def add_invoice(post, money, options)
+        post[:checkout_reference] = options[:partner_id] && options[:order_id] ? "#{options[:partner_id]}-#{options[:order_id]}" : options[:order_id]
+        post[:amount]             = amount(money)
+        post[:currency]           = options[:currency] || currency(money)
+        post[:description]        = options[:description]
+      end
+
+      def add_payment(post, payment, options)
+        post[:payment_type] = options[:payment_type] || 'card'
+
+        post[:card] = {
+          name:         payment.name,
+          number:       payment.number,
+          expiry_month: format(payment.month, :two_digits),
+          expiry_year:  payment.year,
+          cvv:          payment.verification_value
+        }
+      end
+
+      def add_3ds_data(post, options)
+        post[:redirect_url] = options[:redirect_url] if options[:redirect_url]
+      end
+
+      def commit(action, post, method = :post)
+        response = api_request(action, post.compact, method)
+        succeeded = success_from(response)
+
+        Response.new(
+          succeeded,
+          message_from(succeeded, response),
+          action.include?('refund') ? { response_code: response.to_s } : response,
+          authorization: authorization_from(response),
+          test: test?,
+          error_code: error_code_from(succeeded, response)
+        )
+      end
+
+      def api_request(action, post, method)
+        raw_response =
+          begin
+            ssl_request(method, live_url + action, post.to_json, auth_headers)
+          rescue ResponseError => e
+            e.response.body
+          end
+        response = parse(raw_response)
+        response = response.is_a?(Hash) ? response.symbolize_keys : response
+
+        return format_errors(response) if raw_response.include?('error_code') && response.is_a?(Array)
+
+        response
+      end
+
+      def parse(body)
+        JSON.parse(body)
+      end
+
+      def success_from(response)
+        (response.is_a?(Hash) && response[:next_step]) ||
+          response == 204 ||
+          %w(PENDING PAID).include?(response[:status]) ||
+          response[:transactions]&.all? { |transaction| transaction.symbolize_keys[:status] == 'SUCCESSFUL' }
+      end
+
+      def message_from(succeeded, response)
+        if succeeded
+          return 'Succeeded' if (response.is_a?(Hash) && response[:next_step]) || response == 204
+
+          return response[:status]
+        end
+
+        response[:message] || response[:error_message] || response[:status]
+      end
+
+      def authorization_from(response)
+        return nil if response.is_a?(Integer)
+
+        return response[:id] unless response[:transaction_id]
+
+        [response[:id], response[:transaction_id]].join('#')
+      end
+
+      def auth_headers
+        {
+          'Content-Type' => 'application/json',
+          'Authorization' => "Bearer #{options[:access_token]}"
+        }
+      end
+
+      def error_code_from(succeeded, response)
+        response[:error_code] unless succeeded
+      end
+
+      def format_error(error, key)
+        {
+          :error_code => error['error_code'],
+          key => error['param']
+        }
+      end
+
+      def format_errors(errors)
+        return format_error(errors.first, :message) if errors.size == 1
+
+        return {
+          error_code: STANDARD_ERROR_CODE_MAPPING[:multiple_invalid_parameters],
+          message: 'Validation error',
+          errors: errors.map { |error| format_error(error, :param) }
+        }
+      end
+
+      def handle_response(response)
+        case response.code.to_i
+        # to get the response code (204) when the body is nil
+        when 200...300
+          response.body || response.code
+        else
+          raise ResponseError.new(response)
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 require 'json'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class SwipeCheckoutGateway < Gateway
       TRANSACTION_APPROVED_MSG = 'Transaction approved'
       TRANSACTION_DECLINED_MSG = 'Transaction declined'
@@ -104,12 +104,14 @@ module ActiveMerchant #:nodoc:
               result = response['data']['result']
               success = (result == 'accepted' || (test? && result == 'test-accepted'))
 
-              Response.new(success,
+              Response.new(
+                success,
                 success ?
                 TRANSACTION_APPROVED_MSG :
                 TRANSACTION_DECLINED_MSG,
                 response,
-                test: test?)
+                test: test?
+              )
             else
               build_error_response(message, response)
             end

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

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class TelrGateway < Gateway
       self.display_name = 'Telr'
       self.homepage_url = 'http://www.telr.com/'
@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options = {})
         _, amount, currency = split_authorization(authorization)
         commit(:void) do |doc|
-          add_invoice(doc, 'void', amount.to_i, authorization, options.merge(currency: currency))
+          add_invoice(doc, 'void', amount.to_i, authorization, options.merge(currency:))
         end
       end
 
@@ -162,9 +162,9 @@ module ActiveMerchant #:nodoc:
         country.code(:alpha2)
       end
 
-      def commit(action, amount = nil, currency = nil)
+      def commit(action, amount = nil, currency = nil, &block)
         currency = default_currency if currency == nil
-        request = build_xml_request { |doc| yield(doc) }
+        request = build_xml_request(&block)
         response = ssl_post(live_url, request, headers)
         parsed = parse(response)
 
@@ -231,8 +231,7 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(action, response, amount, currency)
         auth = response[:tranref]
-        auth = [auth, amount, currency].join('|')
-        auth
+        [auth, amount, currency].join('|')
       end
 
       def split_authorization(authorization)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class TransFirstGateway < Gateway
       self.test_url = 'https://ws.cert.transfirst.com'
       self.live_url = 'https://webservices.primerchants.com'
@@ -166,6 +166,9 @@ module ActiveMerchant #:nodoc:
           end
         end
 
+        response
+      rescue StandardError
+        response[:message] = data&.to_s&.strip
         response
       end
 
@@ -219,8 +222,7 @@ module ActiveMerchant #:nodoc:
         params[:MerchantID] = @options[:login]
         params[:RegKey] = @options[:password]
 
-        request = params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
-        request
+        params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def add_pair(post, key, value, options = {})

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

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class TransFirstTransactionExpressGateway < Gateway
       self.display_name = 'TransFirst Transaction Express'
       self.homepage_url = 'http://transactionexpress.com/'
@@ -438,29 +438,21 @@ module ActiveMerchant #:nodoc:
       end
 
       # -- request methods ---------------------------------------------------
-      def build_xml_transaction_request
-        build_xml_request('SendTranRequest') do |doc|
-          yield doc
-        end
+      def build_xml_transaction_request(&block)
+        build_xml_request('SendTranRequest', &block)
       end
 
-      def build_xml_payment_storage_request
-        build_xml_request('UpdtRecurrProfRequest') do |doc|
-          yield doc
-        end
+      def build_xml_payment_storage_request(&block)
+        build_xml_request('UpdtRecurrProfRequest', &block)
       end
 
-      def build_xml_payment_update_request
+      def build_xml_payment_update_request(&block)
         merchant_product_type = 5 # credit card
-        build_xml_request('UpdtRecurrProfRequest', merchant_product_type) do |doc|
-          yield doc
-        end
+        build_xml_request('UpdtRecurrProfRequest', merchant_product_type, &block)
       end
 
-      def build_xml_payment_search_request
-        build_xml_request('FndRecurrProfRequest') do |doc|
-          yield doc
-        end
+      def build_xml_payment_search_request(&block)
+        build_xml_request('FndRecurrProfRequest', &block)
       end
 
       def build_xml_request(wrapper, merchant_product_type = nil)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # For more information visit {Transact Pro Services}[https://www.transactpro.lv/business/]
     #
     # This gateway was formerly associated with www.1stpayments.net
@@ -172,7 +172,7 @@ module ActiveMerchant #:nodoc:
             { status: 'success', id: m[2] } :
             { status: 'failure', message: m[2] }
         else
-          Hash[status: body]
+          { status: body }
         end
       end
 

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

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'smart_ps.rb')
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class TransaxGateway < SmartPs
       self.live_url = self.test_url = 'https://secure.nelixtransax.net/api/transact.php'
 

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class TransnationalGateway < NetworkMerchantsGateway
       self.homepage_url = 'http://www.tnbci.com/'
       self.display_name = 'Transnational'

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class TrexleGateway < Gateway
       self.test_url = 'https://core.trexle.com/api/v1'
       self.live_url = 'https://core.trexle.com/api/v1'

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

@@ -4,8 +4,8 @@ rescue LoadError
   # Falls back to an SSL post to TrustCommerce
 end
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # TO USE:
     # First, make sure you have everything setup correctly and all of your dependencies in place with:
     #
@@ -288,7 +288,7 @@ module ActiveMerchant #:nodoc:
 
         parameters = {
           amount: amount(money),
-          cycle: cycle,
+          cycle:,
           verify: options[:verify] || 'y',
           billingid: options[:billingid] || nil,
           payments: options[:payments] || nil
@@ -450,11 +450,15 @@ module ActiveMerchant #:nodoc:
         # to be considered successful, transaction status must be either "approved" or "accepted"
         success = SUCCESS_TYPES.include?(data['status'])
         message = message_from(data)
-        Response.new(success, message, data,
+        Response.new(
+          success,
+          message,
+          data,
           test: test?,
           authorization: authorization_from(action, data),
           cvv_result: data['cvv'],
-          avs_result: { code: data['avs'] })
+          avs_result: { code: data['avs'] }
+        )
       end
 
       def parse(body)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     ##
     # Delegates to the appropriate gateway, either the Transaction or Advanced
     # depending on options passed to new.

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

@@ -1,8 +1,8 @@
 require 'securerandom'
 require 'digest'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # ==== USA ePay Advanced SOAP Interface
     #
     # This class encapsulates USA ePay's Advanced SOAP Interface. The Advanced Soap Interface allows
@@ -64,13 +64,13 @@ module ActiveMerchant #:nodoc:
     class UsaEpayAdvancedGateway < Gateway
       API_VERSION = '1.4'
 
-      TEST_URL_BASE = 'https://sandbox.usaepay.com/soap/gate/' #:nodoc:
-      LIVE_URL_BASE = 'https://www.usaepay.com/soap/gate/' #:nodoc:
+      TEST_URL_BASE = 'https://sandbox.usaepay.com/soap/gate/' # :nodoc:
+      LIVE_URL_BASE = 'https://www.usaepay.com/soap/gate/' # :nodoc:
 
       self.test_url = TEST_URL_BASE
       self.live_url = LIVE_URL_BASE
 
-      FAILURE_MESSAGE = 'Default Failure' #:nodoc:
+      FAILURE_MESSAGE = 'Default Failure' # :nodoc:
 
       self.supported_countries = ['US']
       self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
         notes: [:string, 'Notes'],
         data: [:string, 'CustomData'],
         url: [:string, 'URL']
-      } #:nodoc:
+      } # :nodoc:
 
       CUSTOMER_RECURRING_BILLING_OPTIONS = {
         enabled: [:boolean, 'Enabled'],
@@ -95,19 +95,19 @@ module ActiveMerchant #:nodoc:
         source: [:string, 'Source'],
         send_receipt: [:boolean, 'SendReceipt'],
         receipt_note: [:string, 'ReceiptNote']
-      } #:nodoc:
+      } # :nodoc:
 
       CUSTOMER_POINT_OF_SALE_OPTIONS = {
         price_tier: [:string, 'PriceTier'],
         tax_class: [:string, 'TaxClass'],
         lookup_code: [:string, 'LookupCode']
-      } #:nodoc:
+      } # :nodoc:
 
       CUSTOMER_OPTIONS = [
         CUSTOMER_PROFILE_OPTIONS,
         CUSTOMER_RECURRING_BILLING_OPTIONS,
         CUSTOMER_POINT_OF_SALE_OPTIONS
-      ].inject(:merge) #:nodoc:
+      ].inject(:merge) # :nodoc:
 
       COMMON_ADDRESS_OPTIONS = {
         first_name: [:string, 'FirstName'],
@@ -120,7 +120,7 @@ module ActiveMerchant #:nodoc:
         email: [:string, 'Email'],
         fax: [:string, 'Fax'],
         company: [:string, 'Company']
-      } #:nodoc:
+      } # :nodoc:
 
       ADDRESS_OPTIONS = [
         COMMON_ADDRESS_OPTIONS,
@@ -128,7 +128,7 @@ module ActiveMerchant #:nodoc:
           address1: [:string, 'Street'],
           address2: [:string, 'Street2']
         }
-      ].inject(:merge) #:nodoc
+      ].inject(:merge) # :nodoc
 
       CUSTOMER_UPDATE_DATA_FIELDS = [
         CUSTOMER_PROFILE_OPTIONS,
@@ -146,7 +146,7 @@ module ActiveMerchant #:nodoc:
           check_format: [:string, 'CheckFormat'],
           record_type: [:string, 'RecordType']
         }
-      ].inject(:merge) #:nodoc
+      ].inject(:merge) # :nodoc
 
       CUSTOMER_TRANSACTION_REQUEST_OPTIONS = {
         command: [:string, 'Command'],
@@ -161,7 +161,7 @@ module ActiveMerchant #:nodoc:
         recurring: [:boolean, 'isRecurring'],
         verification_value: [:string, 'CardCode'],
         software: [:string, 'Software']
-      } #:nodoc:
+      } # :nodoc:
 
       TRANSACTION_REQUEST_OBJECT_OPTIONS = {
         command: [:string, 'Command'],
@@ -174,7 +174,7 @@ module ActiveMerchant #:nodoc:
         customer_receipt: [:boolean, 'CustReceipt'],
         customer_template: [:boolean, 'CustReceiptName'],
         software: [:string, 'Software']
-      } #:nodoc:
+      } # :nodoc:
 
       TRANSACTION_DETAIL_OPTIONS = {
         invoice: [:string, 'Invoice'],
@@ -188,7 +188,7 @@ module ActiveMerchant #:nodoc:
         allow_partial_auth: [:boolean, 'AllowPartialAuth'],
         currency: [:string, 'Currency'],
         non_tax: [:boolean, 'NonTax']
-      } #:nodoc:
+      } # :nodoc:
 
       TRANSACTION_DETAIL_MONEY_OPTIONS = {
         amount: [:double, 'Amount'],
@@ -198,7 +198,7 @@ module ActiveMerchant #:nodoc:
         shipping: [:double, 'Shipping'],
         discount: [:double, 'Discount'],
         subtotal: [:double, 'Subtotal']
-      } #:nodoc:
+      } # :nodoc:
 
       CREDIT_CARD_DATA_OPTIONS = {
         magnetic_stripe: [:string, 'MagStripe'],
@@ -211,7 +211,7 @@ module ActiveMerchant #:nodoc:
         eci: [:integer, 'ECI'],
         internal_card_authorization: [:boolean, 'InternalCardAuth'],
         pares: [:string, 'Pares']
-      } #:nodoc:
+      } # :nodoc:
 
       CHECK_DATA_OPTIONS = {
         drivers_license: [:string, 'DriversLicense'],
@@ -221,13 +221,13 @@ module ActiveMerchant #:nodoc:
         epc_code: [:string, 'EpcCode'],
         front_image: [:string, 'FrontImage'],
         back_image: [:string, 'BackImage']
-      } #:nodoc:
+      } # :nodoc:
 
       RECURRING_BILLING_OPTIONS = {
         schedule: [:string, 'Schedule'],
         number_left: [:integer, 'NumLeft'],
         enabled: [:boolean, 'Enabled']
-      } #:nodoc:
+      } # :nodoc:
 
       AVS_RESULTS = {
         'Y' => %w(YYY Y YYA YYD),
@@ -248,13 +248,13 @@ module ActiveMerchant #:nodoc:
       }.inject({}) do |map, (type, codes)|
         codes.each { |code| map[code] = type }
         map
-      end #:nodoc:
+      end # :nodoc:
 
       AVS_CUSTOM_MESSAGES = {
         'XXW' => 'Card number not on file.',
         'XXU' => 'Address information not verified for domestic transaction.',
         'XXE' => 'Address verification not allowed for card type.'
-      } #:nodoc:
+      } # :nodoc:
 
       # Create a new gateway.
       #
@@ -679,7 +679,7 @@ module ActiveMerchant #:nodoc:
       TRANSACTION_METHODS = %i[
         run_sale run_auth_only run_credit
         run_check_sale run_check_credit
-      ] #:nodoc:
+      ] # :nodoc:
 
       TRANSACTION_METHODS.each do |method|
         define_method method do |options|
@@ -1030,15 +1030,17 @@ module ActiveMerchant #:nodoc:
 
       # Build soap header, etc.
       def build_request(action, options = {})
-        soap = Builder::XmlMarkup.new
-        soap.instruct!(:xml, version: '1.0', encoding: 'utf-8')
-        soap.tag! 'SOAP-ENV:Envelope',
+        envelope_obj = {
           'xmlns:SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
           'xmlns:ns1' => 'urn:usaepay',
           'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
           'xmlns:SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
-          'SOAP-ENV:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/' do
+          'SOAP-ENV:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'
+        }
+        soap = Builder::XmlMarkup.new
+        soap.instruct!(:xml, version: '1.0', encoding: 'utf-8')
+        soap.tag! 'SOAP-ENV:Envelope', envelope_obj do
           soap.tag! 'SOAP-ENV:Body' do
             send("build_#{action}", soap, options)
           end
@@ -1335,8 +1337,7 @@ module ActiveMerchant #:nodoc:
         case
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::CreditCard)
           build_tag soap, :string, 'CardNumber', payment_method[:method].number
-          build_tag soap, :string, 'CardExpiration',
-            "#{'%02d' % payment_method[:method].month}#{payment_method[:method].year.to_s[-2..-1]}"
+          build_tag soap, :string, 'CardExpiration', "#{'%02d' % payment_method[:method].month}#{payment_method[:method].year.to_s[-2..-1]}"
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
             build_tag soap, :string, 'AvsZip', options[:billing_address][:zip]
@@ -1520,8 +1521,8 @@ module ActiveMerchant #:nodoc:
 
         begin
           soap = ssl_post(url, request, 'Content-Type' => 'text/xml')
-        rescue ActiveMerchant::ResponseError => error
-          soap = error.response.body
+        rescue ActiveMerchant::ResponseError => e
+          soap = e.response.body
         end
 
         build_response(action, soap)
@@ -1537,7 +1538,7 @@ module ActiveMerchant #:nodoc:
           message,
           response_params,
           test: test?,
-          authorization: authorization,
+          authorization:,
           avs_result: avs_from(avs),
           cvv_result: cvv
         )