activemerchant 1.85.0 → 1.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3fdd27bb50be46ff07917a7dc873c045912fa92
-  data.tar.gz: 04d786332b1047ddc974bc53a989c656b79d9856
+  metadata.gz: 8651e675cc5726ec8424c3023a81307c0d03f66b
+  data.tar.gz: cc00a987adb4cbcd89ac106d07e8cd86d7046052
 SHA512:
-  metadata.gz: 40f01dbedce7566d83da6aa05a068d3b93f86264905e5a34fc50ea08b90952f9cb9bf1206f045c3e76f369bf6012d4975047b74fac577f551108c37ab27e91b4
-  data.tar.gz: dae3bf98f0c4d86885ba4f9e0fd84c218ea9b84be55e1ca21a0eedb98596bd6ae3b19b1d695338c5bc8f29b616fe184ac58e486b16ac1ac874552e5538085c40
+  metadata.gz: 53533aee5d0cb713eb89cdf53ac2d7e71f5ffa0e0ff46a06a6d69effd36e54f76f7f4e18acda564b7392963c586388e55df8e8fdf8f65bb36d090917b3d32df5
+  data.tar.gz: 815a578f9421bb5b5c316c9ee79bf8043dd20cea4fabf8e19885587bf07b9418d2944b218b121b32cbc6ac481a52635ae2c22e6e66a7399b77e1cef90789f117

data/CHANGELOG

@@ -1,12 +1,24 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+== Version 1.86.0 (October 26, 2018)
+* UsaEpayTransaction: Support UMcheckformat option for echecks [dtykocki] #3002
+* Global Collect: handle internal server errors [molbrown] #3005
+* Barclaycard Smartpay: allow third-party payouts for credits [bpollack] #3009
+* RuboCop: AlignHash [nfarve] #3004
+* Beanstream: Switch `recurringPayment` flag from boolean to integer [dtykocki] #3011
+* Update Swipe HQ endpoint [bdewater] #3013
+* Braintree: Adds device_data [deedeelavinder] #3012
+* Payflow Express: Add phone to returned Response [filipebarcos] #3003
+* Authorize.Net: Pass some level 3 fields [curiousepic] #3022
+* Add state to the netbanx payload [Girardvjonathan] #3024
+
 == Version 1.85.0 (September 28, 2018)
-* Authorize.Net: Support custom delimiter for cim [curiousepic] [#3001]
+* Authorize.Net: Support custom delimiter for cim [curiousepic] #3001
 
 == Version 1.84.0 (September 27, 2018)
 * PayU Latam: support partial captures [bpollack] #2974
-* Braintree: Reflect correct test mode in Braintree responses [elfassy] [#2980]
+* Braintree: Reflect correct test mode in Braintree responses [elfassy] #2980
 * FirstPay: Expose error code [curiousepic] #2979
 * Barclaycard Smartpay: Pass device_fingerprint when specified [dtykocki] #2981
 * Komoju: remove no-longer-relevant sandbox URL [miyazawadegica] #2987
@@ -32,7 +44,7 @@
 * Gateway generator: fix a typo that would cause the script to crash [bpollack] #2962
 * Clearhaus: use $0 for verify transactions [bpollack] #2964
 * Global Collect: properly handle partial captures [bpollack] #2967
-* Braintree: Add support for GooglePay [dtykocki] [#2966]
+* Braintree: Add support for GooglePay [dtykocki] #2966
 * Adyen: allow overriding card brands [bpollack] #2968
 * Adyen: allow custom routing [bpollack] #2969
 * First Pay: Adds scrubbing [deedeelavinder] #2972

data/lib/active_merchant/billing/avs_result.rb

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 module ActiveMerchant
-  module Billing 
+  module Billing
     # Implements the Address Verification System
     # https://www.wellsfargo.com/downloads/pdf/biz/merchant/visa_avs.pdf
     # http://en.wikipedia.org/wiki/Address_Verification_System
@@ -38,7 +38,7 @@ module ActiveMerchant
         'Y' => 'Street address and 5-digit postal code match.',
         'Z' => 'Street address does not match, but 5-digit postal code matches.'
       }
-      
+
       # Map vendor's AVS result code to a postal match code
       POSTAL_MATCH_CODE = {
         'Y' => %w( D H F H J L M P Q V W X Y Z ),
@@ -49,7 +49,7 @@ module ActiveMerchant
         codes.each { |code| map[code] = type }
         map
       end
-      
+
       # Map vendor's AVS result code to a street match code
       STREET_MATCH_CODE = {
         'Y' => %w( A B D H J M O Q T V X Y ),
@@ -60,32 +60,32 @@ module ActiveMerchant
         codes.each { |code| map[code] = type }
         map
       end
-      
+
       attr_reader :code, :message, :street_match, :postal_match
-      
+
       def self.messages
         MESSAGES
       end
-      
+
       def initialize(attrs)
         attrs ||= {}
-        
+
         @code = attrs[:code].upcase unless attrs[:code].blank?
         @message = self.class.messages[code]
-        
+
         if attrs[:street_match].blank?
           @street_match = STREET_MATCH_CODE[code]
-        else  
+        else
           @street_match = attrs[:street_match].upcase
         end
-          
+
         if attrs[:postal_match].blank?
           @postal_match = POSTAL_MATCH_CODE[code]
-        else  
+        else
           @postal_match = attrs[:postal_match].upcase
         end
       end
-    
+
       def to_hash
         { 'code' => code,
           'message' => message,

data/lib/active_merchant/billing/compatibility.rb

@@ -75,7 +75,7 @@ module ActiveMerchant
           end
 
           def empty?
-            all?{|k, v| v && v.empty?}
+            all?{|k, v| v&.empty?}
           end
 
           def on(field)
@@ -115,4 +115,3 @@ module ActiveMerchant
     Compatibility::Model.send(:include, Rails::Model)
   end
 end
-

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

@@ -135,7 +135,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
-        return unless post[:card] && post[:card].kind_of?(Hash)
+        return unless post[:card]&.kind_of?(Hash)
         if (address = options[:billing_address] || options[:address]) && address[:country]
           post[:card][:billingAddress] = {}
           post[:card][:billingAddress][:street] = address[:address1] || 'N/A'

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

@@ -257,6 +257,7 @@ module ActiveMerchant
           add_market_type_device_type(xml, payment, options)
           add_settings(xml, payment, options)
           add_user_fields(xml, amount, options)
+          add_ship_from_address(xml, options)
         end
       end
 
@@ -610,6 +611,16 @@ module ActiveMerchant
         end
       end
 
+      def add_ship_from_address(xml, options, root_node='shipFrom')
+        address = options[:ship_from_address]
+        return unless address
+
+        xml.send(root_node) do
+          xml.zip(truncate(address[:zip], 20)) unless empty?(address[:zip])
+          xml.country(truncate(address[:country], 60)) unless empty?(address[:country])
+        end
+      end
+
       def add_order_id(xml, options)
         xml.refId(truncate(options[:order_id], 20))
       end
@@ -619,6 +630,7 @@ module ActiveMerchant
           xml.invoiceNumber(truncate(options[:order_id], 20))
           xml.description(truncate(options[:description], 255))
           xml.purchaseOrderNumber(options[:po_number]) if options[:po_number] && transaction_type.start_with?('profileTrans')
+          xml.summaryCommodityCode(truncate(options[:summary_commodity_code], 4)) if options[:summary_commodity_code] && !transaction_type.start_with?('profileTrans')
         end
 
         # Authorize.net API requires lineItems to be placed directly after order tag

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

@@ -671,7 +671,6 @@ module ActiveMerchant #:nodoc:
                 tag_unless_blank(xml,'customerShippingAddressId', transaction[:customer_shipping_address_id])
                 xml.tag!('transId', transaction[:trans_id])
               when :refund
-                #TODO - add lineItems field
                 xml.tag!('amount', transaction[:amount])
                 tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
                 tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
@@ -879,7 +878,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def format_extra_options(options)
-        options.map{ |k, v| "#{k}=#{v}" }.join('&') unless options.nil?
+        options&.map{ |k, v| "#{k}=#{v}" }&.join('&')
       end
 
       def parse_direct_response(params)

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

@@ -68,7 +68,27 @@ module ActiveMerchant #:nodoc:
         post[:nationality] = options[:nationality] if options[:nationality]
         post[:shopperName] = options[:shopper_name] if options[:shopper_name]
 
-        commit('refundWithData', post)
+        if options[:third_party_payout]
+          post[:recurring] = options[:recurring_contract] || {contract: 'PAYOUT'}
+          MultiResponse.run do |r|
+            r.process {
+              commit(
+                'storeDetailAndSubmitThirdParty',
+                post,
+                @options[:store_payout_account],
+                @options[:store_payout_password])
+            }
+            r.process {
+              commit(
+                'confirmThirdParty',
+                modification_request(r.authorization, @options),
+                @options[:review_payout_account],
+                @options[:review_payout_password])
+            }
+          end
+        else
+          commit('refundWithData', post)
+        end
       end
 
       def void(identification, options = {})
@@ -128,9 +148,10 @@ module ActiveMerchant #:nodoc:
         '18' => 'I'	  # Neither postal code nor address were checked
       }
 
-      def commit(action, post)
+      def commit(action, post, account = 'ws', password = @options[:password])
         request = post_data(flatten_hash(post))
-        raw_response = ssl_post(build_url(action), request, headers)
+        request_headers = headers(account, password)
+        raw_response = ssl_post(build_url(action), request, request_headers)
         response = parse(raw_response)
 
         Response.new(
@@ -181,10 +202,10 @@ module ActiveMerchant #:nodoc:
         flat_hash
       end
 
-      def headers
+      def headers(account, password)
         {
           'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8',
-          'Authorization' => 'Basic ' + Base64.strict_encode64("ws@Company.#{@options[:company]}:#{@options[:password]}").strip
+          'Authorization' => 'Basic ' + Base64.strict_encode64("#{account}@Company.#{@options[:company]}:#{password}").strip
         }
       end
 
@@ -214,10 +235,10 @@ module ActiveMerchant #:nodoc:
 
       def success_from(response)
         return true if response['result'] == 'Success'
-        return true if response['resultCode'] == 'Authorised'
-        return true if response['resultCode'] == 'Received'
-        successful_responses = %w([capture-received] [cancel-received] [refund-received])
-        successful_responses.include?(response['response'])
+
+        successful_results = %w(Authorised Received [payout-submit-received])
+        successful_responses = %w([capture-received] [cancel-received] [refund-received] [payout-confirm-received])
+        successful_results.include?(response['resultCode']) || successful_responses.include?(response['response'])
       end
 
       def build_url(action)
@@ -226,6 +247,8 @@ module ActiveMerchant #:nodoc:
           "#{test? ? self.test_url : self.live_url}/Recurring/#{API_VERSION}/storeToken"
         when 'finalize3ds'
           "#{test? ? self.test_url : self.live_url}/Payment/#{API_VERSION}/authorise3d"
+        when 'storeDetailAndSubmitThirdParty', 'confirmThirdParty'
+          "#{test? ? self.test_url : self.live_url}/Payout/#{API_VERSION}/#{action}"
         else
           "#{test? ? self.test_url : self.live_url}/Payment/#{API_VERSION}/#{action}"
         end
@@ -263,11 +286,11 @@ module ActiveMerchant #:nodoc:
         hash = {}
         hash[:houseNumberOrName] = house
         hash[:street]            = street
-        hash[:city]              = address[:city] if address[:city]
-        hash[:stateOrProvince]   = address[:state] if address[:state]
-        hash[:postalCode]        = address[:zip] if address[:zip]
-        hash[:country]           = address[:country] if address[:country]
-        hash
+        hash[:city]              = address[:city]
+        hash[:stateOrProvince]   = address[:state]
+        hash[:postalCode]        = address[:zip]
+        hash[:country]           = address[:country]
+        hash.keep_if { |_, v| v }
       end
 
       def amount_hash(money, currency)
@@ -301,20 +324,20 @@ module ActiveMerchant #:nodoc:
 
       def payment_request(money, options)
         hash = {}
-        hash[:merchantAccount]  = @options[:merchant]
-        hash[:reference]        = options[:order_id] if options[:order_id]
-        hash[:shopperEmail]     = options[:email] if options[:email]
-        hash[:shopperIP]        = options[:ip] if options[:ip]
-        hash[:shopperReference] = options[:customer] if options[:customer]
-        hash[:shopperInteraction] = options[:shopper_interaction] if options[:shopper_interaction]
-        hash[:deviceFingerprint]  = options[:device_fingerprint] if options[:device_fingerprint]
+        hash[:merchantAccount]    = @options[:merchant]
+        hash[:reference]          = options[:order_id]
+        hash[:shopperEmail]       = options[:email]
+        hash[:shopperIP]          = options[:ip]
+        hash[:shopperReference]   = options[:customer]
+        hash[:shopperInteraction] = options[:shopper_interaction]
+        hash[:deviceFingerprint]  = options[:device_fingerprint]
         hash.keep_if { |_, v| v }
       end
 
       def store_request(options)
         hash = {}
         hash[:merchantAccount]  = @options[:merchant]
-        hash[:shopperEmail]     = options[:email] if options[:email]
+        hash[:shopperEmail]     = options[:email]
         hash[:shopperReference] = options[:customer] if options[:customer]
         hash.keep_if { |_, v| v }
       end

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

@@ -167,8 +167,8 @@ module ActiveMerchant #:nodoc:
         commit(post, true)
       end
 
-      #can't actually delete a secure profile with the supplicated API. This function sets the status of the profile to closed (C).
-      #Closed profiles will have to removed manually.
+      # can't actually delete a secure profile with the supplicated API. This function sets the status of the profile to closed (C).
+      # Closed profiles will have to removed manually.
       def delete(vault_id)
         update(vault_id, false, {:status => 'C'})
       end

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -266,7 +266,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_recurring_payment(post, options)
-        post[:recurringPayment] = true if options[:recurring].to_s == 'true'
+        post[:recurringPayment] = 1 if options[:recurring].to_s == 'true'
       end
 
       def add_invoice(post, options)
@@ -375,11 +375,9 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         results = {}
-        if !body.nil?
-          body.split(/&/).each do |pair|
-            key, val = pair.split(/\=/)
-            results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
-          end
+        body&.split(/&/)&.each do |pair|
+          key, val = pair.split(/\=/)
+          results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
         end
 
         # Clean up the message text if there is any

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

@@ -55,4 +55,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -173,7 +173,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, payment_object, options = {})
-        if(payment_object && payment_object.kind_of?(String))
+        if payment_object&.kind_of?(String)
           ActiveMerchant.deprecated 'credit should only be used to credit a payment method'
           return refund(money, payment_object, options)
         end

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

@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
             :last_name => creditcard.last_name,
             :email => scrub_email(options[:email]),
             :phone => options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
-				      options[:billing_address][:phone]),
+              options[:billing_address][:phone]),
             :credit_card => credit_card_params
           )
           Response.new(result.success?, message_from_result(result),
@@ -231,8 +231,9 @@ module ActiveMerchant #:nodoc:
             :last_name => creditcard.last_name,
             :email => scrub_email(options[:email]),
             :phone => options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
-	            options[:billing_address][:phone]),
+              options[:billing_address][:phone]),
             :id => options[:customer],
+            :device_data => options[:device_data],
           }.merge credit_card_params
           result = @braintree_gateway.customer.create(merge_credit_card_options(parameters, options))
           Response.new(result.success?, message_from_result(result),
@@ -256,6 +257,7 @@ module ActiveMerchant #:nodoc:
             cvv: credit_card.verification_value,
             expiration_month: credit_card.month.to_s.rjust(2, '0'),
             expiration_year: credit_card.year.to_s,
+            device_data: options[:device_data],
           }
           parameters[:billing_address] = map_address(options[:billing_address]) if options[:billing_address]
 
@@ -353,7 +355,7 @@ module ActiveMerchant #:nodoc:
           result.success?,
           message_from_result(result),
           response_hash,
-          authorization: (result.transaction.id if result.transaction),
+          authorization: result.transaction&.id,
           test: test?
         )
       end
@@ -556,7 +558,7 @@ module ActiveMerchant #:nodoc:
             :id => options[:store] == true ? '' : options[:store],
             :email => scrub_email(options[:email]),
             :phone => options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
-	            options[:billing_address][:phone])
+              options[:billing_address][:phone])
           },
           :options => {
             :store_in_vault => options[:store] ? true : false,

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

@@ -166,8 +166,8 @@ module ActiveMerchant #:nodoc:
         response = {}
 
         doc = Nokogiri::XML(xml)
-        doc.root.xpath('*').each do |node|
-          if (node.elements.size == 0)
+        doc.root&.xpath('*')&.each do |node|
+          if node.elements.size == 0
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|
@@ -175,7 +175,7 @@ module ActiveMerchant #:nodoc:
               response[name.to_sym] = childnode.text
             end
           end
-        end unless doc.root.nil?
+        end
 
         response
       end

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

@@ -150,12 +150,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]')
-          .gsub(%r(("cvv2\\":\\")\d*), '\1[FILTERED]')
-          .gsub(%r(("merchid\\":\\")\d*), '\1[FILTERED]')
-          .gsub(%r((&?"account\\":\\")\d*), '\1[FILTERED]')
-          .gsub(%r((&?"token\\":\\")\d*), '\1[FILTERED]')
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r(("cvv2\\":\\")\d*), '\1[FILTERED]').
+          gsub(%r(("merchid\\":\\")\d*), '\1[FILTERED]').
+          gsub(%r((&?"account\\":\\")\d*), '\1[FILTERED]').
+          gsub(%r((&?"token\\":\\")\d*), '\1[FILTERED]')
       end
 
       private