activemerchant 1.113.0 → 1.119.0

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

@@ -129,8 +129,7 @@ module ActiveMerchant #:nodoc:
             postal_match: AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
             street_match: AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
           },
-          cvv_result: CVV2_CODES[response['CVV2ResponseCode']]
-        )
+          cvv_result: CVV2_CODES[response['CVV2ResponseCode']])
       end
 
       def url(action)
@@ -149,9 +148,9 @@ module ActiveMerchant #:nodoc:
 
       def success?(response)
         if %w(cc_settle cc_debit cc_preauth cc_refund).include?(response[:action])
-          !response['ApprovalCode'].nil? and response['ErrorCode'].nil? and response['Status'] == 'Approved'
+          !response['ApprovalCode'].nil? && response['ErrorCode'].nil? && (response['Status'] == 'Approved')
         elsif response[:action] = 'void'
-          !response['ApprovalCode'].nil? and response['ErrorCode'].nil? and response['Status'] == 'Voided'
+          !response['ApprovalCode'].nil? && response['ErrorCode'].nil? && (response['Status'] == 'Voided')
         end
       end
 

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

@@ -16,14 +16,14 @@ module ActiveMerchant #:nodoc:
         'processing_error' => STANDARD_ERROR_CODE[:processing_error]
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :api_key)
         @api_key = options[:api_key]
 
         super
       end
 
-      def purchase(money, payment_method, options={})
+      def purchase(money, payment_method, options = {})
         post = {}
         add_amount(post, money)
         add_payment_method(post, payment_method)
@@ -32,7 +32,7 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'transactions', post)
       end
 
-      def authorize(money, payment_method, options={})
+      def authorize(money, payment_method, options = {})
         post = {}
         add_amount(post, money)
         add_payment_method(post, payment_method)
@@ -43,27 +43,27 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'transactions', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         return Response.new(false, 'Não é possível capturar uma transação sem uma prévia autorização.') if authorization.nil?
 
         post = {}
         commit(:post, "transactions/#{authorization}/capture", post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         return Response.new(false, 'Não é possível estornar uma transação sem uma prévia captura.') if authorization.nil?
 
         void(authorization, options)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         return Response.new(false, 'Não é possível estornar uma transação autorizada sem uma prévia autorização.') if authorization.nil?
 
         post = {}
         commit(:post, "transactions/#{authorization}/refund", post)
       end
 
-      def verify(payment_method, options={})
+      def verify(payment_method, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(127, payment_method, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -99,7 +99,7 @@ module ActiveMerchant #:nodoc:
         post[:card_cvv] = credit_card.verification_value
       end
 
-      def add_metadata(post, options={})
+      def add_metadata(post, options = {})
         post[:metadata] = {}
         post[:metadata][:order_id] = options[:order_id]
         post[:metadata][:ip] = options[:ip]

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

@@ -11,12 +11,12 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.pagofacil.net/'
       self.display_name = 'PagoFacil'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :branch_id, :merchant_id, :service_id)
         super
       end
 
-      def purchase(money, credit_card, options={})
+      def purchase(money, credit_card, options = {})
         post = {}
         add_invoice(post, money, options)
         add_payment(post, credit_card)

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

@@ -13,31 +13,31 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.bluefincommerce.com/'
       self.display_name = 'PayConex'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :account_id, :api_accesskey)
         super
       end
 
-      def purchase(money, payment_method, options={})
+      def purchase(money, payment_method, options = {})
         post = {}
         add_auth_purchase_params(post, money, payment_method, options)
         commit('SALE', post)
       end
 
-      def authorize(money, payment_method, options={})
+      def authorize(money, payment_method, options = {})
         post = {}
         add_auth_purchase_params(post, money, payment_method, options)
         commit('AUTHORIZATION', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         add_reference_params(post, authorization, options)
         add_amount(post, money, options)
         commit('CAPTURE', post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
         add_reference_params(post, authorization, options)
         add_amount(post, money, options)
@@ -50,7 +50,7 @@ module ActiveMerchant #:nodoc:
         commit('REVERSAL', post)
       end
 
-      def credit(money, payment_method, options={})
+      def credit(money, payment_method, options = {})
         raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card or use the #refund method.' if payment_method.is_a?(String)
 
         post = {}
@@ -58,11 +58,11 @@ module ActiveMerchant #:nodoc:
         commit('CREDIT', post)
       end
 
-      def verify(payment_method, options={})
+      def verify(payment_method, options = {})
         authorize(0, payment_method, options)
       end
 
-      def store(payment_method, options={})
+      def store(payment_method, options = {})
         post = {}
         add_credentials(post)
         add_payment_method(post, payment_method)

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

@@ -183,7 +183,7 @@ module ActiveMerchant #:nodoc:
         commit(action, build_request(action, options), authorization)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         action = 'refundtx'
 
         options[:money] = money
@@ -197,7 +197,7 @@ module ActiveMerchant #:nodoc:
         SUCCESS_CODES.include?(response[:res])
       end
 
-      def build_request(action, options={})
+      def build_request(action, options = {})
         xml = Builder::XmlMarkup.new
         xml.instruct!
 
@@ -220,7 +220,7 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_authorization(xml, money, creditcard, options={})
+      def build_authorization(xml, money, creditcard, options = {})
         xml.tag! 'authtx', {
           cref: options[:order_id],
           cname: creditcard.name,
@@ -235,13 +235,13 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def build_capture(xml, money, authorization, options={})
+      def build_capture(xml, money, authorization, options = {})
         xml.tag! 'settletx', {
           tid: authorization
         }
       end
 
-      def build_refund(xml, money, authorization, options={})
+      def build_refund(xml, money, authorization, options = {})
         xml.tag! 'refundtx', {
           tid: authorization,
           amt: amount(money)
@@ -266,8 +266,7 @@ module ActiveMerchant #:nodoc:
         response = parse(action, ssl_post(self.live_url, request))
         Response.new(successful?(response), message_from(response), response,
           test: test?,
-          authorization: authorization || response[:tid]
-        )
+          authorization: authorization || response[:tid])
       end
 
       def message_from(response)

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

@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
         '43' => STANDARD_ERROR_CODE[:pickup_card]
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :orgid, :username, :password, :tid)
 
         super
@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def purchase(amount, creditcard, options={})
+      def purchase(amount, creditcard, options = {})
         post = setup_post('sale')
         add_creditcard(post, creditcard)
         add_amount(post, amount)
@@ -92,7 +92,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def refund(amount, trans_id, options={})
+      def refund(amount, trans_id, options = {})
         # Attempt a void in case the transaction is unsettled
         post = setup_post('void')
         add_reference(post, trans_id)
@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
 
       # No void, as PayHub's void does not work on authorizations
 
-      def verify(creditcard, options={})
+      def verify(creditcard, options = {})
         authorize(100, creditcard, options)
       end
 
@@ -172,7 +172,7 @@ module ActiveMerchant #:nodoc:
         success = false
 
         begin
-          raw_response = ssl_post(live_url, post.to_json, {'Content-Type' => 'application/json'})
+          raw_response = ssl_post(live_url, post.to_json, { 'Content-Type' => 'application/json' })
           response = parse(raw_response)
           success = (response['RESPONSE_CODE'] == '00')
         rescue ResponseError => e
@@ -186,11 +186,10 @@ module ActiveMerchant #:nodoc:
           response_message(response),
           response,
           test: test?,
-          avs_result: {code: response['AVS_RESULT_CODE']},
+          avs_result: { code: response['AVS_RESULT_CODE'] },
           cvv_result: response['VERIFICATION_RESULT_CODE'],
           error_code: (success ? nil : STANDARD_ERROR_CODE_MAPPING[response['RESPONSE_CODE']]),
-          authorization: response['TRANSACTION_ID']
-        )
+          authorization: response['TRANSACTION_ID'])
       end
 
       def response_error(raw_response)

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

@@ -339,8 +339,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(successful?(response), message_from(response), response,
           test: test?,
-          authorization: response[:transaction_id] || parameters[:transaction_id]
-        )
+          authorization: response[:transaction_id] || parameters[:transaction_id])
       end
 
       def successful?(response)
@@ -367,7 +366,7 @@ module ActiveMerchant #:nodoc:
         params[:version] = API_VERSION
         params[:transaction_type] = action
 
-        params.reject { |k, v| v.blank? }.collect { |k, v| "dc_#{k}=#{CGI.escape(v.to_s)}" }.join('&')
+        params.reject { |_k, v| v.blank? }.collect { |k, v| "dc_#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def parse(body)

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

@@ -12,12 +12,12 @@ module ActiveMerchant #:nodoc:
       self.money_format = :dollars
       self.supported_cardtypes = %i[visa master american_express discover]
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :api_login, :api_password, :api_key)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_payment_method(post, payment_method)
@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
         commit('purchase', post)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         post = {}
         post[:status] = 'HOLD'
         add_invoice(post, amount, options)
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
         commit('authorize', post)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         post = {}
         post[:status] = 'CAPTURE'
         post[:transactionId] = authorization
@@ -45,7 +45,7 @@ module ActiveMerchant #:nodoc:
         commit('capture', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         post[:status] = 'VOID'
         post[:transactionId] = authorization
@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
         commit('void', post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = {}
         post[:action] = 'REFUND'
         post[:transactionId] = authorization
@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
         commit('refund', post)
       end
 
-      def credit(amount, payment_method, options={})
+      def credit(amount, payment_method, options = {})
         post = {}
         post[:action] = 'REFUND'
         add_invoice(post, amount, options)
@@ -71,7 +71,7 @@ module ActiveMerchant #:nodoc:
         commit('credit', post)
       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) }
@@ -166,7 +166,7 @@ module ActiveMerchant #:nodoc:
         params.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
-      def url(params={})
+      def url(params = {})
         test? ? "#{test_url}/#{params[:transactionId]}" : "#{live_url}/#{params[:transactionId]}"
       end
 

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

@@ -70,8 +70,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(successful?(response), message_from(response), response,
           test: test_response?(response),
-          authorization: authorization_from(response)
-        )
+          authorization: authorization_from(response))
       end
 
       def successful?(response)
@@ -104,7 +103,7 @@ module ActiveMerchant #:nodoc:
         parameters[:merchant_id]      = @options[:login]
         parameters[:password]         = @options[:password]
 
-        parameters.reject { |k, v| v.blank? }.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')
+        parameters.reject { |_k, v| v.blank? }.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -64,10 +64,31 @@ module ActiveMerchant #:nodoc:
         super
       end
 
+      def add_3dsecure(post, options)
+        # ECI=02 => MasterCard success
+        # ECI=05 => Visa, Amex or JCB success
+        if options[:eci] == '02' || options[:eci] == '05'
+          post[:"3DSTATUS"] = 'Y'
+          post[:"3DENROLLED"] = 'Y'
+          post[:"3DSIGNVAL"] = 'Y'
+          post[:"3DERROR"] = '0'
+        else
+          post[:"3DSTATUS"] = 'N'
+          post[:"3DENROLLED"] = 'N'
+          post[:"3DSIGNVAL"] = 'N'
+          post[:"3DERROR"] = '10000'
+        end
+        post[:"3DECI"] = options[:eci]
+        post[:"3DXID"] = options[:xid]
+        post[:"3DCAVV"] = options[:cavv]
+        post[:"3DCAVVALGO"] = options[:cavv_algorithm]
+      end
+
       def authorize(money, creditcard, options = {})
         post = {}
         add_invoice(post, options)
         add_creditcard(post, creditcard)
+        add_3dsecure(post, options[:three_d_secure]) if options[:three_d_secure]
         add_amount(post, money, options)
 
         commit('authorization', money, post)
@@ -77,6 +98,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, options)
         add_creditcard(post, creditcard)
+        add_3dsecure(post, options[:three_d_secure]) if options[:three_d_secure]
         add_amount(post, money, options)
 
         commit('purchase', money, post)
@@ -160,7 +182,7 @@ module ActiveMerchant #:nodoc:
           test: test?,
           authorization: response[:numappel].to_s + response[:numtrans].to_s,
           fraud_review: false,
-          sent_params: parameters.delete_if { |key, value| %w[porteur dateval cvv].include?(key.to_s) }
+          sent_params: parameters.delete_if { |key, _value| %w[porteur dateval cvv].include?(key.to_s) }
         )
       end
 

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

@@ -45,7 +45,7 @@ module ActiveMerchant
       end
 
       def authorize(amount, payment_method, options = {})
-        params = {transaction_type: 'authorize'}
+        params = { transaction_type: 'authorize' }
 
         add_invoice(params, options)
         add_reversal_id(params, options)
@@ -59,7 +59,7 @@ module ActiveMerchant
       end
 
       def capture(amount, authorization, options = {})
-        params = {transaction_type: 'capture'}
+        params = { transaction_type: 'capture' }
 
         add_authorization_info(params, authorization)
         add_amount(params, amount, options)
@@ -69,7 +69,7 @@ module ActiveMerchant
       end
 
       def refund(amount, authorization, options = {})
-        params = {transaction_type: 'refund'}
+        params = { transaction_type: 'refund' }
 
         add_authorization_info(params, authorization)
         add_amount(params, (amount || amount_from_authorization(authorization)), options)
@@ -78,7 +78,7 @@ module ActiveMerchant
       end
 
       def store(payment_method, options = {})
-        params = {transaction_type: 'store'}
+        params = { transaction_type: 'store' }
 
         add_creditcard_for_tokenization(params, payment_method, options)
 
@@ -86,7 +86,7 @@ module ActiveMerchant
       end
 
       def void(authorization, options = {})
-        params = {transaction_type: 'void'}
+        params = { transaction_type: 'void' }
 
         add_authorization_info(params, authorization, options)
         add_amount(params, amount_from_authorization(authorization), options)
@@ -94,7 +94,7 @@ module ActiveMerchant
         commit(params, options)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(0, credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -247,16 +247,34 @@ module ActiveMerchant
       end
 
       def add_stored_credentials(params, options)
-        if options[:sequence]
+        if options[:sequence] || options[:stored_credential]
           params[:stored_credentials] = {}
-          params[:stored_credentials][:cardbrand_original_transaction_id] = options[:cardbrand_original_transaction_id] if options[:cardbrand_original_transaction_id]
-          params[:stored_credentials][:sequence] = options[:sequence]
-          params[:stored_credentials][:initiator] = options[:initiator] if options[:initiator]
-          params[:stored_credentials][:is_scheduled] = options[:is_scheduled]
+          params[:stored_credentials][:cardbrand_original_transaction_id] = original_transaction_id(options) if original_transaction_id(options)
+          params[:stored_credentials][:initiator] = initiator(options) if initiator(options)
+          params[:stored_credentials][:sequence] = options[:sequence] || sequence(options[:stored_credential][:initial_transaction])
+          params[:stored_credentials][:is_scheduled] = options[:is_scheduled] || is_scheduled(options[:stored_credential][:reason_type])
           params[:stored_credentials][:auth_type_override] = options[:auth_type_override] if options[:auth_type_override]
         end
       end
 
+      def original_transaction_id(options)
+        return options[:cardbrand_original_transaction_id] if options[:cardbrand_original_transaction_id]
+        return options[:stored_credential][:network_transaction_id] if options.dig(:stored_credential, :network_transaction_id)
+      end
+
+      def initiator(options)
+        return options[:initiator] if options[:initiator]
+        return options[:stored_credential][:initiator].upcase if options.dig(:stored_credential, :initiator)
+      end
+
+      def sequence(initial_transaction)
+        initial_transaction ? 'FIRST' : 'SUBSEQUENT'
+      end
+
+      def is_scheduled(reason_type)
+        reason_type == 'recurring' ? 'true' : 'false'
+      end
+
       def commit(params, options)
         url = base_url(options) + endpoint(params)
 
@@ -278,7 +296,7 @@ module ActiveMerchant
           response,
           test: test?,
           authorization: authorization_from(params, response),
-          avs_result: {code: response['avs']},
+          avs_result: { code: response['avs'] },
           cvv_result: response['cvv2'],
           error_code: error_code(response, success_from(response))
         )
@@ -306,7 +324,7 @@ module ActiveMerchant
       def post_data(params)
         return nil unless params
 
-        params.reject { |k, v| v.blank? }.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
+        params.reject { |_k, v| v.blank? }.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def generate_hmac(nonce, current_timestamp, payload)
@@ -405,7 +423,7 @@ module ActiveMerchant
       end
 
       def json_error(raw_response)
-        {'error' => "Unable to parse response: #{raw_response.inspect}"}
+        { 'error' => "Unable to parse response: #{raw_response.inspect}" }
       end
     end
   end