activemerchant 1.133.0 → 1.137.0

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

@@ -111,13 +111,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(action, params)
+        envelope_obj = { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
+          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' }
         xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! 'env:Envelope',
-          { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-            'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
-            'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' } do
-
+        xml.tag! 'env:Envelope', envelope_obj do
           xml.tag! 'env:Body' do
             xml.tag! action, { 'xmlns' => xmlns(action) } do
               xml.tag! 'clientId', @options[:login]
@@ -146,15 +145,24 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, params)
-        data = ssl_post(url(action), build_request(action, params),
-          { 'Content-Type' => 'text/xml; charset=utf-8',
-            'SOAPAction' => "#{xmlns(action)}#{action}" })
+        data = ssl_post(
+          url(action),
+          build_request(action, params),
+          {
+            'Content-Type' => 'text/xml; charset=utf-8',
+            'SOAPAction' => "#{xmlns(action)}#{action}"
+          }
+        )
 
         response = parse(action, data)
-        Response.new(successful?(action, response), message_from(action, response), response,
+        Response.new(
+          successful?(action, response),
+          message_from(action, response),
+          response,
           test: test?,
           authorization: authorization_from(action, response),
-          avs_result: { code: response[:avs_code] })
+          avs_result: { code: response[:avs_code] }
+        )
       end
 
       def authorization_from(action, response)

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

@@ -337,7 +337,7 @@ module ActiveMerchant #:nodoc:
         endpoint = translate_action_endpoint(action, options)
         headers = {
           'Content-Type': 'application/json;charset=UTF-8',
-          'Authorization': @options[:api_key],
+          Authorization: @options[:api_key],
           'User-Agent': 'MONEI/Shopify/0.1.0'
         }
 

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

@@ -54,6 +54,7 @@ module ActiveMerchant #:nodoc:
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         add_external_mpi_fields(post, options)
         add_stored_credential(post, options)
+        add_cust_id(post, options)
         action = if post[:cavv] || options[:three_d_secure]
                    'cavv_preauth'
                  elsif post[:data_key].blank?
@@ -78,6 +79,7 @@ module ActiveMerchant #:nodoc:
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         add_external_mpi_fields(post, options)
         add_stored_credential(post, options)
+        add_cust_id(post, options)
         action = if post[:cavv] || options[:three_d_secure]
                    'cavv_purchase'
                  elsif post[:data_key].blank?
@@ -216,7 +218,7 @@ module ActiveMerchant #:nodoc:
         three_d_secure_options = options[:three_d_secure]
 
         post[:threeds_version] = three_d_secure_options[:version]
-        post[:crypt_type] = three_d_secure_options[:eci]
+        post[:crypt_type] = three_d_secure_options.dig(:eci)&.to_s&.sub!(/^0/, '')
         post[:cavv] = three_d_secure_options[:cavv]
         post[:threeds_server_trans_id] = three_d_secure_options[:three_ds_server_trans_id]
         post[:ds_trans_id] = three_d_secure_options[:ds_transaction_id]
@@ -248,6 +250,10 @@ module ActiveMerchant #:nodoc:
         post[:payment_information] = options[:payment_information] if options[:payment_information]
       end
 
+      def add_cust_id(post, options)
+        post[:cust_id] = options[:cust_id] if options[:cust_id]
+      end
+
       def add_stored_credential(post, options)
         add_cof(post, options)
         # if any of :issuer_id, :payment_information, or :payment_indicator is not passed,
@@ -467,8 +473,8 @@ module ActiveMerchant #:nodoc:
           'indrefund' => %i[order_id cust_id amount pan expdate crypt_type],
           'completion' => %i[order_id comp_amount txn_number crypt_type],
           'purchasecorrection' => %i[order_id txn_number crypt_type],
-          'cavv_preauth' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator],
-          'cavv_purchase' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator],
+          'cavv_preauth' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator threeds_version threeds_server_trans_id ds_trans_id],
+          'cavv_purchase' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator threeds_version threeds_server_trans_id ds_trans_id],
           'card_verification' => %i[order_id cust_id pan expdate crypt_type avs_info cvd_info cof_info],
           'transact' => %i[order_id cust_id amount pan expdate crypt_type],
           'Batchcloseall' => [],

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

@@ -113,11 +113,15 @@ module ActiveMerchant #:nodoc:
         response = parse(data)
         message = message_from(response)
 
-        Response.new(success?(response), message, response,
+        Response.new(
+          success?(response),
+          message,
+          response,
           test: test?,
           authorization: response['transactionid'],
           avs_result: { code: response['avsresponse'] },
-          cvv_result: response['cvvresponse'])
+          cvv_result: response['cvvresponse']
+        )
       end
 
       def success?(response)

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

@@ -233,16 +233,24 @@ module ActiveMerchant #:nodoc:
       def commit(action, request)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(action, request)))
 
-        Response.new(success?(response), message_from(response), response,
+        Response.new(
+          success?(response),
+          message_from(response),
+          response,
           test: test?,
-          authorization: authorization_from(action, response))
+          authorization: authorization_from(action, response)
+        )
       end
 
       def commit_periodic(action, request)
         response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, build_periodic_request(action, request)))
-        Response.new(success?(response), message_from(response), response,
+        Response.new(
+          success?(response),
+          message_from(response),
+          response,
           test: test?,
-          authorization: authorization_from(action, response))
+          authorization: authorization_from(action, response)
+        )
       end
 
       def success?(response)

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

@@ -144,8 +144,12 @@ module ActiveMerchant
         # get gateway response
         response = parse(ssl_post(self.live_url, post_data(action, params)))
 
-        Response.new(response['status'] == 'approved', message_from(response), response,
-          authorization: authorization_from(response, action))
+        Response.new(
+          response['status'] == 'approved',
+          message_from(response),
+          response,
+          authorization: authorization_from(response, action)
+        )
       end
 
       def post_data(action, params)

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

@@ -233,7 +233,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def map_3ds(three_d_secure_options)
-        mapped = {
+        {
           eci: three_d_secure_options[:eci],
           cavv: three_d_secure_options[:cavv],
           xid: three_d_secure_options[:xid],
@@ -241,8 +241,6 @@ module ActiveMerchant #:nodoc:
           threeDSecureVersion: three_d_secure_options[:version],
           directoryServerTransactionId: three_d_secure_options[:ds_transaction_id]
         }
-
-        mapped
       end
 
       def parse(body)

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

@@ -193,11 +193,15 @@ module ActiveMerchant #:nodoc:
       def commit(action, parameters)
         response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
-        Response.new(success?(response), message_from(response), response,
+        Response.new(
+          success?(response),
+          message_from(response),
+          response,
           test: test_response?(response),
           authorization: response[:trans_id],
           avs_result: { code: response[:avs_code] },
-          cvv_result: response[:cvv2_code])
+          cvv_result: response[:cvv2_code]
+        )
       rescue ActiveMerchant::ResponseError => e
         raise unless e.response.code =~ /^[67]\d\d$/
 

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

@@ -200,11 +200,15 @@ module ActiveMerchant #:nodoc:
 
         authorization = authorization_from(success, parameters, raw)
 
-        Response.new(success, raw['responsetext'], raw,
+        Response.new(
+          success,
+          raw['responsetext'],
+          raw,
           test: test?,
           authorization: authorization,
           avs_result: { code: raw['avsresponse'] },
-          cvv_result: raw['cvvresponse'])
+          cvv_result: raw['cvvresponse']
+        )
       end
 
       def build_request(action, parameters)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = self.live_url = 'https://secure.networkmerchants.com/api/transact.php'
       self.default_currency = 'USD'
       self.money_format = :dollars
-      self.supported_countries = ['US']
+      self.supported_countries = %w[US CA]
       self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://nmi.com/'
       self.display_name = 'NMI'
@@ -134,6 +134,7 @@ module ActiveMerchant #:nodoc:
           gsub(%r((cvv=)\d+), '\1[FILTERED]').
           gsub(%r((checkaba=)\d+), '\1[FILTERED]').
           gsub(%r((checkaccount=)\d+), '\1[FILTERED]').
+          gsub(%r((cavv=)[^&\n]*), '\1[FILTERED]').
           gsub(%r((cryptogram=)[^&]+(&?)), '\1[FILTERED]\2')
       end
 
@@ -166,7 +167,7 @@ module ActiveMerchant #:nodoc:
         elsif payment_method.is_a?(NetworkTokenizationCreditCard)
           post[:ccnumber] = payment_method.number
           post[:ccexp] = exp_date(payment_method)
-          post[:token_cryptogram] = payment_method.payment_cryptogram
+          add_network_token_fields(post, payment_method)
         elsif card_brand(payment_method) == 'check'
           post[:payment] = 'check'
           post[:firstname] = payment_method.first_name
@@ -187,6 +188,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_network_token_fields(post, payment_method)
+        if payment_method.source == :apple_pay || payment_method.source == :google_pay
+          post[:cavv] = payment_method.payment_cryptogram
+          post[:eci] = payment_method.eci
+          post[:decrypted_applepay_data] = 1
+          post[:decrypted_googlepay_data] = 1
+        else
+          post[:token_cryptogram] = payment_method.payment_cryptogram
+        end
+      end
+
       def add_stored_credential(post, options)
         return unless (stored_credential = options[:stored_credential])
 
@@ -212,7 +224,8 @@ module ActiveMerchant #:nodoc:
         else
           post[:stored_credential_indicator] = 'used'
           # should only send :initial_transaction_id if it is a MIT
-          post[:initial_transaction_id] = stored_credential[:network_transaction_id] if post[:initiated_by] == 'merchant'
+          ntid = options[:network_transaction_id] || stored_credential[:network_transaction_id]
+          post[:initial_transaction_id] = ntid if post[:initiated_by] == 'merchant'
         end
       end
 
@@ -334,8 +347,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def headers
-        headers = { 'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8' }
-        headers
+        { 'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8' }
       end
 
       def post_data(action, params)
@@ -347,7 +359,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[CGI::parse(body).map { |k, v| [k.intern, v.first] }]
+        CGI::parse(body).map { |k, v| [k.intern, v.first] }.to_h
       end
 
       def success_from(response)

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

@@ -263,7 +263,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment_source(post, payment_source, options)
-        add_d3d(post, options) if options[:d3d]
+        add_d3d(post, options) if options[:d3d] || three_d_secure(options)
         if payment_source.is_a?(String)
           add_alias(post, payment_source, options[:alias_operation])
           add_eci(post, options[:eci] || '9')
@@ -460,7 +460,7 @@ module ActiveMerchant #:nodoc:
             raise "Unknown signature algorithm #{algorithm}"
           end
 
-        filtered_params = signed_parameters.compact
+        filtered_params = signed_parameters.reject { |_k, v| v.nil? || v == '' }
         sha_encryptor.hexdigest(
           filtered_params.sort_by { |k, _v| k.upcase }.map { |k, v| "#{k.upcase}=#{v}#{secret}" }.join('')
         ).upcase
@@ -494,6 +494,10 @@ module ActiveMerchant #:nodoc:
         end
         response_hash
       end
+
+      def three_d_secure(options)
+        options[:three_d_secure] ? options[:three_d_secure][:required] : false
+      end
     end
 
     class OgoneResponse < Response

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

@@ -201,11 +201,13 @@ module ActiveMerchant #:nodoc:
         response = http_request(method, resource, parameters, options)
         success = !error?(response)
 
-        Response.new(success,
+        Response.new(
+          success,
           (success ? response['error_code'] : response['description']),
           response,
           test: test?,
-          authorization: response['id'])
+          authorization: response['id']
+        )
       end
 
       def http_request(method, resource, parameters = {}, options = {})

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

@@ -125,8 +125,7 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment, options = {})
         # debit
         options[:registrationId] = payment if payment.is_a?(String)
-        execute_dbpa(options[:risk_workflow] ? 'PA.CP' : 'DB',
-          money, payment, options)
+        execute_dbpa(options[:risk_workflow] ? 'PA.CP' : 'DB', money, payment, options)
       end
 
       def authorize(money, payment, options = {})

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

@@ -121,11 +121,15 @@ module ActiveMerchant #:nodoc:
         txnRequest = escape_uri(xml)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, "txnMode=#{action}&txnRequest=#{txnRequest}"))
 
-        Response.new(successful?(response), message_from(response), hash_from_xml(response),
+        Response.new(
+          successful?(response),
+          message_from(response),
+          hash_from_xml(response),
           test: test?,
           authorization: authorization_from(response),
           avs_result: { code: avs_result_from(response) },
-          cvv_result: cvv_result_from(response))
+          cvv_result: cvv_result_from(response)
+        )
       end
 
       # The upstream is picky and so we can't use CGI.escape like we want to

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

@@ -33,9 +33,7 @@ module ActiveMerchant #:nodoc:
         errors << [:merchant_phone, 'is required to follow "NNN-NNN-NNNN" or "NNN-AAAAAAA" format'] if !empty?(self.merchant_phone) && !self.merchant_phone.match(PHONE_FORMAT_1) && !self.merchant_phone.match(PHONE_FORMAT_2)
 
         %i[merchant_email merchant_url].each do |attr|
-          unless self.send(attr).blank?
-            errors << [attr, 'is required to be 13 bytes or less'] if self.send(attr).bytesize > 13
-          end
+          errors << [attr, 'is required to be 13 bytes or less'] if !self.send(attr).blank? && (self.send(attr).bytesize > 13)
         end
 
         errors_hash(errors)

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

@@ -30,7 +30,7 @@ module ActiveMerchant #:nodoc:
     class OrbitalGateway < Gateway
       include Empty
 
-      API_VERSION = '9.0'
+      API_VERSION = '9.5'
 
       POST_HEADERS = {
         'MIME-Version' => '1.1',
@@ -193,6 +193,10 @@ module ActiveMerchant #:nodoc:
         'checking' => 'C'
       }
 
+      # safetech token flags
+      GET_TOKEN = 'GT'
+      USE_TOKEN = 'UT'
+
       def initialize(options = {})
         requires!(options, :merchant_id)
         requires!(options, :login, :password) unless options[:ip_authentication]
@@ -253,6 +257,11 @@ module ActiveMerchant #:nodoc:
         commit(order, :refund, options[:retry_logic], options[:trace_number])
       end
 
+      # Orbital save a payment method if the TokenTxnType is 'GT', that's why we use this as the default value for store
+      def store(creditcard, options = {})
+        authorize(0, creditcard, options.merge({ token_txn_type: GET_TOKEN }))
+      end
+
       def void(authorization, options = {}, deprecated = {})
         if !options.kind_of?(Hash)
           ActiveMerchant.deprecated('Calling the void method with an amount parameter is deprecated and will be removed in a future version.')
@@ -487,6 +496,35 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_level2_card_and_more_tax(xml, options = {})
+        if (level2 = options[:level_2_data])
+          xml.tag! :PCardRequestorName, byte_limit(level2[:requestor_name], 38) if level2[:requestor_name]
+          xml.tag! :PCardLocalTaxRate, byte_limit(level2[:local_tax_rate], 5) if level2[:local_tax_rate]
+          # Canadian Merchants Only
+          xml.tag! :PCardNationalTax, byte_limit(level2[:national_tax], 12) if level2[:national_tax]
+          xml.tag! :PCardPstTaxRegNumber, byte_limit(level2[:pst_tax_reg_number], 15) if level2[:pst_tax_reg_number]
+          xml.tag! :PCardCustomerVatRegNumber, byte_limit(level2[:customer_vat_reg_number], 13) if level2[:customer_vat_reg_number]
+          # Canadian Merchants Only
+          xml.tag! :PCardMerchantVatRegNumber, byte_limit(level2[:merchant_vat_reg_number], 20) if level2[:merchant_vat_reg_number]
+          xml.tag! :PCardTotalTaxAmount, byte_limit(level2[:total_tax_amount], 12) if level2[:total_tax_amount]
+        end
+      end
+
+      def add_card_commodity_code(xml, options = {})
+        if (level2 = options[:level_2_data]) && (level2[:commodity_code])
+          xml.tag! :PCardCommodityCode, byte_limit(level2[:commodity_code], 4)
+        end
+      end
+
+      def add_level3_vat_fields(xml, options = {})
+        if (level3 = options[:level_3_data])
+          xml.tag! :PC3InvoiceDiscTreatment, byte_limit(level3[:invoice_discount_treatment], 1) if level3[:invoice_discount_treatment]
+          xml.tag! :PC3TaxTreatment, byte_limit(level3[:tax_treatment], 1) if level3[:tax_treatment]
+          xml.tag! :PC3UniqueVATInvoiceRefNum, byte_limit(level3[:unique_vat_invoice_ref], 15) if level3[:unique_vat_invoice_ref]
+          xml.tag! :PC3ShipVATRate, byte_limit(level3[:ship_vat_rate], 4) if level3[:ship_vat_rate]
+        end
+      end
+
       #=====ADDRESS FIELDS=====
 
       def add_address(xml, payment_source, options)
@@ -536,9 +574,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def billing_name(payment_source, options)
-        if payment_source&.name.present?
+        if !payment_source.is_a?(String) && payment_source&.name.present?
           payment_source.name[0..29]
-        elsif options[:billing_address][:name].present?
+        elsif options[:billing_address] && options[:billing_address][:name].present?
           options[:billing_address][:name][0..29]
         end
       end
@@ -555,10 +593,17 @@ module ActiveMerchant #:nodoc:
         options[:billing_address] || options[:address]
       end
 
+      def add_safetech_token_data(xml, payment_source, options)
+        payment_source_token = split_authorization(payment_source).values_at(2).first
+        xml.tag! :CardBrand, options[:card_brand]
+        xml.tag! :AccountNum, payment_source_token
+      end
+
       #=====PAYMENT SOURCE FIELDS=====
 
       # Payment can be done through either Credit Card or Electronic Check
       def add_payment_source(xml, payment_source, options = {})
+        add_safetech_token_data(xml, payment_source, options) if payment_source.is_a?(String)
         payment_source.is_a?(Check) ? add_echeck(xml, payment_source, options) : add_credit_card(xml, payment_source, options)
       end
 
@@ -576,10 +621,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_credit_card(xml, credit_card, options)
-        xml.tag! :AccountNum, credit_card.number if credit_card
-        xml.tag! :Exp, expiry_date(credit_card) if credit_card
+        xml.tag! :AccountNum, credit_card.number if credit_card.is_a?(CreditCard)
+        xml.tag! :Exp, expiry_date(credit_card) if credit_card.is_a?(CreditCard)
         add_currency_fields(xml, options[:currency])
-        add_verification_value(xml, credit_card) if credit_card
+        add_verification_value(xml, credit_card) if credit_card.is_a?(CreditCard)
       end
 
       def add_verification_value(xml, credit_card)
@@ -679,7 +724,7 @@ module ActiveMerchant #:nodoc:
         add_mc_sca_recurring(xml, credit_card, parameters, three_d_secure)
         add_mc_program_protocol(xml, credit_card, three_d_secure)
         add_mc_directory_trans_id(xml, credit_card, three_d_secure)
-        add_mc_ucafind(xml, credit_card, three_d_secure)
+        add_mc_ucafind(xml, credit_card, three_d_secure, parameters)
       end
 
       def add_mc_sca_merchant_initiated(xml, credit_card, parameters, three_d_secure)
@@ -708,10 +753,16 @@ module ActiveMerchant #:nodoc:
         xml.tag!(:MCDirectoryTransID, three_d_secure[:ds_transaction_id]) if three_d_secure[:ds_transaction_id]
       end
 
-      def add_mc_ucafind(xml, credit_card, three_d_secure)
+      def add_mc_ucafind(xml, credit_card, three_d_secure, options)
         return unless three_d_secure
 
-        xml.tag! :UCAFInd, '4'
+        if options[:alternate_ucaf_flow]
+          return unless %w(4 6 7).include?(three_d_secure[:eci])
+
+          xml.tag! :UCAFInd, options[:ucaf_collection_indicator] if options[:ucaf_collection_indicator]
+        else
+          xml.tag! :UCAFInd, options[:ucaf_collection_indicator] || '4'
+        end
       end
 
       #=====SCA (STORED CREDENTIAL) FIELDS=====
@@ -886,13 +937,19 @@ module ActiveMerchant #:nodoc:
             request.call(remote_url(:secondary))
           end
 
-        Response.new(success?(response, message_type), message_from(response), response,
+        authorization = authorization_string(response[:tx_ref_num], response[:order_id], response[:safetech_token], response[:card_brand])
+
+        Response.new(
+          success?(response, message_type),
+          message_from(response),
+          response,
           {
-            authorization: authorization_string(response[:tx_ref_num], response[:order_id]),
+            authorization: authorization,
             test: self.test?,
             avs_result: OrbitalGateway::AVSResult.new(response[:avs_resp_code]),
             cvv_result: OrbitalGateway::CVVResult.new(response[:cvv2_resp_code])
-          })
+          }
+        )
       end
 
       def remote_url(url = :primary)
@@ -981,35 +1038,34 @@ module ActiveMerchant #:nodoc:
             xml.tag! :OrderID, format_order_id(parameters[:order_id])
             xml.tag! :Amount, amount(money)
             xml.tag! :Comments, parameters[:comments] if parameters[:comments]
-
             add_level2_tax(xml, parameters)
             add_level2_advice_addendum(xml, parameters)
-
             add_aav(xml, payment_source, three_d_secure)
             # CustomerAni, AVSPhoneType and AVSDestPhoneType could be added here.
-
             add_soft_descriptors(xml, parameters[:soft_descriptors])
-            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, 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 && payment_source.nil?
-
             add_level2_purchase(xml, parameters)
             add_level3_purchase(xml, parameters)
             add_level3_tax(xml, parameters)
             add_line_items(xml, parameters) if parameters[:line_items]
-            add_ecp_details(xml, payment_source, parameters) if payment_source.is_a?(Check)
             add_card_indicators(xml, parameters)
+            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_level2_card_and_more_tax(xml, parameters)
+            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)
+            add_ecp_details(xml, payment_source, parameters) if payment_source.is_a?(Check)
+
             add_stored_credentials(xml, parameters)
             add_pymt_brand_program_code(xml, payment_source, three_d_secure)
+            xml.tag! :TokenTxnType, parameters[:token_txn_type] if parameters[:token_txn_type]
             add_mastercard_fields(xml, payment_source, parameters, three_d_secure) if mastercard?(payment_source)
+            add_card_commodity_code(xml, parameters)
+            add_level3_vat_fields(xml, parameters)
           end
         end
         xml.target!
@@ -1031,6 +1087,9 @@ module ActiveMerchant #:nodoc:
             add_level3_purchase(xml, parameters)
             add_level3_tax(xml, parameters)
             add_line_items(xml, parameters) if parameters[:line_items]
+            add_level2_card_and_more_tax(xml, parameters)
+            add_card_commodity_code(xml, parameters)
+            add_level3_vat_fields(xml, parameters)
           end
         end
         xml.target!

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

@@ -121,7 +121,10 @@ module ActiveMerchant #:nodoc:
 
         test_mode = test? || message =~ /TESTMODE/
 
-        Response.new(success?(response), message, response,
+        Response.new(
+          success?(response),
+          message,
+          response,
           test: test_mode,
           authorization: response['TrackingNumber'],
           fraud_review: fraud_review?(response),
@@ -129,7 +132,8 @@ module ActiveMerchant #:nodoc:
             postal_match: AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
             street_match: AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
           },
-          cvv_result: CVV2_CODES[response['CVV2ResponseCode']])
+          cvv_result: CVV2_CODES[response['CVV2ResponseCode']]
+        )
       end
 
       def url(action)
@@ -178,8 +182,7 @@ module ActiveMerchant #:nodoc:
         post['RequestID']     = request_id
         post['Signature']     = signature(action, post, parameters)
 
-        request = post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
-        request
+        post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def timestamp

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

@@ -264,9 +264,13 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, request, authorization = nil)
         response = parse(action, ssl_post(self.live_url, request))
-        Response.new(successful?(response), message_from(response), response,
+        Response.new(
+          successful?(response),
+          message_from(response),
+          response,
           test: test?,
-          authorization: authorization || response[:tid])
+          authorization: authorization || response[:tid]
+        )
       end
 
       def message_from(response)