activemerchant 1.86.0 → 1.87.0

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

@@ -269,7 +269,7 @@ module ActiveMerchant
       end
 
       def format_date(month, year)
-        "#{format(month,:two_digits)}/#{format(year, :two_digits)}"
+        "#{format(month, :two_digits)}/#{format(year, :two_digits)}"
       end
 
       def parse(body)
@@ -286,7 +286,7 @@ module ActiveMerchant
 
       def parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|e| parse_element(response, e) }
+          node.elements.each { |e| parse_element(response, e) }
         else
           response[node.name.underscore.to_sym] = node.text
         end

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

@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency: #{k}")}
+      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
       CURRENCY_CODES['USD'] = '840'
       CURRENCY_CODES['DKK'] = '208'
       CURRENCY_CODES['NOK'] = '578'
@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_hmac(post)
-        data = post.sort.collect { |key, value| "#{key}=#{value.to_s}" }.join('&')
+        data = post.sort.collect { |key, value| "#{key}=#{value}" }.join('&')
         digest = OpenSSL::Digest.new('sha256')
         key = [@options[:secret_key]].pack('H*')
         post[:MAC] = OpenSSL::HMAC.hexdigest(digest, key, data)

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

@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
       def store(payment, options = {})
         MultiResponse.run do |r|
           r.process { commit('auth/token', app_token_request(options)) }
-          options.merge!({ app_token: app_token_from(r) })
+          options[:app_token] = app_token_from(r)
 
           if options[:customer_id].present?
             customer_id = check_customer_exists(options)
@@ -197,7 +197,7 @@ module ActiveMerchant #:nodoc:
 
       def add_customer_with_credit_card(payment, options = {})
         customer_response = commit('customers', create_customer_request(payment, options), options)
-        options.merge!({customer_id: customer_response.authorization})
+        options[:customer_id] = customer_response.authorization
         commit('tokens', create_token_request(payment, options), options)
       end
 
@@ -228,7 +228,7 @@ module ActiveMerchant #:nodoc:
       def message_from(response)
         return response['message'] if response['message']
         return 'Success' if success_from(response)
-        response['errors'].map {|error_hash| error_hash['detail'] }.join(', ')
+        response['errors'].map { |error_hash| error_hash['detail'] }.join(', ')
       end
 
       def authorization_from(response)
@@ -257,13 +257,13 @@ module ActiveMerchant #:nodoc:
           'x-api-key' => @options[:api_key]
         }
 
-        headers.merge!({'Authorization' => "Bearer #{options[:app_token]}"}) if options[:app_token]
+        headers['Authorization'] = "Bearer #{options[:app_token]}" if options[:app_token]
         headers
       end
 
       def error_code_from(response)
         unless success_from(response)
-          response['errors'].nil? ? response['message'] : response['errors'].map {|error_hash| error_hash['code'] }.join(', ')
+          response['errors'].nil? ? response['message'] : response['errors'].map { |error_hash| error_hash['code'] }.join(', ')
         end
       end
 

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

@@ -147,7 +147,7 @@ module ActiveMerchant #:nodoc:
 
       def add_customer_responsible_person(post, payment, options)
         post[:payment][:person_type] = options[:person_type] if options[:person_type]
-        if options[:person_type] && options[:person_type].downcase == 'business'
+        if options[:person_type]&.casecmp('business')&.zero?
           post[:payment][:responsible] = {}
           post[:payment][:responsible][:name] = options[:responsible_name] if options[:responsible_name]
           post[:payment][:responsible][:document] = options[:responsible_document] if options[:responsible_document]

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

@@ -99,16 +99,16 @@ module ActiveMerchant #:nodoc:
           :client_ip_address => options[:ip]
 
         }
-        add_creditcard(post,creditcard)
-        add_address(post,options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
         post
       end
 
       def format_reference_number(number)
-        number.to_s.slice(0,12)
+        number.to_s.slice(0, 12)
       end
 
-      def add_address(post,options)
+      def add_address(post, options)
         if address = options[:billing_address] || options[:address]
           if address[:address2]
             post[:billing_address]    = address[:address1].to_s << ' ' <<  address[:address2].to_s

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

@@ -149,7 +149,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      def add_invoice(form,options)
+      def add_invoice(form, options)
         form[:invoice_number] = truncate((options[:order_id] || options[:invoice]), 10)
         form[:description] = truncate(options[:description], 255)
       end
@@ -256,7 +256,7 @@ module ActiveMerchant #:nodoc:
         parameters[:amount] = amount(money)
         parameters[:transaction_type] = self.actions[action]
 
-        response = parse( ssl_post(test? ? self.test_url : self.live_url, post_data(parameters, options)) )
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(parameters, options)))
 
         Response.new(response['result'] == '0', message_from(response), response,
           :test => @options[:test] || test?,
@@ -299,7 +299,7 @@ module ActiveMerchant #:nodoc:
 
       def parse(msg)
         resp = {}
-        msg.split(self.delimiter).collect{|li|
+        msg.split(self.delimiter).collect { |li|
           key, value = li.split('=')
           resp[key.to_s.strip.gsub(/^ssl_/, '')] = value.to_s.strip
         }

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

@@ -54,7 +54,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options={})
         trans_id, _ = split_authorization(authorization)
-        options.merge!({trans_id: trans_id})
+        options[:trans_id] = trans_id
 
         request = build_soap_request do |xml|
           xml.CreditCardAuthorizationCompletion(xmlns: 'https://transaction.elementexpress.com') do
@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
 
       def refund(money, authorization, options={})
         trans_id, _ = split_authorization(authorization)
-        options.merge!({trans_id: trans_id})
+        options[:trans_id] = trans_id
 
         request = build_soap_request do |xml|
           xml.CreditCardReturn(xmlns: 'https://transaction.elementexpress.com') do
@@ -334,9 +334,9 @@ module ActiveMerchant #:nodoc:
 
       def url(action)
         if action == 'PaymentAccountCreate'
-          url = (test? ? SERVICE_TEST_URL : SERVICE_LIVE_URL)
+          test? ? SERVICE_TEST_URL : SERVICE_LIVE_URL
         else
-          url = (test? ? test_url : live_url)
+          test? ? test_url : live_url
         end
       end
 

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

@@ -208,7 +208,7 @@ module ActiveMerchant #:nodoc:
         end
 
         result = {}
-        query.each_pair do |k,v|
+        query.each_pair do |k, v|
           result[k] = v.is_a?(Array) && v.size == 1 ? v[0] : v # make values like ['v'] into 'v'
         end
         result

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

@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def requires_address!(options)
-        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless (options.has_key?(:address) or options.has_key?(:billing_address))
+        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless options.has_key?(:address) or options.has_key?(:billing_address)
       end
 
       def add_creditcard(post, creditcard)
@@ -145,7 +145,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(message)
         return '' if message.blank?
-        MESSAGES[message[0,2]] || message
+        MESSAGES[message[0, 2]] || message
       end
 
       def purchase_url(cvn)

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

@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
                 reply[:success]=true
               else
                 if root = REXML::XPath.first(xml, '//UpdateCustomerResult') then
-                  if root.text.downcase == 'true' then
+                  if root.text.casecmp('true').zero? then
                     reply[:message]='OK'
                     reply[:success]=true
                   else
@@ -231,13 +231,13 @@ module ActiveMerchant #:nodoc:
       def soap_request(arguments, action)
         # eWay demands all fields be sent, but contain an empty string if blank
         post = case action
-                when 'QueryCustomer'
+               when 'QueryCustomer'
                   arguments
-                when 'ProcessPayment'
+               when 'ProcessPayment'
                   default_payment_fields.merge(arguments)
-                when 'CreateCustomer'
+               when 'CreateCustomer'
                   default_customer_fields.merge(arguments)
-                when 'UpdateCustomer'
+               when 'UpdateCustomer'
                   default_customer_fields.merge(arguments)
                end
 

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

@@ -299,7 +299,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse_errors(message)
-        errors = message.split(',').collect{|code| MESSAGES[code.strip]}.flatten.join(',')
+        errors = message.split(',').collect { |code| MESSAGES[code.strip] }.flatten.join(',')
         errors.presence || message
       end
 

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

@@ -211,7 +211,7 @@ module ActiveMerchant #:nodoc:
           parse_elements(response, root)
         end
 
-        response.delete_if{ |k,v| SENSITIVE_FIELDS.include?(k) }
+        response.delete_if { |k, v| SENSITIVE_FIELDS.include?(k) }
       end
 
       def parse_elements(response, root)

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

@@ -152,7 +152,7 @@ module ActiveMerchant #:nodoc:
         parameters[:type] = action
         parameters[:username] = @options[:login]
         parameters[:password] = @options[:password]
-        parameters.map{|k, v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+        parameters.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
     end
   end

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

@@ -116,7 +116,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def encode(hash)
-        hash.collect{|(k,v)| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"}.join('&')
+        hash.collect { |(k, v)| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def creditcard_brand(brand)

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

@@ -246,12 +246,12 @@ module ActiveMerchant #:nodoc:
 
       def add_credit_card_eci(xml, credit_card, options)
         eci = if credit_card.is_a?(NetworkTokenizationCreditCard) && credit_card.source == :apple_pay && card_brand(credit_card) == 'discover'
-          # Discover requires any Apple Pay transaction, regardless of in-app
-          # or web, and regardless of the ECI contained in the PKPaymentToken,
-          # to have an ECI value explicitly of 04.
-          '04'
-        else
-          (credit_card.respond_to?(:eci) ? credit_card.eci : nil) || options[:eci] || DEFAULT_ECI
+                # Discover requires any Apple Pay transaction, regardless of in-app
+                # or web, and regardless of the ECI contained in the PKPaymentToken,
+                # to have an ECI value explicitly of 04.
+                '04'
+              else
+                (credit_card.respond_to?(:eci) ? credit_card.eci : nil) || options[:eci] || DEFAULT_ECI
         end
 
         xml.tag! 'Ecommerce_Flag', eci.to_s =~ /^[0-9]+$/ ? eci.to_s.rjust(2, '0') : eci
@@ -438,7 +438,7 @@ module ActiveMerchant #:nodoc:
           parse_elements(response, root)
         end
 
-        response.delete_if{ |k,v| SENSITIVE_FIELDS.include?(k) }
+        response.delete_if { |k, v| SENSITIVE_FIELDS.include?(k) }
       end
 
       def parse_elements(response, root)

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

@@ -71,7 +71,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency: #{k}")}
+      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
       CURRENCY_CODES['NZD'] = '554'
 
       def add_invoice(post, money, options)
@@ -172,7 +172,7 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|element| parse_element(response, element) }
+          node.elements.each { |element| parse_element(response, element) }
         else
           response[node.name.underscore.to_sym] = node.text
         end

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

@@ -191,7 +191,7 @@ module ActiveMerchant #:nodoc:
           success_from(response),
           message_from(response),
           response,
-          authorization: authorization_from(response),
+          authorization: authorization_from(response, parameters),
           avs_result: AVSResult.new(code: response['response']['avs_result']),
           cvv_result: CVVResult.new(response['response']['cvv_code']),
           test: test?
@@ -219,8 +219,12 @@ module ActiveMerchant #:nodoc:
         response['response']['response_desc']
       end
 
-      def authorization_from(response)
-        [response.try(:[], 'transaction_id'), response.try(:[], 'response').try(:[], 'authorization_code')].join('#')
+      def authorization_from(response, parameters)
+        if parameters[:action] == 'capture'
+          [response['transaction_id'], response.dig('response', 'authorization_code'), parameters[:transaction_id], parameters[:authorization_code]].join('#')
+        else
+          [response['transaction_id'], response.dig('response', 'authorization_code')].join('#')
+        end
       end
 
       def endpoint
@@ -253,13 +257,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_code_from(authorization)
-        _, authorization_code = split_authorization(authorization)
-        authorization_code
+        _, authorization_code, _, original_auth_authorization_code = split_authorization(authorization)
+        original_auth_authorization_code.present? ? original_auth_authorization_code : authorization_code
       end
 
       def transaction_id_from(authorization)
-        transaction_id, _ = split_authorization(authorization)
-        transaction_id
+        transaction_id, _, original_auth_transaction_id, _= split_authorization(authorization)
+        original_auth_transaction_id.present? ? original_auth_transaction_id : transaction_id
       end
     end
   end

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://sanalposprovtest.garanti.com.tr/VPServlet'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['US','TR']
+      self.supported_countries = ['US', 'TR']
 
       # The card types supported by the payment gateway
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -181,7 +181,7 @@ module ActiveMerchant #:nodoc:
       def add_address(xml, address)
         xml.tag! 'Name', normalize(address[:name])
         address_text = address[:address1]
-        address_text << " #{ address[:address2]}" if address[:address2]
+        address_text << " #{address[:address2]}" if address[:address2]
         xml.tag! 'Text', normalize(address_text)
         xml.tag! 'City', normalize(address[:city])
         xml.tag! 'District', normalize(address[:state])
@@ -195,7 +195,7 @@ module ActiveMerchant #:nodoc:
         return unless text
 
         if ActiveSupport::Inflector.method(:transliterate).arity == -2
-          ActiveSupport::Inflector.transliterate(text,'')
+          ActiveSupport::Inflector.transliterate(text, '')
         else
           text.gsub(/[^\x00-\x7F]+/, '')
         end
@@ -214,7 +214,7 @@ module ActiveMerchant #:nodoc:
         CURRENCY_CODES[currency] || CURRENCY_CODES[default_currency]
       end
 
-      def commit(money,request)
+      def commit(money, request)
         url = test? ? self.test_url : self.live_url
         raw_response = ssl_post(url, 'data=' + request)
         response = parse(raw_response)
@@ -240,7 +240,7 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|element| parse_element(response, element) }
+          node.elements.each { |element| parse_element(response, element) }
         else
           response[node.name.underscore.to_sym] = node.text
         end

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

@@ -170,7 +170,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, creditcard, options)
-        billing_address = options[:billing_address] || options[:address]
         shipping_address = options[:shipping_address]
         if billing_address = options[:billing_address] || options[:address]
           post['order']['customer']['billingAddress'] = {
@@ -201,7 +200,7 @@ module ActiveMerchant #:nodoc:
       def add_fraud_fields(post, options)
         fraud_fields = {}
         fraud_fields.merge!(options[:fraud_fields]) if options[:fraud_fields]
-        fraud_fields.merge!({customerIpAddress: options[:ip]}) if options[:ip]
+        fraud_fields[:customerIpAddress] = options[:ip] if options[:ip]
 
         post['fraudFields'] = fraud_fields unless fraud_fields.empty?
       end
@@ -330,7 +329,7 @@ EOS
       end
 
       def nestable_hash
-        Hash.new {|h,k| h[k] = Hash.new(&h.default_proc) }
+        Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
       end
 
       def capture_requested?(response)

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

@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency for HDFC: #{k}")}
+      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency for HDFC: #{k}") }
       CURRENCY_CODES['AED'] = '784'
       CURRENCY_CODES['AUD'] = '036'
       CURRENCY_CODES['CAD'] = '124'
@@ -113,7 +113,7 @@ EOA
         doc.children.each do |node|
           if node.text?
             next
-          elsif (node.elements.size == 0)
+          elsif node.elements.size == 0
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|

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

@@ -42,7 +42,7 @@ module ActiveMerchant #:nodoc:
         commit('CreditSale') do |xml|
           add_amount(xml, money)
           add_allow_dup(xml)
-          add_customer_data(xml, card_or_token,options)
+          add_customer_data(xml, card_or_token, options)
           add_details(xml, options)
           add_descriptor_name(xml, options)
           add_payment(xml, card_or_token, options)
@@ -54,7 +54,7 @@ module ActiveMerchant #:nodoc:
           add_amount(xml, money)
           add_allow_dup(xml)
           add_reference(xml, transaction_id)
-          add_customer_data(xml, transaction_id,options)
+          add_customer_data(xml, transaction_id, options)
           add_details(xml, options)
         end
       end
@@ -204,7 +204,7 @@ module ActiveMerchant #:nodoc:
         doc.remove_namespaces!
         if(header = doc.xpath('//Header').first)
           header.elements.each do |node|
-            if (node.elements.size == 0)
+            if node.elements.size == 0
               response[node.name] = node.text
             else
               node.elements.each do |childnode|