activemerchant 1.79.2 → 1.80.0

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v10.rb

@@ -160,10 +160,10 @@ module ActiveMerchant
         end
 
         def authorization_from(response)
-          if response["token"]
-            response["token"].to_s
+          if response['token']
+            response['token'].to_s
           else
-             response["id"].to_s
+             response['id'].to_s
           end
         end
 
@@ -231,13 +231,13 @@ module ActiveMerchant
         end
 
         def message_from(success, response)
-          success ? 'OK' : (response['message'] || invalid_operation_message(response) || "Unknown error - please contact QuickPay")
+          success ? 'OK' : (response['message'] || invalid_operation_message(response) || 'Unknown error - please contact QuickPay')
         end
 
         def invalid_operation_code?(response)
           if response['operations']
             operation = response['operations'].last
-            operation && operation['qp_status_code'] != "20000"
+            operation && operation['qp_status_code'] != '20000'
           end
         end
 
@@ -267,11 +267,11 @@ module ActiveMerchant
         def headers
           auth = Base64.strict_encode64(":#{@options[:api_key]}")
           {
-            "Authorization"  => "Basic " + auth,
-            "User-Agent"     => "Quickpay-v#{API_VERSION} ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-            "Accept"         => "application/json",
-            "Accept-Version" => "v#{API_VERSION}",
-            "Content-Type"   => "application/json"
+            'Authorization'  => 'Basic ' + auth,
+            'User-Agent'     => "Quickpay-v#{API_VERSION} ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+            'Accept'         => 'application/json',
+            'Accept-Version' => "v#{API_VERSION}",
+            'Content-Type'   => 'application/json'
           }
         end
 
@@ -286,7 +286,7 @@ module ActiveMerchant
         def json_error(raw_response)
           msg = 'Invalid response received from the Quickpay API.'
           msg += "  (The raw response returned by the API was #{raw_response.inspect})"
-          { "message" => msg }
+          { 'message' => msg }
         end
 
         def synchronized_path(path)

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v4to7.rb

@@ -136,7 +136,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_description(post, options)
-        post[:description] = options[:description] || "Description"
+        post[:description] = options[:description] || 'Description'
       end
 
       def add_testmode(post)
@@ -196,7 +196,7 @@ module ActiveMerchant #:nodoc:
         params[:apikey] = @options[:apikey] if @options[:apikey]
         params[:md5check] = generate_check_hash(action, params)
 
-        params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def generate_check_hash(action, params)
@@ -219,7 +219,7 @@ module ActiveMerchant #:nodoc:
 
       # 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

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

@@ -1,14 +1,14 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class QvalentGateway < Gateway
-      self.display_name = "Qvalent"
-      self.homepage_url = "https://www.qvalent.com/"
+      self.display_name = 'Qvalent'
+      self.homepage_url = 'https://www.qvalent.com/'
 
-      self.test_url = "https://ccapi.client.support.qvalent.com/post/CreditCardAPIReceiver"
-      self.live_url = "https://ccapi.client.qvalent.com/post/CreditCardAPIReceiver"
+      self.test_url = 'https://ccapi.client.support.qvalent.com/post/CreditCardAPIReceiver'
+      self.live_url = 'https://ccapi.client.qvalent.com/post/CreditCardAPIReceiver'
 
-      self.supported_countries = ["AU"]
-      self.default_currency = "AUD"
+      self.supported_countries = ['AU']
+      self.default_currency = 'AUD'
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners]
 
@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
-        commit("capture", post)
+        commit('capture', post)
       end
 
       def authorize(amount, payment_method, options={})
@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
-        commit("preauth", post)
+        commit('preauth', post)
       end
 
       def capture(amount, authorization, options={})
@@ -48,7 +48,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
-        commit("captureWithoutAuth", post)
+        commit('captureWithoutAuth', post)
       end
 
       def refund(amount, authorization, options={})
@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
-        commit("refund", post)
+        commit('refund', post)
       end
 
       # Credit requires the merchant account to be enabled for "Adhoc Refunds"
@@ -70,7 +70,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
-        commit("refund", post)
+        commit('refund', post)
       end
 
       def void(authorization, options={})
@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
-        commit("reversal", post)
+        commit('reversal', post)
       end
 
       def store(payment_method, options = {})
@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
         add_payment_method(post, payment_method)
         add_card_reference(post)
 
-        commit("registerAccount", post)
+        commit('registerAccount', post)
       end
 
       def supports_scrubbing?
@@ -104,70 +104,70 @@ module ActiveMerchant #:nodoc:
       private
 
       CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency: #{k}")}
-      CURRENCY_CODES["AUD"] = "AUD"
-      CURRENCY_CODES["INR"] = "INR"
+      CURRENCY_CODES['AUD'] = 'AUD'
+      CURRENCY_CODES['INR'] = 'INR'
 
       def add_soft_descriptors(post, options)
-        post["customer.merchantName"] = options[:customer_merchant_name] if options[:customer_merchant_name]
-        post["customer.merchantStreetAddress"] = options[:customer_merchant_street_address] if options[:customer_merchant_street_address]
-        post["customer.merchantLocation"] = options[:customer_merchant_location] if options[:customer_merchant_location]
-        post["customer.merchantState"] = options[:customer_merchant_state] if options[:customer_merchant_state]
-        post["customer.merchantCountry"] = options[:customer_merchant_country] if options[:customer_merchant_country]
-        post["customer.merchantPostCode"] = options[:customer_merchant_post_code] if options[:customer_merchant_post_code]
-        post["customer.subMerchantId"] = options[:customer_sub_merchant_id] if options[:customer_sub_merchant_id]
+        post['customer.merchantName'] = options[:customer_merchant_name] if options[:customer_merchant_name]
+        post['customer.merchantStreetAddress'] = options[:customer_merchant_street_address] if options[:customer_merchant_street_address]
+        post['customer.merchantLocation'] = options[:customer_merchant_location] if options[:customer_merchant_location]
+        post['customer.merchantState'] = options[:customer_merchant_state] if options[:customer_merchant_state]
+        post['customer.merchantCountry'] = options[:customer_merchant_country] if options[:customer_merchant_country]
+        post['customer.merchantPostCode'] = options[:customer_merchant_post_code] if options[:customer_merchant_post_code]
+        post['customer.subMerchantId'] = options[:customer_sub_merchant_id] if options[:customer_sub_merchant_id]
       end
 
       def add_invoice(post, money, options)
-        post["order.amount"] = amount(money)
-        post["card.currency"] = CURRENCY_CODES[options[:currency] || currency(money)]
-        post["order.ECI"] = options[:eci] ? options[:eci] : "SSL"
+        post['order.amount'] = amount(money)
+        post['card.currency'] = CURRENCY_CODES[options[:currency] || currency(money)]
+        post['order.ECI'] = options[:eci] || 'SSL'
       end
 
       def add_payment_method(post, payment_method)
-        post["card.cardHolderName"] = payment_method.name
-        post["card.PAN"] = payment_method.number
-        post["card.expiryYear"] = format(payment_method.year, :two_digits)
-        post["card.expiryMonth"] = format(payment_method.month, :two_digits)
+        post['card.cardHolderName'] = payment_method.name
+        post['card.PAN'] = payment_method.number
+        post['card.expiryYear'] = format(payment_method.year, :two_digits)
+        post['card.expiryMonth'] = format(payment_method.month, :two_digits)
       end
 
       def add_verification_value(post, payment_method)
-        post["card.CVN"] = payment_method.verification_value
+        post['card.CVN'] = payment_method.verification_value
       end
 
       def add_card_reference(post)
-        post["customer.customerReferenceNumber"] = options[:order_id]
+        post['customer.customerReferenceNumber'] = options[:order_id]
       end
 
       def add_reference(post, authorization, options)
-        post["customer.originalOrderNumber"] = authorization
+        post['customer.originalOrderNumber'] = authorization
         add_order_number(post, options)
       end
 
       def add_order_number(post, options)
-        post["customer.orderNumber"] = options[:order_id] || SecureRandom.uuid
+        post['customer.orderNumber'] = options[:order_id] || SecureRandom.uuid
       end
 
       def add_customer_data(post, options)
-        post["order.ipAddress"] = options[:ip] || "127.0.0.1"
-        post["order.xid"] = options[:xid] if options[:xid]
-        post["order.cavv"] = options[:cavv] if options[:cavv]
+        post['order.ipAddress'] = options[:ip] || '127.0.0.1'
+        post['order.xid'] = options[:xid] if options[:xid]
+        post['order.cavv'] = options[:cavv] if options[:cavv]
       end
 
       def commit(action, post)
-        post["customer.username"] = @options[:username]
-        post["customer.password"] = @options[:password]
-        post["customer.merchant"] = @options[:merchant]
-        post["order.type"] = action
+        post['customer.username'] = @options[:username]
+        post['customer.password'] = @options[:password]
+        post['customer.merchant'] = @options[:merchant]
+        post['order.type'] = action
 
         data = build_request(post)
         raw = parse(ssl_post(url(action), data, headers))
 
-        succeeded = success_from(raw["response.responseCode"])
+        succeeded = success_from(raw['response.responseCode'])
         Response.new(
           succeeded,
           message_from(succeeded, raw),
           raw,
-          authorization: raw["response.orderNumber"] || raw["response.customerReferenceNumber"],
+          authorization: raw['response.orderNumber'] || raw['response.customerReferenceNumber'],
           error_code: error_code_from(succeeded, raw),
           test: test?
         )
@@ -175,12 +175,12 @@ module ActiveMerchant #:nodoc:
 
       def headers
         {
-          "Content-Type"  => "application/x-www-form-urlencoded"
+          'Content-Type'  => 'application/x-www-form-urlencoded'
         }
       end
 
       def build_request(post)
-        post.to_query + "&message.end"
+        post.to_query + '&message.end'
       end
 
       def url(action)
@@ -211,25 +211,25 @@ module ActiveMerchant #:nodoc:
 
       def message_from(succeeded, response)
         if succeeded
-          "Succeeded"
+          'Succeeded'
         else
-          response["response.text"] || "Unable to read error message"
+          response['response.text'] || 'Unable to read error message'
         end
       end
 
       STANDARD_ERROR_CODE_MAPPING = {
-        "14" => STANDARD_ERROR_CODE[:invalid_number],
-        "QQ" => STANDARD_ERROR_CODE[:invalid_cvc],
-        "33" => STANDARD_ERROR_CODE[:expired_card],
-        "NT" => STANDARD_ERROR_CODE[:incorrect_address],
-        "12" => STANDARD_ERROR_CODE[:card_declined],
-        "06" => STANDARD_ERROR_CODE[:processing_error],
-        "01" => STANDARD_ERROR_CODE[:call_issuer],
-        "04" => STANDARD_ERROR_CODE[:pickup_card],
+        '14' => STANDARD_ERROR_CODE[:invalid_number],
+        'QQ' => STANDARD_ERROR_CODE[:invalid_cvc],
+        '33' => STANDARD_ERROR_CODE[:expired_card],
+        'NT' => STANDARD_ERROR_CODE[:incorrect_address],
+        '12' => STANDARD_ERROR_CODE[:card_declined],
+        '06' => STANDARD_ERROR_CODE[:processing_error],
+        '01' => STANDARD_ERROR_CODE[:call_issuer],
+        '04' => STANDARD_ERROR_CODE[:pickup_card],
       }
 
       def error_code_from(succeeded, response)
-        succeeded ? nil : STANDARD_ERROR_CODE_MAPPING[response["response.responseCode"]]
+        succeeded ? nil : STANDARD_ERROR_CODE_MAPPING[response['response.responseCode']]
       end
     end
   end

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

@@ -39,9 +39,9 @@ module ActiveMerchant
       self.homepage_url = 'http://www.realexpayments.com/'
       self.display_name = 'Realex'
 
-      SUCCESS, DECLINED          = "Successful", "Declined"
-      BANK_ERROR = REALEX_ERROR  = "Gateway is in maintenance. Please try again later."
-      ERROR = CLIENT_DEACTIVATED = "Gateway Error"
+      SUCCESS, DECLINED          = 'Successful', 'Declined'
+      BANK_ERROR = REALEX_ERROR  = 'Gateway is in maintenance. Please try again later.'
+      ERROR = CLIENT_DEACTIVATED = 'Gateway Error'
 
       def initialize(options = {})
         requires!(options, :login, :password)
@@ -64,7 +64,7 @@ module ActiveMerchant
       end
 
       def capture(money, authorization, options = {})
-        request = build_capture_request(authorization, options)
+        request = build_capture_request(money, authorization, options)
         commit(request)
       end
 
@@ -98,7 +98,7 @@ module ActiveMerchant
         response = parse(ssl_post(self.live_url, request))
 
         Response.new(
-          (response[:result] == "00"),
+          (response[:result] == '00'),
           message_from(response),
           response,
           :test => (response[:message] =~ %r{\[ test system \]}),
@@ -147,14 +147,15 @@ module ActiveMerchant
         xml.target!
       end
 
-      def build_capture_request(authorization, options)
+      def build_capture_request(money, authorization, options)
         timestamp = new_timestamp
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'settle' do
           add_merchant_details(xml, options)
+          add_amount(xml, money, options)
           add_transaction_identifiers(xml, authorization, options)
           add_comments(xml, options)
-          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), nil, nil, nil)
+          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), amount(money), (options[:currency] || currency(money)), nil)
         end
         xml.target!
       end
@@ -266,7 +267,7 @@ module ActiveMerchant
 
       def format_address_code(address)
         code = [address[:zip].to_s, address[:address1].to_s + address[:address2].to_s]
-        code.collect{|e| e.gsub(/\D/, "")}.reject{|e| e.empty?}.join("|")
+        code.collect{|e| e.gsub(/\D/, '')}.reject{|e| e.empty?}.join('|')
       end
 
       def new_timestamp
@@ -274,8 +275,8 @@ module ActiveMerchant
       end
 
       def add_signed_digest(xml, *values)
-        string = Digest::SHA1.hexdigest(values.join("."))
-        xml.tag! 'sha1hash', Digest::SHA1.hexdigest([string, @options[:password]].join("."))
+        string = Digest::SHA1.hexdigest(values.join('.'))
+        xml.tag! 'sha1hash', Digest::SHA1.hexdigest([string, @options[:password]].join('.'))
       end
 
       def auto_settle_flag(action)
@@ -289,11 +290,11 @@ module ActiveMerchant
       def message_from(response)
         message = nil
         case response[:result]
-        when "00"
+        when '00'
           message = SUCCESS
-        when "101"
+        when '101'
           message = response[:message]
-        when "102", "103"
+        when '102', '103'
           message = DECLINED
         when /^2[0-9][0-9]/
           message = BANK_ERROR
@@ -301,9 +302,9 @@ module ActiveMerchant
           message = REALEX_ERROR
         when /^5[0-9][0-9]/
           message = response[:message]
-        when "600", "601", "603"
+        when '600', '601', '603'
           message = ERROR
-        when "666"
+        when '666'
           message = CLIENT_DEACTIVATED
         else
           message = DECLINED

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

@@ -35,8 +35,8 @@ module ActiveMerchant #:nodoc:
     #
     #
     class RedsysGateway < Gateway
-      self.live_url = "https://sis.sermepa.es/sis/operaciones"
-      self.test_url = "https://sis-t.redsys.es:25443/sis/operaciones"
+      self.live_url = 'https://sis.sermepa.es/sis/operaciones'
+      self.test_url = 'https://sis-t.redsys.es:25443/sis/operaciones'
 
       self.supported_countries = ['ES']
       self.default_currency    = 'EUR'
@@ -44,46 +44,46 @@ module ActiveMerchant #:nodoc:
 
       # Not all card types may be activated by the bank!
       self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :diners_club]
-      self.homepage_url        = "http://www.redsys.es/"
-      self.display_name        = "Redsys"
+      self.homepage_url        = 'http://www.redsys.es/'
+      self.display_name        = 'Redsys'
 
       CURRENCY_CODES = {
-        "AED" => '784',
-        "ARS" => '32',
-        "AUD" => '36',
-        "BRL" => '986',
-        "BOB" => '68',
-        "CAD" => '124',
-        "CHF" => '756',
-        "CLP" => '152',
-        "CNY" => '156',
-        "COP" => '170',
-        "CRC" => '188',
-        "CZK" => '203',
-        "DKK" => '208',
-        "DOP" => '214',
-        "EUR" => '978',
-        "GBP" => '826',
-        "GTQ" => '320',
-        "HUF" => '348',
-        "IDR" => '360',
-        "INR" => '356',
-        "JPY" => '392',
-        "KRW" => '410',
-        "MYR" => '458',
-        "MXN" => '484',
-        "NOK" => '578',
-        "NZD" => '554',
-        "PEN" => '604',
-        "PLN" => '985',
-        "RUB" => '643',
-        "SAR" => '682',
-        "SEK" => '752',
-        "SGD" => '702',
-        "THB" => '764',
-        "TWD" => '901',
-        "USD" => '840',
-        "UYU" => '858'
+        'AED' => '784',
+        'ARS' => '32',
+        'AUD' => '36',
+        'BRL' => '986',
+        'BOB' => '68',
+        'CAD' => '124',
+        'CHF' => '756',
+        'CLP' => '152',
+        'CNY' => '156',
+        'COP' => '170',
+        'CRC' => '188',
+        'CZK' => '203',
+        'DKK' => '208',
+        'DOP' => '214',
+        'EUR' => '978',
+        'GBP' => '826',
+        'GTQ' => '320',
+        'HUF' => '348',
+        'IDR' => '360',
+        'INR' => '356',
+        'JPY' => '392',
+        'KRW' => '410',
+        'MYR' => '458',
+        'MXN' => '484',
+        'NOK' => '578',
+        'NZD' => '554',
+        'PEN' => '604',
+        'PLN' => '985',
+        'RUB' => '643',
+        'SAR' => '682',
+        'SEK' => '752',
+        'SGD' => '702',
+        'THB' => '764',
+        'TWD' => '901',
+        'USD' => '840',
+        'UYU' => '858'
       }
 
       # The set of supported transactions for this gateway.
@@ -101,72 +101,72 @@ module ActiveMerchant #:nodoc:
       # a card has been rejected. Syntax or general request errors
       # are not covered here.
       RESPONSE_TEXTS = {
-        0 => "Transaction Approved",
-        400 => "Cancellation Accepted",
-        481 => "Cancellation Accepted",
-        500 => "Reconciliation Accepted",
-        900 => "Refund / Confirmation approved",
-
-        101 => "Card expired",
-        102 => "Card blocked temporarily or under susciption of fraud",
-        104 => "Transaction not permitted",
-        107 => "Contact the card issuer",
-        109 => "Invalid identification by merchant or POS terminal",
-        110 => "Invalid amount",
-        114 => "Card cannot be used to the requested transaction",
-        116 => "Insufficient credit",
-        118 => "Non-registered card",
-        125 => "Card not effective",
-        129 => "CVV2/CVC2 Error",
-        167 => "Contact the card issuer: suspected fraud",
-        180 => "Card out of service",
-        181 => "Card with credit or debit restrictions",
-        182 => "Card with credit or debit restrictions",
-        184 => "Authentication error",
-        190 => "Refusal with no specific reason",
-        191 => "Expiry date incorrect",
-
-        201 => "Card expired",
-        202 => "Card blocked temporarily or under suspicion of fraud",
-        204 => "Transaction not permitted",
-        207 => "Contact the card issuer",
-        208 => "Lost or stolen card",
-        209 => "Lost or stolen card",
-        280 => "CVV2/CVC2 Error",
-        290 => "Declined with no specific reason",
-
-        480 => "Original transaction not located, or time-out exceeded",
-        501 => "Original transaction not located, or time-out exceeded",
-        502 => "Original transaction not located, or time-out exceeded",
-        503 => "Original transaction not located, or time-out exceeded",
-
-        904 => "Merchant not registered at FUC",
-        909 => "System error",
-        912 => "Issuer not available",
-        913 => "Duplicate transmission",
-        916 => "Amount too low",
-        928 => "Time-out exceeded",
-        940 => "Transaction cancelled previously",
-        941 => "Authorization operation already cancelled",
-        942 => "Original authorization declined",
-        943 => "Different details from origin transaction",
-        944 => "Session error",
-        945 => "Duplicate transmission",
-        946 => "Cancellation of transaction while in progress",
-        947 => "Duplicate tranmission while in progress",
-        949 => "POS Inoperative",
-        950 => "Refund not possible",
-        9064 => "Card number incorrect",
-        9078 => "No payment method available",
-        9093 => "Non-existent card",
-        9218 => "Recursive transaction in bad gateway",
-        9253 => "Check-digit incorrect",
-        9256 => "Preauth not allowed for merchant",
-        9257 => "Preauth not allowed for card",
-        9261 => "Operating limit exceeded",
-        9912 => "Issuer not available",
-        9913 => "Confirmation error",
-        9914 => "KO Confirmation"
+        0 => 'Transaction Approved',
+        400 => 'Cancellation Accepted',
+        481 => 'Cancellation Accepted',
+        500 => 'Reconciliation Accepted',
+        900 => 'Refund / Confirmation approved',
+
+        101 => 'Card expired',
+        102 => 'Card blocked temporarily or under susciption of fraud',
+        104 => 'Transaction not permitted',
+        107 => 'Contact the card issuer',
+        109 => 'Invalid identification by merchant or POS terminal',
+        110 => 'Invalid amount',
+        114 => 'Card cannot be used to the requested transaction',
+        116 => 'Insufficient credit',
+        118 => 'Non-registered card',
+        125 => 'Card not effective',
+        129 => 'CVV2/CVC2 Error',
+        167 => 'Contact the card issuer: suspected fraud',
+        180 => 'Card out of service',
+        181 => 'Card with credit or debit restrictions',
+        182 => 'Card with credit or debit restrictions',
+        184 => 'Authentication error',
+        190 => 'Refusal with no specific reason',
+        191 => 'Expiry date incorrect',
+
+        201 => 'Card expired',
+        202 => 'Card blocked temporarily or under suspicion of fraud',
+        204 => 'Transaction not permitted',
+        207 => 'Contact the card issuer',
+        208 => 'Lost or stolen card',
+        209 => 'Lost or stolen card',
+        280 => 'CVV2/CVC2 Error',
+        290 => 'Declined with no specific reason',
+
+        480 => 'Original transaction not located, or time-out exceeded',
+        501 => 'Original transaction not located, or time-out exceeded',
+        502 => 'Original transaction not located, or time-out exceeded',
+        503 => 'Original transaction not located, or time-out exceeded',
+
+        904 => 'Merchant not registered at FUC',
+        909 => 'System error',
+        912 => 'Issuer not available',
+        913 => 'Duplicate transmission',
+        916 => 'Amount too low',
+        928 => 'Time-out exceeded',
+        940 => 'Transaction cancelled previously',
+        941 => 'Authorization operation already cancelled',
+        942 => 'Original authorization declined',
+        943 => 'Different details from origin transaction',
+        944 => 'Session error',
+        945 => 'Duplicate transmission',
+        946 => 'Cancellation of transaction while in progress',
+        947 => 'Duplicate tranmission while in progress',
+        949 => 'POS Inoperative',
+        950 => 'Refund not possible',
+        9064 => 'Card number incorrect',
+        9078 => 'No payment method available',
+        9093 => 'Non-existent card',
+        9218 => 'Recursive transaction in bad gateway',
+        9253 => 'Check-digit incorrect',
+        9256 => 'Preauth not allowed for merchant',
+        9257 => 'Preauth not allowed for card',
+        9261 => 'Operating limit exceeded',
+        9912 => 'Issuer not available',
+        9913 => 'Confirmation error',
+        9914 => 'KO Confirmation'
       }
 
       # Creates a new instance
@@ -184,7 +184,7 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :login, :secret_key)
         options[:terminal] ||= 1
-        options[:signature_algorithm] ||= "sha1"
+        options[:signature_algorithm] ||= 'sha1'
         super
       end
 
@@ -299,8 +299,8 @@ module ActiveMerchant #:nodoc:
           data[:credit_card_token] = card
         else
           name  = [card.first_name, card.last_name].join(' ').slice(0, 60)
-          year  = sprintf("%.4i", card.year)
-          month = sprintf("%.2i", card.month)
+          year  = sprintf('%.4i', card.year)
+          month = sprintf('%.2i', card.month)
           data[:card] = {
             :name => name,
             :pan  => card.number,
@@ -395,6 +395,7 @@ module ActiveMerchant #:nodoc:
             xml.DS_MERCHANT_IDENTIFIER 'REQUIRED' if data[:store_in_vault]
           elsif data[:credit_card_token]
             xml.DS_MERCHANT_IDENTIFIER data[:credit_card_token]
+            xml.DS_MERCHANT_DIRECTPAYMENT 'true'
           end
         end
       end
@@ -402,12 +403,12 @@ module ActiveMerchant #:nodoc:
       def parse(data)
         params  = {}
         success = false
-        message = ""
+        message = ''
         options = @options.merge(:test => test?)
         xml     = Nokogiri::XML(data)
-        code    = xml.xpath("//RETORNOXML/CODIGO").text
-        if code == "0"
-          op = xml.xpath("//RETORNOXML/OPERACION")
+        code    = xml.xpath('//RETORNOXML/CODIGO').text
+        if code == '0'
+          op = xml.xpath('//RETORNOXML/OPERACION')
           op.children.each do |element|
             params[element.name.downcase.to_sym] = element.text
           end
@@ -417,7 +418,7 @@ module ActiveMerchant #:nodoc:
             options[:authorization] = build_authorization(params)
             success = is_success_response?(params[:ds_response])
           else
-            message = "Response failed validation check"
+            message = 'Response failed validation check'
           end
         else
           # Some kind of programmer error with the request!
@@ -448,11 +449,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_authorization(params)
-        [params[:ds_order], params[:ds_amount], params[:ds_currency]].join("|")
+        [params[:ds_order], params[:ds_amount], params[:ds_currency]].join('|')
       end
 
       def split_authorization(authorization)
-        order_id, amount, currency = authorization.split("|")
+        order_id, amount, currency = authorization.split('|')
         [order_id, amount.to_i, currency]
       end
 
@@ -469,7 +470,7 @@ module ActiveMerchant #:nodoc:
       def response_text(code)
         code = code.to_i
         code = 0 if code < 100
-        RESPONSE_TEXTS[code] || "Unkown code, please check in manual"
+        RESPONSE_TEXTS[code] || 'Unkown code, please check in manual'
       end
 
       def is_success_response?(code)
@@ -481,12 +482,12 @@ module ActiveMerchant #:nodoc:
         if cleansed =~ /^\d{4}/
           cleansed[0..11]
         else
-          "%04d%s" % [rand(0..9999), cleansed[0...8]]
+          '%04d%s' % [rand(0..9999), cleansed[0...8]]
         end
       end
 
       def sha256_authentication?
-        @options[:signature_algorithm] == "sha256"
+        @options[:signature_algorithm] == 'sha256'
       end
 
       def sign_request(xml_request_string, order_id)
@@ -514,8 +515,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def xml_signed_fields(data)
-        data[:ds_amount] + data[:ds_order] + data[:ds_merchantcode] + data[:ds_currency] +
-          data[:ds_response] + data[:ds_transactiontype] + data[:ds_securepayment]
+        xml_signed_fields = data[:ds_amount] + data[:ds_order] + data[:ds_merchantcode] +
+          data[:ds_currency] + data[:ds_response]
+
+        if data[:ds_cardnumber]
+          xml_signed_fields += data[:ds_cardnumber]
+        end
+
+        xml_signed_fields += data[:ds_transactiontype] + data[:ds_securepayment]
       end
 
       def get_key(order_id)