activemerchant 1.126.0 → 1.130.0

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

@@ -6,18 +6,12 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(BR MX CO CL AR PE)
       self.default_currency = 'USD'
-      self.supported_cardtypes = %i[visa master american_express discover diners_club]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club elo hipercard]
 
       self.homepage_url = 'http://www.ebanx.com/'
       self.display_name = 'EBANX'
 
-      CARD_BRAND = {
-        visa: 'visa',
-        master: 'master_card',
-        american_express: 'amex',
-        discover: 'discover',
-        diners_club: 'diners'
-      }
+      TAGS = ['Spreedly']
 
       URL_MAP = {
         purchase: 'direct',
@@ -25,7 +19,8 @@ module ActiveMerchant #:nodoc:
         capture: 'capture',
         refund: 'refund',
         void: 'cancel',
-        store: 'token'
+        store: 'token',
+        inquire: 'query'
       }
 
       HTTP_METHOD = {
@@ -34,13 +29,14 @@ module ActiveMerchant #:nodoc:
         capture: :get,
         refund: :post,
         void: :get,
-        store: :post
+        store: :post,
+        inquire: :get
       }
 
       VERIFY_AMOUNT_PER_COUNTRY = {
         'br' => 100,
         'ar' => 100,
-        'co' => 100,
+        'co' => 50000,
         'pe' => 300,
         'mx' => 2000,
         'cl' => 80000
@@ -57,7 +53,7 @@ module ActiveMerchant #:nodoc:
         add_operation(post)
         add_invoice(post, money, options)
         add_customer_data(post, payment, options)
-        add_card_or_token(post, payment)
+        add_card_or_token(post, payment, options)
         add_address(post, options)
         add_customer_responsible_person(post, payment, options)
         add_additional_data(post, options)
@@ -71,7 +67,7 @@ module ActiveMerchant #:nodoc:
         add_operation(post)
         add_invoice(post, money, options)
         add_customer_data(post, payment, options)
-        add_card_or_token(post, payment)
+        add_card_or_token(post, payment, options)
         add_address(post, options)
         add_customer_responsible_person(post, payment, options)
         add_additional_data(post, options)
@@ -124,6 +120,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def inquire(authorization, options = {})
+        post = {}
+        add_integration_key(post)
+        add_authorization(post, authorization)
+
+        commit(:inquire, post)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -151,7 +155,7 @@ module ActiveMerchant #:nodoc:
 
       def add_customer_data(post, payment, options)
         post[:payment][:name] = customer_name(payment, options)
-        post[:payment][:email] = options[:email] || 'unspecified@example.com'
+        post[:payment][:email] = options[:email]
         post[:payment][:document] = options[:document]
         post[:payment][:birth_date] = options[:birth_date] if options[:birth_date]
       end
@@ -186,14 +190,15 @@ module ActiveMerchant #:nodoc:
         post[:payment][:order_number] = options[:order_id][0..39] if options[:order_id]
       end
 
-      def add_card_or_token(post, payment)
-        payment, brand = payment.split('|') if payment.is_a?(String)
-        post[:payment][:payment_type_code] = payment.is_a?(String) ? brand : CARD_BRAND[payment.brand.to_sym]
+      def add_card_or_token(post, payment, options)
+        payment = payment.split('|')[0] if payment.is_a?(String)
+        post[:payment][:payment_type_code] = 'creditcard'
         post[:payment][:creditcard] = payment_details(payment)
+        post[:payment][:creditcard][:soft_descriptor] = options[:soft_descriptor] if options[:soft_descriptor]
       end
 
       def add_payment_details(post, payment)
-        post[:payment_type_code] = CARD_BRAND[payment.brand.to_sym]
+        post[:payment_type_code] = 'creditcard'
         post[:creditcard] = payment_details(payment)
       end
 
@@ -216,6 +221,7 @@ module ActiveMerchant #:nodoc:
         post[:metadata] = {} if post[:metadata].nil?
         post[:metadata][:merchant_payment_code] = options[:order_id] if options[:order_id]
         post[:processing_type] = options[:processing_type] if options[:processing_type]
+        post[:payment][:tags] = TAGS
       end
 
       def parse(body)
@@ -253,13 +259,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(action, response)
+        payment_status = response.try(:[], 'payment').try(:[], 'status')
+
         if %i[purchase capture refund].include?(action)
-          response.try(:[], 'payment').try(:[], 'status') == 'CO'
+          payment_status == 'CO'
         elsif action == :authorize
-          response.try(:[], 'payment').try(:[], 'status') == 'PE'
+          payment_status == 'PE'
         elsif action == :void
-          response.try(:[], 'payment').try(:[], 'status') == 'CA'
-        elsif action == :store
+          payment_status == 'CA'
+        elsif %i[store inquire].include?(action)
           response.try(:[], 'status') == 'SUCCESS'
         else
           false
@@ -274,7 +282,11 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(action, parameters, response)
         if action == :store
-          "#{response.try(:[], 'token')}|#{CARD_BRAND[parameters[:payment_type_code].to_sym]}"
+          if success_from(action, response)
+            "#{response.try(:[], 'token')}|#{response['payment_type_code']}"
+          else
+            response.try(:[], 'token')
+          end
         else
           response.try(:[], 'payment').try(:[], 'hash')
         end
@@ -294,7 +306,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def requires_http_get(action)
-        return true if %i[capture void].include?(action)
+        return true if %i[capture void inquire].include?(action)
 
         false
       end

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

@@ -17,6 +17,11 @@ module ActiveMerchant #:nodoc:
       SERVICE_TEST_URL = 'https://certservices.elementexpress.com/express.asmx'
       SERVICE_LIVE_URL = 'https://services.elementexpress.com/express.asmx'
 
+      NETWORK_TOKEN_TYPE = {
+        apple_pay: '2',
+        google_pay: '1'
+      }
+
       def initialize(options = {})
         requires!(options, :account_id, :account_token, :application_id, :acceptor_id, :application_name, :application_version)
         super
@@ -171,6 +176,8 @@ module ActiveMerchant #:nodoc:
           add_payment_account_id(xml, payment)
         elsif payment.is_a?(Check)
           add_echeck(xml, payment)
+        elsif payment.is_a?(NetworkTokenizationCreditCard)
+          add_network_tokenization_card(xml, payment)
         else
           add_credit_card(xml, payment)
         end
@@ -200,7 +207,7 @@ module ActiveMerchant #:nodoc:
           xml.TransactionID options[:trans_id] if options[:trans_id]
           xml.TransactionAmount amount(money.to_i) if money
           xml.MarketCode market_code(money, options) if options[:market_code] || money
-          xml.ReferenceNumber options[:order_id] || SecureRandom.hex(20)
+          xml.ReferenceNumber options[:order_id].present? ? options[:order_id][0, 50] : SecureRandom.hex(20)
           xml.TicketNumber options[:ticket_number] if options[:ticket_number]
           xml.MerchantSuppliedTransactionId options[:merchant_supplied_transaction_id] if options[:merchant_supplied_transaction_id]
           xml.PaymentType options[:payment_type] if options[:payment_type]
@@ -246,8 +253,21 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_network_tokenization_card(xml, payment)
+        xml.card do
+          xml.CardNumber payment.number
+          xml.ExpirationMonth format(payment.month, :two_digits)
+          xml.ExpirationYear format(payment.year, :two_digits)
+          xml.CardholderName "#{payment.first_name} #{payment.last_name}"
+          xml.Cryptogram payment.payment_cryptogram
+          xml.ElectronicCommerceIndicator payment.eci if payment.eci.present?
+          xml.WalletType NETWORK_TOKEN_TYPE.fetch(payment.source, '0')
+        end
+      end
+
       def add_address(xml, options)
         if address = options[:billing_address] || options[:address]
+          address[:email] ||= options[:email]
           xml.address do
             xml.BillingAddress1 address[:address1] if address[:address1]
             xml.BillingAddress2 address[:address2] if address[:address2]

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

@@ -2,6 +2,8 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class GlobalCollectGateway < Gateway
       class_attribute :preproduction_url
+      class_attribute :ogone_direct_test
+      class_attribute :ogone_direct_live
 
       self.display_name = 'GlobalCollect'
       self.homepage_url = 'http://www.globalcollect.com/'
@@ -9,6 +11,8 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://eu.sandbox.api-ingenico.com'
       self.preproduction_url = 'https://world.preprod.api-ingenico.com'
       self.live_url = 'https://world.api-ingenico.com'
+      self.ogone_direct_test = 'https://payment.preprod.direct.worldline-solutions.com'
+      self.ogone_direct_live = 'https://payment.direct.worldline-solutions.com'
 
       self.supported_countries = %w[AD AE AG AI AL AM AO AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ CA CC CD CF CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HN HR HT HU ID IE IL IM IN IS IT JM JO JP KE KG KH KI KM KN KR KW KY KZ LA LB LC LI LK LR LS LT LU LV MA MC MD ME MF MG MH MK MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PL PN PS PT PW QA RE RO RS RU RW SA SB SC SE SG SH SI SJ SK SL SM SN SR ST SV SZ TC TD TG TH TJ TL TM TN TO TR TT TV TW TZ UA UG US UY UZ VC VE VG VI VN WF WS ZA ZM ZW]
       self.default_currency = 'USD'
@@ -36,7 +40,7 @@ module ActiveMerchant #:nodoc:
         add_creator_info(post, options)
         add_fraud_fields(post, options)
         add_external_cardholder_authentication_data(post, options)
-        commit(:authorize, post, options: options)
+        commit(:post, :authorize, post, options: options)
       end
 
       def capture(money, authorization, options = {})
@@ -44,7 +48,7 @@ module ActiveMerchant #:nodoc:
         add_order(post, money, options, capture: true)
         add_customer_data(post, options)
         add_creator_info(post, options)
-        commit(:capture, post, authorization: authorization)
+        commit(:post, :capture, post, authorization: authorization)
       end
 
       def refund(money, authorization, options = {})
@@ -52,13 +56,13 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         add_refund_customer_data(post, options)
         add_creator_info(post, options)
-        commit(:refund, post, authorization: authorization)
+        commit(:post, :refund, post, authorization: authorization)
       end
 
       def void(authorization, options = {})
         post = nestable_hash
         add_creator_info(post, options)
-        commit(:void, post, authorization: authorization)
+        commit(:post, :void, post, authorization: authorization)
       end
 
       def verify(payment, options = {})
@@ -68,6 +72,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def inquire(authorization, options = {})
+        commit(:get, :inquire, nil, authorization: authorization)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -76,7 +84,10 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(%r((Authorization: )[^\\]*)i, '\1[FILTERED]').
           gsub(%r(("cardNumber\\+":\\+")\d+), '\1[FILTERED]').
-          gsub(%r(("cvv\\+":\\+")\d+), '\1[FILTERED]')
+          gsub(%r(("cvv\\+":\\+")\d+), '\1[FILTERED]').
+          gsub(%r(("dpan\\+":\\+")\d+), '\1[FILTERED]').
+          gsub(%r(("pan\\+":\\+")\d+), '\1[FILTERED]').
+          gsub(%r(("cryptogram\\+":\\+"|("cavv\\+" : \\+"))[^\\]*), '\1[FILTERED]')
       end
 
       private
@@ -89,7 +100,9 @@ module ActiveMerchant #:nodoc:
         'jcb' => '125',
         'diners_club' => '132',
         'cabal' => '135',
-        'naranja' => '136'
+        'naranja' => '136',
+        'apple_pay': '302',
+        'google_pay': '320'
       }
 
       def add_order(post, money, options, capture: false)
@@ -105,7 +118,7 @@ module ActiveMerchant #:nodoc:
         post['order']['references']['invoiceData'] = {
           'invoiceNumber' => options[:invoice]
         }
-        add_airline_data(post, options)
+        add_airline_data(post, options) unless ogone_direct?
         add_lodging_data(post, options)
         add_number_of_installments(post, options) if options[:number_of_installments]
       end
@@ -239,9 +252,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_amount(post, money, options = {})
+        currency_ogone = 'EUR' if ogone_direct?
         post['amountOfMoney'] = {
           'amount' => amount(money),
-          'currencyCode' => options[:currency] || currency(money)
+          'currencyCode' => options[:currency] || currency_ogone || currency(money)
         }
       end
 
@@ -250,20 +264,58 @@ module ActiveMerchant #:nodoc:
         month = format(payment.month, :two_digits)
         expirydate = "#{month}#{year}"
         pre_authorization = options[:pre_authorization] ? 'PRE_AUTHORIZATION' : 'FINAL_AUTHORIZATION'
-        post['cardPaymentMethodSpecificInput'] = {
-          'paymentProductId' => BRAND_MAP[payment.brand],
-          'skipAuthentication' => 'true', # refers to 3DSecure
+        product_id = options[:payment_product_id] || BRAND_MAP[payment.brand]
+        specifics_inputs = {
+          'paymentProductId' => product_id,
+          'skipAuthentication' => options[:skip_authentication] || 'true', # refers to 3DSecure
           'skipFraudService' => 'true',
           'authorizationMode' => pre_authorization
         }
-        post['cardPaymentMethodSpecificInput']['requiresApproval'] = options[:requires_approval] unless options[:requires_approval].nil?
+        specifics_inputs['requiresApproval'] = options[:requires_approval] unless options[:requires_approval].nil?
+        if payment.is_a?(NetworkTokenizationCreditCard)
+          add_mobile_credit_card(post, payment, options, specifics_inputs, expirydate)
+        elsif payment.is_a?(CreditCard)
+          options[:google_pay_pan_only] ? add_mobile_credit_card(post, payment, options, specifics_inputs, expirydate) : add_credit_card(post, payment, specifics_inputs, expirydate)
+        end
+      end
 
-        post['cardPaymentMethodSpecificInput']['card'] = {
-          'cvv' => payment.verification_value,
-          'cardNumber' => payment.number,
-          'expiryDate' => expirydate,
-          'cardholderName' => payment.name
-        }
+      def add_credit_card(post, payment, specifics_inputs, expirydate)
+        post['cardPaymentMethodSpecificInput'] = specifics_inputs.merge({
+          'card' => {
+            'cvv' => payment.verification_value,
+            'cardNumber' => payment.number,
+            'expiryDate' => expirydate,
+            'cardholderName' => payment.name
+          }
+        })
+      end
+
+      def add_mobile_credit_card(post, payment, options, specifics_inputs, expirydate)
+        specifics_inputs['paymentProductId'] = options[:google_pay_pan_only] ? BRAND_MAP[:google_pay] : BRAND_MAP[payment.source]
+        post['mobilePaymentMethodSpecificInput'] = specifics_inputs
+        add_decrypted_payment_data(post, payment, options, expirydate)
+      end
+
+      def add_decrypted_payment_data(post, payment, options, expirydate)
+        if payment.is_a?(NetworkTokenizationCreditCard) && payment.payment_cryptogram
+          data = {
+            'cardholderName' => payment.name,
+            'cryptogram' => payment.payment_cryptogram,
+            'eci' => payment.eci,
+            'expiryDate' => expirydate,
+            'dpan' => payment.number
+          }
+          data['paymentMethod'] = 'TOKENIZED_CARD' if payment.source == :google_pay
+        # else case when google payment is an ONLY_PAN, doesn't have cryptogram or eci.
+        elsif options[:google_pay_pan_only]
+          data = {
+            'cardholderName' => payment.name,
+            'expiryDate' => expirydate,
+            'pan' => payment.number,
+            'paymentMethod' => 'CARD'
+          }
+        end
+        post['mobilePaymentMethodSpecificInput']['decryptedPaymentData'] = data if data
       end
 
       def add_customer_data(post, options, payment = nil)
@@ -330,18 +382,24 @@ module ActiveMerchant #:nodoc:
       def add_external_cardholder_authentication_data(post, options)
         return unless threeds_2_options = options[:three_d_secure]
 
-        authentication_data = {}
-        authentication_data[:acsTransactionId] = threeds_2_options[:acs_transaction_id] if threeds_2_options[:acs_transaction_id]
-        authentication_data[:cavv] = threeds_2_options[:cavv] if threeds_2_options[:cavv]
-        authentication_data[:cavvAlgorithm] = threeds_2_options[:cavv_algorithm] if threeds_2_options[:cavv_algorithm]
-        authentication_data[:directoryServerTransactionId] = threeds_2_options[:ds_transaction_id] if threeds_2_options[:ds_transaction_id]
-        authentication_data[:eci] = threeds_2_options[:eci] if threeds_2_options[:eci]
-        authentication_data[:threeDSecureVersion] = threeds_2_options[:version] if threeds_2_options[:version]
-        authentication_data[:validationResult] = threeds_2_options[:authentication_response_status] if threeds_2_options[:authentication_response_status]
-        authentication_data[:xid] = threeds_2_options[:xid] if threeds_2_options[:xid]
+        authentication_data = {
+          priorThreeDSecureData: { acsTransactionId: threeds_2_options[:acs_transaction_id] }.compact,
+          cavv: threeds_2_options[:cavv],
+          cavvAlgorithm: threeds_2_options[:cavv_algorithm],
+          directoryServerTransactionId: threeds_2_options[:ds_transaction_id],
+          eci: threeds_2_options[:eci],
+          threeDSecureVersion: threeds_2_options[:version] || options[:three_ds_version],
+          validationResult: threeds_2_options[:authentication_response_status],
+          xid: threeds_2_options[:xid],
+          acsTransactionId: threeds_2_options[:acs_transaction_id],
+          flow: threeds_2_options[:flow]
+        }.compact
 
         post['cardPaymentMethodSpecificInput'] ||= {}
         post['cardPaymentMethodSpecificInput']['threeDSecure'] ||= {}
+        post['cardPaymentMethodSpecificInput']['threeDSecure']['merchantFraudRate'] = threeds_2_options[:merchant_fraud_rate]
+        post['cardPaymentMethodSpecificInput']['threeDSecure']['exemptionRequest'] = threeds_2_options[:exemption_request]
+        post['cardPaymentMethodSpecificInput']['threeDSecure']['secureCorporatePayment'] = threeds_2_options[:secure_corporate_payment]
         post['cardPaymentMethodSpecificInput']['threeDSecure']['externalCardholderAuthenticationData'] = authentication_data unless authentication_data.empty?
       end
 
@@ -355,31 +413,44 @@ module ActiveMerchant #:nodoc:
 
       def url(action, authorization)
         return preproduction_url + uri(action, authorization) if @options[:url_override].to_s == 'preproduction'
+        return ogone_direct_url(action, authorization) if ogone_direct?
 
         (test? ? test_url : live_url) + uri(action, authorization)
       end
 
+      def ogone_direct_url(action, authorization)
+        (test? ? ogone_direct_test : ogone_direct_live) + uri(action, authorization)
+      end
+
+      def ogone_direct?
+        @options[:url_override].to_s == 'ogone_direct'
+      end
+
       def uri(action, authorization)
-        uri = "/v1/#{@options[:merchant_id]}/"
+        version = ogone_direct? ? 'v2' : 'v1'
+        uri = "/#{version}/#{@options[:merchant_id]}/"
         case action
         when :authorize
           uri + 'payments'
         when :capture
-          uri + "payments/#{authorization}/approve"
+          capture_name = ogone_direct? ? 'capture' : 'approve'
+          uri + "payments/#{authorization}/#{capture_name}"
         when :refund
           uri + "payments/#{authorization}/refund"
         when :void
           uri + "payments/#{authorization}/cancel"
+        when :inquire
+          uri + "payments/#{authorization}"
         end
       end
 
       def idempotency_key_for_signature(options)
-        "x-gcs-idempotence-key:#{options[:idempotency_key]}" if options[:idempotency_key]
+        "x-gcs-idempotence-key:#{options[:idempotency_key]}" if options[:idempotency_key] && !ogone_direct?
       end
 
-      def commit(action, post, authorization: nil, options: {})
+      def commit(method, action, post, authorization: nil, options: {})
         begin
-          raw_response = ssl_post(url(action, authorization), post.to_json, headers(action, post, authorization, options))
+          raw_response = ssl_request(method, url(action, authorization), post&.to_json, headers(method, action, post, authorization, options))
           response = parse(raw_response)
         rescue ResponseError => e
           response = parse(e.response.body) if e.response.code.to_i >= 400
@@ -405,33 +476,33 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def headers(action, post, authorization = nil, options = {})
+      def headers(method, action, post, authorization = nil, options = {})
         headers = {
           'Content-Type' => content_type,
-          'Authorization' => auth_digest(action, post, authorization, options),
+          'Authorization' => auth_digest(method, action, post, authorization, options),
           'Date' => date
         }
 
-        headers['X-GCS-Idempotence-Key'] = options[:idempotency_key] if options[:idempotency_key]
+        headers['X-GCS-Idempotence-Key'] = options[:idempotency_key] if options[:idempotency_key] && !ogone_direct?
         headers
       end
 
-      def auth_digest(action, post, authorization = nil, options = {})
+      def auth_digest(method, action, post, authorization = nil, options = {})
         data = <<~REQUEST
-          POST
+          #{method.to_s.upcase}
           #{content_type}
           #{date}
           #{idempotency_key_for_signature(options)}
           #{uri(action, authorization)}
         REQUEST
         data = data.each_line.reject { |line| line.strip == '' }.join
-        digest = OpenSSL::Digest.new('sha256')
+        digest = OpenSSL::Digest.new('SHA256')
         key = @options[:secret_api_key]
-        "GCS v1HMAC:#{@options[:api_key_id]}:#{Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, data))}"
+        "GCS v1HMAC:#{@options[:api_key_id]}:#{Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, data)).strip}"
       end
 
       def date
-        @date ||= Time.now.strftime('%a, %d %b %Y %H:%M:%S %Z') # Must be same in digest and HTTP header
+        @date ||= Time.now.gmtime.strftime('%a, %d %b %Y %H:%M:%S GMT')
       end
 
       def content_type
@@ -441,6 +512,8 @@ module ActiveMerchant #:nodoc:
       def success_from(action, response)
         return false if response['errorId'] || response['error_message']
 
+        return %w(CAPTURED CAPTURE_REQUESTED).include?(response.dig('payment', 'status')) if response.dig('payment', 'paymentOutput', 'paymentMethod') == 'mobile'
+
         case action
         when :authorize
           response.dig('payment', 'statusOutput', 'isAuthorized')

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

@@ -27,32 +27,32 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment, options = {})
         xml = build_purchase_and_authorize_request(money, payment, options)
 
-        commit('sale', xml)
+        commit('sale', xml, options)
       end
 
       def authorize(money, payment, options = {})
         xml = build_purchase_and_authorize_request(money, payment, options)
 
-        commit('preAuth', xml)
+        commit('preAuth', xml, options)
       end
 
       def capture(money, authorization, options = {})
         xml = build_capture_and_refund_request(money, authorization, options)
 
-        commit('postAuth', xml)
+        commit('postAuth', xml, options)
       end
 
       def refund(money, authorization, options = {})
         xml = build_capture_and_refund_request(money, authorization, options)
 
-        commit('return', xml)
+        commit('return', xml, options)
       end
 
       def void(authorization, options = {})
         xml = Builder::XmlMarkup.new(indent: 2)
         add_transaction_details(xml, options.merge!({ order_id: authorization }))
 
-        commit('void', xml)
+        commit('void', xml, options)
       end
 
       def store(credit_card, options = {})
@@ -60,7 +60,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new(indent: 2)
         add_storage_item(xml, credit_card, options)
 
-        commit('vault', xml)
+        commit('vault', xml, options)
       end
 
       def unstore(hosted_data_id)
@@ -343,7 +343,12 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def commit(action, request)
+      def override_store_id(options)
+        @credentials[:store_id] = options[:store_id] if options[:store_id].present?
+      end
+
+      def commit(action, request, options = {})
+        override_store_id(options)
         url = (test? ? test_url : live_url)
         soap_request = build_soap_request(action, request)
         response = parse(ssl_post(url, soap_request, build_header))
@@ -391,7 +396,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        response[:TransactionResult]
+        [response[:TransactionResult], response[:ErrorMessage]&.split(':')&.last&.strip].compact.join(', ')
       end
 
       def authorization_from(action, response)

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

@@ -3,7 +3,10 @@ require 'nokogiri'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class IveriGateway < Gateway
+      class_attribute :iveri_url
+
       self.live_url = self.test_url = 'https://portal.nedsecure.co.za/iVeriWebService/Service.asmx'
+      self.iveri_url = 'https://portal.host.iveri.com/iVeriWebService/Service.asmx'
 
       self.supported_countries = %w[US ZA GB]
       self.default_currency = 'ZAR'
@@ -91,7 +94,7 @@ module ActiveMerchant #:nodoc:
           xml[:soap].Envelope 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/' do
             xml[:soap].Body do
               xml.Execute 'xmlns' => 'http://iveri.com/' do
-                xml.validateRequest 'true'
+                xml.validateRequest('false')
                 xml.protocol 'V_XML'
                 xml.protocolVersion '2.0'
                 xml.request vxml
@@ -118,8 +121,9 @@ module ActiveMerchant #:nodoc:
       def add_auth_purchase_params(post, money, payment_method, options)
         add_card_holder_authentication(post, options)
         add_amount(post, money, options)
-        add_electronic_commerce_indicator(post, options)
+        add_electronic_commerce_indicator(post, options) unless options[:three_d_secure]
         add_payment_method(post, payment_method, options)
+        add_three_ds(post, options)
       end
 
       def add_amount(post, money, options)
@@ -156,7 +160,7 @@ module ActiveMerchant #:nodoc:
       def commit(post)
         raw_response =
           begin
-            ssl_post(live_url, build_xml_envelope(post), headers(post))
+            ssl_post(url, build_xml_envelope(post), headers(post))
           rescue ActiveMerchant::ResponseError => e
             e.response.body
           end
@@ -178,6 +182,10 @@ module ActiveMerchant #:nodoc:
         test? ? 'Test' : 'Live'
       end
 
+      def url
+        @options[:url_override].to_s == 'iveri' ? iveri_url : live_url
+      end
+
       def headers(post)
         {
           'Content-Type' => 'text/xml; charset=utf-8',
@@ -249,6 +257,34 @@ module ActiveMerchant #:nodoc:
           tr('-', '_').
           downcase
       end
+
+      def add_three_ds(post, options)
+        return unless three_d_secure = options[:three_d_secure]
+
+        post.ElectronicCommerceIndicator(formatted_three_ds_eci(three_d_secure[:eci])) if three_d_secure[:eci]
+        post.CardHolderAuthenticationID(three_d_secure[:xid]) if three_d_secure[:xid]
+        post.CardHolderAuthenticationData(three_d_secure[:cavv]) if three_d_secure[:cavv]
+        post.ThreeDSecure_ProtocolVersion(three_d_secure[:version]) if three_d_secure[:version]
+        post.ThreeDSecure_DSTransID(three_d_secure[:ds_transaction_id]) if three_d_secure[:ds_transaction_id]
+        post.ThreeDSecure_VEResEnrolled(formatted_enrollment(three_d_secure[:enrolled])) if three_d_secure[:enrolled]
+      end
+
+      def formatted_enrollment(val)
+        case val
+        when 'Y', 'N', 'U' then val
+        when true, 'true' then 'Y'
+        when false, 'false' then 'N'
+        end
+      end
+
+      def formatted_three_ds_eci(val)
+        case val
+        when '05', '02' then 'ThreeDSecure'
+        when '06', '01' then 'ThreeDSecureAttempted'
+        when '07' then 'SecureChannel'
+        else val
+        end
+      end
     end
   end
 end