activemerchant 1.42.6 → 1.90.0

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

@@ -2,26 +2,26 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class MerchantWareVersionFourGateway < Gateway
       self.live_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
-      self.test_url = 'https://staging.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
+      self.test_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
 
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://merchantwarehouse.com/merchantware'
       self.display_name = 'MerchantWARE'
 
-      ENV_NAMESPACES = { "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/" }
+      ENV_NAMESPACES = { '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/' }
 
-      TX_NAMESPACE = "http://schemas.merchantwarehouse.com/merchantware/40/Credit/"
+      TX_NAMESPACE = 'http://schemas.merchantwarehouse.com/merchantware/40/Credit/'
 
       ACTIONS = {
-        :purchase  => "SaleKeyed",
+        :purchase  => 'SaleKeyed',
         :reference_purchase => 'RepeatSale',
-        :authorize => "PreAuthorizationKeyed",
-        :capture   => "PostAuthorization",
-        :void      => "VoidPreAuthorization",
-        :refund    => "Refund"
+        :authorize => 'PreAuthorizationKeyed',
+        :capture   => 'PostAuthorization',
+        :void      => 'Void',
+        :refund    => 'Refund'
       }
 
       # Creates a new MerchantWareVersionFourGateway
@@ -102,23 +102,41 @@ module ActiveMerchant #:nodoc:
         request = soap_request(:refund) do |xml|
           add_reference_token(xml, reference)
           add_invoice(xml, options)
-          add_amount(xml, money, "overrideAmount")
+          add_amount(xml, money, 'overrideAmount')
         end
 
         commit(:refund, request)
       end
 
+      def verify(credit_card, options={})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<merchantKey>).+?(</merchantKey>))i, '\1[FILTERED]\2').
+          gsub(%r((<cardNumber>).+?(</cardNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<cardSecurityCode>).+?(</cardSecurityCode>))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def soap_request(action)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
-        xml.tag! "soap:Envelope", ENV_NAMESPACES do
-          xml.tag! "soap:Body" do
-            xml.tag! ACTIONS[action], "xmlns" => TX_NAMESPACE do
-              xml.tag! "merchantName", @options[:name]
-              xml.tag! "merchantSiteId", @options[:login]
-              xml.tag! "merchantKey", @options[:password]
+        xml.tag! 'soap:Envelope', ENV_NAMESPACES do
+          xml.tag! 'soap:Body' do
+            xml.tag! ACTIONS[action], 'xmlns' => TX_NAMESPACE do
+              xml.tag! 'merchantName', @options[:name]
+              xml.tag! 'merchantSiteId', @options[:login]
+              xml.tag! 'merchantKey', @options[:password]
               yield xml
             end
           end
@@ -129,7 +147,7 @@ module ActiveMerchant #:nodoc:
       def build_purchase_request(action, money, payment_source, options)
         requires!(options, :order_id)
 
-        request = soap_request(action) do |xml|
+        soap_request(action) do |xml|
           add_invoice(xml, options)
           add_amount(xml, money)
           add_payment_source(xml, payment_source)
@@ -140,36 +158,29 @@ module ActiveMerchant #:nodoc:
       def build_capture_request(action, money, identification, options)
         reference, options[:order_id] = split_reference(identification)
 
-        request = soap_request(action) do |xml|
+        soap_request(action) do |xml|
           add_reference_token(xml, reference)
           add_invoice(xml, options)
           add_amount(xml, money)
         end
       end
 
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
       def add_invoice(xml, options)
-        xml.tag! "invoiceNumber", options[:order_id].to_s.gsub(/[^\w]/, '').slice(0, 25)
+        xml.tag! 'invoiceNumber', truncate(options[:order_id].to_s.gsub(/[^\w]/, ''), 8)
       end
 
-      def add_amount(xml, money, tag = "amount")
+      def add_amount(xml, money, tag = 'amount')
         xml.tag! tag, amount(money)
       end
 
       def add_reference_token(xml, reference)
-        xml.tag! "token", reference
+        xml.tag! 'token', reference
       end
 
       def add_address(xml, options)
         address = options[:billing_address] || options[:address] || {}
-        xml.tag! "avsStreetAddress", address[:address1]
-        xml.tag! "avsStreetZipCode", address[:zip]
+        xml.tag! 'avsStreetAddress', address[:address1]
+        xml.tag! 'avsStreetZipCode', address[:zip]
       end
 
       def add_payment_source(xml, source)
@@ -181,14 +192,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_credit_card(xml, credit_card)
-        xml.tag! "cardNumber", credit_card.number
-        xml.tag! "expirationDate", expdate(credit_card)
-        xml.tag! "cardholder", credit_card.name
-        xml.tag! "cardSecurityCode", credit_card.verification_value if credit_card.verification_value?
+        xml.tag! 'cardNumber', credit_card.number
+        xml.tag! 'expirationDate', expdate(credit_card)
+        xml.tag! 'cardholder', credit_card.name
+        xml.tag! 'cardSecurityCode', credit_card.verification_value if credit_card.verification_value?
       end
 
       def split_reference(reference)
-        reference.to_s.split(";")
+        reference.to_s.split(';')
       end
 
       def parse(action, data)
@@ -201,14 +212,14 @@ module ActiveMerchant #:nodoc:
           response[element.name] = element.text
         end
 
-        if response["ErrorMessage"].present?
-          response[:message] = response["ErrorMessage"]
+        if response['ErrorMessage'].present?
+          response[:message] = response['ErrorMessage']
           response[:success] = false
         else
-          status, code, message = response["ApprovalStatus"].split(";")
+          status, code, message = response['ApprovalStatus'].split(';')
           response[:status] = status
 
-          if response[:success] = status == "APPROVED"
+          if response[:success] = status == 'APPROVED'
             response[:message] = status
           else
             response[:message] = message
@@ -232,11 +243,11 @@ module ActiveMerchant #:nodoc:
           response[element.name] = element.text
         end
 
-        response[:message] = response["ErrorMessage"].to_s.gsub("\n", " ")
+        response[:message] = response['ErrorMessage'].to_s.gsub("\n", ' ')
         response
-      rescue REXML::ParseException => e
+      rescue REXML::ParseException
         response[:http_body]        = http_response.body
-        response[:message]          = "Failed to parse the failed response"
+        response[:message]          = 'Failed to parse the failed response'
         response
       end
 
@@ -251,9 +262,9 @@ module ActiveMerchant #:nodoc:
       def commit(action, request)
         begin
           data = ssl_post(url, request,
-                   "Content-Type" => 'text/xml; charset=utf-8',
-                   "SOAPAction"   => soap_action(action)
-                 )
+            'Content-Type' => 'text/xml; charset=utf-8',
+            'SOAPAction'   => soap_action(action)
+          )
           response = parse(action, data)
         rescue ActiveMerchant::ResponseError => e
           response = parse_error(e.response, action)
@@ -262,8 +273,8 @@ module ActiveMerchant #:nodoc:
         Response.new(response[:success], response[:message], response,
           :test => test?,
           :authorization => authorization_from(response),
-          :avs_result => { :code => response["AvsResponse"] },
-          :cvv_result => response["CvResponse"]
+          :avs_result => { :code => response['AvsResponse'] },
+          :cvv_result => response['CvResponse']
         )
       end
 

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

@@ -12,9 +12,9 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express,
-                                  :diners_club, :discover]
-      self.homepage_url = 'http://www.merchantwarrior.com/'
-      self.display_name = 'MerchantWarrior'
+                                  :diners_club, :discover, :jcb]
+      self.homepage_url = 'https://www.merchantwarrior.com/'
+      self.display_name = 'Merchant Warrior'
 
       self.money_format = :dollars
       self.default_currency = 'AUD'
@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
       def authorize(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
-        add_product(post, options)
+        add_order_id(post, options)
         add_address(post, options)
         add_payment_method(post, payment_method)
         commit('processAuth', post)
@@ -36,21 +36,21 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
-        add_product(post, options)
+        add_order_id(post, options)
         add_address(post, options)
         add_payment_method(post, payment_method)
         commit('processCard', post)
       end
 
-      def capture(money, identification)
+      def capture(money, identification, options = {})
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
-        post.merge!('captureAmount' => amount(money))
+        post['captureAmount'] = amount(money)
         commit('processCapture', post)
       end
 
-      def refund(money, identification)
+      def refund(money, identification, options = {})
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
@@ -60,7 +60,7 @@ module ActiveMerchant #:nodoc:
 
       def store(creditcard, options = {})
         post = {
-          'cardName' => creditcard.name,
+          'cardName' => scrub_name(creditcard.name),
           'cardNumber' => creditcard.number,
           'cardExpiryMonth' => format(creditcard.month, :two_digits),
           'cardExpiryYear'  => format(creditcard.year, :two_digits)
@@ -68,6 +68,18 @@ module ActiveMerchant #:nodoc:
         commit('addCard', post)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((&?paymentCardNumber=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((CardNumber=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?paymentCardCSC=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?apiKey=)[^&]*)i, '\1[FILTERED]')
+      end
+
       private
 
       def add_transaction(post, identification)
@@ -77,16 +89,19 @@ module ActiveMerchant #:nodoc:
       def add_address(post, options)
         return unless(address = (options[:billing_address] || options[:address]))
 
-        post['customerName'] = address[:name]
+        post['customerName'] = scrub_name(address[:name])
         post['customerCountry'] = address[:country]
-        post['customerState'] = address[:state]
+        post['customerState'] = address[:state] || 'N/A'
         post['customerCity'] = address[:city]
         post['customerAddress'] = address[:address1]
         post['customerPostCode'] = address[:zip]
+        post['customerIP'] = address[:ip]
+        post['customerPhone'] = address[:phone]
+        post['customerEmail'] = address[:email]
       end
 
-      def add_product(post, options)
-        post['transactionProduct'] = options[:description]
+      def add_order_id(post, options)
+        post['transactionProduct'] = truncate(options[:order_id], 34) || SecureRandom.hex(15)
       end
 
       def add_payment_method(post, payment_method)
@@ -103,11 +118,15 @@ module ActiveMerchant #:nodoc:
 
       def add_creditcard(post, creditcard)
         post['paymentCardNumber'] = creditcard.number
-        post['paymentCardName'] = creditcard.name
-        post['paymentCardExpiry'] = creditcard.expiry_date.expiration.strftime("%m%y")
+        post['paymentCardName'] = scrub_name(creditcard.name)
+        post['paymentCardExpiry'] = creditcard.expiry_date.expiration.strftime('%m%y')
         post['paymentCardCSC'] = creditcard.verification_value if creditcard.verification_value?
       end
 
+      def scrub_name(name)
+        name.gsub(/[^a-zA-Z\. -]/, '')
+      end
+
       def add_amount(post, money, options)
         currency = (options[:currency] || currency(money))
 
@@ -139,7 +158,7 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|element| parse_element(response, element)}
+          node.elements.each { |element| parse_element(response, element) }
         else
           response[node.name.underscore.to_sym] = node.text
         end
@@ -169,14 +188,14 @@ module ActiveMerchant #:nodoc:
 
       def url_for(action, post)
         if token?(post)
-          [(test? ? TOKEN_TEST_URL : TOKEN_LIVE_URL), action].join("/")
+          [(test? ? TOKEN_TEST_URL : TOKEN_LIVE_URL), action].join('/')
         else
           (test? ? POST_TEST_URL : POST_LIVE_URL)
         end
       end
 
       def token?(post)
-        (post["cardID"] || post["cardName"])
+        (post['cardID'] || post['cardName'])
       end
 
       def success?(response)
@@ -184,7 +203,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(post)
-        post.collect{|k,v| "#{k}=#{CGI.escape(v.to_s)}" }.join("&")
+        post.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
     end
   end

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

@@ -12,16 +12,22 @@ module ActiveMerchant #:nodoc:
     # and +refund+ will become mandatory.
     class MercuryGateway < Gateway
       URLS = {
-        :test => 'https://w1.mercurydev.net/ws/ws.asmx',
+        :test => 'https://w1.mercurycert.net/ws/ws.asmx',
         :live => 'https://w1.mercurypay.com/ws/ws.asmx'
       }
 
       self.homepage_url = 'http://www.mercurypay.com'
       self.display_name = 'Mercury'
-      self.supported_countries = ['US']
+      self.supported_countries = ['US', 'CA']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
       self.default_currency = 'USD'
 
+      STANDARD_ERROR_CODE_MAPPING = {
+        '100204' => STANDARD_ERROR_CODE[:invalid_number],
+        '100205' => STANDARD_ERROR_CODE[:invalid_expiry_date],
+        '000000' => STANDARD_ERROR_CODE[:card_declined]
+      }
+
       def initialize(options = {})
         requires!(options, :login, :password)
         @use_tokenization = (!options.has_key?(:tokenization) || options[:tokenization])
@@ -66,13 +72,6 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options={})
         requires!(options, :credit_card) unless @use_tokenization
 
-        if options[:try_reversal]
-          request = build_authorized_request('VoidSale', nil, authorization, options[:credit_card], options.merge(:reversal => true))
-          response = commit('VoidSale', request)
-
-          return response if response.success?
-        end
-
         request = build_authorized_request('VoidSale', nil, authorization, options[:credit_card], options)
         commit('VoidSale', request)
       end
@@ -82,24 +81,37 @@ module ActiveMerchant #:nodoc:
         commit('CardLookup', request)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r(&lt;), '<').
+          gsub(%r(&gt;), '>').
+          gsub(%r((<pw>).*(</pw>))i, '\1[FILTERED]\2').
+          gsub(%r((<AcctNo>)(\d|x)*(</AcctNo>))i, '\1[FILTERED]\3').
+          gsub(%r((<CVVData>)\d*(</CVVData>))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def build_non_authorized_request(action, money, credit_card, options)
         xml = Builder::XmlMarkup.new
 
-        xml.tag! "TStream" do
-          xml.tag! "Transaction" do
+        xml.tag! 'TStream' do
+          xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'Credit'
             xml.tag! 'TranCode', action
-            if action == 'PreAuth' || action == 'Sale'
-              xml.tag! "PartialAuth", "Allow"
+            if options[:allow_partial_auth] && ['PreAuth', 'Sale'].include?(action)
+              xml.tag! 'PartialAuth', 'Allow'
             end
             add_invoice(xml, options[:order_id], nil, options)
-            add_reference(xml, "RecordNumberRequested")
+            add_reference(xml, 'RecordNumberRequested')
             add_customer_data(xml, options)
             add_amount(xml, money, options)
             add_credit_card(xml, credit_card, action)
-            add_address(xml, options)
+            add_address(xml, options) unless credit_card.track_data.present?
           end
         end
         xml = xml.target!
@@ -109,15 +121,15 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new
 
         invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount = split_authorization(authorization)
-        ref_no = invoice_no if options[:reversal]
+        ref_no = '1' if ref_no.blank?
 
-        xml.tag! "TStream" do
-          xml.tag! "Transaction" do
+        xml.tag! 'TStream' do
+          xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'Credit'
-            if action == 'PreAuthCapture'
-              xml.tag! "PartialAuth", "Allow"
+            if options[:allow_partial_auth] && (action == 'PreAuthCapture')
+              xml.tag! 'PartialAuth', 'Allow'
             end
-            xml.tag! 'TranCode', (@use_tokenization ? (action + "ByRecordNo") : action)
+            xml.tag! 'TranCode', (@use_tokenization ? (action + 'ByRecordNo') : action)
             add_invoice(xml, invoice_no, ref_no, options)
             add_reference(xml, record_no)
             add_customer_data(xml, options)
@@ -125,9 +137,9 @@ module ActiveMerchant #:nodoc:
             add_credit_card(xml, credit_card, action) if credit_card
             add_address(xml, options)
             xml.tag! 'TranInfo' do
-              xml.tag! "AuthCode", auth_code
-              xml.tag! "AcqRefData", acq_ref_data if options[:reversal]
-              xml.tag! "ProcessData", process_data if options[:reversal]
+              xml.tag! 'AuthCode', auth_code
+              xml.tag! 'AcqRefData', acq_ref_data
+              xml.tag! 'ProcessData', process_data
             end
           end
         end
@@ -137,8 +149,8 @@ module ActiveMerchant #:nodoc:
       def build_card_lookup_request(credit_card, options)
         xml = Builder::XmlMarkup.new
 
-        xml.tag! "TStream" do
-          xml.tag! "Transaction" do
+        xml.tag! 'TStream' do
+          xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'CardLookup'
             xml.tag! 'RecordNo', 'RecordNumberRequested'
             xml.tag! 'Frequency', 'OneTime'
@@ -152,10 +164,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(xml, invoice_no, ref_no, options)
-        if /^\d+$/ !~ invoice_no.to_s
-          raise ArgumentError.new("order_id '#{invoice_no}' is not numeric as required by Mercury")
-        end
-
         xml.tag! 'InvoiceNo', invoice_no
         xml.tag! 'RefNo', (ref_no || invoice_no)
         xml.tag! 'OperatorID', options[:merchant] if options[:merchant]
@@ -164,15 +172,15 @@ module ActiveMerchant #:nodoc:
 
       def add_reference(xml, record_no)
         if @use_tokenization
-          xml.tag! "Frequency", "OneTime"
-          xml.tag! "RecordNo", record_no
+          xml.tag! 'Frequency', 'OneTime'
+          xml.tag! 'RecordNo', record_no
         end
       end
 
       def add_customer_data(xml, options)
         xml.tag! 'IpAddress', options[:ip] if options[:ip]
         if options[:customer]
-          xml.tag! "TranInfo" do
+          xml.tag! 'TranInfo' do
             xml.tag! 'CustomerCode', options[:customer]
           end
         end
@@ -199,22 +207,36 @@ module ActiveMerchant #:nodoc:
 
       def add_credit_card(xml, credit_card, action)
         xml.tag! 'Account' do
-          xml.tag! 'AcctNo', credit_card.number
-          xml.tag! 'ExpDate', expdate(credit_card)
+          if credit_card.track_data.present?
+            # Track 1 has a start sentinel (STX) of '%' and track 2 is ';'
+            # Track 1 and 2 have identical end sentinels (ETX) of '?'
+            # Tracks may or may not have checksum (LRC) after the ETX
+            # If the track has no STX or is corrupt, we send it as track 1, to let Mercury
+            # handle with the validation error as it sees fit.
+            # Track 2 requires having the STX and ETX stripped. Track 1 does not.
+            # Max-length track 1s require having the STX and ETX stripped. Max is 79 bytes including LRC.
+            is_track_2 = credit_card.track_data[0] == ';'
+            etx_index = credit_card.track_data.rindex('?') || credit_card.track_data.length
+            is_max_track1 = etx_index >= 77
+
+            if is_track_2
+              xml.tag! 'Track2', credit_card.track_data[1...etx_index]
+            elsif is_max_track1
+              xml.tag! 'Track1', credit_card.track_data[1...etx_index]
+            else
+              xml.tag! 'Track1', credit_card.track_data
+            end
+          else
+            xml.tag! 'AcctNo', credit_card.number
+            xml.tag! 'ExpDate', expdate(credit_card)
+          end
         end
         xml.tag! 'CardType', CARD_CODES[credit_card.brand] if credit_card.brand
 
-        include_cvv = !%w(Return PreAuthCapture).include?(action)
+        include_cvv = !%w(Return PreAuthCapture).include?(action) && !credit_card.track_data.present?
         xml.tag! 'CVVData', credit_card.verification_value if(include_cvv && credit_card.verification_value)
       end
 
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
       def add_address(xml, options)
         if billing_address = options[:billing_address] || options[:address]
           xml.tag! 'AVS' do
@@ -233,12 +255,12 @@ module ActiveMerchant #:nodoc:
       def hashify_xml!(xml, response)
         xml = REXML::Document.new(xml)
 
-        xml.elements.each("//CmdResponse/*") do |node|
+        xml.elements.each('//CmdResponse/*') do |node|
           response[node.name.underscore.to_sym] = node.text
         end
 
-        xml.elements.each("//TranResponse/*") do |node|
-          if node.name.to_s == "Amount"
+        xml.elements.each('//TranResponse/*') do |node|
+          if node.name.to_s == 'Amount'
             node.elements.each do |amt|
               response[amt.name.underscore.to_sym] = amt.text
             end
@@ -271,8 +293,8 @@ module ActiveMerchant #:nodoc:
 
       def build_header
         {
-          "SOAPAction" => "http://www.mercurypay.com/CreditTransaction",
-          "Content-Type" => "text/xml; charset=utf-8"
+          'SOAPAction' => 'http://www.mercurypay.com/CreditTransaction',
+          'Content-Type' => 'text/xml; charset=utf-8'
         }
       end
 
@@ -288,7 +310,8 @@ module ActiveMerchant #:nodoc:
           :test => test?,
           :authorization => authorization_from(response),
           :avs_result => { :code => response[:avs_result] },
-          :cvv_result => response[:cvv_result])
+          :cvv_result => response[:cvv_result],
+          :error_code => success ? nil : STANDARD_ERROR_CODE_MAPPING[response[:dsix_return_code]])
       end
 
       def message_from(response)
@@ -296,7 +319,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
-        dollars, cents = (response[:purchase] || "").split(".").collect{|e| e.to_i}
+        dollars, cents = (response[:purchase] || '').split('.').collect(&:to_i)
         dollars ||= 0
         cents ||= 0
         [
@@ -307,17 +330,17 @@ module ActiveMerchant #:nodoc:
           response[:process_data],
           response[:record_no],
           ((dollars * 100) + cents).to_s
-        ].join(";")
+        ].join(';')
       end
 
       def split_authorization(authorization)
-        invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount = authorization.split(";")
+        invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount = authorization.split(';')
         [invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount]
       end
 
       ENVELOPE_NAMESPACES = {
         'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-        'xmlns:soap' => "http://schemas.xmlsoap.org/soap/envelope/",
+        'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/',
         'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
       }
 
@@ -326,7 +349,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def unescape_xml(escaped_xml)
-        escaped_xml.gsub(/\&gt;/,'>').gsub(/\&lt;/,'<')
+        escaped_xml.gsub(/\&gt;/, '>').gsub(/\&lt;/, '<')
       end
     end
   end