activemerchant 1.114.0 → 1.116.0

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

@@ -185,8 +185,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(success?(response), message_from(response), response,
           test: test?,
-          authorization: authorization_from(response)
-        )
+          authorization: authorization_from(response))
       end
 
       def build_periodic_item(action, money, credit_card, options)
@@ -242,8 +241,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(success?(response), message_from(response), response,
           test: test?,
-          authorization: authorization_from(response)
-        )
+          authorization: authorization_from(response))
       end
 
       def success?(response)

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

@@ -86,8 +86,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(response[:result_code] == 1, message_from(response), response,
           test: test?,
-          authorization: response[:merchant_transaction_reference]
-        )
+          authorization: response[:merchant_transaction_reference])
       end
 
       def message_from(result)

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

@@ -31,17 +31,17 @@ module ActiveMerchant #:nodoc:
         'expired_token' => STANDARD_ERROR_CODE[:card_declined]
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :secret_key)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         post = create_post_for_auth_or_purchase(money, payment, options)
         commit('charges', post, options)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         post = create_post_for_auth_or_purchase(money, payment, options)
         post[:captured] = 'false'
         commit('charges', post, options)
@@ -63,7 +63,7 @@ module ActiveMerchant #:nodoc:
         commit("charges/#{CGI.escape(authorization)}/refund", {}, options)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -190,8 +190,7 @@ module ActiveMerchant #:nodoc:
           response,
           test: test?,
           authorization: (success ? response['id'] : response['error']['charge']),
-          error_code: (success ? nil : STANDARD_ERROR_CODE_MAPPING[response['error']['code']])
-        )
+          error_code: (success ? nil : STANDARD_ERROR_CODE_MAPPING[response['error']['code']]))
       end
 
       def headers(options = {})

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

@@ -213,7 +213,7 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>:force_settlement</tt> -- Force the settlement to occur as soon as possible. This option is not supported by other gateways. See the SkipJack API reference for more details
       def capture(money, authorization, options = {})
-        post = { }
+        post = {}
         add_status_action(post, 'SETTLE')
         add_forced_settlement(post, options)
         add_transaction_id(post, authorization)
@@ -267,8 +267,7 @@ module ActiveMerchant #:nodoc:
           test: test?,
           authorization: response[:szTransactionFileName] || parameters[:szTransactionId],
           avs_result: { code: response[:szAVSResponseCode] },
-          cvv_result: response[:szCVV2ResponseCode]
-        )
+          cvv_result: response[:szCVV2ResponseCode])
       end
 
       def url_for(action)

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

@@ -123,7 +123,7 @@ module ActiveMerchant #:nodoc:
         commit(nil, nil, post)
       end
 
-      alias_method :unstore, :delete
+      alias unstore delete
 
       private
 
@@ -133,9 +133,9 @@ module ActiveMerchant #:nodoc:
         post[:ipaddress] = options[:ip] if options.has_key? :ip
       end
 
-      def add_address(post, address, prefix='')
+      def add_address(post, address, prefix = '')
         prefix += '_' unless prefix.blank?
-        unless address.blank? or address.values.blank?
+        unless address.blank? || address.values.blank?
           post[prefix + 'address1']    = address[:address1].to_s
           post[prefix + 'address2']    = address[:address2].to_s unless address[:address2].blank?
           post[prefix + 'company']    = address[:company].to_s
@@ -163,7 +163,7 @@ module ActiveMerchant #:nodoc:
         post[:orderid] = options[:order_id].to_s.gsub(/[^\w.]/, '')
       end
 
-      def add_payment_source(params, source, options={})
+      def add_payment_source(params, source, options = {})
         case determine_funding_source(source)
         when :vault       then add_customer_vault_id(params, source)
         when :credit_card then add_creditcard(params, source, options)
@@ -230,8 +230,7 @@ module ActiveMerchant #:nodoc:
           authorization: (response['transactionid'] || response['customer_vault_id']),
           test: test?,
           cvv_result: response['cvvresponse'],
-          avs_result: { code: response['avsresponse'] }
-        )
+          avs_result: { code: response['avsresponse'] })
       end
 
       def expdate(creditcard)

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

@@ -39,11 +39,11 @@ module ActiveMerchant #:nodoc:
         commit('CaptureTransaction', do_capture(money, authorization, options), options)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         commit('RefundTransaction', do_refund(money, authorization, options), options)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         commit('CancelTransaction', do_void(authorization, options), options)
       end
 
@@ -139,7 +139,7 @@ module ActiveMerchant #:nodoc:
         soap.tag!('cardExpireYear', card.year.to_s)
       end
 
-      def fill_order_info(soap, money, options, skip_currency=false)
+      def fill_order_info(soap, money, options, skip_currency = false)
         soap.tag!('orderID', options[:order_id].to_s)
         soap.tag!('orderDescription', "Order #{options[:order_id]}")
         soap.tag!('amount', amount(money).to_s)
@@ -157,8 +157,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(soap_action, soap, options)
-        headers = {'SOAPAction' => "\"urn:Interface##{soap_action}\"",
-                   'Content-Type' => 'text/xml; charset=utf-8'}
+        headers = { 'SOAPAction' => "\"urn:Interface##{soap_action}\"",
+                   'Content-Type' => 'text/xml; charset=utf-8' }
         response_string = ssl_post(test? ? self.test_url : self.live_url, soap, headers)
         response = parse(response_string, soap_action)
         return Response.new(response['errorcode'] == '000',
@@ -179,9 +179,9 @@ module ActiveMerchant #:nodoc:
           'xmlns:types' => 'urn:Interface/encodedTypes',
           'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'
         }) do
-          retval.tag!('soap:Body', {'soap:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'}) do
+          retval.tag!('soap:Body', { 'soap:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/' }) do
             retval.tag!("tns:#{request}") do
-              retval.tag!("#{request}Request", {'xsi:type' => "tns:#{request}Request"}) do
+              retval.tag!("#{request}Request", { 'xsi:type' => "tns:#{request}Request" }) do
                 yield retval
               end
             end

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

@@ -56,7 +56,7 @@ module ActiveMerchant #:nodoc:
         commit("gateways/#{@options[:gateway_token]}/authorize.xml", request)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         request = build_xml_request('transaction') do |doc|
           add_invoice(doc, money, options)
         end
@@ -64,7 +64,7 @@ module ActiveMerchant #:nodoc:
         commit("transactions/#{authorization}/capture.xml", request)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         request = build_xml_request('transaction') do |doc|
           add_invoice(doc, money, options)
           add_extra_options(:gateway_specific_fields, doc, options)
@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
         commit("transactions/#{authorization}/credit.xml", request)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         commit("transactions/#{authorization}/void.xml", '')
       end
 
@@ -98,7 +98,7 @@ module ActiveMerchant #:nodoc:
       #
       # credit_card    - The CreditCard to store
       # options        - A standard ActiveMerchant options hash
-      def store(credit_card, options={})
+      def store(credit_card, options = {})
         retain = (options.has_key?(:retain) ? options[:retain] : true)
         save_card(retain, credit_card, options)
       end
@@ -108,7 +108,7 @@ module ActiveMerchant #:nodoc:
       #
       # credit_card    - The CreditCard to store
       # options        - A standard ActiveMerchant options hash
-      def unstore(authorization, options={})
+      def unstore(authorization, options = {})
         commit("payment_methods/#{authorization}/redact.xml", '', :put)
       end
 
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
         commit("transactions/#{transaction_token}.xml", nil, :get)
       end
 
-      alias_method :status, :find
+      alias status find
 
       def supports_scrubbing?
         true

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

@@ -221,7 +221,7 @@ module ActiveMerchant #:nodoc:
             # The /cards endpoint does not update other customer parameters.
             r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", params, options) }
 
-            post[:default_card] = r.params['id'] if options[:set_default] and r.success? and !r.params['id'].blank?
+            post[:default_card] = r.params['id'] if options[:set_default] && r.success? && !r.params['id'].blank?
 
             r.process { update_customer(options[:customer], post) } if post.count > 0
           end
@@ -309,8 +309,8 @@ module ActiveMerchant #:nodoc:
           add_creditcard(post, payment, options, true)
           add_source_owner(post, payment, options)
         elsif type == 'three_d_secure'
-          post[:three_d_secure] = {card: payment}
-          post[:redirect] = {return_url: options[:redirect_url]}
+          post[:three_d_secure] = { card: payment }
+          post[:redirect] = { return_url: options[:redirect_url] }
         end
         commit(:post, 'sources', post, options)
       end
@@ -560,11 +560,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_connected_account(post, options = {})
+        post[:on_behalf_of] = options[:on_behalf_of] if options[:on_behalf_of]
+
         return unless options[:transfer_destination]
 
         post[:transfer_data] = { destination: options[:transfer_destination] }
         post[:transfer_data][:amount] = options[:transfer_amount] if options[:transfer_amount]
-        post[:on_behalf_of] = options[:on_behalf_of] if options[:on_behalf_of]
         post[:transfer_group] = options[:transfer_group] if options[:transfer_group]
         post[:application_fee_amount] = options[:application_fee_amount] if options[:application_fee_amount]
       end
@@ -617,7 +618,7 @@ module ActiveMerchant #:nodoc:
           'User-Agent' => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           'Stripe-Version' => api_version(options),
           'X-Stripe-Client-User-Agent' => stripe_client_user_agent(options),
-          'X-Stripe-Client-User-Metadata' => {ip: options[:ip]}.to_json
+          'X-Stripe-Client-User-Metadata' => { ip: options[:ip] }.to_json
         }
         headers['Idempotency-Key'] = idempotency_key if idempotency_key
         headers['Stripe-Account'] = options[:stripe_account] if options[:stripe_account]
@@ -627,7 +628,7 @@ module ActiveMerchant #:nodoc:
       def stripe_client_user_agent(options)
         return user_agent unless options[:application]
 
-        JSON.dump(JSON.parse(user_agent).merge!({application: options[:application]}))
+        JSON.dump(JSON.parse(user_agent).merge!({ application: options[:application] }))
       end
 
       def api_version(options)
@@ -666,8 +667,7 @@ module ActiveMerchant #:nodoc:
           avs_result: { code: avs_code },
           cvv_result: cvc_code,
           emv_authorization: emv_authorization_from_response(response),
-          error_code: success ? nil : error_code_from(response)
-        )
+          error_code: success ? nil : error_code_from(response))
       end
 
       def authorization_from(success, url, method, response)
@@ -683,7 +683,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(success, response)
-        success ? 'Transaction approved' : response.fetch('error', {'message' => 'No error details'})['message']
+        success ? 'Transaction approved' : response.fetch('error', { 'message' => 'No error details' })['message']
       end
 
       def success_from(response, options)

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

@@ -29,6 +29,7 @@ module ActiveMerchant #:nodoc:
         add_shipping_address(post, options)
         setup_future_usage(post, options)
         add_exemption(post, options)
+        request_three_d_secure(post, options)
 
         CREATE_INTENT_ATTRIBUTES.each do |attribute|
           add_whitelisted_attribute(post, options, attribute)
@@ -267,6 +268,14 @@ module ActiveMerchant #:nodoc:
         post[:payment_method_options][:card][:moto] = true if options[:moto]
       end
 
+      def request_three_d_secure(post, options = {})
+        return unless options[:request_three_d_secure] && %w(any automatic).include?(options[:request_three_d_secure])
+
+        post[:payment_method_options] ||= {}
+        post[:payment_method_options][:card] ||= {}
+        post[:payment_method_options][:card][:request_three_d_secure] = options[:request_three_d_secure]
+      end
+
       def setup_future_usage(post, options = {})
         post[:setup_future_usage] = options[:setup_future_usage] if %w(on_session off_session).include?(options[:setup_future_usage])
         post[:off_session] = options[:off_session] if options[:off_session] && options[:confirm] == true

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

@@ -109,8 +109,7 @@ module ActiveMerchant #:nodoc:
                 TRANSACTION_APPROVED_MSG :
                 TRANSACTION_DECLINED_MSG,
                 response,
-                test: test?
-              )
+                test: test?)
             else
               build_error_response(message, response)
             end
@@ -125,7 +124,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def call_api(api, params=nil)
+      def call_api(api, params = nil)
         params ||= {}
         params[:merchant_id] = @options[:login]
         params[:api_key] = @options[:api_key]
@@ -139,7 +138,7 @@ module ActiveMerchant #:nodoc:
         (test? ? self.test_url : self.live_url) + api
       end
 
-      def build_error_response(message, params={})
+      def build_error_response(message, params = {})
         Response.new(
           false,
           message,

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

@@ -28,12 +28,12 @@ module ActiveMerchant #:nodoc:
         'E' => 'R'
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :merchant_id, :api_key)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         commit(:purchase, amount, options[:currency]) do |doc|
           add_invoice(doc, 'sale', amount, payment_method, options)
           add_payment_method(doc, payment_method, options)
@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         commit(:authorize, amount, options[:currency]) do |doc|
           add_invoice(doc, 'auth', amount, payment_method, options)
           add_payment_method(doc, payment_method, options)
@@ -49,26 +49,26 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         commit(:capture) do |doc|
           add_invoice(doc, 'capture', amount, authorization, options)
         end
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         _, amount, currency = split_authorization(authorization)
         commit(:void) do |doc|
           add_invoice(doc, 'void', amount.to_i, authorization, options.merge(currency: currency))
         end
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         commit(:refund) do |doc|
           add_invoice(doc, 'refund', amount, authorization, options)
         end
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         commit(:verify) do |doc|
           add_invoice(doc, 'verify', 100, credit_card, options)
           add_payment_method(doc, credit_card, options)
@@ -162,7 +162,7 @@ module ActiveMerchant #:nodoc:
         country.code(:alpha2)
       end
 
-      def commit(action, amount=nil, currency=nil)
+      def commit(action, amount = nil, currency = nil)
         currency = default_currency if currency == nil
         request = build_xml_request { |doc| yield(doc) }
         response = ssl_post(live_url, request, headers)

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
         commit((payment.is_a?(Check) ? :purchase_echeck : :purchase), post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
 
         transaction_id, payment_type = split_authorization(authorization)
@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         commit((payment_type == 'check' ? :refund_echeck : :refund), post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
 
         transaction_id, = split_authorization(authorization)

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

@@ -182,12 +182,12 @@ module ActiveMerchant #:nodoc:
         wallet_sale: 14
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :gateway_id, :reg_key)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         if credit_card?(payment_method)
           action = :purchase
           request = build_xml_transaction_request do |doc|
@@ -216,7 +216,7 @@ module ActiveMerchant #:nodoc:
         commit(action, request)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         if credit_card?(payment_method)
           request = build_xml_transaction_request do |doc|
             add_credit_card(doc, payment_method)
@@ -234,7 +234,7 @@ module ActiveMerchant #:nodoc:
         commit(:authorize, request)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         transaction_id = split_authorization(authorization)[1]
         request = build_xml_transaction_request do |doc|
           add_amount(doc, amount)
@@ -244,7 +244,7 @@ module ActiveMerchant #:nodoc:
         commit(:capture, request)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         action, transaction_id = split_authorization(authorization)
 
         request = build_xml_transaction_request do |doc|
@@ -254,7 +254,7 @@ module ActiveMerchant #:nodoc:
         commit(void_type(action), request)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         action, transaction_id = split_authorization(authorization)
 
         request = build_xml_transaction_request do |doc|
@@ -265,7 +265,7 @@ module ActiveMerchant #:nodoc:
         commit(refund_type(action), request)
       end
 
-      def credit(amount, payment_method, options={})
+      def credit(amount, payment_method, options = {})
         request = build_xml_transaction_request do |doc|
           add_pan(doc, payment_method)
           add_amount(doc, amount)
@@ -274,7 +274,7 @@ module ActiveMerchant #:nodoc:
         commit(:credit, request)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         request = build_xml_transaction_request do |doc|
           add_credit_card(doc, credit_card)
           add_contact(doc, credit_card.name, options)
@@ -283,7 +283,7 @@ module ActiveMerchant #:nodoc:
         commit(:verify, request)
       end
 
-      def store(payment_method, options={})
+      def store(payment_method, options = {})
         store_customer_request = build_xml_payment_storage_request do |doc|
           store_customer_details(doc, payment_method.name, options)
         end
@@ -322,7 +322,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'
 
       def headers
@@ -462,7 +462,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def build_xml_request(wrapper, merchant_product_type=nil)
+      def build_xml_request(wrapper, merchant_product_type = nil)
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
           xml['soapenv'].Envelope('xmlns:soapenv' => SOAPENV_NAMESPACE) do
             xml['soapenv'].Body do
@@ -485,7 +485,7 @@ module ActiveMerchant #:nodoc:
         doc.root.to_xml
       end
 
-      def add_merchant(doc, product_type=nil)
+      def add_merchant(doc, product_type = nil)
         doc['v1'].merc do
           doc['v1'].id @options[:gateway_id]
           doc['v1'].regKey @options[:reg_key]