activemerchant 1.45.0 → 1.126.0

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

@@ -0,0 +1,386 @@
+require 'nokogiri'
+require 'securerandom'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class ElementGateway < Gateway
+      self.test_url = 'https://certtransaction.elementexpress.com/express.asmx'
+      self.live_url = 'https://transaction.elementexpress.com/express.asmx'
+
+      self.supported_countries = ['US']
+      self.default_currency = 'USD'
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
+
+      self.homepage_url = 'http://www.elementps.com'
+      self.display_name = 'Element'
+
+      SERVICE_TEST_URL = 'https://certservices.elementexpress.com/express.asmx'
+      SERVICE_LIVE_URL = 'https://services.elementexpress.com/express.asmx'
+
+      def initialize(options = {})
+        requires!(options, :account_id, :account_token, :application_id, :acceptor_id, :application_name, :application_version)
+        super
+      end
+
+      def purchase(money, payment, options = {})
+        action = payment.is_a?(Check) ? 'CheckSale' : 'CreditCardSale'
+
+        request = build_soap_request do |xml|
+          xml.send(action, xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, payment)
+            add_transaction(xml, money, options)
+            add_terminal(xml, options)
+            add_address(xml, options)
+          end
+        end
+
+        commit(action, request, money)
+      end
+
+      def authorize(money, payment, options = {})
+        request = build_soap_request do |xml|
+          xml.CreditCardAuthorization(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, payment)
+            add_transaction(xml, money, options)
+            add_terminal(xml, options)
+            add_address(xml, options)
+          end
+        end
+
+        commit('CreditCardAuthorization', request, money)
+      end
+
+      def capture(money, authorization, options = {})
+        trans_id, = split_authorization(authorization)
+        options[:trans_id] = trans_id
+
+        request = build_soap_request do |xml|
+          xml.CreditCardAuthorizationCompletion(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_transaction(xml, money, options)
+            add_terminal(xml, options)
+          end
+        end
+
+        commit('CreditCardAuthorizationCompletion', request, money)
+      end
+
+      def refund(money, authorization, options = {})
+        trans_id, = split_authorization(authorization)
+        options[:trans_id] = trans_id
+
+        request = build_soap_request do |xml|
+          xml.CreditCardReturn(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_transaction(xml, money, options)
+            add_terminal(xml, options)
+          end
+        end
+
+        commit('CreditCardReturn', request, money)
+      end
+
+      def credit(money, payment, options = {})
+        request = build_soap_request do |xml|
+          xml.CreditCardCredit(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, payment)
+            add_transaction(xml, money, options)
+            add_terminal(xml, options)
+          end
+        end
+
+        commit('CreditCardCredit', request, money)
+      end
+
+      def void(authorization, options = {})
+        trans_id, trans_amount = split_authorization(authorization)
+        options.merge!({ trans_id: trans_id, trans_amount: trans_amount, reversal_type: 'Full' })
+
+        request = build_soap_request do |xml|
+          xml.CreditCardReversal(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_transaction(xml, trans_amount, options)
+            add_terminal(xml, options)
+          end
+        end
+
+        commit('CreditCardReversal', request, trans_amount)
+      end
+
+      def store(payment, options = {})
+        request = build_soap_request do |xml|
+          xml.PaymentAccountCreate(xmlns: 'https://services.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, payment)
+            add_payment_account(xml, payment, options[:payment_account_reference_number] || SecureRandom.hex(20))
+            add_address(xml, options)
+          end
+        end
+
+        commit('PaymentAccountCreate', request, nil)
+      end
+
+      def verify(credit_card, options = {})
+        request = build_soap_request do |xml|
+          xml.CreditCardAVSOnly(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, credit_card)
+            add_transaction(xml, 0, options)
+            add_terminal(xml, options)
+            add_address(xml, options)
+          end
+        end
+
+        # send request with the transaction amount set to 0
+        commit('CreditCardAVSOnly', request, 0)
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<AccountToken>).+?(</AccountToken>))i, '\1[FILTERED]\2').
+          gsub(%r((<CardNumber>).+?(</CardNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<CVV>).+?(</CVV>))i, '\1[FILTERED]\2').
+          gsub(%r((<AccountNumber>).+?(</AccountNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<RoutingNumber>).+?(</RoutingNumber>))i, '\1[FILTERED]\2')
+      end
+
+      private
+
+      def add_credentials(xml)
+        xml.credentials do
+          xml.AccountID @options[:account_id]
+          xml.AccountToken @options[:account_token]
+          xml.AcceptorID @options[:acceptor_id]
+        end
+        xml.application do
+          xml.ApplicationID @options[:application_id]
+          xml.ApplicationName @options[:application_name]
+          xml.ApplicationVersion @options[:application_version]
+        end
+      end
+
+      def add_payment_method(xml, payment)
+        if payment.is_a?(String)
+          add_payment_account_id(xml, payment)
+        elsif payment.is_a?(Check)
+          add_echeck(xml, payment)
+        else
+          add_credit_card(xml, payment)
+        end
+      end
+
+      def add_payment_account(xml, payment, payment_account_reference_number)
+        xml.paymentAccount do
+          xml.PaymentAccountType payment_account_type(payment)
+          xml.PaymentAccountReferenceNumber payment_account_reference_number
+        end
+      end
+
+      def add_payment_account_id(xml, payment)
+        xml.extendedParameters do
+          xml.ExtendedParameters do
+            xml.Key 'PaymentAccount'
+            xml.Value('xsi:type' => 'PaymentAccount') do
+              xml.PaymentAccountID payment
+            end
+          end
+        end
+      end
+
+      def add_transaction(xml, money, options = {})
+        xml.transaction do
+          xml.ReversalType options[:reversal_type] if options[:reversal_type]
+          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.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]
+          xml.SubmissionType options[:submission_type] if options[:submission_type]
+          xml.DuplicateCheckDisableFlag options[:duplicate_check_disable_flag].to_s == 'true' ? 'True' : 'False' unless options[:duplicate_check_disable_flag].nil?
+          xml.DuplicateOverrideFlag options[:duplicate_override_flag].to_s == 'true' ? 'True' : 'False' unless options[:duplicate_override_flag].nil?
+          xml.MerchantDescriptor options[:merchant_descriptor] if options[:merchant_descriptor]
+        end
+      end
+
+      def market_code(money, options)
+        options[:market_code] || 'Default'
+      end
+
+      def add_terminal(xml, options)
+        xml.terminal do
+          xml.TerminalID options[:terminal_id] || '01'
+          xml.CardPresentCode options[:card_present_code] || 'UseDefault'
+          xml.CardholderPresentCode 'UseDefault'
+          xml.CardInputCode 'UseDefault'
+          xml.CVVPresenceCode 'UseDefault'
+          xml.TerminalCapabilityCode 'UseDefault'
+          xml.TerminalEnvironmentCode 'UseDefault'
+          xml.MotoECICode 'NonAuthenticatedSecureECommerceTransaction'
+        end
+      end
+
+      def add_credit_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.CVV payment.verification_value
+        end
+      end
+
+      def add_echeck(xml, payment)
+        xml.demandDepositAccount do
+          xml.AccountNumber payment.account_number
+          xml.RoutingNumber payment.routing_number
+          xml.DDAAccountType payment.account_type.capitalize
+        end
+      end
+
+      def add_address(xml, options)
+        if address = options[:billing_address] || options[:address]
+          xml.address do
+            xml.BillingAddress1 address[:address1] if address[:address1]
+            xml.BillingAddress2 address[:address2] if address[:address2]
+            xml.BillingCity address[:city] if address[:city]
+            xml.BillingState address[:state] if address[:state]
+            xml.BillingZipcode address[:zip] if address[:zip]
+            xml.BillingEmail address[:email] if address[:email]
+            xml.BillingPhone address[:phone_number] if address[:phone_number]
+          end
+        end
+        if shipping_address = options[:shipping_address]
+          xml.address do
+            xml.ShippingAddress1 shipping_address[:address1] if shipping_address[:address1]
+            xml.ShippingAddress2 shipping_address[:address2] if shipping_address[:address2]
+            xml.ShippingCity shipping_address[:city] if shipping_address[:city]
+            xml.ShippingState shipping_address[:state] if shipping_address[:state]
+            xml.ShippingZipcode shipping_address[:zip] if shipping_address[:zip]
+            xml.ShippingEmail shipping_address[:email] if shipping_address[:email]
+            xml.ShippingPhone shipping_address[:phone_number] if shipping_address[:phone_number]
+          end
+        end
+      end
+
+      def parse(xml)
+        response = {}
+
+        doc = Nokogiri::XML(xml)
+        doc.remove_namespaces!
+        root = doc.root.xpath('//response/*')
+
+        root = doc.root.xpath('//Response/*') if root.empty?
+
+        root.each do |node|
+          if node.elements.empty?
+            response[node.name.downcase] = node.text
+          else
+            node_name = node.name.downcase
+            response[node_name] = Hash.new
+
+            node.elements.each do |childnode|
+              response[node_name][childnode.name.downcase] = childnode.text
+            end
+          end
+        end
+
+        response
+      end
+
+      def commit(action, xml, amount)
+        response = parse(ssl_post(url(action), xml, headers(action)))
+
+        Response.new(
+          success_from(response),
+          message_from(response),
+          response,
+          authorization: authorization_from(action, response, amount),
+          avs_result: success_from(response) ? avs_from(response) : nil,
+          cvv_result: success_from(response) ? cvv_from(response) : nil,
+          test: test?
+        )
+      end
+
+      def authorization_from(action, response, amount)
+        if action == 'PaymentAccountCreate'
+          response['paymentaccount']['paymentaccountid']
+        else
+          "#{response['transaction']['transactionid']}|#{amount}" if response['transaction']
+        end
+      end
+
+      def success_from(response)
+        response['expressresponsecode'] == '0'
+      end
+
+      def message_from(response)
+        response['expressresponsemessage']
+      end
+
+      def avs_from(response)
+        AVSResult.new(code: response['card']['avsresponsecode']) if response['card']
+      end
+
+      def cvv_from(response)
+        CVVResult.new(response['card']['cvvresponsecode']) if response['card']
+      end
+
+      def split_authorization(authorization)
+        authorization.split('|')
+      end
+
+      def build_soap_request
+        builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+          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
+              yield(xml)
+            end
+          end
+        end
+
+        builder.to_xml
+      end
+
+      def payment_account_type(payment)
+        if payment.is_a?(Check)
+          payment_account_type = payment.account_type
+        else
+          payment_account_type = 'CreditCard'
+        end
+        payment_account_type
+      end
+
+      def url(action)
+        if action == 'PaymentAccountCreate'
+          test? ? SERVICE_TEST_URL : SERVICE_LIVE_URL
+        else
+          test? ? test_url : live_url
+        end
+      end
+
+      def interface(action)
+        return 'transaction' if action != 'PaymentAccountCreate'
+        return 'services' if action == 'PaymentAccountCreate'
+      end
+
+      def headers(action)
+        {
+          'Content-Type' => 'text/xml; charset=utf-8',
+          'SOAPAction' => "https://#{interface(action)}.elementexpress.com/#{action}"
+        }
+      end
+    end
+  end
+end

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

@@ -1,53 +1,52 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class EpayGateway < Gateway
-      API_HOST = 'ssl.ditonlinebetalingssystem.dk'
-      self.live_url = 'https://' + API_HOST + '/remote/payment'
+      self.live_url = 'https://ssl.ditonlinebetalingssystem.dk/'
 
       self.default_currency = 'DKK'
       self.money_format = :cents
-      self.supported_cardtypes = [:dankort, :forbrugsforeningen, :visa, :master,
-                                  :american_express, :diners_club, :jcb, :maestro]
-      self.supported_countries = ['DK', 'SE', 'NO']
+      self.supported_countries = %w[DK SE NO]
+      self.supported_cardtypes = %i[dankort forbrugsforeningen visa master
+                                    american_express diners_club jcb maestro]
       self.homepage_url = 'http://epay.dk/'
       self.display_name = 'ePay'
 
       CURRENCY_CODES = {
-        :ADP => '020', :AED => '784', :AFA => '004', :ALL => '008', :AMD => '051',
-        :ANG => '532', :AOA => '973', :ARS => '032', :AUD => '036', :AWG => '533',
-        :AZM => '031', :BAM => '977', :BBD => '052', :BDT => '050', :BGL => '100',
-        :BGN => '975', :BHD => '048', :BIF => '108', :BMD => '060', :BND => '096',
-        :BOB => '068', :BOV => '984', :BRL => '986', :BSD => '044', :BTN => '064',
-        :BWP => '072', :BYR => '974', :BZD => '084', :CAD => '124', :CDF => '976',
-        :CHF => '756', :CLF => '990', :CLP => '152', :CNY => '156', :COP => '170',
-        :CRC => '188', :CUP => '192', :CVE => '132', :CYP => '196', :CZK => '203',
-        :DJF => '262', :DKK => '208', :DOP => '214', :DZD => '012', :ECS => '218',
-        :ECV => '983', :EEK => '233', :EGP => '818', :ERN => '232', :ETB => '230',
-        :EUR => '978', :FJD => '242', :FKP => '238', :GBP => '826', :GEL => '981',
-        :GHC => '288', :GIP => '292', :GMD => '270', :GNF => '324', :GTQ => '320',
-        :GWP => '624', :GYD => '328', :HKD => '344', :HNL => '340', :HRK => '191',
-        :HTG => '332', :HUF => '348', :IDR => '360', :ILS => '376', :INR => '356',
-        :IQD => '368', :IRR => '364', :ISK => '352', :JMD => '388', :JOD => '400',
-        :JPY => '392', :KES => '404', :KGS => '417', :KHR => '116', :KMF => '174',
-        :KPW => '408', :KRW => '410', :KWD => '414', :KYD => '136', :KZT => '398',
-        :LAK => '418', :LBP => '422', :LKR => '144', :LRD => '430', :LSL => '426',
-        :LTL => '440', :LVL => '428', :LYD => '434', :MAD => '504', :MDL => '498',
-        :MGF => '450', :MKD => '807', :MMK => '104', :MNT => '496', :MOP => '446',
-        :MRO => '478', :MTL => '470', :MUR => '480', :MVR => '462', :MWK => '454',
-        :MXN => '484', :MXV => '979', :MYR => '458', :MZM => '508', :NAD => '516',
-        :NGN => '566', :NIO => '558', :NOK => '578', :NPR => '524', :NZD => '554',
-        :OMR => '512', :PAB => '590', :PEN => '604', :PGK => '598', :PHP => '608',
-        :PKR => '586', :PLN => '985', :PYG => '600', :QAR => '634', :ROL => '642',
-        :RUB => '643', :RUR => '810', :RWF => '646', :SAR => '682', :SBD => '090',
-        :SCR => '690', :SDD => '736', :SEK => '752', :SGD => '702', :SHP => '654',
-        :SIT => '705', :SKK => '703', :SLL => '694', :SOS => '706', :SRG => '740',
-        :STD => '678', :SVC => '222', :SYP => '760', :SZL => '748', :THB => '764',
-        :TJS => '972', :TMM => '795', :TND => '788', :TOP => '776', :TPE => '626',
-        :TRL => '792', :TRY => '949', :TTD => '780', :TWD => '901', :TZS => '834',
-        :UAH => '980', :UGX => '800', :USD => '840', :UYU => '858', :UZS => '860',
-        :VEB => '862', :VND => '704', :VUV => '548', :XAF => '950', :XCD => '951',
-        :XOF => '952', :XPF => '953', :YER => '886', :YUM => '891', :ZAR => '710',
-        :ZMK => '894', :ZWD => '716'
+        ADP: '020', AED: '784', AFA: '004', ALL: '008', AMD: '051',
+        ANG: '532', AOA: '973', ARS: '032', AUD: '036', AWG: '533',
+        AZM: '031', BAM: '977', BBD: '052', BDT: '050', BGL: '100',
+        BGN: '975', BHD: '048', BIF: '108', BMD: '060', BND: '096',
+        BOB: '068', BOV: '984', BRL: '986', BSD: '044', BTN: '064',
+        BWP: '072', BYR: '974', BZD: '084', CAD: '124', CDF: '976',
+        CHF: '756', CLF: '990', CLP: '152', CNY: '156', COP: '170',
+        CRC: '188', CUP: '192', CVE: '132', CYP: '196', CZK: '203',
+        DJF: '262', DKK: '208', DOP: '214', DZD: '012', ECS: '218',
+        ECV: '983', EEK: '233', EGP: '818', ERN: '232', ETB: '230',
+        EUR: '978', FJD: '242', FKP: '238', GBP: '826', GEL: '981',
+        GHC: '288', GIP: '292', GMD: '270', GNF: '324', GTQ: '320',
+        GWP: '624', GYD: '328', HKD: '344', HNL: '340', HRK: '191',
+        HTG: '332', HUF: '348', IDR: '360', ILS: '376', INR: '356',
+        IQD: '368', IRR: '364', ISK: '352', JMD: '388', JOD: '400',
+        JPY: '392', KES: '404', KGS: '417', KHR: '116', KMF: '174',
+        KPW: '408', KRW: '410', KWD: '414', KYD: '136', KZT: '398',
+        LAK: '418', LBP: '422', LKR: '144', LRD: '430', LSL: '426',
+        LTL: '440', LVL: '428', LYD: '434', MAD: '504', MDL: '498',
+        MGF: '450', MKD: '807', MMK: '104', MNT: '496', MOP: '446',
+        MRO: '478', MTL: '470', MUR: '480', MVR: '462', MWK: '454',
+        MXN: '484', MXV: '979', MYR: '458', MZM: '508', NAD: '516',
+        NGN: '566', NIO: '558', NOK: '578', NPR: '524', NZD: '554',
+        OMR: '512', PAB: '590', PEN: '604', PGK: '598', PHP: '608',
+        PKR: '586', PLN: '985', PYG: '600', QAR: '634', ROL: '642',
+        RUB: '643', RUR: '810', RWF: '646', SAR: '682', SBD: '090',
+        SCR: '690', SDD: '736', SEK: '752', SGD: '702', SHP: '654',
+        SIT: '705', SKK: '703', SLL: '694', SOS: '706', SRG: '740',
+        STD: '678', SVC: '222', SYP: '760', SZL: '748', THB: '764',
+        TJS: '972', TMM: '795', TND: '788', TOP: '776', TPE: '626',
+        TRL: '792', TRY: '949', TTD: '780', TWD: '901', TZS: '834',
+        UAH: '980', UGX: '800', USD: '840', UYU: '858', UZS: '860',
+        VEB: '862', VND: '704', VUV: '548', XAF: '950', XCD: '951',
+        XOF: '952', XPF: '953', YER: '886', YUM: '891', ZAR: '710',
+        ZMK: '894', ZWD: '716'
       }
 
       # login: merchant number
@@ -64,6 +63,7 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, options)
         add_creditcard_or_reference(post, credit_card_or_reference)
         add_instant_capture(post, false)
+        add_3ds_auth(post, options)
 
         commit(:authorize, post)
       end
@@ -75,6 +75,7 @@ module ActiveMerchant #:nodoc:
         add_creditcard_or_reference(post, credit_card_or_reference)
         add_invoice(post, options)
         add_instant_capture(post, true)
+        add_3ds_auth(post, options)
 
         commit(:authorize, post)
       end
@@ -110,6 +111,17 @@ module ActiveMerchant #:nodoc:
         refund(money, identification, options)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r(((?:\?|&)cardno=)\d*(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?cvc=)\d*(&?)), '\1[FILTERED]\2')
+      end
+
       private
 
       def add_amount(post, money, options)
@@ -148,21 +160,31 @@ module ActiveMerchant #:nodoc:
         post[:instantcapture] = option ? 1 : 0
       end
 
+      def add_3ds_auth(post, options)
+        if options[:three_d_secure]
+          post[:eci] = options.dig(:three_d_secure, :eci)
+          post[:xid] = options.dig(:three_d_secure, :xid)
+          post[:cavv] = options.dig(:three_d_secure, :cavv)
+          post[:threeds_version] = options.dig(:three_d_secure, :version)
+          post[:ds_transaction_id] = options.dig(:three_d_secure, :ds_transaction_id)
+        end
+      end
+
       def commit(action, params)
         response = send("do_#{action}", params)
 
         if action == :authorize
           Response.new response['accept'].to_i == 1,
-                       response['errortext'],
-                       response,
-                       :test => test?,
-                       :authorization => response['tid']
+            response['errortext'],
+            response,
+            test: test?,
+            authorization: response['tid']
         else
           Response.new response['result'] == 'true',
-                       messages(response['epay'], response['pbs']),
-                       response,
-                       :test => test?,
-                       :authorization => params[:transaction]
+            messages(response['epay'], response['pbs']),
+            response,
+            test: test?,
+            authorization: params[:transaction]
         end
       end
 
@@ -175,19 +197,18 @@ module ActiveMerchant #:nodoc:
       def soap_post(method, params)
         data = xml_builder(params, method)
         headers = make_headers(data, method)
-        REXML::Document.new(ssl_post('https://' + API_HOST + '/remote/payment.asmx', data, headers))
+        REXML::Document.new(ssl_post(live_url + 'remote/payment.asmx', data, headers))
       end
 
       def do_authorize(params)
         headers = {}
-        headers['Referer'] = (options[:password] || "activemerchant.org")
-
-        response = raw_ssl_request(:post, 'https://' + API_HOST + '/auth/default.aspx', authorize_post_data(params), headers)
+        headers['Referer'] = (options[:password] || 'activemerchant.org')
 
+        response = raw_ssl_request(:post, live_url + 'auth/default.aspx', authorize_post_data(params), headers)
         # Authorize gives the response back by redirecting with the values in
         # the URL query
         if location = response['Location']
-          query = CGI::parse(URI.parse(location.gsub(' ', '%20')).query)
+          query = CGI::parse(URI.parse(location.gsub(' ', '%20').gsub('<', '%3C').gsub('>', '%3E')).query)
         else
           return {
             'accept' => '0',
@@ -198,7 +219,7 @@ module ActiveMerchant #:nodoc:
         end
 
         result = {}
-        query.each_pair do |k,v|
+        query.each_pair do |k, v|
           result[k] = v.is_a?(Array) && v.size == 1 ? v[0] : v # make values like ['v'] into 'v'
         end
         result
@@ -233,42 +254,42 @@ module ActiveMerchant #:nodoc:
       def make_headers(data, soap_call)
         {
           'Content-Type' => 'text/xml; charset=utf-8',
-          'Host' => API_HOST,
+          'Host' => 'ssl.ditonlinebetalingssystem.dk',
           'Content-Length' => data.size.to_s,
-          'SOAPAction' => self.live_url + '/' + soap_call
+          'SOAPAction' => self.live_url + 'remote/payment/' + soap_call
         }
       end
 
       def xml_builder(params, soap_call)
-        xml = Builder::XmlMarkup.new(:indent => 2)
+        xml = Builder::XmlMarkup.new(indent: 2)
         xml.instruct!
-          xml.tag! 'soap:Envelope', { 'xmlns:xsi' => 'http://schemas.xmlsoap.org/soap/envelope/',
-                                      'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-                                      'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/' } do
-            xml.tag! 'soap:Body' do
-              xml.tag! soap_call, { 'xmlns' => self.live_url } do
-                xml.tag! 'merchantnumber', @options[:login]
-                xml.tag! 'transactionid', params[:transaction]
-                xml.tag! 'amount', params[:amount].to_s if soap_call != 'delete'
-              end
+        xml.tag! 'soap:Envelope', { 'xmlns:xsi' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                                    'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+                                    'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/' } do
+          xml.tag! 'soap:Body' do
+            xml.tag! soap_call, { 'xmlns' => "#{self.live_url}remote/payment" } do
+              xml.tag! 'merchantnumber', @options[:login]
+              xml.tag! 'transactionid', params[:transaction]
+              xml.tag! 'amount', params[:amount].to_s if soap_call != 'delete'
             end
           end
+        end
         xml.target!
       end
 
       def authorize_post_data(params = {})
         params[:language] = '2'
-        params[:cms] = 'activemerchant'
-        params[:accepturl] = 'https://ssl.ditonlinebetalingssystem.dk/auth/default.aspx?accept=1'
-        params[:declineurl] = 'https://ssl.ditonlinebetalingssystem.dk/auth/default.aspx?decline=1'
+        params[:cms] = 'activemerchant_3ds'
+        params[:accepturl] = live_url + 'auth/default.aspx?accept=1'
+        params[:declineurl] = live_url + 'auth/default.aspx?decline=1'
         params[:merchantnumber] = @options[:login]
 
-        params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       # Limited to 20 digits max
       def format_order_number(number)
-        number.to_s.gsub(/[^\w]/, '').rjust(4, "0")[0...20]
+        number.to_s.gsub(/[^\w]/, '').rjust(4, '0')[0...20]
       end
     end
   end