activemerchant 1.126.0 → 1.129.0

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

@@ -33,7 +33,14 @@ module ActiveMerchant #:nodoc:
         store: 'customer/create',
         redact: 'customer/delete',
         level_3_visa: 'level_three/visa',
-        level_3_mastercard: 'level_three/mastercard'
+        level_3_mastercard: 'level_three/mastercard',
+        ach_sale: 'checks/sale/by_account',
+        ach_customer_sale: 'checks/sale/by_customer',
+        ach_authorize: 'checks/hold/by_account',
+        ach_customer_authorize: 'checks/hold/by_customer',
+        ach_refund: 'checks/refund/by_transaction',
+        ach_capture: 'checks/manage/fund',
+        ach_void: 'checks/manage/void'
       }
 
       def initialize(options = {})
@@ -52,7 +59,15 @@ module ActiveMerchant #:nodoc:
           end
         else
           post = build_purchase_request(money, payment_or_customer_id, options)
-          post[:customer_id] ? endpoint = ENDPOINTS[:customer_id_sale] : endpoint = ENDPOINTS[:keyed_sale]
+          endpoint = if payment_or_customer_id.kind_of?(Check)
+                       ENDPOINTS[:ach_sale]
+                     elsif options[:check_transaction]
+                       ENDPOINTS[:ach_customer_sale]
+                     elsif post[:customer_id]
+                       ENDPOINTS[:customer_id_sale]
+                     else
+                       ENDPOINTS[:keyed_sale]
+                     end
           response = commit(endpoint, post)
           check_token_response(response, endpoint, post, options)
         end
@@ -63,12 +78,16 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         if customer_id?(payment_or_customer_id)
           post[:customer_id] = payment_or_customer_id
-          endpoint = ENDPOINTS[:customer_id_auth]
+          endpoint = if options[:check_transaction]
+                       ENDPOINTS[:ach_customer_authorize]
+                     else
+                       ENDPOINTS[:customer_id_auth]
+                     end
         else
           add_payment(post, payment_or_customer_id)
           add_address(post, payment_or_customer_id, options)
           add_customer_data(post, options)
-          endpoint = ENDPOINTS[:keyed_auth]
+          endpoint = payment_or_customer_id.kind_of?(Check) ? ENDPOINTS[:ach_authorize] : ENDPOINTS[:keyed_auth]
         end
         response = commit(endpoint, post)
         check_token_response(response, endpoint, post, options)
@@ -82,8 +101,13 @@ module ActiveMerchant #:nodoc:
           end
         else
           post = build_capture_request(money, authorization, options)
-          response = commit(ENDPOINTS[:capture], post)
-          check_token_response(response, ENDPOINTS[:capture], post, options)
+          endpoint = if options[:check_transaction]
+                       ENDPOINTS[:ach_capture]
+                     else
+                       ENDPOINTS[:capture]
+                     end
+          response = commit(endpoint, post)
+          check_token_response(response, endpoint, post, options)
         end
       end
 
@@ -91,17 +115,29 @@ module ActiveMerchant #:nodoc:
         # currently only support full and partial refunds of settled transactions via a transaction ID
         post = {}
         add_amount(post, money, options)
-        post[:transaction_id] = authorization
-        response = commit(ENDPOINTS[:transaction_refund], post)
-        check_token_response(response, ENDPOINTS[:transaction_refund], post, options)
+        if options[:check_transaction]
+          post[:check_transaction_id] = authorization
+          endpoint = ENDPOINTS[:ach_refund]
+        else
+          post[:transaction_id] = authorization
+          endpoint = ENDPOINTS[:transaction_refund]
+        end
+        response = commit(endpoint, post)
+        check_token_response(response, endpoint, post, options)
       end
 
       def void(authorization, options = {})
         post = {}
-        post[:transaction_id] = authorization
+        if options[:check_transaction]
+          post[:check_transaction_id] = authorization
+          endpoint = ENDPOINTS[:ach_void]
+        else
+          post[:transaction_id] = authorization
+          endpoint = ENDPOINTS[:transaction_void]
+        end
 
-        response = commit(ENDPOINTS[:transaction_void], post)
-        check_token_response(response, ENDPOINTS[:transaction_void], post, options)
+        response = commit(endpoint, post)
+        check_token_response(response, endpoint, post, options)
       end
 
       def verify(credit_card, options = {})
@@ -175,7 +211,11 @@ module ActiveMerchant #:nodoc:
 
       def build_capture_request(money, authorization, options)
         post = {}
-        post[:transaction_id] = authorization
+        if options[:check_transaction]
+          post[:check_transaction_id] = authorization
+        else
+          post[:transaction_id] = authorization
+        end
         add_amount(post, money, options)
 
         post
@@ -234,10 +274,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment(post, payment)
-        post[:credit_card] = {}
-        post[:credit_card][:number] = payment.number
-        post[:credit_card][:expiration_month] = payment.month
-        post[:credit_card][:expiration_year] = payment.year
+        if payment.kind_of?(Check)
+          post[:check] = {}
+          post[:check][:account_number] = payment.account_number
+          post[:check][:routing_number] = payment.routing_number
+        else
+          post[:credit_card] = {}
+          post[:credit_card][:number] = payment.number
+          post[:credit_card][:expiration_month] = payment.month
+          post[:credit_card][:expiration_year] = payment.year
+        end
       end
 
       def add_level_3_data(post, options)
@@ -380,7 +426,7 @@ module ActiveMerchant #:nodoc:
         if action == ENDPOINTS[:store]
           response['customer_id']
         else
-          response['transaction_id']
+          response['transaction_id'] || response['check_transaction_id']
         end
       end
 

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

@@ -41,6 +41,7 @@ module ActiveMerchant
         add_soft_descriptors(params, options)
         add_level2_data(params, options)
         add_stored_credentials(params, options)
+        add_external_three_ds(params, payment_method, options)
 
         commit(params, options)
       end
@@ -56,6 +57,7 @@ module ActiveMerchant
         add_soft_descriptors(params, options)
         add_level2_data(params, options)
         add_stored_credentials(params, options)
+        add_external_three_ds(params, payment_method, options)
 
         commit(params, options)
       end
@@ -125,6 +127,7 @@ module ActiveMerchant
           gsub(%r((Apikey: )(\w|-)+), '\1[FILTERED]').
           gsub(%r((\\?"card_number\\?":\\?")\d+), '\1[FILTERED]').
           gsub(%r((\\?"cvv\\?":\\?")\d+), '\1[FILTERED]').
+          gsub(%r((\\?"cvv\\?":\\?)\d+), '\1[FILTERED]').
           gsub(%r((\\?"account_number\\?":\\?")\d+), '\1[FILTERED]').
           gsub(%r((\\?"routing_number\\?":\\?")\d+), '\1[FILTERED]').
           gsub(%r((\\?card_number=)\d+(&?)), '\1[FILTERED]').
@@ -132,11 +135,33 @@ module ActiveMerchant
           gsub(%r((\\?apikey=)\w+(&?)), '\1[FILTERED]').
           gsub(%r{(\\?"credit_card\.card_number\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]').
           gsub(%r{(\\?"credit_card\.cvv\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]').
-          gsub(%r{(\\?"apikey\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]')
+          gsub(%r{(\\?"apikey\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]').
+          gsub(%r{(\\?"cavv\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]').
+          gsub(%r{(\\?"xid\\?":)(\\?"[^"]+\\?")}, '\1[FILTERED]')
       end
 
       private
 
+      def add_external_three_ds(params, payment_method, options)
+        return unless three_ds = options[:three_d_secure]
+
+        params[:'3DS'] = {
+          program_protocol: three_ds[:version][0],
+          directory_server_transaction_id: three_ds[:ds_transaction_id],
+          cardholder_name: payment_method.name,
+          card_number: payment_method.number,
+          exp_date: format_exp_date(payment_method.month, payment_method.year),
+          cvv: payment_method.verification_value,
+          xid: three_ds[:acs_transaction_id],
+          cavv: three_ds[:cavv],
+          wallet_provider_id: 'NO_WALLET',
+          type: 'D'
+        }.compact
+
+        params[:eci_indicator] = options[:three_d_secure][:eci]
+        params[:method] = '3DS'
+      end
+
       def add_invoice(params, options)
         params[:merchant_ref] = options[:order_id]
       end
@@ -152,6 +177,8 @@ module ActiveMerchant
       def add_authorization_info(params, authorization, options = {})
         transaction_id, transaction_tag, method, = authorization.split('|')
         params[:method] = method == 'token' ? 'credit_card' : method
+        # If the previous transaction `method` value was 3DS, it needs to be set to `credit_card` on follow up transactions
+        params[:method] = 'credit_card' if method == '3DS'
 
         if options[:reversal_id]
           params[:reversal_id] = options[:reversal_id]
@@ -178,6 +205,8 @@ module ActiveMerchant
           add_echeck(params, payment_method, options)
         elsif payment_method.is_a? String
           add_token(params, payment_method, options)
+        elsif payment_method.is_a? NetworkTokenizationCreditCard
+          add_network_tokenization(params, payment_method, options)
         else
           add_creditcard(params, payment_method)
         end
@@ -190,7 +219,7 @@ module ActiveMerchant
         tele_check[:check_type] = 'P'
         tele_check[:routing_number] = echeck.routing_number
         tele_check[:account_number] = echeck.account_number
-        tele_check[:accountholder_name] = "#{echeck.first_name} #{echeck.last_name}"
+        tele_check[:accountholder_name] = name_from_payment_method(echeck)
         tele_check[:customer_id_type] = options[:customer_id_type] if options[:customer_id_type]
         tele_check[:customer_id_number] = options[:customer_id_number] if options[:customer_id_number]
         tele_check[:client_email] = options[:client_email] if options[:client_email]
@@ -233,10 +262,37 @@ module ActiveMerchant
         card
       end
 
+      def add_network_tokenization(params, payment_method, options)
+        nt_card = {}
+        nt_card[:type] = 'D'
+        nt_card[:cardholder_name] = name_from_payment_method(payment_method) || name_from_address(options)
+        nt_card[:card_number] = payment_method.number
+        nt_card[:exp_date] = format_exp_date(payment_method.month, payment_method.year)
+        nt_card[:cvv] = payment_method.verification_value
+        nt_card[:xid] = payment_method.payment_cryptogram unless payment_method.payment_cryptogram.empty? || payment_method.brand.include?('american_express')
+        nt_card[:cavv] = payment_method.payment_cryptogram unless payment_method.payment_cryptogram.empty?
+        nt_card[:wallet_provider_id] = 'APPLE_PAY'
+
+        params['3DS'] = nt_card
+        params[:method] = '3DS'
+        params[:eci_indicator] = payment_method.eci.nil? ? '5' : payment_method.eci
+      end
+
       def format_exp_date(month, year)
         "#{format(month, :two_digits)}#{format(year, :two_digits)}"
       end
 
+      def name_from_address(options)
+        return unless address = options[:billing_address]
+        return address[:name] if address[:name]
+      end
+
+      def name_from_payment_method(payment_method)
+        return unless payment_method.first_name && payment_method.last_name
+
+        return "#{payment_method.first_name} #{payment_method.last_name}"
+      end
+
       def add_address(params, options)
         address = options[:billing_address]
         return unless address
@@ -279,8 +335,7 @@ module ActiveMerchant
       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)
+        return options[:cardbrand_original_transaction_id] || options.dig(:stored_credential, :network_transaction_id)
       end
 
       def initiator(options)

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

@@ -137,6 +137,10 @@ module ActiveMerchant #:nodoc:
         commit_card('delete', post)
       end
 
+      def inquire(authorization, options = {})
+        commit_transaction('inquire', authorization)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -232,12 +236,20 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit_raw(object, action, parameters)
-        url = "#{(test? ? test_url : live_url)}#{object}/#{action}"
-
-        begin
-          raw_response = ssl_post(url, post_data(parameters), headers)
-        rescue ResponseError => e
-          raw_response = e.response.body
+        if action == 'inquire'
+          url = "#{(test? ? test_url : live_url)}#{object}/#{parameters}"
+          begin
+            raw_response = ssl_get(url, headers)
+          rescue ResponseError => e
+            raw_response = e.response.body
+          end
+        else
+          url = "#{(test? ? test_url : live_url)}#{object}/#{action}"
+          begin
+            raw_response = ssl_post(url, post_data(parameters), headers)
+          rescue ResponseError => e
+            raw_response = e.response.body
+          end
         end
 
         begin

data/lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb

@@ -13,6 +13,10 @@ module ActiveMerchant #:nodoc:
         (@params['PaymentDetails']||{})
       end
 
+      def checkout_status
+        (@params['CheckoutStatus']||{})
+      end
+
       def name
         payer = (info['PayerName']||{})
         [payer['FirstName'], payer['MiddleName'], payer['LastName']].compact.join(' ')

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

@@ -17,14 +17,8 @@ module ActiveMerchant #:nodoc:
 
       def purchase(money, payment, options = {})
         post = {}
-        add_invoice(post, money, options)
-        add_payment(post, payment)
-        add_billing_address(post, options)
-        add_merchant_details(post, options)
+        add_auth_purchase_params(post, money, payment, options)
         add_airline_travel_details(post, options)
-        add_customer_data(post, payment, options) unless payment.is_a?(String)
-        add_three_d_secure(post, payment, options) if options[:three_d_secure]
-        add_stored_credential(post, options) if options[:stored_credential]
         add_split_pay_details(post, options)
         post[:settleWithAuth] = true
 
@@ -33,13 +27,7 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, payment, options = {})
         post = {}
-        add_invoice(post, money, options)
-        add_payment(post, payment)
-        add_billing_address(post, options)
-        add_merchant_details(post, options)
-        add_customer_data(post, payment, options) unless payment.is_a?(String)
-        add_three_d_secure(post, payment, options) if options[:three_d_secure]
-        add_stored_credential(post, options) if options[:stored_credential]
+        add_auth_purchase_params(post, money, payment, options)
 
         commit(:post, 'auths', post, options)
       end
@@ -111,6 +99,17 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def add_auth_purchase_params(post, money, payment, options)
+        add_invoice(post, money, options)
+        add_payment(post, payment)
+        add_billing_address(post, options)
+        add_merchant_details(post, options)
+        add_customer_data(post, payment, options) unless payment.is_a?(String)
+        add_three_d_secure(post, payment, options) if options[:three_d_secure]
+        add_stored_credential(post, options) if options[:stored_credential]
+        add_funding_transaction(post, options)
+      end
+
       # Customer data can be included in transactions where the payment method is a credit card
       # but should not be sent when the payment method is a token
       def add_customer_data(post, creditcard, options)
@@ -286,6 +285,15 @@ module ActiveMerchant #:nodoc:
         post[:splitpay] = split_pay
       end
 
+      def add_funding_transaction(post, options)
+        return unless options[:funding_transaction]
+
+        post[:fundingTransaction] = {}
+        post[:fundingTransaction][:type] = options[:funding_transaction]
+        post[:profile] ||= {}
+        post[:profile][:merchantCustomerId] = options[:customer_id] || SecureRandom.hex(12)
+      end
+
       def add_stored_credential(post, options)
         return unless options[:stored_credential]
 

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

@@ -313,6 +313,9 @@ module ActiveMerchant #:nodoc:
       def add_extra_parameters(post, options)
         extra_parameters = {}
         extra_parameters[:INSTALLMENTS_NUMBER] = options[:installments_number] || 1
+        extra_parameters[:EXTRA1] = options[:extra_1] if options[:extra_1]
+        extra_parameters[:EXTRA2] = options[:extra_2] if options[:extra_2]
+        extra_parameters[:EXTRA3] = options[:extra_3] if options[:extra_3]
         post[:transaction][:extraParameters] = extra_parameters
       end