activemerchant 1.108.0 → 1.113.0

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

@@ -9,9 +9,9 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://gatewaystage.itstgate.com/SmartPayments/transact3.asmx'
       self.live_url = 'https://gateway.itstgate.com/SmartPayments/transact3.asmx'
 
-      self.supported_countries = ['CA', 'US']
+      self.supported_countries = %w[CA US]
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
       def initialize(options={})
         requires!(options, :user_name, :password)

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'https://www.centralams.com/'
       self.display_name = 'CAMS: Central Account Management System'
@@ -167,7 +167,7 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, payment)
         post[:ccnumber] = payment.number
-        post[:ccexp] = "#{payment.month.to_s.rjust(2, "0")}#{payment.year.to_s[-2..-1]}"
+        post[:ccexp] = "#{payment.month.to_s.rjust(2, '0')}#{payment.year.to_s[-2..-1]}"
         post[:cvv] = payment.verification_value
       end
 

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'https://cardconnect.com/'
       self.display_name = 'Card Connect'

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
 
       self.money_format = :cents
       self.default_currency = 'GBP'
-      self.supported_cardtypes = [:visa, :maestro, :master, :american_express, :jcb]
+      self.supported_cardtypes = %i[visa maestro master american_express jcb]
       self.supported_countries = ['GB']
       self.homepage_url = 'http://www.cardsave.net/'
       self.display_name = 'CardSave'

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

@@ -7,8 +7,8 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.default_currency = 'GBP'
       self.currencies_without_fractions = %w(CVE ISK JPY UGX)
-      self.supported_countries = ['GB', 'US', 'CH', 'SE', 'SG', 'NO', 'JP', 'IS', 'HK', 'NL', 'CZ', 'CA', 'AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro]
+      self.supported_countries = %w[GB US CH SE SG NO JP IS HK NL CZ CA AU]
+      self.supported_cardtypes = %i[visa master american_express diners_club discover jcb maestro]
       self.homepage_url = 'http://www.cardstream.com/'
       self.display_name = 'CardStream'
 
@@ -247,7 +247,7 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :statementNarrative1, options[:merchant_name]) if options[:merchant_name]
         add_pair(post, :statementNarrative2, options[:dynamic_descriptor]) if options[:dynamic_descriptor]
         if credit_card_or_reference.respond_to?(:number)
-          if ['american_express', 'diners_club'].include?(card_brand(credit_card_or_reference).to_s)
+          if %w[american_express diners_club].include?(card_brand(credit_card_or_reference).to_s)
             add_pair(post, :item1Quantity, 1)
             add_pair(post, :item1Description, (options[:description] || options[:order_id]).slice(0, 15))
             add_pair(post, :item1GrossValue, localized_amount(money, options[:currency] || currency(money)))
@@ -309,7 +309,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        parameters.update(countryCode: self.supported_countries[0]) unless ['CAPTURE', 'CANCEL'].include?(action)
+        parameters.update(countryCode: self.supported_countries[0]) unless %w[CAPTURE CANCEL].include?(action)
         parameters.update(
           merchantID: @options[:login],
           action: action

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

@@ -3,9 +3,9 @@ module ActiveMerchant #:nodoc:
     class CardknoxGateway < Gateway
       self.live_url = 'https://x1.cardknox.com/gateway'
 
-      self.supported_countries = ['US', 'CA', 'GB']
+      self.supported_countries = %w[US CA GB]
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
       self.homepage_url = 'https://www.cardknox.com/'
       self.display_name = 'Cardknox'
@@ -116,7 +116,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, reference)
-        reference, _, _ = split_authorization(reference)
+        reference, = split_authorization(reference)
         post[:Refnum] = reference
       end
 
@@ -247,7 +247,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_cardknox_token(post, authorization)
-        _, token, _ = split_authorization(authorization)
+        _, token, = split_authorization(authorization)
 
         post[:Token] = token
       end
@@ -312,7 +312,7 @@ module ActiveMerchant #:nodoc:
           Version: '4.5.4',
           SoftwareName: 'Active Merchant',
           SoftwareVersion: ActiveMerchant::VERSION.to_s,
-          Command: command,
+          Command: command
         }
 
         seed = SecureRandom.hex(32).upcase

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
                                      MT HU NL AT PL PT RO SI SK FI SE GB IS LI NO
                                      CH ME MK AL RS TR BA ]
       self.default_currency = 'EUR'
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
 
       self.homepage_url = 'https://vr-pay-ecommerce.docs.oppwa.com/'
       self.display_name = 'CardProcess VR-Pay'

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://train.cashnet.com/'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
       self.homepage_url        = 'http://www.higherone.com/'
       self.display_name        = 'Cashnet'
       self.money_format        = :dollars

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://pgw.ceca.es'
 
       self.supported_countries = ['ES']
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = %i[visa master american_express]
       self.homepage_url = 'http://www.ceca.es/es/'
       self.display_name = 'Cecabank'
       self.default_currency = 'EUR'

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = %w(AD AI AG AR AU AT BS BB BE BZ BM BR BN BG CA HR CY CZ DK DM EE FI FR DE GR GD GY HK HU IS IL IT JP LV LI LT LU MY MT MX MC MS NL PA PL PT KN LC MF VC SM SG SK SI ZA ES SR SE CH TR GB US UY)
       self.default_currency = 'USD'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       def initialize(options={})
         requires!(options, :merchant_id, :password, :user_id)
@@ -198,17 +198,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def envelope(body)
-        <<-EOS
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tem="http://tempuri.org/" xmlns:acr="http://schemas.datacontract.org/2004/07/Acriter.ABI.CenPOS.EPayment.VirtualTerminal.Common" xmlns:acr1="http://schemas.datacontract.org/2004/07/Acriter.ABI.CenPOS.EPayment.VirtualTerminal.v6.Common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<soapenv:Header/>
-   <soapenv:Body>
-      <tem:ProcessCreditCard>
-         <tem:request>
-           #{body}
-         </tem:request>
-      </tem:ProcessCreditCard>
-   </soapenv:Body>
-</soapenv:Envelope>
+        <<~EOS
+          <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tem="http://tempuri.org/" xmlns:acr="http://schemas.datacontract.org/2004/07/Acriter.ABI.CenPOS.EPayment.VirtualTerminal.Common" xmlns:acr1="http://schemas.datacontract.org/2004/07/Acriter.ABI.CenPOS.EPayment.VirtualTerminal.v6.Common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <soapenv:Header/>
+             <soapenv:Body>
+                <tem:ProcessCreditCard>
+                   <tem:request>
+                     #{body}
+                   </tem:request>
+                </tem:ProcessCreditCard>
+             </soapenv:Body>
+          </soapenv:Envelope>
         EOS
       end
 
@@ -250,7 +250,7 @@ module ActiveMerchant #:nodoc:
         '257' => STANDARD_ERROR_CODE[:invalid_cvc],
         '333' => STANDARD_ERROR_CODE[:expired_card],
         '1' => STANDARD_ERROR_CODE[:card_declined],
-        '99' => STANDARD_ERROR_CODE[:processing_error],
+        '99' => STANDARD_ERROR_CODE[:processing_error]
       }
 
       def authorization_from(request, response)

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

@@ -7,8 +7,8 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'USD'
       self.money_format = :cents
 
-      self.supported_countries = ['AD', 'AT', 'BE', 'BG', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FO', 'FI', 'FR', 'GB', 'GI', 'GL', 'GR', 'HR', 'HU', 'IE', 'IS', 'IL', 'IT', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SM', 'SK', 'SJ', 'TR', 'VA']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
+      self.supported_countries = %w[AD AT BE BG CH CY CZ DE DK EE ES FO FI FR GB GI GL GR HR HU IE IS IL IT LI LT LU LV MC MT NL NO PL PT RO SE SI SM SK SJ TR VA]
+      self.supported_cardtypes = %i[visa master american_express diners_club]
 
       self.homepage_url = 'https://www.checkout.com/'
       self.display_name = 'Checkout.com'
@@ -150,7 +150,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(xml, authorization)
-        transid, trackid, _, _, _ = split_authorization(authorization)
+        transid, trackid, = split_authorization(authorization)
         xml.transid transid
         add_track_id(xml, trackid)
       end

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

@@ -6,10 +6,10 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://api.checkout.com'
       self.test_url = 'https://api.sandbox.checkout.com'
 
-      self.supported_countries = ['AD', 'AE', 'AR', 'AT', 'AU', 'BE', 'BG', 'BH', 'BR', 'CH', 'CL', 'CN', 'CO', 'CY', 'CZ', 'DE', 'DK', 'EE', 'EG', 'ES', 'FI', 'FR', 'GB', 'GR', 'HK', 'HR', 'HU', 'IE', 'IS', 'IT', 'JO', 'JP', 'KW', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'MX', 'MY', 'NL', 'NO', 'NZ', 'OM', 'PE', 'PL', 'PT', 'QA', 'RO', 'SA', 'SE', 'SG', 'SI', 'SK', 'SM', 'TR', 'US']
+      self.supported_countries = %w[AD AE AR AT AU BE BG BH BR CH CL CN CO CY CZ DE DK EE EG ES FI FR GB GR HK HR HU IE IS IT JO JP KW LI LT LU LV MC MT MX MY NL NO NZ OM PE PL PT QA RO SA SE SG SI SK SM TR US]
       self.default_currency = 'USD'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :maestro, :discover]
+      self.supported_cardtypes = %i[visa master american_express diners_club maestro discover]
       self.currencies_without_fractions = %w(BIF DJF GNF ISK KMF XAF CLF XPF JPY PYG RWF KRW VUV VND XOF)
       self.currencies_with_three_decimal_places = %w(BHD LYD JOD KWD OMR TND)
 
@@ -194,7 +194,7 @@ module ActiveMerchant #:nodoc:
       def headers
         {
           'Authorization' => @options[:secret_key],
-          'Content-Type' => 'application/json;charset=UTF-8',
+          'Content-Type' => 'application/json;charset=UTF-8'
         }
       end
 

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

@@ -15,7 +15,7 @@ module ActiveMerchant
       self.homepage_url = 'http://www.citruspay.com/'
       self.supported_countries = %w(AR AU BR FR DE HK MX NZ SG GB US)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb maestro]
     end
   end
 end

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

@@ -4,12 +4,12 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://gateway.test.clearhaus.com'
       self.live_url = 'https://gateway.clearhaus.com'
 
-      self.supported_countries = ['DK', 'NO', 'SE', 'FI', 'DE', 'CH', 'NL', 'AD', 'AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'FO', 'GL', 'EE', 'FR', 'GR',
-                                  'HU', 'IS', 'IE', 'IT', 'LV', 'LI', 'LT', 'LU', 'MT', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'GB']
+      self.supported_countries = %w[DK NO SE FI DE CH NL AD AT BE BG HR CY CZ FO GL EE FR GR
+                                    HU IS IE IT LV LI LT LU MT PL PT RO SK SI ES GB]
 
       self.default_currency    = 'EUR'
       self.currencies_without_fractions = %w(BIF CLP DJF GNF JPY KMF KRW PYG RWF UGX VND VUV XAF XOF XPF)
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = %i[visa master]
 
       self.homepage_url = 'https://www.clearhaus.com'
       self.display_name = 'Clearhaus'

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
 
       self.money_format = :dollars
       self.default_currency = 'EUR'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://www.commercegate.com/'
       self.display_name = 'CommerceGate'
 

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://api.conekta.io/'
 
       self.supported_countries = ['MX']
-      self.supported_cardtypes = [:visa, :master, :american_express, :carnet]
+      self.supported_cardtypes = %i[visa master american_express carnet]
       self.homepage_url = 'https://conekta.io/'
       self.display_name = 'Conekta Gateway'
       self.money_format = :cents

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'https://www.creditcall.com'
       self.display_name = 'Creditcall'

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

@@ -25,7 +25,7 @@ module ActiveMerchant #:nodoc:
       self.currencies_with_three_decimal_places = %w(BHD IQD JOD KWD LYD OMR TND)
 
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :maestro]
+      self.supported_cardtypes = %i[visa master maestro]
 
       RESPONSE_MESSAGES = {
         '00' => 'Approved or completed successfully',
@@ -193,6 +193,7 @@ module ActiveMerchant #:nodoc:
         add_email(post, options)
 
         if options[:referral_cft]
+          add_customer_name(post, options)
           commit(:referral_cft, post)
         else
           commit(:refund, post)
@@ -238,6 +239,10 @@ module ActiveMerchant #:nodoc:
             normalized_value = normalize(value)
             next if normalized_value.nil?
 
+            if key == :'3ds_homephonecountry'
+              next unless options[:billing_address] && options[:billing_address][:phone]
+            end
+
             post[key] = normalized_value unless post[key]
           end
         end
@@ -313,6 +318,11 @@ module ActiveMerchant #:nodoc:
         post[:c3] = options[:email] || 'unspecified@example.com'
       end
 
+      def add_customer_name(post, options)
+        post[:j5] = options[:first_name] if options[:first_name]
+        post[:j13] = options[:last_name] if options[:last_name]
+      end
+
       def add_3d_secure(post, options)
         if options[:eci] && options[:xid]
           add_3d_secure_1_data(post, options)
@@ -329,7 +339,7 @@ module ActiveMerchant #:nodoc:
           post[:'3ds_browsertz'] = browser_info[:timezone]
           post[:'3ds_browserscreenwidth'] = browser_info[:width]
           post[:'3ds_browserscreenheight'] = browser_info[:height]
-          post[:'3ds_browsercolordepth'] = browser_info[:depth]
+          post[:'3ds_browsercolordepth'] = browser_info[:depth].to_s == '30' ? '32' : browser_info[:depth]
           post[:d6] = browser_info[:language]
           post[:'3ds_browserjavaenabled'] = browser_info[:java]
           post[:'3ds_browseracceptheader'] = browser_info[:accept_header]
@@ -413,7 +423,7 @@ module ActiveMerchant #:nodoc:
           success_from(response),
           message_from(response),
           response,
-          authorization: "#{response["Z1"]};#{response["Z4"]};#{response["A1"]};#{action}",
+          authorization: "#{response['Z1']};#{response['Z4']};#{response['A1']};#{action}",
           avs_result: AVSResult.new(code: response['Z9']),
           cvv_result: CVVResult.new(response['Z14']),
           test: test?

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

@@ -4,9 +4,9 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://test.ctpaiement.ca/v1/'
       self.live_url = 'https://www.ctpaiement.com/v1/'
 
-      self.supported_countries = ['US', 'CA']
+      self.supported_countries = %w[US CA]
       self.default_currency = 'CAD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club]
 
       self.homepage_url = 'http://www.ct-payment.com/'
       self.display_name = 'CT Payment'

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

@@ -18,7 +18,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['PE']
       self.default_currency = 'PEN'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :diners_club, :american_express]
+      self.supported_cardtypes = %i[visa master diners_club american_express]
 
       def initialize(options={})
         requires!(options, :merchant_id, :terminal_id, :secret_key)
@@ -205,7 +205,7 @@ module ActiveMerchant #:nodoc:
         refund: 'SingleCallGenericReverse',
         tokenize: 'SingleCallTokenServlet',
         invalidate: 'SingleCallInvalidateToken',
-        tokenpay: 'SingleCallTokenTransaction',
+        tokenpay: 'SingleCallTokenTransaction'
       }
 
       def commit(action, params)

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

@@ -30,14 +30,16 @@ module ActiveMerchant #:nodoc:
       ECI_BRAND_MAPPING = {
         visa: 'vbv',
         master: 'spa',
+        maestro: 'spa',
         american_express: 'aesk',
         jcb: 'js',
         discover: 'pb',
+        diners_club: 'pb'
       }.freeze
       DEFAULT_COLLECTION_INDICATOR = 2
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :dankort, :maestro, :elo]
-      self.supported_countries = %w(US BR CA CN DK FI FR DE IN JP MX NO SE GB SG LB PK)
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb dankort maestro elo]
+      self.supported_countries = %w(US AE BR CA CN DK FI FR DE IN JP MX NO SE GB SG LB PK)
 
       self.default_currency = 'USD'
       self.currencies_without_fractions = %w(JPY)
@@ -264,7 +266,9 @@ module ActiveMerchant #:nodoc:
           zip: '00000',
           country: 'US'
         }
-        options[:billing_address] = options[:billing_address] || options[:address] || default_address
+
+        submitted_address = options[:billing_address] || options[:address] || default_address
+        options[:billing_address] = default_address.merge(submitted_address) { |_k, default, submitted| submitted.blank? ? default : submitted }
         options[:shipping_address] = options[:shipping_address] || {}
       end
 
@@ -278,10 +282,11 @@ module ActiveMerchant #:nodoc:
         add_threeds_services(xml, options)
         add_payment_network_token(xml) if network_tokenization?(creditcard_or_reference)
         add_business_rules_data(xml, creditcard_or_reference, options)
-        add_stored_credential_options(xml, options)
+        add_stored_credential_subsequent_auth(xml, options)
         add_issuer_additional_data(xml, options)
-        add_merchant_description(xml, options)
         add_partner_solution_id(xml)
+        add_stored_credential_options(xml, options)
+        add_merchant_description(xml, options)
 
         xml.target!
       end
@@ -322,17 +327,20 @@ module ActiveMerchant #:nodoc:
         add_mdd_fields(xml, options)
         if !payment_method_or_reference.is_a?(String) && card_brand(payment_method_or_reference) == 'check'
           add_check_service(xml)
+          add_issuer_additional_data(xml, options)
+          add_partner_solution_id(xml)
         else
           add_purchase_service(xml, payment_method_or_reference, options)
           add_threeds_services(xml, options)
           add_payment_network_token(xml) if network_tokenization?(payment_method_or_reference)
           add_business_rules_data(xml, payment_method_or_reference, options) unless options[:pinless_debit_card]
+          add_stored_credential_subsequent_auth(xml, options)
+          add_issuer_additional_data(xml, options)
+          add_partner_solution_id(xml)
           add_stored_credential_options(xml, options)
         end
 
-        add_issuer_additional_data(xml, options)
         add_merchant_description(xml, options)
-        add_partner_solution_id(xml)
 
         xml.target!
       end
@@ -604,27 +612,41 @@ module ActiveMerchant #:nodoc:
               indicator = options[:commerce_indicator] || stored_credential_commerce_indicator(options)
               xml.tag!('commerceIndicator', indicator) if indicator
             end
+            xml.tag!('reconciliationID', options[:reconciliation_id]) if options[:reconciliation_id]
           end
         end
       end
 
       def add_normalized_threeds_2_data(xml, payment_method, options)
         threeds_2_options = options[:three_d_secure]
+        cc_brand = card_brand(payment_method).to_sym
+
+        return if threeds_2_options[:cavv].blank? && infer_commerce_indicator?(options, cc_brand)
+
+        xid = threeds_2_options[:xid]
 
-        xml.tag!('cavv', threeds_2_options[:cavv]) if threeds_2_options[:cavv] && card_brand(payment_method).to_sym != :master
+        xml.tag!('cavv', threeds_2_options[:cavv]) if threeds_2_options[:cavv] && cc_brand != :master
         xml.tag!('cavvAlgorithm', threeds_2_options[:cavv_algorithm]) if threeds_2_options[:cavv_algorithm]
         xml.tag!('paSpecificationVersion', threeds_2_options[:version]) if threeds_2_options[:version]
         xml.tag!('directoryServerTransactionID', threeds_2_options[:ds_transaction_id]) if threeds_2_options[:ds_transaction_id]
-        xml.tag!('commerceIndicator', options[:commerce_indicator] || ECI_BRAND_MAPPING[card_brand(payment_method).to_sym])
+        xml.tag!('commerceIndicator', options[:commerce_indicator] || ECI_BRAND_MAPPING[cc_brand])
         xml.tag!('eciRaw', threeds_2_options[:eci]) if threeds_2_options[:eci]
 
-        xid = threeds_2_options[:xid] || threeds_2_options[:cavv]
-        xml.tag!('xid', xid) if xid
+        if xid.present?
+          xml.tag!('xid', xid)
+        elsif threeds_2_options[:version]&.start_with?('2') && cc_brand != :master
+          cavv = threeds_2_options[:cavv]
+          xml.tag!('xid', cavv) if cavv.present?
+        end
 
         xml.tag!('veresEnrolled', threeds_2_options[:enrolled]) if threeds_2_options[:enrolled]
         xml.tag!('paresStatus', threeds_2_options[:authentication_response_status]) if threeds_2_options[:authentication_response_status]
       end
 
+      def infer_commerce_indicator?(options, cc_brand)
+        options[:commerce_indicator].blank? && ECI_BRAND_MAPPING[cc_brand].present?
+      end
+
       def add_threeds_2_ucaf_data(xml, payment_method, options)
         return unless options[:three_d_secure] && card_brand(payment_method).to_sym == :master
 
@@ -660,6 +682,7 @@ module ActiveMerchant #:nodoc:
             xml.tag!('cavv', payment_method.payment_cryptogram)
             xml.tag!('commerceIndicator', ECI_BRAND_MAPPING[brand])
             xml.tag!('xid', payment_method.payment_cryptogram)
+            xml.tag!('reconciliationID', options[:reconciliation_id]) if options[:reconciliation_id]
           end
         when :master
           xml.tag! 'ucaf' do
@@ -668,6 +691,7 @@ module ActiveMerchant #:nodoc:
           end
           xml.tag! 'ccAuthService', {'run' => 'true'} do
             xml.tag!('commerceIndicator', ECI_BRAND_MAPPING[brand])
+            xml.tag!('reconciliationID', options[:reconciliation_id]) if options[:reconciliation_id]
           end
         when :american_express
           cryptogram = Base64.decode64(payment_method.payment_cryptogram)
@@ -675,6 +699,7 @@ module ActiveMerchant #:nodoc:
             xml.tag!('cavv', Base64.encode64(cryptogram[0...20]))
             xml.tag!('commerceIndicator', ECI_BRAND_MAPPING[brand])
             xml.tag!('xid', Base64.encode64(cryptogram[20...40]))
+            xml.tag!('reconciliationID', options[:reconciliation_id]) if options[:reconciliation_id]
           end
         end
       end
@@ -689,15 +714,20 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'ccCaptureService', {'run' => 'true'} do
           xml.tag! 'authRequestID', request_id
           xml.tag! 'authRequestToken', request_token
+          xml.tag! 'reconciliationID', options[:reconciliation_id] if options[:reconciliation_id]
         end
       end
 
       def add_purchase_service(xml, payment_method, options)
         if options[:pinless_debit_card]
-          xml.tag! 'pinlessDebitService', {'run' => 'true'}
+          xml.tag! 'pinlessDebitService', {'run' => 'true'} do
+            xml.tag!('reconciliationID', options[:reconciliation_id]) if options[:reconciliation_id]
+          end
         else
           add_auth_service(xml, payment_method, options)
-          xml.tag! 'ccCaptureService', {'run' => 'true'}
+          xml.tag! 'ccCaptureService', {'run' => 'true'} do
+            xml.tag!('reconciliationID', options[:reconciliation_id]) if options[:reconciliation_id]
+          end
         end
       end
 
@@ -821,13 +851,30 @@ module ActiveMerchant #:nodoc:
         country_code&.code(:alpha2)
       end
 
+      def add_stored_credential_subsequent_auth(xml, options={})
+        return unless options[:stored_credential] || options[:stored_credential_overrides]
+
+        stored_credential_subsequent_auth = 'true' if options.dig(:stored_credential, :initiator) == 'merchant'
+
+        override_subsequent_auth = options.dig(:stored_credential_overrides, :subsequent_auth)
+
+        xml.subsequentAuth override_subsequent_auth.nil? ? stored_credential_subsequent_auth : override_subsequent_auth
+      end
+
       def add_stored_credential_options(xml, options={})
-        return unless options[:stored_credential]
+        return unless options[:stored_credential] || options[:stored_credential_overrides]
+
+        stored_credential_subsequent_auth_first = 'true' if options.dig(:stored_credential, :initial_transaction)
+        stored_credential_transaction_id = options.dig(:stored_credential, :network_transaction_id) if options.dig(:stored_credential, :initiator) == 'merchant'
+        stored_credential_subsequent_auth_stored_cred = 'true' if options.dig(:stored_credential, :initiator) == 'cardholder' && !options.dig(:stored_credential, :initial_transaction) || options.dig(:stored_credential, :initiator) == 'merchant' && options.dig(:stored_credential, :reason_type) == 'unscheduled'
 
-        xml.tag! 'subsequentAuth', 'true' if options[:stored_credential][:initiator] == 'merchant'
-        xml.tag! 'subsequentAuthFirst', 'true' if options[:stored_credential][:initial_transaction]
-        xml.tag! 'subsequentAuthTransactionID', options[:stored_credential][:network_transaction_id] if options[:stored_credential][:initiator] == 'merchant'
-        xml.tag! 'subsequentAuthStoredCredential', 'true' if options[:stored_credential][:initiator] == 'cardholder' && !options[:stored_credential][:initial_transaction] || options[:stored_credential][:initiator] == 'merchant' && options[:stored_credential][:reason_type] == 'unscheduled'
+        override_subsequent_auth_first = options.dig(:stored_credential_overrides, :subsequent_auth_first)
+        override_subsequent_auth_transaction_id = options.dig(:stored_credential_overrides, :subsequent_auth_transaction_id)
+        override_subsequent_auth_stored_cred = options.dig(:stored_credential_overrides, :subsequent_auth_stored_credential)
+
+        xml.subsequentAuthFirst override_subsequent_auth_first.nil? ? stored_credential_subsequent_auth_first : override_subsequent_auth_first
+        xml.subsequentAuthTransactionID override_subsequent_auth_transaction_id.nil? ? stored_credential_transaction_id : override_subsequent_auth_transaction_id
+        xml.subsequentAuthStoredCredential override_subsequent_auth_stored_cred.nil? ? stored_credential_subsequent_auth_stored_cred : override_subsequent_auth_stored_cred
       end
 
       def add_partner_solution_id(xml)
@@ -878,8 +925,7 @@ module ActiveMerchant #:nodoc:
 
         success = success?(response)
         message = message_from(response)
-
-        authorization = success ? authorization_from(response, action, amount, options) : nil
+        authorization = success || in_fraud_review?(response) ? authorization_from(response, action, amount, options) : nil
 
         Response.new(success, message, response,
           test: test?,