activemerchant 1.103.0 → 1.104.0

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

@@ -249,6 +249,7 @@ module ActiveMerchant #:nodoc:
       def hashify_xml!(xml, response)
         xml = REXML::Document.new(xml)
         return if xml.root.nil?
+
         xml.elements.each('//receipt/*') do |node|
           response[node.name.underscore.to_sym] = normalize(node.text)
         end
@@ -316,6 +317,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(message)
         return 'Unspecified error' if message.blank?
+
         message.gsub(/[^\w]/, ' ').split.join(' ').capitalize
       end
 

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

@@ -198,6 +198,7 @@ module ActiveMerchant #:nodoc:
 
       def voucher?(payment)
         return false if payment.is_a?(String)
+
         %w[sodexo vr].include? card_brand(payment)
       end
 
@@ -301,6 +302,7 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(response, action)
         return "#{response['customer']['id']}|#{response['id']}" if action == 'store'
+
         response['id']
       end
 
@@ -313,7 +315,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(response)
-        STANDARD_ERROR_CODE[:processing_error] unless success_from(response)
+        return if success_from(response)
+        return response['last_transaction']['acquirer_return_code'] if response['last_transaction']
+
+        STANDARD_ERROR_CODE[:processing_error]
       end
     end
   end

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

@@ -39,7 +39,7 @@ module ActiveMerchant #:nodoc:
         :trigger   => 8
       }
 
-      SUCCESS_CODES = [ '00', '08', '11', '16', '77' ]
+      SUCCESS_CODES = ['00', '08', '11', '16', '77']
 
       def initialize(options = {})
         requires!(options, :login, :password)
@@ -84,6 +84,7 @@ module ActiveMerchant #:nodoc:
 
       def scrub(transcript)
         return '' if transcript.blank?
+
         transcript.
           gsub(%r((<cardNumber>)[^<]+(<))i, '\1[FILTERED]\2').
           gsub(%r((<cvv>)[^<]+(<))i, '\1[FILTERED]\2').
@@ -295,7 +296,6 @@ module ActiveMerchant #:nodoc:
       def request_timeout
         @options[:request_timeout] || 60
       end
-
     end
   end
 end

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

@@ -24,7 +24,7 @@ module ActiveMerchant
     class NetRegistryGateway < Gateway
       self.live_url = self.test_url = 'https://paygate.ssllock.net/external2.pl'
 
-      FILTERED_PARAMS = [ 'card_no', 'card_expiry', 'receipt_array' ]
+      FILTERED_PARAMS = ['card_no', 'card_expiry', 'receipt_array']
 
       self.supported_countries = ['AU']
 

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

@@ -168,6 +168,7 @@ module ActiveMerchant #:nodoc:
 
       def map_address(address)
         return {} if address.nil?
+
         country = Country.find(address[:country]) if address[:country]
         mapped = {
           :street => address[:address1],
@@ -203,7 +204,8 @@ module ActiveMerchant #:nodoc:
           begin
             parse(ssl_request(method, get_url(uri), params, headers))
           rescue ResponseError => e
-            return Response.new(false, 'Invalid Login') if(e.response.code == '401')
+            return Response.new(false, 'Invalid Login') if e.response.code == '401'
+
             parse(e.response.body)
           end
 

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

@@ -23,7 +23,7 @@ module ActiveMerchant #:nodoc:
         :quasi         => 'Q'
       }
 
-      SUCCESS_CODES = [ '1', 'T' ]
+      SUCCESS_CODES = ['1', 'T']
       SUCCESS_MESSAGE = 'The transaction was approved'
       FAILURE_MESSAGE = 'The transaction failed'
       TEST_LOGIN = '104901072025'
@@ -200,7 +200,8 @@ module ActiveMerchant #:nodoc:
           :cvv_result => response[:cvv2_code]
         )
       rescue ActiveMerchant::ResponseError => e
-        raise unless(e.response.code =~ /^[67]\d\d$/)
+        raise unless e.response.code =~ /^[67]\d\d$/
+
         return Response.new(false, e.response.message, {:status_code => e.response.code}, :test => test?)
       end
 
@@ -224,7 +225,6 @@ module ActiveMerchant #:nodoc:
 
         parameters.reject { |k, v| v.blank? }.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
-
     end
   end
 end

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

@@ -215,6 +215,7 @@ module ActiveMerchant #:nodoc:
 
       def currency_code(currency)
         return currency if currency =~ /^\d+$/
+
         CURRENCY_CODES[currency]
       end
     end

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

@@ -153,14 +153,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment_method(post, payment_method, options)
-        if(payment_method.is_a?(String))
+        if payment_method.is_a?(String)
           customer_vault_id, _ = split_authorization(payment_method)
           post[:customer_vault_id] = customer_vault_id
         elsif payment_method.is_a?(NetworkTokenizationCreditCard)
           post[:ccnumber] = payment_method.number
           post[:ccexp] = exp_date(payment_method)
           post[:token_cryptogram] = payment_method.payment_cryptogram
-        elsif(card_brand(payment_method) == 'check')
+        elsif card_brand(payment_method) == 'check'
           post[:payment] = 'check'
           post[:firstname] = payment_method.first_name
           post[:lastname] = payment_method.last_name
@@ -213,7 +213,7 @@ module ActiveMerchant #:nodoc:
         post[:ipaddress] = options[:ip]
         post[:customer_id] = options[:customer_id] || options[:customer]
 
-        if(billing_address = options[:billing_address] || options[:address])
+        if (billing_address = options[:billing_address] || options[:address])
           post[:company] = billing_address[:company]
           post[:address1] = billing_address[:address1]
           post[:address2] = billing_address[:address2]
@@ -224,7 +224,7 @@ module ActiveMerchant #:nodoc:
           post[:phone] = billing_address[:phone]
         end
 
-        if(shipping_address = options[:shipping_address])
+        if (shipping_address = options[:shipping_address])
           post[:shipping_company] = shipping_address[:company]
           post[:shipping_address1] = shipping_address[:address1]
           post[:shipping_address2] = shipping_address[:address2]
@@ -284,7 +284,7 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(response, payment_type, action)
         authorization = (action == 'add_customer' ? response[:customer_vault_id] : response[:transactionid])
-        [ authorization, payment_type ].join('#')
+        [authorization, payment_type].join('#')
       end
 
       def split_authorization(authorization)
@@ -318,7 +318,6 @@ module ActiveMerchant #:nodoc:
           response[:responsetext]
         end
       end
-
     end
   end
 end

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

@@ -213,7 +213,7 @@ module ActiveMerchant #:nodoc:
 
       # Store a credit card by creating an Ogone Alias
       def store(payment_source, options = {})
-        options[:alias_operation] = 'BYPSP' unless(options.has_key?(:billing_id) || options.has_key?(:store))
+        options[:alias_operation] = 'BYPSP' unless options.has_key?(:billing_id) || options.has_key?(:store)
         response = authorize(@options[:store_amount] || 1, payment_source, options)
         void(response.authorization) if response.success?
         response
@@ -239,6 +239,7 @@ module ActiveMerchant #:nodoc:
 
       def reference_transaction?(identifier)
         return false unless identifier.is_a?(String)
+
         _, action = identifier.split(';')
         !action.nil?
       end
@@ -322,6 +323,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, creditcard, options)
         return unless options[:billing_address]
+
         add_pair post, 'Owneraddress', options[:billing_address][:address1]
         add_pair post, 'OwnerZip',     options[:billing_address][:zip]
         add_pair post, 'ownertown',    options[:billing_address][:city]
@@ -408,7 +410,7 @@ module ActiveMerchant #:nodoc:
 
       def add_signature(parameters)
         if @options[:signature].blank?
-          ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == 'none')
+          ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless @options[:signature_encryptor] == 'none'
           return
         end
 

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
 
       # Country supported by Omise
       # * Thailand
-      self.supported_countries = %w( TH JP )
+      self.supported_countries = %w(TH JP)
 
       # Credit cards supported by Omise
       # * VISA
@@ -318,7 +318,6 @@ module ActiveMerchant #:nodoc:
         post[:currency]    = (options[:currency] || currency(money))
         post[:description] = options[:description] if options.key?(:description)
       end
-
     end
   end
 end

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

@@ -75,7 +75,7 @@ module ActiveMerchant #:nodoc:
           MultiResponse.run(:first) do |r|
             r.process { commit(:post, 'customers', post, options) }
 
-            if(r.success? && !r.params['id'].blank?)
+            if r.success? && !r.params['id'].blank?
               customer_id = r.params['id']
               r.process { commit(:post, "customers/#{customer_id}/cards", card, options) }
             end
@@ -151,6 +151,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(card, options)
         return unless card.kind_of?(Hash)
+
         if address = (options[:billing_address] || options[:address])
           card[:address] = {
             line1: address[:address1],
@@ -175,6 +176,7 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         return {} unless body
+
         JSON.parse(body)
       end
 

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

@@ -258,6 +258,7 @@ module ActiveMerchant #:nodoc:
 
       def add_payment_method(post, payment, options)
         return if payment.is_a?(String)
+
         if options[:registrationId]
           post[:card] = {
             cvv: payment.verification_value,

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

@@ -19,12 +19,12 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Optimal Payments'
 
       def initialize(options = {})
-        if(options[:login])
+        if options[:login]
           ActiveMerchant.deprecated("The 'login' option is deprecated in favor of 'store_id' and will be removed in a future version.")
           options[:store_id] = options[:login]
         end
 
-        if(options[:account])
+        if options[:account]
           ActiveMerchant.deprecated("The 'account' option is deprecated in favor of 'account_number' and will be removed in a future version.")
           options[:account_number] = options[:account]
         end
@@ -158,13 +158,13 @@ module ActiveMerchant #:nodoc:
         %w(confirmationNumber authCode
            decision code description
            actionCode avsResponse cvdResponse
-           txnTime duplicateFound
-        ).each do |tag|
+           txnTime duplicateFound).each do |tag|
           node = REXML::XPath.first(response, "//#{tag}")
           hsh[tag] = node.text if node
         end
         REXML::XPath.each(response, '//detail') do |detail|
           next unless detail.is_a?(REXML::Element)
+
           tag = detail.elements['tag'].text
           value = detail.elements['value'].text
           hsh[tag] = value
@@ -323,7 +323,6 @@ module ActiveMerchant #:nodoc:
           'discover'        => 'DI',
           'diners_club'     => 'DC', }[key]
       end
-
     end
   end
 end

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

@@ -243,7 +243,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def void(authorization, options = {}, deprecated = {})
-        if(!options.kind_of?(Hash))
+        if !options.kind_of?(Hash)
           ActiveMerchant.deprecated('Calling the void method with an amount parameter is deprecated and will be removed in a future version.')
           return void(options, deprecated.merge(:amount => authorization))
         end
@@ -383,7 +383,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(xml, creditcard, options)
-        if(address = (options[:billing_address] || options[:address]))
+        if (address = (options[:billing_address] || options[:address]))
           avs_supported = AVS_SUPPORTED_COUNTRIES.include?(address[:country].to_s) || empty?(address[:country])
 
           if avs_supported
@@ -421,7 +421,7 @@ module ActiveMerchant #:nodoc:
 
       # For Profile requests
       def add_customer_address(xml, options)
-        if(address = (options[:billing_address] || options[:address]))
+        if (address = (options[:billing_address] || options[:address]))
           avs_supported = AVS_SUPPORTED_COUNTRIES.include?(address[:country].to_s)
 
           xml.tag! :CustomerAddress1, byte_limit(format_address_field(address[:address1]), 30)
@@ -455,7 +455,7 @@ module ActiveMerchant #:nodoc:
         # - http://download.chasepaymentech.com/docs/orbital/orbital_gateway_xml_specification.pdf
         unless creditcard.nil?
           if creditcard.verification_value?
-            xml.tag! :CardSecValInd, '1' if %w( visa discover ).include?(creditcard.brand)
+            xml.tag! :CardSecValInd, '1' if %w(visa discover).include?(creditcard.brand)
             xml.tag! :CardSecVal, creditcard.verification_value
           end
         end
@@ -550,6 +550,7 @@ module ActiveMerchant #:nodoc:
 
       def add_stored_credentials(xml, parameters)
         return unless parameters[:mit_stored_credential_ind] == 'Y' || parameters[:stored_credential] && !parameters[:stored_credential].values.all?(&:nil?)
+
         if msg_type = get_msg_type(parameters)
           xml.tag! :MITMsgType, msg_type
         end
@@ -565,6 +566,7 @@ module ActiveMerchant #:nodoc:
         return parameters[:mit_msg_type] if parameters[:mit_msg_type]
         return 'CSTO' if parameters[:stored_credential][:initial_transaction]
         return unless parameters[:stored_credential][:initiator] && parameters[:stored_credential][:reason_type]
+
         initiator =
           case parameters[:stored_credential][:initiator]
           when 'customer' then 'C'
@@ -726,6 +728,7 @@ module ActiveMerchant #:nodoc:
       def set_recurring_ind(xml, parameters)
         if parameters[:recurring_ind]
           raise 'RecurringInd must be set to either "RF" or "RS"' unless %w(RF RS).include?(parameters[:recurring_ind])
+
           xml.tag! :RecurringInd, parameters[:recurring_ind]
         end
       end
@@ -830,7 +833,8 @@ module ActiveMerchant #:nodoc:
         limited_value = ''
 
         value.to_s.each_char do |c|
-          break if((limited_value.bytesize + c.bytesize) > byte_length)
+          break if (limited_value.bytesize + c.bytesize) > byte_length
+
           limited_value << c
         end
 
@@ -938,10 +942,10 @@ module ActiveMerchant #:nodoc:
 
         # Map vendor's AVS result code to a postal match code
         ORBITAL_POSTAL_MATCH_CODE = {
-            'Y' => %w( 9 A B C H JA JD M2 M3 M5 N5 N8 N9 X Z ),
-            'N' => %w( D E F G M8 ),
-            'X' => %w( 4 J R ),
-            nil => %w( 1 2 3 5 6 7 8 JB JC M1 M4 M6 M7 N3 N4 N6 N7 UK )
+            'Y' => %w(9 A B C H JA JD M2 M3 M5 N5 N8 N9 X Z),
+            'N' => %w(D E F G M8),
+            'X' => %w(4 J R),
+            nil => %w(1 2 3 5 6 7 8 JB JC M1 M4 M6 M7 N3 N4 N6 N7 UK)
         }.inject({}) do |map, (type, codes)|
           codes.each { |code| map[code] = type }
           map
@@ -949,10 +953,10 @@ module ActiveMerchant #:nodoc:
 
         # Map vendor's AVS result code to a street match code
         ORBITAL_STREET_MATCH_CODE = {
-            'Y' => %w( 9 B D F H JA JB M2 M4 M5 M6 M7 N3 N5 N7 N8 N9 X ),
-            'N' => %w( A C E G M8 Z ),
-            'X' => %w( 4 J R ),
-            nil => %w( 1 2 3 5 6 7 8 JC JD M1 M3 N4 N6 UK )
+            'Y' => %w(9 B D F H JA JB M2 M4 M5 M6 M7 N3 N5 N7 N8 N9 X),
+            'N' => %w(A C E G M8 Z),
+            'X' => %w(4 J R),
+            nil => %w(1 2 3 5 6 7 8 JC JD M1 M3 N4 N6 UK)
         }.inject({}) do |map, (type, codes)|
           codes.each { |code| map[code] = type }
           map

data/lib/active_merchant/billing/gateways/orbital/orbital_soft_descriptors.rb

@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
 
         [:merchant_email, :merchant_url].each do |attr|
           unless self.send(attr).blank?
-            errors << [attr, 'is required to be 13 bytes or less'] if(self.send(attr).bytesize > 13)
+            errors << [attr, 'is required to be 13 bytes or less'] if self.send(attr).bytesize > 13
           end
         end
 

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

@@ -1,7 +1,6 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PacNetRavenGateway < Gateway
-
       AVS_ADDRESS_CODES = {
         'avs_address_unavailable'   => 'X',
         'avs_address_not_checked'   => 'X',
@@ -140,6 +139,7 @@ module ActiveMerchant #:nodoc:
 
       def endpoint(action)
         return 'void' if action == 'void'
+
         'submit'
       end
 

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

@@ -119,6 +119,7 @@ module ActiveMerchant #:nodoc:
 
         params.map do |key, value|
           next if value != false && value.blank?
+
           if value.is_a?(Hash)
             h = {}
             value.each do |k, v|

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

@@ -86,6 +86,7 @@ module ActiveMerchant #:nodoc:
 
       def force_utf8(string)
         return nil unless string
+
         binary = string.encode('BINARY', invalid: :replace, undef: :replace, replace: '?') # Needed for Ruby 2.0 since #encode is a no-op if the string is already UTF-8. It's not needed for Ruby 2.1 and up since it's not a no-op there.
         binary.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
       end
@@ -237,7 +238,6 @@ module ActiveMerchant #:nodoc:
         message += " (The raw response returned by the API was #{raw_response.inspect})"
         return Response.new(false, message)
       end
-
     end
   end
 end