activemerchant 1.126.0 → 1.129.0

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

@@ -5,9 +5,10 @@ module ActiveMerchant #:nodoc:
     class LitleGateway < Gateway
       SCHEMA_VERSION = '9.14'
 
-      class_attribute :postlive_url
+      class_attribute :postlive_url, :prelive_url
 
       self.test_url = 'https://www.testvantivcnp.com/sandbox/communicator/online'
+      self.prelive_url = 'https://payments.vantivprelive.com/vap/communicator/online'
       self.postlive_url = 'https://payments.vantivpostlive.com/vap/communicator/online'
       self.live_url = 'https://payments.vantivcnp.com/vap/communicator/online'
 
@@ -15,7 +16,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'USD'
       self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
-      self.homepage_url = 'http://www.vantiv.com/'
+      self.homepage_url = 'https://www.fisglobal.com/'
       self.display_name = 'Vantiv eCommerce'
 
       def initialize(options = {})
@@ -320,6 +321,7 @@ module ActiveMerchant #:nodoc:
         add_merchant_data(doc, options)
         add_debt_repayment(doc, options)
         add_stored_credential_params(doc, options)
+        add_fraud_filter_override(doc, options)
       end
 
       def add_credit_params(doc, money, payment_method, options)
@@ -365,6 +367,10 @@ module ActiveMerchant #:nodoc:
         doc.debtRepayment(true) if options[:debt_repayment] == true
       end
 
+      def add_fraud_filter_override(doc, options)
+        doc.fraudFilterOverride(options[:fraud_filter_override]) if options[:fraud_filter_override]
+      end
+
       def add_payment_method(doc, payment_method, options)
         if payment_method.is_a?(String)
           doc.token do
@@ -532,8 +538,10 @@ module ActiveMerchant #:nodoc:
 
       def parse(kind, xml)
         parsed = {}
-
         doc = Nokogiri::XML(xml).remove_namespaces!
+
+        parsed['duplicate'] = doc.at_xpath('//saleResponse').try(:[], 'duplicate') == 'true' if kind == :sale
+
         doc.xpath("//litleOnlineResponse/#{kind}Response/*").each do |node|
           if node.elements.empty?
             parsed[node.name.to_sym] = node.text
@@ -564,15 +572,26 @@ module ActiveMerchant #:nodoc:
           cvv_result: parsed[:fraudResult_cardValidationResult]
         }
 
-        Response.new(success_from(kind, parsed), parsed[:message], parsed, options)
+        Response.new(success_from(kind, parsed), message_from(parsed), parsed, options)
       end
 
       def success_from(kind, parsed)
-        return (parsed[:response] == '000') unless kind == :registerToken
+        return %w(000 001 010).any?(parsed[:response]) unless kind == :registerToken
 
         %w(000 801 802).include?(parsed[:response])
       end
 
+      def message_from(parsed)
+        case parsed[:response]
+        when '010'
+          return "#{parsed[:message]}: The authorized amount is less than the requested amount."
+        when '001'
+          return "#{parsed[:message]}: This is sent to acknowledge that the submitted transaction has been received."
+        else
+          parsed[:message]
+        end
+      end
+
       def authorization_from(kind, parsed, money)
         kind == :registerToken ? parsed[:litleToken] : "#{parsed[:litleTxnId]};#{kind};#{money}"
       end
@@ -609,6 +628,7 @@ module ActiveMerchant #:nodoc:
 
       def url
         return postlive_url if @options[:url_override].to_s == 'postlive'
+        return prelive_url if @options[:url_override].to_s == 'prelive'
 
         test? ? test_url : live_url
       end

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

@@ -218,14 +218,7 @@ module ActiveMerchant
 
       def base_url
         if test?
-          case @options[:region]
-          when 'asia_pacific'
-            test_ap_url
-          when 'europe'
-            test_eu_url
-          when 'north_america', nil
-            test_na_url
-          end
+          test_url
         else
           case @options[:region]
           when 'asia_pacific'

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

@@ -61,6 +61,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def inquire(authorization, options = {})
+        commit('inquire', inquire_path(authorization, options), {})
+      end
+
       def supports_scrubbing?
         true
       end
@@ -261,6 +265,10 @@ module ActiveMerchant #:nodoc:
       def commit(action, path, parameters)
         if %w[capture void].include?(action)
           response = parse(ssl_request(:put, url(path), post_data(parameters), headers))
+        elsif action == 'inquire'
+          response = parse(ssl_get(url(path), headers))
+
+          response = response[0]['results'][0] if response.is_a?(Array)
         else
           response = parse(ssl_post(url(path), post_data(parameters), headers(parameters)))
         end
@@ -295,6 +303,15 @@ module ActiveMerchant #:nodoc:
         parameters.clone.tap { |p| p.delete(:device_id) }.to_json
       end
 
+      def inquire_path(authorization, options)
+        if authorization
+          authorization, = authorization.split('|')
+          "payments/#{authorization}"
+        else
+          "payments/search?external_reference=#{options[:order_id] || options[:external_reference]}"
+        end
+      end
+
       def error_code_from(action, response)
         unless success_from(action, response)
           if cause = response['cause']

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

@@ -18,6 +18,8 @@ module ActiveMerchant #:nodoc:
       # The name of the gateway
       self.display_name = 'Merchant e-Solutions'
 
+      SUCCESS_RESPONSE_CODES = %w(000 085)
+
       def initialize(options = {})
         requires!(options, :login, :password)
         super
@@ -25,23 +27,21 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, creditcard_or_card_id, options = {})
         post = {}
-        post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
-        post[:moto_ecommerce_ind] = options[:moto_ecommerce_ind] if options.has_key?(:moto_ecommerce_ind)
         add_invoice(post, options)
         add_payment_source(post, creditcard_or_card_id, options)
         add_address(post, options)
         add_3dsecure_params(post, options)
+        add_stored_credentials(post, options)
         commit('P', money, post)
       end
 
       def purchase(money, creditcard_or_card_id, options = {})
         post = {}
-        post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
-        post[:moto_ecommerce_ind] = options[:moto_ecommerce_ind] if options.has_key?(:moto_ecommerce_ind)
         add_invoice(post, options)
         add_payment_source(post, creditcard_or_card_id, options)
         add_address(post, options)
         add_3dsecure_params(post, options)
+        add_stored_credentials(post, options)
         commit('D', money, post)
       end
 
@@ -55,10 +55,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def store(creditcard, options = {})
-        post = {}
-        post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
-        add_creditcard(post, creditcard, options)
-        commit('T', nil, post)
+        MultiResponse.run do |r|
+          r.process { temporary_store(creditcard, options) }
+          r.process { verify(r.authorization, { store_card: 'y' }) }
+        end
       end
 
       def unstore(card_id, options = {})
@@ -94,6 +94,13 @@ module ActiveMerchant #:nodoc:
         commit('V', nil, options.merge(post))
       end
 
+      def verify(credit_card, options = {})
+        post = {}
+        post[:store_card] = options[:store_card] if options[:store_card]
+        add_payment_source(post, credit_card, options)
+        commit('A', 0, post)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -107,6 +114,13 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def temporary_store(creditcard, options = {})
+        post = {}
+        post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
+        add_creditcard(post, creditcard, options)
+        commit('T', nil, post)
+      end
+
       def add_address(post, options)
         if address = options[:billing_address] || options[:address]
           post[:cardholder_street_address] = address[:address1].to_s.gsub(/[^\w.]/, '+')
@@ -145,6 +159,16 @@ module ActiveMerchant #:nodoc:
         post[:ucaf_auth_data] = options[:ucaf_auth_data] unless empty?(options[:ucaf_auth_data])
       end
 
+      def add_stored_credentials(post, options)
+        post[:client_reference_number] = options[:client_reference_number] if options[:client_reference_number]
+        post[:moto_ecommerce_ind] = options[:moto_ecommerce_ind] if options[:moto_ecommerce_ind]
+        post[:recurring_pmt_num] = options[:recurring_pmt_num] if options[:recurring_pmt_num]
+        post[:recurring_pmt_count] = options[:recurring_pmt_count] if options[:recurring_pmt_count]
+        post[:card_on_file] = options[:card_on_file] if options[:card_on_file]
+        post[:cit_mit_indicator] = options[:cit_mit_indicator] if options[:cit_mit_indicator]
+        post[:account_data_source] = options[:account_data_source] if options[:account_data_source]
+      end
+
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
@@ -165,13 +189,23 @@ module ActiveMerchant #:nodoc:
             { 'error_code' => '404', 'auth_response_text' => e.to_s }
           end
 
-        Response.new(response['error_code'] == '000', message_from(response), response,
-          authorization: response['transaction_id'],
+        Response.new(success_from(response), message_from(response), response,
+          authorization: authorization_from(response),
           test: test?,
           cvv_result: response['cvv2_result'],
           avs_result: { code: response['avs_result'] })
       end
 
+      def authorization_from(response)
+        return response['card_id'] if response['card_id']
+
+        response['transaction_id']
+      end
+
+      def success_from(response)
+        SUCCESS_RESPONSE_CODES.include?(response['error_code'])
+      end
+
       def message_from(response)
         if response['error_code'] == '000'
           'This transaction has been approved'

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

@@ -201,6 +201,7 @@ module ActiveMerchant #:nodoc:
           request[:paymentMethod][:card][:expMonth] = format(payment_method.month, :two_digits)
           request[:paymentMethod][:card][:expYear] = format(payment_method.year, :two_digits)
           request[:paymentMethod][:card][:cvc] = payment_method.verification_value.to_s
+          request[:paymentMethod][:card][:cardholderName] = payment_method.name
         end
       end
 
@@ -293,6 +294,7 @@ module ActiveMerchant #:nodoc:
       def add_browser_info(request, options)
         request[:sessionDetails][:ip] = options[:ip] if options[:ip]
         request[:sessionDetails][:userAgent] = options[:user_agent] if options[:user_agent]
+        request[:sessionDetails][:lang] = options[:lang] if options[:lang]
       end
 
       # Private: Parse JSON response from Monei servers

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

@@ -9,6 +9,8 @@ module ActiveMerchant #:nodoc:
     # Response Values", available at Moneris' {eSelect Plus Documentation
     # Centre}[https://www3.moneris.com/connect/en/documents/index.html].
     class MonerisGateway < Gateway
+      WALLETS = %w(APP GPP)
+
       self.test_url = 'https://esqa.moneris.com/gateway2/servlet/MpgRequest'
       self.live_url = 'https://www3.moneris.com/gateway2/servlet/MpgRequest'
 
@@ -47,7 +49,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_payment_source(post, creditcard_or_datakey, options)
         post[:amount] = amount(money)
-        post[:order_id] = options[:order_id]
+        post[:order_id] = format_order_id(post[:wallet_indicator], options[:order_id])
         post[:address] = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         add_external_mpi_fields(post, options)
@@ -71,7 +73,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_payment_source(post, creditcard_or_datakey, options)
         post[:amount] = amount(money)
-        post[:order_id] = options[:order_id]
+        post[:order_id] = format_order_id(post[:wallet_indicator], options[:order_id])
         post[:address] = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         add_external_mpi_fields(post, options)
@@ -431,10 +433,23 @@ module ActiveMerchant #:nodoc:
       end
 
       def wallet_indicator(token_source)
-        return 'APP' if token_source == 'apple_pay'
-        return 'ANP' if token_source == 'android_pay'
+        return {
+          'apple_pay' => 'APP',
+          'google_pay' => 'GPP',
+          'android_pay' => 'ANP'
+        }[token_source]
+      end
+
+      def format_order_id(wallet_indicator_code, order_id = nil)
+        # Truncate (max 100 characters) order id for
+        # google pay and apple pay (specific wallets / token sources)
+        return truncate_order_id(order_id) if WALLETS.include?(wallet_indicator_code)
+
+        order_id
+      end
 
-        nil
+      def truncate_order_id(order_id = nil)
+        order_id.present? ? order_id[0, 100] : SecureRandom.alphanumeric(100)
       end
 
       def message_from(message)

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

@@ -60,11 +60,13 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:code] = authorization
         add_invoice(post, money, options)
+        add_auth_key(post, options)
         commit('capture', post, authorization)
       end
 
       def refund(money, authorization, options = {})
         add_invoice(post = {}, money, options)
+        add_auth_key(post, options)
         commit('refund', post, authorization)
       end
 
@@ -77,6 +79,7 @@ module ActiveMerchant #:nodoc:
         options.update(name: payment.name)
         options = add_customer(options) unless options[:customer_id]
         add_payment(post, payment, options)
+        add_auth_key(post, options)
         commit('store', post, options[:customer_id])
       end
 

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

@@ -136,7 +136,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = %w[BE DE FR NL AT CH]
       # also supports Airplus and UATP
       self.supported_cardtypes = %i[visa master american_express diners_club discover jcb maestro]
-      self.homepage_url = 'http://www.ogone.com/'
+      self.homepage_url = 'https://www.ingenico.com/login/ogone/'
       self.display_name = 'Ogone'
       self.default_currency = 'EUR'
       self.money_format = :cents
@@ -264,7 +264,6 @@ module ActiveMerchant #:nodoc:
 
       def add_payment_source(post, payment_source, options)
         add_d3d(post, options) if options[:d3d]
-
         if payment_source.is_a?(String)
           add_alias(post, payment_source, options[:alias_operation])
           add_eci(post, options[:eci] || '9')
@@ -285,8 +284,6 @@ module ActiveMerchant #:nodoc:
           THREE_D_SECURE_DISPLAY_WAYS[options[:win_3ds]] :
           THREE_D_SECURE_DISPLAY_WAYS[:main_window]
         add_pair post, 'WIN3DS', win_3ds
-
-        add_pair post, 'HTTP_ACCEPT',     options[:http_accept] || '*/*'
         add_pair post, 'HTTP_USER_AGENT', options[:http_user_agent] if options[:http_user_agent]
         add_pair post, 'ACCEPTURL',       options[:accept_url]      if options[:accept_url]
         add_pair post, 'DECLINEURL',      options[:decline_url]     if options[:decline_url]
@@ -296,6 +293,37 @@ module ActiveMerchant #:nodoc:
         add_pair post, 'PARAMPLUS',       options[:paramplus]       if options[:paramplus]
         add_pair post, 'COMPLUS',         options[:complus]         if options[:complus]
         add_pair post, 'LANGUAGE',        options[:language]        if options[:language]
+        if  options[:three_ds_2]
+          browser_info = options[:three_ds_2][:browser_info]
+          ecom_postal = options[:billing_address]
+          if browser_info
+            add_pair post, 'BROWSERACCEPTHEADER', browser_info[:accept_header]
+            add_pair post, 'BROWSERCOLORDEPTH', browser_info[:depth]
+
+            # for 3ds v2.1 to v2.2 add BROWSERJAVASCRIPTENABLED: This boolean indicates whether your customers have enabled JavaScript in their browsers when making a purchase.
+            # the following BROWSER<tag> parameters will remain mandatory unless browser_info[:javascript] = false
+            # her documentation https://epayments-support.ingenico.com/en/integration-solutions/integrations/directlink#directlink_integration_guides_secure_payment_with_3_d_secure
+            add_pair post, 'BROWSERJAVASCRIPTENABLED', browser_info[:javascript]
+            add_pair post, 'BROWSERJAVAENABLED', browser_info[:java]
+            add_pair post, 'BROWSERLANGUAGE', browser_info[:language]
+            add_pair post, 'BROWSERSCREENHEIGHT', browser_info[:height]
+            add_pair post, 'BROWSERSCREENWIDTH', browser_info[:width]
+            add_pair post, 'BROWSERTIMEZONE', browser_info[:timezone]
+            add_pair post, 'BROWSERUSERAGENT', browser_info[:user_agent]
+          end
+          # recommended
+          if ecom_postal
+            add_pair post, 'ECOM_BILLTO_POSTAL_CITY', ecom_postal[:city]
+            add_pair post, 'ECOM_BILLTO_POSTAL_COUNTRYCODE', ecom_postal[:country]
+            add_pair post, 'ECOM_BILLTO_POSTAL_STREET_LINE1', ecom_postal[:address1]
+            add_pair post, 'ECOM_BILLTO_POSTAL_STREET_LINE2', ecom_postal[:address2]
+            add_pair post, 'ECOM_BILLTO_POSTAL_POSTALCODE', ecom_postal[:zip]
+          end
+          # optional
+          add_pair post, 'Mpi.threeDSRequestorChallengeIndicator', options[:three_ds_reqchallengeind]
+        else
+          add_pair post, 'HTTP_ACCEPT', options[:http_accept] || '*/*'
+        end
       end
 
       def add_eci(post, eci)
@@ -414,7 +442,7 @@ module ActiveMerchant #:nodoc:
           return
         end
 
-        add_pair parameters, 'SHASign', calculate_signature(parameters, @options[:signature_encryptor], @options[:signature])
+        add_pair parameters, 'SHASIGN', calculate_signature(parameters, @options[:signature_encryptor], @options[:signature])
       end
 
       def calculate_signature(signed_parameters, algorithm, secret)
@@ -432,7 +460,7 @@ module ActiveMerchant #:nodoc:
             raise "Unknown signature algorithm #{algorithm}"
           end
 
-        filtered_params = signed_parameters.select { |_k, v| !v.blank? }
+        filtered_params = signed_parameters.compact
         sha_encryptor.hexdigest(
           filtered_params.sort_by { |k, _v| k.upcase }.map { |k, v| "#{k.upcase}=#{v}#{secret}" }.join('')
         ).upcase
@@ -456,7 +484,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_pair(post, key, value)
-        post[key] = value if !value.blank?
+        post[key] = value unless value.nil?
       end
 
       def convert_attributes_to_hash(rexml_attributes)

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

@@ -1,8 +1,15 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class OpenpayGateway < Gateway
-      self.live_url = 'https://api.openpay.mx/v1/'
-      self.test_url = 'https://sandbox-api.openpay.mx/v1/'
+      class_attribute :mx_live_url, :mx_test_url
+      class_attribute :co_live_url, :co_test_url
+
+      self.co_live_url = 'https://api.openpay.co/v1/'
+      self.co_test_url = 'https://sandbox-api.openpay.co/v1/'
+      self.mx_live_url = 'https://api.openpay.mx/v1/'
+      self.mx_test_url = 'https://sandbox-api.openpay.mx/v1/'
+      self.live_url = self.co_live_url
+      self.test_url = self.co_test_url
 
       self.supported_countries = %w(CO MX)
       self.supported_cardtypes = %i[visa master american_express carnet]
@@ -24,6 +31,16 @@ module ActiveMerchant #:nodoc:
         super
       end
 
+      def gateway_url(options = {})
+        country = options[:merchant_country] || @options[:merchant_country]
+
+        if country == 'MX'
+          test? ? mx_test_url : mx_live_url
+        else
+          test? ? co_test_url : co_live_url
+        end
+      end
+
       def purchase(money, creditcard, options = {})
         post = create_post_for_auth_or_purchase(money, creditcard, options)
         commit(:post, 'charges', post, options)
@@ -192,7 +209,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def http_request(method, resource, parameters = {}, options = {})
-        url = (test? ? self.test_url : self.live_url) + @merchant_id + '/' + resource
+        url = gateway_url(options) + @merchant_id + '/' + resource
         raw_response = nil
         begin
           raw_response = ssl_request(method, url, (parameters ? parameters.to_json : nil), headers(options))

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

@@ -30,7 +30,7 @@ module ActiveMerchant #:nodoc:
     class OrbitalGateway < Gateway
       include Empty
 
-      API_VERSION = '8.1'
+      API_VERSION = '9.0'
 
       POST_HEADERS = {
         'MIME-Version' => '1.1',
@@ -98,6 +98,7 @@ module ActiveMerchant #:nodoc:
         'NZD' => '554',
         'NOK' => '578',
         'SGD' => '702',
+        'ZAR' => '710',
         'SEK' => '752',
         'CHF' => '756',
         'GBP' => '826',
@@ -119,6 +120,7 @@ module ActiveMerchant #:nodoc:
         'NZD' => '2',
         'NOK' => '2',
         'SGD' => '2',
+        'ZAR' => '2',
         'SEK' => '2',
         'CHF' => '2',
         'GBP' => '2',
@@ -196,6 +198,7 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login, :password) unless options[:ip_authentication]
         super
         @options[:merchant_id] = @options[:merchant_id].to_s
+        @use_secondary_url = false
       end
 
       # A – Authorization request
@@ -235,11 +238,7 @@ module ActiveMerchant #:nodoc:
       def refund(money, authorization, options = {})
         payment_method = options[:payment_method]
         order = build_new_order_xml(REFUND, money, payment_method, options.merge(authorization: authorization)) do |xml|
-          if payment_method.is_a?(Check)
-            add_echeck(xml, payment_method, options)
-          else
-            add_refund_payment_source(xml, options[:currency])
-          end
+          add_payment_source(xml, payment_method, options)
           xml.tag! :CustomerRefNum, options[:customer_ref_num] if @options[:customer_profiles] && options[:profile_txn]
         end
 
@@ -398,6 +397,12 @@ module ActiveMerchant #:nodoc:
         add_soft_descriptors_from_hash(xml, descriptors) if descriptors.is_a?(Hash)
       end
 
+      def add_payment_action_ind(xml, payment_action_ind)
+        return unless payment_action_ind
+
+        xml.tag! :PaymentActionInd, payment_action_ind
+      end
+
       def add_soft_descriptors_from_specialized_class(xml, soft_desc)
         xml.tag! :SDMerchantName, soft_desc.merchant_name             if soft_desc.merchant_name
         xml.tag! :SDProductDescription, soft_desc.product_description if soft_desc.product_description
@@ -564,7 +569,7 @@ module ActiveMerchant #:nodoc:
         add_currency_fields(xml, options[:currency])
         xml.tag! :BCRtNum, check.routing_number
         xml.tag! :CheckDDA, check.account_number if check.account_number
-        xml.tag! :BankAccountType, ACCOUNT_TYPE[check.account_type] if ACCOUNT_TYPE[check.account_type]
+        add_bank_account_type(xml, check)
         xml.tag! :ECPAuthMethod, options[:auth_method] if options[:auth_method]
         xml.tag! :BankPmtDelv, options[:payment_delivery] || 'B'
         xml.tag! :AVSname, (check&.name ? check.name[0..29] : nil) if get_address(options).blank?
@@ -577,12 +582,6 @@ module ActiveMerchant #:nodoc:
         add_verification_value(xml, credit_card) if credit_card
       end
 
-      def add_refund_payment_source(xml, currency = nil)
-        xml.tag! :AccountNum, nil
-
-        add_currency_fields(xml, currency)
-      end
-
       def add_verification_value(xml, credit_card)
         return unless credit_card&.verification_value?
 
@@ -595,7 +594,7 @@ module ActiveMerchant #:nodoc:
         #   Null-fill this attribute OR
         #   Do not submit the attribute at all.
         # - http://download.chasepaymentech.com/docs/orbital/orbital_gateway_xml_specification.pdf
-        xml.tag! :CardSecValInd, '1' if %w(visa master discover).include?(credit_card.brand)
+        xml.tag! :CardSecValInd, '1' if %w(visa discover diners_club).include?(credit_card.brand)
         xml.tag! :CardSecVal, credit_card.verification_value
       end
 
@@ -604,6 +603,17 @@ module ActiveMerchant #:nodoc:
         xml.tag! :CurrencyExponent, currency_exponents(currency)
       end
 
+      def add_bank_account_type(xml, check)
+        bank_account_type =
+          if check.account_holder_type == 'business'
+            'X'
+          else
+            ACCOUNT_TYPE[check.account_type]
+          end
+
+        xml.tag! :BankAccountType, bank_account_type if bank_account_type
+      end
+
       def add_card_indicators(xml, options)
         xml.tag! :CardIndicators, options[:card_indicators] if options[:card_indicators]
       end
@@ -752,16 +762,23 @@ module ActiveMerchant #:nodoc:
         xml.tag!(:AuthenticationECIInd, eci) if eci
       end
 
-      def add_dpanind(xml, credit_card)
+      def add_dpanind(xml, credit_card, industry_type = nil)
         return unless credit_card.is_a?(NetworkTokenizationCreditCard)
 
-        xml.tag! :DPANInd, 'Y'
+        xml.tag! :DPANInd, 'Y' unless industry_type == 'RC'
       end
 
-      def add_digital_token_cryptogram(xml, credit_card)
-        return unless credit_card.is_a?(NetworkTokenizationCreditCard)
+      def add_digital_token_cryptogram(xml, credit_card, three_d_secure)
+        return unless credit_card.is_a?(NetworkTokenizationCreditCard) || three_d_secure && credit_card.brand == 'discover'
 
-        xml.tag! :DigitalTokenCryptogram, credit_card.payment_cryptogram
+        cryptogram =
+          if three_d_secure && credit_card.brand == 'discover'
+            three_d_secure[:cavv]
+          else
+            credit_card.payment_cryptogram
+          end
+
+        xml.tag!(:DigitalTokenCryptogram, cryptogram)
       end
 
       #=====OTHER FIELDS=====
@@ -862,6 +879,8 @@ module ActiveMerchant #:nodoc:
         # Failover URL will be attempted in the event of a connection error
         response =
           begin
+            raise ConnectionError.new 'Should use secondary url', 500 if @use_secondary_url
+
             request.call(remote_url)
           rescue ConnectionError
             request.call(remote_url(:secondary))
@@ -942,6 +961,7 @@ module ActiveMerchant #:nodoc:
 
       def build_new_order_xml(action, money, payment_source, parameters = {})
         requires!(parameters, :order_id)
+        @use_secondary_url = parameters[:use_secondary_url] if parameters[:use_secondary_url]
         xml = xml_envelope
         xml.tag! :Request do
           xml.tag! :NewOrder do
@@ -969,16 +989,17 @@ module ActiveMerchant #:nodoc:
             # CustomerAni, AVSPhoneType and AVSDestPhoneType could be added here.
 
             add_soft_descriptors(xml, parameters[:soft_descriptors])
-            add_dpanind(xml, payment_source)
+            add_payment_action_ind(xml, parameters[:payment_action_ind])
+            add_dpanind(xml, payment_source, parameters[:industry_type])
             add_aevv(xml, payment_source, three_d_secure)
-            add_digital_token_cryptogram(xml, payment_source)
+            add_digital_token_cryptogram(xml, payment_source, three_d_secure)
 
             xml.tag! :ECPSameDayInd, parameters[:same_day] if parameters[:same_day] && payment_source.is_a?(Check)
 
             set_recurring_ind(xml, parameters)
 
             # Append Transaction Reference Number at the end for Refund transactions
-            add_tx_ref_num(xml, parameters[:authorization]) if action == REFUND
+            add_tx_ref_num(xml, parameters[:authorization]) if action == REFUND && payment_source.nil?
 
             add_level2_purchase(xml, parameters)
             add_level3_purchase(xml, parameters)