activemerchant 1.86.0 → 1.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8651e675cc5726ec8424c3023a81307c0d03f66b
-  data.tar.gz: cc00a987adb4cbcd89ac106d07e8cd86d7046052
+SHA256:
+  metadata.gz: 6c6735efd6b43a6792c15f372218c58388a7481e907f221b8ca401dcee3c9fc2
+  data.tar.gz: eaecbc6f7dfcae07746717eb79208ec5911f80bd15d73ed859fab38164f08d63
 SHA512:
-  metadata.gz: 53533aee5d0cb713eb89cdf53ac2d7e71f5ffa0e0ff46a06a6d69effd36e54f76f7f4e18acda564b7392963c586388e55df8e8fdf8f65bb36d090917b3d32df5
-  data.tar.gz: 815a578f9421bb5b5c316c9ee79bf8043dd20cea4fabf8e19885587bf07b9418d2944b218b121b32cbc6ac481a52635ae2c22e6e66a7399b77e1cef90789f117
+  metadata.gz: 5c37662376465c08da0eafa7ca7a801efb37316b254ac81c234b52c6e780b204763b2c0fdef035a38a6a28e6b5377e2d384e621770719a7497f8e27a008518ca
+  data.tar.gz: 4d8ff4e910d7b93c9f21476be94acdcf25123db575c39614303a5b10ee7c5bf50b050ea1b7c1cb4e6a158c909f76bd82b83327904b8fd7b73f1093ad138e6d19

data/CHANGELOG

@@ -1,6 +1,28 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+* Barclaycard Smartpay: Improves Error Handling [deedeelavinder] #3026
+* Braintree: Fix passing phone-only billing address [curiousepic] #3025
+* Litle: Capitalize check account type [curiousepic] #3028
+* Braintree: Account for nil billing address fields [curiousepic] #3029
+* Realex: Add verify [kheang] #3030
+* Braintree: Actually account for nil address fields [curiousepic] #3032
+* Mercado Pago: do not infer card type [bpollack] #3038
+* Credorax: allow sending submerchant ID (h3 parameter) [bpollack] #3040
+* Worldpay: Pass stored credential option fields [curiousepic] #3041
+* Make behavior of nil CC numbers more consistent [guaguasi] #3010
+* Moneris: Adds Credential on File logic [deedeelavinder] #3042
+* Adyen: Return AVS and CVC Result [nfarve] #3044
+* Paymentez: Supports phone field, does not send if empty [molbrown] #3043
+* Braintree: Account for nil address with existing customer [curiousepic] #3047
+* Optimal Payment: Add verify capabilities #3052
+* Moneris: Allows cof_enabled gateway to process non-cof transactions [deedeelavinder] #3051
+* Cenpos: update supported countries [bpollack] #3055
+* CyberSource: update supported countries [bpollack] #3055
+* MiGS: update supported countries [bpollack] #3055
+* Clearhaus: update submission data format [bpollack] #3053
+* Forte: Allow void on capture #3059
+
 == Version 1.86.0 (October 26, 2018)
 * UsaEpayTransaction: Support UMcheckformat option for echecks [dtykocki] #3002
 * Global Collect: handle internal server errors [molbrown] #3005

data/lib/active_merchant/billing/avs_result.rb

@@ -1,4 +1,3 @@
-#!ruby19
 # encoding: utf-8
 
 module ActiveMerchant

data/lib/active_merchant/billing/check.rb

@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
       #   (3(d1 + d4 + d7) + 7(d2 + d5 + d8) + 1(d3 + d6 + d9))mod 10 = 0
       # See http://en.wikipedia.org/wiki/Routing_transit_number#Internal_checksums
       def valid_routing_number?
-        digits = routing_number.to_s.split('').map(&:to_i).select{|d| (0..9).include?(d)}
+        digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
         case digits.size
         when 9
           checksum = ((3 * (digits[0] + digits[3] + digits[6])) +

data/lib/active_merchant/billing/compatibility.rb

@@ -61,7 +61,7 @@ module ActiveMerchant
 
         class Errors < Hash
           def initialize
-            super(){|h, k| h[k] = []}
+            super() { |h, k| h[k] = [] }
           end
 
           alias count size
@@ -75,7 +75,7 @@ module ActiveMerchant
           end
 
           def empty?
-            all?{|k, v| v&.empty?}
+            all? { |k, v| v&.empty? }
           end
 
           def on(field)
@@ -91,7 +91,7 @@ module ActiveMerchant
           end
 
           def each_full
-            full_messages.each{|msg| yield msg}
+            full_messages.each { |msg| yield msg }
           end
 
           def full_messages

data/lib/active_merchant/billing/credit_card.rb

@@ -388,7 +388,7 @@ module ActiveMerchant #:nodoc:
         private
 
         def month_days
-          mdays = [nil,31,28,31,30,31,30,31,31,30,31,30,31]
+          mdays = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
           mdays[2] = 29 if Date.leap?(year)
           mdays[month]
         end

data/lib/active_merchant/billing/credit_card_formatting.rb

@@ -13,9 +13,9 @@ module ActiveMerchant #:nodoc:
         return '' if number.blank?
 
         case option
-          when :two_digits  then sprintf('%.2i', number.to_i)[-2..-1]
-          when :four_digits then sprintf('%.4i', number.to_i)[-4..-1]
-          else number
+        when :two_digits  then sprintf('%.2i', number.to_i)[-2..-1]
+        when :four_digits then sprintf('%.4i', number.to_i)[-4..-1]
+        else number
         end
       end
     end

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         'diners_club'        => ->(num) { num =~ /^3(0[0-5]|[68]\d)\d{11}$/ },
         'jcb'                => ->(num) { num =~ /^35(28|29|[3-8]\d)\d{12}$/ },
         'dankort'            => ->(num) { num =~ /^5019\d{12}$/ },
-        'maestro'            => ->(num) { (12..19).include?(num&.size) && in_bin_range?(num.slice(0, 6), MAESTRO_RANGES) },
+        'maestro'            => ->(num) { (12..19).cover?(num&.size) && in_bin_range?(num.slice(0, 6), MAESTRO_RANGES) },
         'forbrugsforeningen' => ->(num) { num =~ /^600722\d{10}$/ },
         'sodexo'             => ->(num) { num =~ /^(606071|603389|606070|606069|606068|600818)\d{8}$/ },
         'vr'                 => ->(num) { num =~ /^(627416|637036)\d{8}$/ },
@@ -86,7 +86,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def valid_expiry_year?(year)
-        (Time.now.year..Time.now.year + 20).include?(year.to_i)
+        (Time.now.year..Time.now.year + 20).cover?(year.to_i)
       end
 
       def valid_start_year?(year)
@@ -160,7 +160,7 @@ module ActiveMerchant #:nodoc:
         end
 
         def electron?(number)
-          return false unless [16, 19].include?(number.length)
+          return false unless [16, 19].include?(number&.length)
 
           # don't recalculate for each range
           bank_identification_number = first_digits(number).to_i
@@ -176,7 +176,7 @@ module ActiveMerchant #:nodoc:
         end
 
         def first_digits(number)
-          number.slice(0,6)
+          number&.slice(0, 6) || ''
         end
 
         def last_digits(number)
@@ -201,10 +201,12 @@ module ActiveMerchant #:nodoc:
         private
 
         def valid_card_number_length?(number) #:nodoc:
+          return false if number.nil?
           number.length >= 12
         end
 
         def valid_card_number_characters?(number) #:nodoc:
+          return false if number.nil?
           !number.match(/\D/)
         end
 

data/lib/active_merchant/billing/gateway.rb

@@ -204,11 +204,11 @@ module ActiveMerchant #:nodoc:
 
       def normalize(field)
         case field
-          when 'true'   then true
-          when 'false'  then false
-          when ''       then nil
-          when 'null'   then nil
-          else field
+        when 'true'   then true
+        when 'false'  then false
+        when ''       then nil
+        when 'null'   then nil
+        else field
         end
       end
 
@@ -241,10 +241,10 @@ module ActiveMerchant #:nodoc:
       def amount(money)
         return nil if money.nil?
         cents = if money.respond_to?(:cents)
-          ActiveMerchant.deprecated 'Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents'
-          money.cents
-        else
-          money
+                  ActiveMerchant.deprecated 'Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents'
+                  money.cents
+                else
+                  money
         end
 
         if money.is_a?(String)

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://pal-test.adyen.com/pal/servlet/Payment/v18'
       self.live_url = 'https://pal-live.adyen.com/pal/servlet/Payment/v18'
 
-      self.supported_countries = ['AT','AU','BE','BG','BR','CH','CY','CZ','DE','DK','EE','ES','FI','FR','GB','GI','GR','HK','HU','IE','IS','IT','LI','LT','LU','LV','MC','MT','MX','NL','NO','PL','PT','RO','SE','SG','SK','SI','US']
+      self.supported_countries = ['AT', 'AU', 'BE', 'BG', 'BR', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GI', 'GR', 'HK', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SG', 'SK', 'SI', 'US']
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb, :dankort, :maestro,  :discover]
 
@@ -34,8 +34,8 @@ module ActiveMerchant #:nodoc:
 
       def purchase(money, payment, options={})
         MultiResponse.run do |r|
-          r.process{authorize(money, payment, options)}
-          r.process{capture(money, r.authorization, options)}
+          r.process { authorize(money, payment, options) }
+          r.process { capture(money, r.authorization, options) }
         end
       end
 
@@ -103,6 +103,38 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      AVS_MAPPING = {
+        '0'  => 'R',  # Unknown
+        '1'  => 'A',	# Address matches, postal code doesn't
+        '2'  => 'N',	# Neither postal code nor address match
+        '3'  => 'R',	# AVS unavailable
+        '4'  => 'E',	# AVS not supported for this card type
+        '5'  => 'U',	# No AVS data provided
+        '6'  => 'Z',	# Postal code matches, address doesn't match
+        '7'  => 'D',	# Both postal code and address match
+        '8'  => 'U',	# Address not checked, postal code unknown
+        '9'  => 'B',	# Address matches, postal code unknown
+        '10' => 'N',	# Address doesn't match, postal code unknown
+        '11' => 'U',	# Postal code not checked, address unknown
+        '12' => 'B',	# Address matches, postal code not checked
+        '13' => 'U',	# Address doesn't match, postal code not checked
+        '14' => 'P',	# Postal code matches, address unknown
+        '15' => 'P',	# Postal code matches, address not checked
+        '16' => 'N',	# Postal code doesn't match, address unknown
+        '17' => 'U',  # Postal code doesn't match, address not checked
+        '18' => 'I'	  # Neither postal code nor address were checked
+      }
+
+      CVC_MAPPING = {
+        '0' => 'P', # Unknown
+        '1' => 'M', # Matches
+        '2' => 'N', # Does not match
+        '3' => 'P', # Not checked
+        '4' => 'S', # No CVC/CVV provided, but was required
+        '5' => 'U', # Issuer not certifed by CVC/CVV
+        '6' => 'P'  # No CVC/CVV provided
+      }
+
       NETWORK_TOKENIZATION_CARD_SOURCE = {
         'apple_pay' => 'applepay',
         'android_pay' => 'androidpay',
@@ -184,7 +216,7 @@ module ActiveMerchant #:nodoc:
           cvc: credit_card.verification_value
         }
 
-        card.delete_if{|k,v| v.blank? }
+        card.delete_if { |k, v| v.blank? }
         card[:holderName] ||= 'Not Provided' if credit_card.is_a?(NetworkTokenizationCreditCard)
         requires!(card, :expiryMonth, :expiryYear, :holderName, :number)
         post[:card] = card
@@ -233,13 +265,12 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, parameters)
         begin
-          raw_response = ssl_post("#{url}/#{action.to_s}", post_data(action, parameters), request_headers)
+          raw_response = ssl_post("#{url}/#{action}", post_data(action, parameters), request_headers)
           response = parse(raw_response)
         rescue ResponseError => e
           raw_response = e.response.body
           response = parse(raw_response)
         end
-
         success = success_from(action, response)
         Response.new(
           success,
@@ -247,10 +278,20 @@ module ActiveMerchant #:nodoc:
           response,
           authorization: authorization_from(action, parameters, response),
           test: test?,
-          error_code: success ? nil : error_code_from(response)
+          error_code: success ? nil : error_code_from(response),
+          avs_result: AVSResult.new(:code => avs_code_from(response)),
+          cvv_result: CVVResult.new(cvv_result_from(response))
         )
       end
 
+      def avs_code_from(response)
+        AVS_MAPPING[response['additionalData']['avsResult'][0..1].strip] if response.dig('additionalData', 'avsResult')
+      end
+
+      def cvv_result_from(response)
+        CVC_MAPPING[response['additionalData']['cvcResult'][0]] if response.dig('additionalData', 'cvcResult')
+      end
+
       def url
         if test?
           test_url

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

@@ -182,7 +182,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/authorize_net.rb

@@ -133,9 +133,9 @@ module ActiveMerchant
 
       def refund(amount, authorization, options={})
         response = if auth_was_for_cim?(authorization)
-          cim_refund(amount, authorization, options)
-        else
-          normal_refund(amount, authorization, options)
+                     cim_refund(amount, authorization, options)
+                   else
+                     normal_refund(amount, authorization, options)
         end
 
         return response if response.success?
@@ -199,7 +199,7 @@ module ActiveMerchant
       end
 
       def verify_credentials
-        response = commit(:verify_credentials) { }
+        response = commit(:verify_credentials) {}
         response.success?
       end
 
@@ -394,7 +394,7 @@ module ActiveMerchant
       end
 
       def camel_case_lower(key)
-        String(key).split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+        String(key).split('_').inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
       end
 
       def add_settings(xml, source, options)
@@ -594,9 +594,9 @@ module ActiveMerchant
 
         xml.send(root_node) do
           first_name, last_name = if address[:name]
-            split_names(address[:name])
-          else
-            [address[:first_name], address[:last_name]]
+                                    split_names(address[:name])
+                                  else
+                                    [address[:first_name], address[:last_name]]
           end
           full_address = "#{address[:address1]} #{address[:address2]}".strip
 

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

@@ -407,7 +407,7 @@ module ActiveMerchant #:nodoc:
 
       def recurring_parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|e| recurring_parse_element(response, e) }
+          node.elements.each { |e| recurring_parse_element(response, e) }
         else
           response[node.name.underscore.to_sym] = node.text
         end

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

@@ -379,18 +379,18 @@ module ActiveMerchant #:nodoc:
         requires!(options, :transaction)
         requires!(options[:transaction], :type)
         case options[:transaction][:type]
-          when :void
+        when :void
             requires!(options[:transaction], :trans_id)
-          when :refund
+        when :refund
             requires!(options[:transaction], :trans_id) &&
               (
                 (options[:transaction][:customer_profile_id] && options[:transaction][:customer_payment_profile_id]) ||
                 options[:transaction][:credit_card_number_masked] ||
                 (options[:transaction][:bank_routing_number_masked] && options[:transaction][:bank_account_number_masked])
               )
-          when :prior_auth_capture
+        when :prior_auth_capture
             requires!(options[:transaction], :amount, :trans_id)
-          else
+        else
             requires!(options[:transaction], :amount, :customer_profile_id, :customer_payment_profile_id)
         end
         request = build_request(:create_customer_profile_transaction, options)
@@ -614,7 +614,7 @@ module ActiveMerchant #:nodoc:
 
       def build_create_customer_profile_transaction_request(xml, options)
         options[:extra_options] ||= {}
-        options[:extra_options].merge!('x_delim_char' => @options[:delimiter]) if @options[:delimiter]
+        options[:extra_options]['x_delim_char'] = @options[:delimiter] if @options[:delimiter]
 
         add_transaction(xml, options[:transaction])
         xml.tag!('extraOptions') do
@@ -665,12 +665,12 @@ module ActiveMerchant #:nodoc:
           xml.tag!(CIM_TRANSACTION_TYPES[transaction[:type]]) do
             # The amount to be billed to the customer
             case transaction[:type]
-              when :void
-                tag_unless_blank(xml,'customerProfileId', transaction[:customer_profile_id])
-                tag_unless_blank(xml,'customerPaymentProfileId', transaction[:customer_payment_profile_id])
-                tag_unless_blank(xml,'customerShippingAddressId', transaction[:customer_shipping_address_id])
+            when :void
+                tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
+                tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
+                tag_unless_blank(xml, 'customerShippingAddressId', transaction[:customer_shipping_address_id])
                 xml.tag!('transId', transaction[:trans_id])
-              when :refund
+            when :refund
                 xml.tag!('amount', transaction[:amount])
                 tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
                 tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
@@ -683,11 +683,11 @@ module ActiveMerchant #:nodoc:
                 add_tax(xml, transaction[:tax]) if transaction[:tax]
                 add_duty(xml, transaction[:duty]) if transaction[:duty]
                 add_shipping(xml, transaction[:shipping]) if transaction[:shipping]
-              when :prior_auth_capture
+            when :prior_auth_capture
                 xml.tag!('amount', transaction[:amount])
                 add_order(xml, transaction[:order]) if transaction[:order].present?
                 xml.tag!('transId', transaction[:trans_id])
-              else
+            else
                 xml.tag!('amount', transaction[:amount])
                 xml.tag!('customerProfileId', transaction[:customer_profile_id])
                 xml.tag!('customerPaymentProfileId', transaction[:customer_payment_profile_id])
@@ -698,7 +698,7 @@ module ActiveMerchant #:nodoc:
             if [:auth_capture, :auth_only, :capture_only].include?(transaction[:type])
               xml.tag!('recurringBilling', transaction[:recurring_billing]) if transaction.has_key?(:recurring_billing)
             end
-            unless [:void,:refund,:prior_auth_capture].include?(transaction[:type])
+            unless [:void, :refund, :prior_auth_capture].include?(transaction[:type])
               tag_unless_blank(xml, 'cardCode', transaction[:card_code])
             end
           end
@@ -878,7 +878,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def format_extra_options(options)
-        options&.map{ |k, v| "#{k}=#{v}" }&.join('&')
+        options&.map { |k, v| "#{k}=#{v}" }&.join('&')
       end
 
       def parse_direct_response(params)
@@ -952,7 +952,7 @@ module ActiveMerchant #:nodoc:
       def parse_element(node)
         if node.has_elements?
           response = {}
-          node.elements.each{ |e|
+          node.elements.each { |e|
             key = e.name.underscore
             value = parse_element(e)
             if response.has_key?(key)

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

@@ -94,11 +94,11 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(response, node)
         if node.has_attributes?
-          node.attributes.each{|name, value| response["#{node.name}_#{name}".underscore.to_sym] = value }
+          node.attributes.each { |name, value| response["#{node.name}_#{name}".underscore.to_sym] = value }
         end
 
         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