activemerchant 1.101.0 → 1.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cadecd1cc8fe450e59061eac7cf2c2ce023513d1338858809fe828df46a1b745
-  data.tar.gz: cc7e81f49b5b4b0f17cbd73c921a7b73cbd4c8f468d70722dc844a4973191ffa
+  metadata.gz: 676020bb24cc6d3a8b17a3d2ed035398803a436371c3c6a368ab3b49104d618e
+  data.tar.gz: 5a46ff06616a3b914c599d7da7455f0a4dc1b7579907a03a2c51463d6c81a8ef
 SHA512:
-  metadata.gz: 4d3889d6325099cff6ffef0dc9de3259afac3ff6d86292cd5dfa9e85208e9eae671436222ec84e08ad1104e77ede4ab475519229f5121c61498f79adaf7da104
-  data.tar.gz: 3e0b7935750ab8d772d62d78d6c359187d287835e997076ba0a1d66a3586424e63897892a736cbf7b720aa7e04633112aca6fb4cad57a8bcbee2885f13701ea7
+  metadata.gz: b06c1bd98e25faed372c68877041f127a64b21021f88ec102dd0910d976eeaba2f19a4414a5b9d122fb5a92f64489d34e961652ad1a7aac6f85e802ada89d1cf
+  data.tar.gz: 7cb0c86d44cbc7d23ea441aba7dc90ec58d7d5be2d972dd63c0b3545c4372c752d7fc068a173f0d26532f4cede6a97dcecae8fd86c40f17551c6017a9c07db1c

data/CHANGELOG

@@ -1,6 +1,21 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+
+== Version 1.102.0 (Nov 14, 2019)
+* Quickbooks: Make token refresh optional with allow_refresh flag [britth] #3419
+* Paymentez: Update supported countries [curiousepic] #3425
+* Ixopay: Add new gateway [jasonxp] #3426
+* Ixopay: Add support for currency option to refund method #3433
+* Ixopay: Remove default callback URL #3436
+* Ixopay: Refactor capture #3431
+* Update supported countries list. Add currencies without fractions / with 3 decimal places #3424
+* RuboCop: Fix Layout/EndAlignment [leila-alderman] #3427
+* RuboCop: Fix Layout/ExtraSpacing [leila-alderman] #3429
+* RuboCop: Fix Layout/MultilineOperationIndentation [leila-alderman] #3439
+* Worldpay: Update logic to set cardholderName for 3DS transactions [britth] #3444
+* Adopt new enrolled key for 3DS1 transactions. enrolled contains the 3… #3442
+
 == Version 1.101.0 (Nov 4, 2019)
 * Add UYI to list of currencies without fractions [curiousepic] #3416
 * Quickbooks: Add OAuth 2.0 support and void action [britth] #3397

data/README.md

@@ -112,7 +112,7 @@ The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wiki
 * [Cecabank](http://www.ceca.es/es/) - ES
 * [Cenpos](https://www.cenpos.com/) - AD, AI, AG, AR, AU, AT, BS, BB, BE, BZ, BM, BR, BN, BG, CA, HR, CY, CZ, DK, DM, EE, FI, FR, DE, GR, GD, GY, HK, HU, IS, IN, IL, IT, JP, LV, LI, LT, LU, MY, MT, MX, MC, MS, NL, PA, PL, PT, KN, LC, MF, VC, SM, SG, SK, SI, ZA, ES, SR, SE, CH, TR, GB, US, UY
 * [CAMS: Central Account Management System](https://www.centralams.com/) - US
-* [Checkout.com](https://www.checkout.com/) - AT, BE, BG, CY, CZ, DE, DK, EE, ES, FI, FR, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, MU, NL, NO, PL, PT, RO, SE, SI, SK, US
+* [Checkout.com](https://www.checkout.com/) - AD, AE, AR, AT, AU, BE, BG, BH, BR, CH, CL, CN, CO, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GR, HK, HR, HU, IE, IS, IT, JO, JP, KW, LI, LT, LU, LV, MC, MT, MX, MY, NL, NO, NZ, OM, PE, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, US
 * [Clearhaus](https://www.clearhaus.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GL, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK
 * [Commercegate](http://www.commercegate.com/) - AD, AT, AX, BE, BG, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GG, GI, GR, HR, HU, IE, IM, IS, IT, JE, LI, LT, LU, LV, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, VA
 * [Conekta](https://conekta.io) - MX

data/lib/active_merchant/billing/credit_card.rb

@@ -336,7 +336,7 @@ module ActiveMerchant #:nodoc:
           if expired?
             errors << [:year,  'expired']
           else
-            errors << [:year,  'is not a valid year']  if !valid_expiry_year?(year)
+            errors << [:year,  'is not a valid year'] if !valid_expiry_year?(year)
           end
         end
 
@@ -347,7 +347,7 @@ module ActiveMerchant #:nodoc:
         errors = []
 
         if !empty?(brand)
-          errors << [:brand, 'is invalid']  if !CreditCard.card_companies.include?(brand)
+          errors << [:brand, 'is invalid'] if !CreditCard.card_companies.include?(brand)
         end
 
         if empty?(number)

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -197,8 +197,8 @@ module ActiveMerchant #:nodoc:
         def valid_number?(number)
           valid_test_mode_card_number?(number) ||
             valid_card_number_length?(number) &&
-            valid_card_number_characters?(number) &&
-            valid_by_algorithm?(brand?(number), number)
+              valid_card_number_characters?(number) &&
+              valid_by_algorithm?(brand?(number), number)
         end
 
         def card_companies

data/lib/active_merchant/billing/gateway.rb

@@ -249,12 +249,13 @@ 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
-        end
+        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
+          end
 
         raise ArgumentError, 'money amount must be a positive Integer in cents.' if money.is_a?(String)
 

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
       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.currencies_without_fractions = %w(CVE DJF GNF IDR JPY KMF KRW PYG RWF UGX VND VUV XAF XOF XPF)
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb, :dankort, :maestro,  :discover, :elo, :naranja, :cabal]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb, :dankort, :maestro, :discover, :elo, :naranja, :cabal]
 
       self.money_format = :cents
 
@@ -371,7 +371,7 @@ module ActiveMerchant #:nodoc:
           cavvAlgorithm: three_d_secure_options[:cavv_algorithm],
           eci: three_d_secure_options[:eci],
           xid: three_d_secure_options[:xid],
-          directoryResponse: three_d_secure_options[:directory_response_status],
+          directoryResponse: three_d_secure_options[:enrolled],
           authenticationResponse: three_d_secure_options[:authentication_response_status]
         }
       end

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

@@ -113,7 +113,7 @@ module ActiveMerchant #:nodoc:
           post[:city] = billing_address[:city]
           post[:state] = billing_address[:state]
           post[:countryId] = billing_address[:country]
-          post[:postalCode]    = billing_address[:zip]
+          post[:postalCode] = billing_address[:zip]
           post[:phone] = billing_address[:phone]
         end
       end

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

@@ -132,11 +132,12 @@ module ActiveMerchant
       end
 
       def refund(amount, authorization, options={})
-        response = if auth_was_for_cim?(authorization)
-                     cim_refund(amount, authorization, options)
-                   else
-                     normal_refund(amount, authorization, options)
-        end
+        response =
+          if auth_was_for_cim?(authorization)
+            cim_refund(amount, authorization, options)
+          else
+            normal_refund(amount, authorization, options)
+          end
 
         return response if response.success?
         return response unless options[:force_full_refund_if_unsettled]
@@ -596,11 +597,12 @@ module ActiveMerchant
         return unless address
 
         xml.send(root_node) do
-          first_name, last_name = if address[:name]
-                                    split_names(address[:name])
-                                  else
-                                    [address[:first_name], address[:last_name]]
-          end
+          first_name, last_name =
+            if address[:name]
+              split_names(address[:name])
+            else
+              [address[:first_name], address[:last_name]]
+            end
           full_address = "#{address[:address1]} #{address[:address2]}".strip
 
           xml.firstName(truncate(first_name, 50)) unless empty?(first_name)
@@ -840,8 +842,8 @@ module ActiveMerchant
         response = {action: action}
 
         response[:response_code] = if(element = doc.at_xpath('//transactionResponse/responseCode'))
-                                     (empty?(element.content) ? nil : element.content.to_i)
-        end
+                                     empty?(element.content) ? nil : element.content.to_i
+                                   end
 
         if(element = doc.at_xpath('//errors/error'))
           response[:response_reason_code] = element.at_xpath('errorCode').content[/0*(\d+)$/, 1]
@@ -857,37 +859,45 @@ module ActiveMerchant
           response[:response_reason_text] = ''
         end
 
-        response[:avs_result_code] = if(element = doc.at_xpath('//avsResultCode'))
-                                       (empty?(element.content) ? nil : element.content)
-        end
+        response[:avs_result_code] =
+          if(element = doc.at_xpath('//avsResultCode'))
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:transaction_id] = if(element = doc.at_xpath('//transId'))
-                                      (empty?(element.content) ? nil : element.content)
-        end
+        response[:transaction_id] =
+          if element = doc.at_xpath('//transId')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:card_code] = if(element = doc.at_xpath('//cvvResultCode'))
-                                 (empty?(element.content) ? nil : element.content)
-        end
+        response[:card_code] =
+          if element = doc.at_xpath('//cvvResultCode')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:authorization_code] = if(element = doc.at_xpath('//authCode'))
-                                          (empty?(element.content) ? nil : element.content)
-        end
+        response[:authorization_code] =
+          if element = doc.at_xpath('//authCode')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:cardholder_authentication_code] = if(element = doc.at_xpath('//cavvResultCode'))
-                                                      (empty?(element.content) ? nil : element.content)
-        end
+        response[:cardholder_authentication_code] =
+          if element = doc.at_xpath('//cavvResultCode')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:account_number] = if(element = doc.at_xpath('//accountNumber'))
-                                      (empty?(element.content) ? nil : element.content[-4..-1])
-        end
+        response[:account_number] =
+          if element = doc.at_xpath('//accountNumber')
+            empty?(element.content) ? nil : element.content[-4..-1]
+          end
 
-        response[:test_request] = if(element = doc.at_xpath('//testRequest'))
-                                    (empty?(element.content) ? nil : element.content)
-        end
+        response[:test_request] =
+          if element = doc.at_xpath('//testRequest')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:full_response_code] = if(element = doc.at_xpath('//messages/message/code'))
-                                          (empty?(element.content) ? nil : element.content)
-        end
+        response[:full_response_code] =
+          if element = doc.at_xpath('//messages/message/code')
+            empty?(element.content) ? nil : element.content
+          end
 
         response
       end
@@ -897,35 +907,41 @@ module ActiveMerchant
 
         doc = Nokogiri::XML(body).remove_namespaces!
 
-        if (element = doc.at_xpath('//messages/message'))
+        if element = doc.at_xpath('//messages/message')
           response[:message_code] = element.at_xpath('code').content[/0*(\d+)$/, 1]
           response[:message_text] = element.at_xpath('text').content.chomp('.')
         end
 
-        response[:result_code] = if(element = doc.at_xpath('//messages/resultCode'))
-                                   (empty?(element.content) ? nil : element.content)
-        end
+        response[:result_code] =
+          if element = doc.at_xpath('//messages/resultCode')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:test_request] = if(element = doc.at_xpath('//testRequest'))
-                                    (empty?(element.content) ? nil : element.content)
-        end
+        response[:test_request] =
+          if element = doc.at_xpath('//testRequest')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:customer_profile_id] = if(element = doc.at_xpath('//customerProfileId'))
-                                           (empty?(element.content) ? nil : element.content)
-        end
+        response[:customer_profile_id] =
+          if element = doc.at_xpath('//customerProfileId')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:customer_payment_profile_id] = if(element = doc.at_xpath('//customerPaymentProfileIdList/numericString'))
-                                                   (empty?(element.content) ? nil : element.content)
-        end
+        response[:customer_payment_profile_id] =
+          if element = doc.at_xpath('//customerPaymentProfileIdList/numericString')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:customer_payment_profile_id] = if(element = doc.at_xpath('//customerPaymentProfileIdList/numericString') ||
-                                                              doc.at_xpath('//customerPaymentProfileId'))
-                                                   (empty?(element.content) ? nil : element.content)
-        end
+        response[:customer_payment_profile_id] =
+          if element = doc.at_xpath('//customerPaymentProfileIdList/numericString') ||
+                       doc.at_xpath('//customerPaymentProfileId')
+            empty?(element.content) ? nil : element.content
+          end
 
-        response[:direct_response] = if(element = doc.at_xpath('//directResponse'))
-                                       (empty?(element.content) ? nil : element.content)
-        end
+        response[:direct_response] =
+          if element = doc.at_xpath('//directResponse')
+            empty?(element.content) ? nil : element.content
+          end
 
         response.merge!(parse_direct_response_elements(response, options))
 

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

@@ -44,12 +44,13 @@ module ActiveMerchant #:nodoc:
         add_common_params(post, options)
 
         MultiResponse.run do |r|
-          identifier = if(payment_method.respond_to?(:number))
-                         r.process { store(payment_method, options) }
-                         r.authorization
-                       else
-                         payment_method
-          end
+          identifier =
+            if(payment_method.respond_to?(:number))
+              r.process { store(payment_method, options) }
+              r.authorization
+            else
+              payment_method
+            end
           r.process { commit('debits', "cards/#{card_identifier_from(identifier)}/debits", post) }
         end
       end
@@ -61,12 +62,13 @@ module ActiveMerchant #:nodoc:
         add_common_params(post, options)
 
         MultiResponse.run do |r|
-          identifier = if(payment_method.respond_to?(:number))
-                         r.process { store(payment_method, options) }
-                         r.authorization
-                       else
-                         payment_method
-          end
+          identifier =
+            if(payment_method.respond_to?(:number))
+              r.process { store(payment_method, options) }
+              r.authorization
+            else
+              payment_method
+            end
           r.process { commit('card_holds', "cards/#{card_identifier_from(identifier)}/card_holds", post) }
         end
       end

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

@@ -97,7 +97,7 @@ module ActiveMerchant #:nodoc:
           post[:zip]     = address[:zip].to_s
           post[:city]    = address[:city].to_s
           post[:country] = address[:country].to_s
-          post[:state]   = address[:state].blank?  ? 'n/a' : address[:state]
+          post[:state]   = address[:state].blank? ? 'n/a' : address[:state]
         end
       end
 
@@ -119,7 +119,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        results  = {}
+        results = {}
         xml = Nokogiri::XML(body)
         resp = xml.xpath('//Response/Transaction/Identification')
         resp.children.each do |element|

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

@@ -129,25 +129,25 @@ module ActiveMerchant #:nodoc:
       # Smartpay may return AVS codes not covered by standard AVSResult codes.
       # Smartpay's descriptions noted below.
       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
+        '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
       }
 
       def commit(action, post, account = 'ws', password = @options[:password])

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

@@ -84,7 +84,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_rebill(post, options) if options[:rebill]
         add_duplicate_override(post, options)
-        post[:TRANS_TYPE]  = 'AUTH'
+        post[:TRANS_TYPE] = 'AUTH'
         commit('AUTH_ONLY', money, post, options)
       end
 
@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_rebill(post, options) if options[:rebill]
         add_duplicate_override(post, options)
-        post[:TRANS_TYPE]  = 'SALE'
+        post[:TRANS_TYPE] = 'SALE'
         commit('AUTH_CAPTURE', money, post, options)
       end
 
@@ -385,7 +385,7 @@ module ActiveMerchant #:nodoc:
         elsif message =~ /Approved/
           message = 'This transaction has been approved'
         elsif message =~  /Expired/
-          message =  'The credit card has expired'
+          message = 'The credit card has expired'
         end
         message
       end

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

@@ -341,7 +341,7 @@ module ActiveMerchant #:nodoc:
                  'A'
                else
                  'I'
-        end
+               end
 
         AVSResult.new({
           :code => code,

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

@@ -186,7 +186,7 @@ module ActiveMerchant #:nodoc:
           post[address_key(prefix, 'FirstName')] = address[:first_name]
           post[address_key(prefix, 'LastName')]  = address[:last_name]
         end
-        post[address_key(prefix, 'MiddleName')]  = address[:middle_name]
+        post[address_key(prefix, 'MiddleName')] = address[:middle_name]
 
         post[address_key(prefix, 'Company')]  = address[:company]
         post[address_key(prefix, 'Street')]   = address[:address1]