activemerchant 1.59.0 → 1.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b699a9e799907880fbd2fb3c7cc68e8f1bdaead
-  data.tar.gz: aba5081dee95a33710e5ac97bed5edd577cb1e33
+  metadata.gz: 7d43ab38ffa5badee3266ac1da82758f7f5a928d
+  data.tar.gz: 044674b27950c204a881c24ef8556e4d01841f22
 SHA512:
-  metadata.gz: f1ca11be38d85bcea0dcca1cb3b036090d2f37535e0987159071e40345220c14b19f2b2c314e44c81bc1652c3195306bbed61badec33a17ccefca951a21b2182
-  data.tar.gz: 68eddb6d812f974fe3ad0d8569bdab2374acffd012fac3bfa95c422958e61666c7994a482da845cb04f9eef9a54fc573ddebd291b08242757115ad5614bc0406
+  metadata.gz: 304da6ed75b96dbfa07fb1546f318a224a021c46d2d528b29db4d821858838c28ea4b3ecc9b7319d739281224a6e42c7a5880bd7f06483165f92d8b99f544d80
+  data.tar.gz: 889d972567c2b9cb383b29f8c472e27047b6e5b229e512b85478d9b60759014968c23963c1b48fe3b2aa1db7c36c9323e5fe5011cc00e4e3173db0c397e13f5f

data/CHANGELOG

@@ -1,5 +1,46 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.60.0 (July 4, 2016)
+* Orbital: Fix CC num leak on profile calls [drewblas]
+* VisaNetPeru: Add ability to refund [duff]
+* AuthorizeNet: Fix store using new profile [duff]
+* Clearhaus: Support private key for signature [curiousepic]
+* Clearhaus: Copy private_key when stripping [curiousepic]
+* CertoDirect: Remove gateway [shiroginne]
+* Braintree: Extra error messaging [jordan-brough]
+* AuthorizeNetCim: Set error code for AuthorizeNetCimGateway response [ka8725]
+* Quickpay v10: Remove amount requirement for store [curiousepic]
+* PSLCards: correct namespace in doc for Response object from ActiveRecord::Billing to ActiveMerchant::Billing [CJ Keeney]
+* Pagar.me: Add pagar.me [chrisenytc]
+* Stripe: Update Readme to show stripe support [rhlrjv]
+* Orbital: Add support for the BRL currency [duff]
+* GlobalTransport: Require TLSv1 [duff]
+* Openpay: Allow currency to be specified [darkaz]
+* DataCash: Use API version 2 [curiousepic]
+* Stripe: Support verify_credentials [duff]
+* AuthorizeNet: Support verify_credentials [duff]
+* BraintreeBlue: Support verify_credentials [duff]
+* Redsys: Added SAR currency [agseco]
+* QuickPay: Adding customer_ip for authorize action in quickpay [dinesh]
+* MaxiPago: add void and refund [shasum]
+* MaxiPago: Allow processor_id override [duff]
+* Stripe: Interpret string input to store method as token identifier [bizla]
+* MaxiPago: Add verify and scrub [shasum]
+* Stripe: Remove metadata restriction from EMV transactions [bizla]
+* SagePay: Add optional fields to SagePay requests [cristianstanescu]
+* CyberSource: Assign default with override for billing address and email [shasum]
+* CyberSource: Assign default order_id [duff]
+* TNS: Support asia_pacific endpoint [curiousepic]
+* TransFirsTransactionExpress: Fix exception [duff]
+* CyberSource: Add decision manager optional fields [shasum]
+* CyberSource: Add decision manager optional fields [shasum]
+* TNS: Add support for TLS v1.2 [curiousepic]
+* QuickpayV7: Default description field for store operation [duff]
+* Elavon: Support customer_number field [duff]
+* Map test_mode_live_card code to new standard error code [berkcaputcu]
+* Elavon: Pass customer_number correctly [duff]
+* Stripe: add SG to supported_countries attribute [timbeiko]
+
 == Version 1.59.0 (May 18, 2016)
 * Orbital: Allow AVS parts to be sent sans country [duff]
 * SecureNet: Return the right error message for declines [duff]

data/README.md

@@ -105,7 +105,6 @@ The [ActiveMerchant Wiki](http://github.com/activemerchant/active_merchant/wikis
 * [Cecabank](http://www.ceca.es/es/) - ES
 * [Cenpos](https://www.cenpos.com/) - AD, AI, AG, AR, AU, AT, BS, BB, BE, BZ, BM, BR, BN, BG, CA, HR, CY, CZ, DK, DM, EE, FI, FR, DE, GR, GD, GY, HK, HU, IS, IN, IL, IT, JP, LV, LI, LT, LU, MY, MT, MX, MC, MS, NL, PA, PL, PT, KN, LC, MF, VC, SM, SG, SK, SI, ZA, ES, SR, SE, CH, TR, GB, US, UY
 * [CAMS: Central Account Management System](https://www.centralams.com/) - US
-* [CertoDirect](http://www.certodirect.com/) - BE, BG, CZ, DK, DE, EE, IE, EL, ES, FR, IT, CY, LV, LT, LU, HU, MT, NL, AT, PL, PT, RO, SI, SK, FI, SE, GB
 * [Checkout.com](https://www.checkout.com/) - AT, BE, BG, CY, CZ, DE, DK, EE, ES, FI, FR, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, MU, NL, NO, PL, PT, RO, SE, SI, SK, US
 * [Clearhaus](https://www.clearhaus.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GL, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK
 * [Commercegate](http://www.commercegate.com/) - AD, AT, AX, BE, BG, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GG, GI, GR, HR, HU, IE, IM, IS, IT, JE, LI, LT, LU, LV, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, VA
@@ -167,6 +166,7 @@ The [ActiveMerchant Wiki](http://github.com/activemerchant/active_merchant/wikis
 * [Openpay](Openpay) - MX
 * [Optimal Payments](http://www.optimalpayments.com/) - CA, US, GB
 * [Orbital Paymentech](http://chasepaymentech.com/) - US, CA
+* [Pagar.me](https://pagar.me/) - BR
 * [PagoFacil](http://www.pagofacil.net/) - MX
 * [PayConex](http://www.bluefincommerce.com/) - US, CA
 * [PayGate PayXML](http://paygate.co.za/) - US, ZA
@@ -212,7 +212,7 @@ The [ActiveMerchant Wiki](http://github.com/activemerchant/active_merchant/wikis
 * [SkipJack](http://www.skipjack.com/) - US, CA
 * [SoEasyPay](http://www.soeasypay.com/) - US, CA, AT, BE, BG, HR, CY, CZ, DK, EE, FI, FR, DE, GR, HU, IE, IT, LV, LT, LU, MT, NL, PL, PT, RO, SK, SI, ES, SE, GB, IS, NO, CH
 * [Spreedly](https://spreedly.com) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
-* [Stripe](https://stripe.com/) - AT, AU, BE, CA, CH, DE, DK, ES, FI, FR, GB, IE, IT, LU, NL, NO, SE, US
+* [Stripe](https://stripe.com/) - AT, AU, BE, CA, CH, DE, DK, ES, FI, FR, GB, IE, IT, LU, NL, NO, SE, SG, US
 * [Swipe](https://www.swipehq.com/checkout) - CA, NZ
 * [TNS](http://www.tnsi.com/) - AR, AU, BR, FR, DE, HK, MX, NZ, SG, GB, US
 * [Transact Pro](https://www.transactpro.lv/business/online-payments-acceptance) - US

data/lib/active_merchant/billing/gateway.rb

@@ -76,6 +76,7 @@ module ActiveMerchant #:nodoc:
       # :processing_error - Processor error
       # :call_issuer - Transaction requires voice authentication, call issuer
       # :pickup_card - Issuer requests that you pickup the card from merchant
+      # :test_mode_live_card - Card was declined. Request was in test mode, but used a non test card.
 
       STANDARD_ERROR_CODE = {
         :incorrect_number => 'incorrect_number',
@@ -91,7 +92,8 @@ module ActiveMerchant #:nodoc:
         :processing_error => 'processing_error',
         :call_issuer => 'call_issuer',
         :pickup_card => 'pick_up_card',
-        :config_error => 'config_error'
+        :config_error => 'config_error',
+        :test_mode_live_card => 'test_mode_live_card'
       }
 
       cattr_reader :implementations

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

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant
+  module Billing
     class AuthorizeNetGateway < Gateway
       include Empty
 
@@ -161,6 +161,11 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def verify_credentials
+        response = commit(:verify_credentials) { }
+        response.success?
+      end
+
       def supports_scrubbing?
         true
       end
@@ -580,7 +585,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(action, raw_response)
-        if is_cim_action?(action)
+        if is_cim_action?(action) || action == :verify_credentials
           parse_cim(raw_response)
         else
           parse_normal(action, raw_response)
@@ -628,6 +633,8 @@ module ActiveMerchant #:nodoc:
           "createCustomerProfileRequest"
         elsif action == :cim_store_update
           "createCustomerPaymentProfileRequest"
+        elsif action == :verify_credentials
+          "authenticateTestRequest"
         elsif is_cim_action?(action)
           "createCustomerProfileTransactionRequest"
         else
@@ -738,7 +745,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(action, response)
-        if action == :cim_store
+        if cim?(action) || (action == :verify_credentials)
           response[:result_code] == "Ok"
         else
           response[:response_code] == APPROVED && TRANSACTION_ALREADY_ACTIONED.exclude?(response[:response_reason_code])
@@ -758,7 +765,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(action, response)
-        if action == :cim_store
+        if cim?(action)
           [response[:customer_profile_id], response[:customer_payment_profile_id], action].join("#")
         else
           [response[:transaction_id], response[:account_number], action].join("#")
@@ -769,6 +776,10 @@ module ActiveMerchant #:nodoc:
         authorization.split("#")
       end
 
+      def cim?(action)
+        (action == :cim_store) || (action == :cim_store_update)
+      end
+
       def transaction_id_from(authorization)
         transaction_id, _, _ = split_authorization(authorization)
         transaction_id

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

@@ -864,10 +864,12 @@ module ActiveMerchant #:nodoc:
         response_params['direct_response'] = parse_direct_response(response_params['direct_response']) if response_params['direct_response']
         transaction_id = response_params['direct_response']['transaction_id'] if response_params['direct_response']
 
-        Response.new(success, message, response_params,
-          :test => test_mode,
-          :authorization => transaction_id || response_params['customer_profile_id'] || (response_params['profile'] ? response_params['profile']['customer_profile_id'] : nil)
-        )
+        response_options = {}
+        response_options[:test] = test_mode
+        response_options[:authorization] = transaction_id || response_params['customer_profile_id'] || (response_params['profile'] ? response_params['profile']['customer_profile_id'] : nil)
+        response_options[:error_code] = response_params['messages']['message']['code'] unless success
+
+        Response.new(success, message, response_params, response_options)
       end
 
       def tag_unless_blank(xml, tag_name, data)

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

@@ -6,7 +6,9 @@ rescue LoadError
   raise "Could not load the braintree gem.  Use `gem install braintree` to install it."
 end
 
-raise "Need braintree gem 2.x.y. Run `gem install braintree --version '~>2.0'` to get the correct version." unless Braintree::Version::Major == 2
+unless Braintree::Version::Major == 2 && Braintree::Version::Minor >= 4
+  raise "Need braintree gem >= 2.4.0. Run `gem install braintree --version '~>2.4'` to get the correct version."
+end
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -173,6 +175,18 @@ module ActiveMerchant #:nodoc:
         true
       end
 
+      def verify_credentials
+        begin
+          @braintree_gateway.transaction.find("non_existent_token")
+        rescue Braintree::AuthenticationError
+          return false
+        rescue Braintree::NotFoundError
+          return true
+        end
+
+        true
+      end
+
       private
 
       def check_customer_exists(customer_vault_id)
@@ -311,10 +325,12 @@ module ActiveMerchant #:nodoc:
       def message_from_result(result)
         if result.success?
           "OK"
-        elsif result.errors.size == 0 && result.credit_card_verification
+        elsif result.errors.any?
+          result.errors.map { |e| "#{e.message} (#{e.code})" }.join(" ")
+        elsif result.credit_card_verification
           "Processor declined: #{result.credit_card_verification.processor_response_text} (#{result.credit_card_verification.processor_response_code})"
         else
-          result.errors.map { |e| "#{e.message} (#{e.code})" }.join(" ")
+          result.message.to_s
         end
       end
 

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

@@ -37,22 +37,12 @@ module ActiveMerchant #:nodoc:
         50000 => 'Clearhaus error'
       }
 
-      # Create gateway
-      #
-      # options:
-      #       :api_key - merchant's Clearhaus API Key
-      #       :signing_key - merchant's private key for optionally signing request
       def initialize(options={})
         requires!(options, :api_key)
-        options[:signing_key].strip! if options[:signing_key]
+        options[:private_key] = options[:private_key].strip if options[:private_key]
         super
       end
 
-      # Make a purchase (authorize and capture)
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # payment        - The CreditCard or the Clearhaus card token.
-      # options        - A standard ActiveMerchant options hash
       def purchase(amount, payment, options={})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(amount, payment, options) }
@@ -60,11 +50,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Authorize a transaction.
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # payment        - The CreditCard or the Clearhaus card token.
-      # options        - A standard ActiveMerchant options hash  with optional pares
       def authorize(amount, payment, options={})
         post = {}
         add_invoice(post, amount, options)
@@ -84,11 +69,6 @@ module ActiveMerchant #:nodoc:
         commit(action, post)
       end
 
-      # Capture a pre-authorized transaction.
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # authorization  - The Clearhaus authorization id string.
-      # options        - A standard ActiveMerchant options hash
       def capture(amount, authorization, options={})
         post = {}
         add_invoice(post, amount, options)
@@ -96,11 +76,6 @@ module ActiveMerchant #:nodoc:
         commit("/authorizations/#{authorization}/captures", post)
       end
 
-      # Refund a captured transaction (fully or partial).
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # authorization  - The Clearhaus authorization id string.
-      # options        - A standard ActiveMerchant options hash
       def refund(amount, authorization, options={})
         post = {}
         add_amount(post, amount, options)
@@ -119,10 +94,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Tokenize credit card with Clearhaus.
-      #
-      # credit_card    - The CreditCard.
-      # options        - A standard ActiveMerchant options hash
       def store(credit_card, options={})
         post = {}
         add_payment(post, credit_card)
@@ -183,9 +154,9 @@ module ActiveMerchant #:nodoc:
         headers = headers(@options[:api_key])
         body = parameters.to_query
 
-        if signing_key = @options[:signing_key]
+        if @options[:signing_key] && @options[:private_key]
           begin
-            headers["Signature"] = generate_signature(@options[:api_key], signing_key, body)
+            headers["Signature"] = generate_signature(body)
           rescue OpenSSL::PKey::RSAError => e
             return Response.new(false, e.message)
           end
@@ -226,11 +197,11 @@ module ActiveMerchant #:nodoc:
         response['id']
       end
 
-      def generate_signature(api_key, signing_key, body)
-        key = OpenSSL::PKey::RSA.new(signing_key)
+      def generate_signature(body)
+        key = OpenSSL::PKey::RSA.new(@options[:private_key])
         hex = key.sign(OpenSSL::Digest.new('sha256'), body).unpack('H*').first
 
-        "#{api_key} RS256-hex #{hex}"
+        "#{@options[:signing_key]} RS256-hex #{hex}"
       end
 
       def error_code_from(response)

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

@@ -120,7 +120,6 @@ module ActiveMerchant #:nodoc:
       #
       # You must supply an :order_id in the options hash
       def authorize(money, creditcard_or_reference, options = {})
-        requires!(options,  :order_id)
         setup_address_hash(options)
         commit(build_auth_request(money, creditcard_or_reference, options), options )
       end
@@ -139,7 +138,6 @@ module ActiveMerchant #:nodoc:
       # You must supply an order_id in the options hash
       # options[:pinless_debit_card] => true # attempts to process as pinless debit card
       def purchase(money, payment_method_or_reference, options = {})
-        requires!(options, :order_id)
         setup_address_hash(options)
         commit(build_purchase_request(money, payment_method_or_reference, options), options)
       end
@@ -161,7 +159,6 @@ module ActiveMerchant #:nodoc:
 
       # Adds credit to a subscription (stand alone credit).
       def credit(money, reference, options = {})
-        requires!(options, :order_id)
         commit(build_credit_request(money, reference, options), options)
       end
 
@@ -169,7 +166,6 @@ module ActiveMerchant #:nodoc:
       # To charge the card while creating a profile, pass
       # options[:setup_fee] => money
       def store(payment_method, options = {})
-        requires!(options, :order_id)
         setup_address_hash(options)
         commit(build_create_subscription_request(payment_method, options), options)
       end
@@ -252,15 +248,23 @@ module ActiveMerchant #:nodoc:
       private
 
       # Create all address hash key value pairs so that we still function if we
-      # were only provided with one or two of them
+      # were only provided with one or two of them or even none
       def setup_address_hash(options)
-        options[:billing_address] = options[:billing_address] || options[:address] || {}
+        default_address = {
+          :address1 => 'Unspecified',
+          :city => 'Unspecified',
+          :state => 'NC',
+          :zip => '00000',
+          :country => 'US'
+        }
+        options[:billing_address] = options[:billing_address] || options[:address] || default_address
         options[:shipping_address] = options[:shipping_address] || {}
       end
 
       def build_auth_request(money, creditcard_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
         add_payment_method_or_subscription(xml, money, creditcard_or_reference, options)
+        add_decision_manager_fields(xml, options)
         add_mdd_fields(xml, options)
         add_auth_service(xml, creditcard_or_reference, options)
         add_business_rules_data(xml, creditcard_or_reference, options)
@@ -292,6 +296,7 @@ module ActiveMerchant #:nodoc:
       def build_purchase_request(money, payment_method_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
         add_payment_method_or_subscription(xml, money, payment_method_or_reference, options)
+        add_decision_manager_fields(xml, options)
         add_mdd_fields(xml, options)
         if !payment_method_or_reference.is_a?(String) && card_brand(payment_method_or_reference) == 'check'
           add_check_service(xml)
@@ -435,7 +440,7 @@ module ActiveMerchant #:nodoc:
 
       def add_merchant_data(xml, options)
         xml.tag! 'merchantID', @options[:login]
-        xml.tag! 'merchantReferenceCode', options[:order_id]
+        xml.tag! 'merchantReferenceCode', options[:order_id] || generate_unique_id
         xml.tag! 'clientLibrary' ,'Ruby Active Merchant'
         xml.tag! 'clientLibraryVersion',  VERSION
         xml.tag! 'clientEnvironment' , RUBY_PLATFORM
@@ -461,7 +466,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'company',               address[:company]                 unless address[:company].blank?
           xml.tag! 'companyTaxID',          address[:companyTaxID]            unless address[:company_tax_id].blank?
           xml.tag! 'phoneNumber',           address[:phone]                   unless address[:phone].blank?
-          xml.tag! 'email',                 options[:email]
+          xml.tag! 'email',                 options[:email] || 'null@cybersource.com'
           xml.tag! 'ipAddress',             options[:ip]                      unless options[:ip].blank? || shipTo
           xml.tag! 'driversLicenseNumber',  options[:drivers_license_number]  unless options[:drivers_license_number].blank?
           xml.tag! 'driversLicenseState',   options[:drivers_license_state]   unless options[:drivers_license_state].blank?
@@ -478,6 +483,13 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_decision_manager_fields(xml, options)
+        xml.tag! 'decisionManager' do
+          xml.tag! 'enabled', options[:decision_manager_enabled] if options[:decision_manager_enabled]
+          xml.tag! 'profile', options[:decision_manager_profile] if options[:decision_manager_profile]
+        end
+      end
+
       def add_mdd_fields(xml, options)
         xml.tag! 'merchantDefinedData' do
           (1..20).each do |each|

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

@@ -6,23 +6,14 @@ module ActiveMerchant
       self.default_currency = 'GBP'
       self.supported_countries = ['GB']
 
-      # From the DataCash docs; Page 13, the following cards are
-      # usable:
-      # American Express, ATM, Carte Blanche, Diners Club, Discover,
-      # EnRoute, GE Capital, JCB, Laser, Maestro, Mastercard, Solo,
-      # Switch, Visa, Visa Delta, VISA Electron, Visa Purchasing
-      #
-      # Note continuous authority is only supported for :visa, :master and :american_express card types
       self.supported_cardtypes = [ :visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro, :switch, :solo, :laser ]
 
       self.homepage_url = 'http://www.datacash.com/'
       self.display_name = 'DataCash'
 
-      # Datacash server URLs
       self.test_url = 'https://testserver.datacash.com/Transaction'
       self.live_url = 'https://mars.transaction.datacash.com/Transaction'
 
-      # Different Card Transaction Types
       AUTH_TYPE = 'auth'
       CANCEL_TYPE = 'cancel'
       FULFILL_TYPE = 'fulfill'
@@ -30,44 +21,14 @@ module ActiveMerchant
       REFUND_TYPE = 'refund'
       TRANSACTION_REFUND_TYPE = 'txn_refund'
 
-      # Constant strings for use in the ExtendedPolicy complex element for
-      # CV2 checks
       POLICY_ACCEPT = 'accept'
       POLICY_REJECT = 'reject'
 
-      # Datacash success code
-      DATACASH_SUCCESS = '1'
-
-      # Creates a new DataCashGateway
-      #
-      # The gateway requires that a valid login and password be passed
-      # in the +options+ hash.
-      #
-      # ==== Options
-      #
-      # * <tt>:login</tt> -- The Datacash account login.
-      # * <tt>:password</tt> -- The Datacash account password.
-      # * <tt>:test => +true+ or +false+</tt> -- Use the test or live Datacash url.
-      #
       def initialize(options = {})
         requires!(options, :login, :password)
         super
       end
 
-      # Perform a purchase, which is essentially an authorization and capture in a single operation.
-      #
-      # ==== Parameters
-      # * <tt>money</tt> The amount to be authorized as an Integer value in cents.
-      # * <tt>authorization_or_credit_card</tt>:: The continuous authority reference or CreditCard details for the transaction.
-      # * <tt>options</tt> A hash of optional parameters.
-      #   * <tt>:order_id</tt> A unique reference for this order (corresponds to merchantreference in datacash documentation)
-      #   * <tt>:set_up_continuous_authority</tt>
-      #      Set to true to set up a recurring historic transaction account be set up.
-      #      Only supported for :visa, :master and :american_express card types
-      #      See http://www.datacash.com/services/recurring/historic.php for more details of historic transactions.
-      #   * <tt>:address</tt>:: billing address for card
-      #
-      # The continuous authority reference will be available in response#params['ca_reference'] if you have requested one
       def purchase(money, authorization_or_credit_card, options = {})
         requires!(options, :order_id)
 
@@ -80,22 +41,6 @@ module ActiveMerchant
         commit(request)
       end
 
-      # Performs an authorization, which reserves the funds on the customer's credit card, but does not
-      # charge the card.
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> The amount to be authorized as an Integer value in cents.
-      # * <tt>authorization_or_credit_card</tt>:: The continuous authority reference or CreditCard details for the transaction.
-      # * <tt>options</tt> A hash of optional parameters.
-      #   * <tt>:order_id</tt> A unique reference for this order (corresponds to merchantreference in datacash documentation)
-      #   * <tt>:set_up_continuous_authority</tt>::
-      #      Set to true to set up a recurring historic transaction account be set up.
-      #      Only supported for :visa, :master and :american_express card types
-      #      See http://www.datacash.com/services/recurring/historic.php for more details of historic transactions.
-      #   * <tt>:address</tt>:: billing address for card
-      #
-      # The continuous authority reference will be available in response#params['ca_reference'] if you have requested one
       def authorize(money, authorization_or_credit_card, options = {})
         requires!(options, :order_id)
 
@@ -108,42 +53,22 @@ module ActiveMerchant
         commit(request)
       end
 
-      # Captures the funds from an authorized transaction.
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> -- The amount to be captured as anInteger value in cents.
-      # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.
       def capture(money, authorization, options = {})
         commit(build_void_or_capture_request(FULFILL_TYPE, money, authorization, options))
       end
 
-      # Void a previous transaction
-      #
-      # ==== Parameters
-      #
-      # * <tt>authorization</tt> - The authorization returned from the previous authorize request.
       def void(authorization, options = {})
         request = build_void_or_capture_request(CANCEL_TYPE, nil, authorization, options)
 
         commit(request)
       end
 
-      # Refund to a card
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> The amount to be refunded as an Integer value in cents. Set to nil for a full refund on existing transaction.
-      # * <tt>reference_or_credit_card</tt> The credit card you want to refund OR the datacash_reference for the existing transaction you are refunding
-      # * <tt>options</tt> Are ignored when refunding via reference to an existing transaction, otherwise
-      #   * <tt>:order_id</tt> A unique reference for this order (corresponds to merchantreference in datacash documentation)
-      #   * <tt>:address</tt>:: billing address for card
       def credit(money, reference_or_credit_card, options = {})
         if reference_or_credit_card.is_a?(String)
           ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
           refund(money, reference_or_credit_card)
         else
-          request = build_refund_request(money, reference_or_credit_card, options)
+          request = build_credit_request(money, reference_or_credit_card, options)
           commit(request)
         end
       end
@@ -152,42 +77,14 @@ module ActiveMerchant
         commit(build_transaction_refund_request(money, reference))
       end
 
+
       private
-      # Create the xml document for a 'cancel' or 'fulfill' transaction.
-      #
-      # Final XML should look like:
-      # <Request>
-      #  <Authentication>
-      #    <client>99000001</client>
-      #    <password>******</password>
-      #  </Authentication>
-      #  <Transaction>
-      #    <TxnDetails>
-      #      <amount>25.00</amount>
-      #    </TxnDetails>
-      #    <HistoricTxn>
-      #      <reference>4900200000000001</reference>
-      #      <authcode>A6</authcode>
-      #      <method>fulfill</method>
-      #    </HistoricTxn>
-      #  </Transaction>
-      # </Request>
-      #
-      # Parameters:
-      # * <tt>type</tt> must be FULFILL_TYPE or CANCEL_TYPE
-      # * <tt>money</tt> - optional - Integer value in cents
-      # * <tt>authorization</tt> - the Datacash authorization from a previous succesful authorize transaction
-      # * <tt>options</tt>
-      #   * <tt>order_id</tt> - A unique reference for the transaction
-      #
-      # Returns:
-      #   -Builder xml document
-      #
+
       def build_void_or_capture_request(type, money, authorization, options)
         parsed_authorization = parse_authorization_string(authorization)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
-        xml.tag! :Request do
+        xml.tag! :Request, :version => '2' do
           add_authentication(xml)
 
           xml.tag! :Transaction do
@@ -209,71 +106,10 @@ module ActiveMerchant
         xml.target!
       end
 
-      # Create the xml document for an 'auth' or 'pre' transaction with a credit card
-      #
-      # Final XML should look like:
-      #
-      # <Request>
-      #  <Authentication>
-      #    <client>99000000</client>
-      #    <password>*******</password>
-      #  </Authentication>
-      #  <Transaction>
-      #    <TxnDetails>
-      #      <merchantreference>123456</merchantreference>
-      #      <amount currency="EUR">10.00</amount>
-      #    </TxnDetails>
-      #    <CardTxn>
-      #      <Card>
-      #        <pan>4444********1111</pan>
-      #        <expirydate>03/04</expirydate>
-      #        <Cv2Avs>
-      #          <street_address1>Flat 7</street_address1>
-      #          <street_address2>89 Jumble
-      #               Street</street_address2>
-      #          <street_address3>Mytown</street_address3>
-      #          <postcode>AV12FR</postcode>
-      #          <cv2>123</cv2>
-      #           <ExtendedPolicy>
-      #             <cv2_policy notprovided="reject"
-      #                          notchecked="accept"
-      #                          matched="accept"
-      #                          notmatched="reject"
-      #                          partialmatch="reject"/>
-      #             <postcode_policy notprovided="reject"
-      #                          notchecked="accept"
-      #                          matched="accept"
-      #                          notmatched="reject"
-      #                          partialmatch="accept"/>
-      #             <address_policy notprovided="reject"
-      #                          notchecked="accept"
-      #                          matched="accept"
-      #                          notmatched="reject"
-      #                          partialmatch="accept"/>
-      #           </ExtendedPolicy>
-      #        </Cv2Avs>
-      #      </Card>
-      #      <method>auth</method>
-      #    </CardTxn>
-      #  </Transaction>
-      # </Request>
-      #
-      # Parameters:
-      #   -type must be 'auth' or 'pre'
-      #   -money - A money object with the price and currency
-      #   -credit_card - The credit_card details to use
-      #   -options:
-      #     :order_id is the merchant reference number
-      #     :billing_address is the billing address for the cc
-      #     :address is the delivery address
-      #
-      # Returns:
-      #   -xml: Builder document containing the markup
-      #
       def build_purchase_or_authorization_request_with_credit_card_request(type, money, credit_card, options)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
-        xml.tag! :Request do
+        xml.tag! :Request, :version => '2' do
           add_authentication(xml)
 
           xml.tag! :Transaction do
@@ -294,47 +130,13 @@ module ActiveMerchant
         xml.target!
       end
 
-      # Create the xml document for an 'auth' or 'pre' transaction with
-      # continuous authorization
-      #
-      # Final XML should look like:
-      #
-      # <Request>
-      #   <Transaction>
-      #     <ContAuthTxn type="historic" />
-      #     <TxnDetails>
-      #       <merchantreference>3851231</merchantreference>
-      #       <capturemethod>cont_auth</capturemethod>
-      #       <amount currency="GBP">18.50</amount>
-      #     </TxnDetails>
-      #     <HistoricTxn>
-      #       <reference>4500200040925092</reference>
-      #       <method>auth</method>
-      #     </HistoricTxn>
-      #   </Transaction>
-      #   <Authentication>
-      #     <client>99000001</client>
-      #     <password>mypasswd</password>
-      #   </Authentication>
-      # </Request>
-      #
-      # Parameters:
-      #   -type must be 'auth' or 'pre'
-      #   -money - A money object with the price and currency
-      #   -authorization - The authorization containing a continuous authority reference previously set up on a credit card
-      #   -options:
-      #     :order_id is the merchant reference number
-      #
-      # Returns:
-      #   -xml: Builder document containing the markup
-      #
       def build_purchase_or_authorization_request_with_continuous_authority_reference_request(type, money, authorization, options)
         parsed_authorization = parse_authorization_string(authorization)
         raise ArgumentError, "The continuous authority reference is required for continuous authority transactions" if parsed_authorization[:ca_reference].blank?
 
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
-        xml.tag! :Request do
+        xml.tag! :Request, :version => '2' do
           add_authentication(xml)
           xml.tag! :Transaction do
             xml.tag! :ContAuthTxn, :type => 'historic'
@@ -352,31 +154,11 @@ module ActiveMerchant
         xml.target!
       end
 
-      # Create the xml document for a full or partial refund transaction with
-      #
-      # Final XML should look like:
-      #
-      # <Request>
-      #   <Authentication>
-      #     <client>99000001</client>
-      #     <password>*******</password>
-      #   </Authentication>
-      #   <Transaction>
-      #     <HistoricTxn>
-      #       <method>txn_refund</method>
-      #       <reference>12345678</reference>
-      #     </HistoricTxn>
-      #     <TxnDetails>
-      #       <amount>10.00</amount>
-      #     </TxnDetails>
-      #   </Transaction>
-      # </Request>
-      #
       def build_transaction_refund_request(money, authorization)
         parsed_authorization = parse_authorization_string(authorization)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
-        xml.tag! :Request do
+        xml.tag! :Request, :version => '2' do
           add_authentication(xml)
           xml.tag! :Transaction do
             xml.tag! :HistoricTxn do
@@ -393,34 +175,10 @@ module ActiveMerchant
         xml.target!
       end
 
-      # Create the xml document for a full or partial refund  with
-      #
-      # Final XML should look like:
-      #
-      # <Request>
-      #   <Authentication>
-      #     <client>99000001</client>
-      #     <password>*****</password>
-      #   </Authentication>
-      #   <Transaction>
-      #     <CardTxn>
-      #       <Card>
-      #         <pan>633300*********1</pan>
-      #         <expirydate>04/06</expirydate>
-      #         <startdate>01/04</startdate>
-      #       </Card>
-      #       <method>refund</method>
-      #     </CardTxn>
-      #     <TxnDetails>
-      #       <merchantreference>1000001</merchantreference>
-      #       <amount currency="GBP">95.99</amount>
-      #     </TxnDetails>
-      #   </Transaction>
-      # </Request>
-      def build_refund_request(money, credit_card, options)
+      def build_credit_request(money, credit_card, options)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
-        xml.tag! :Request do
+        xml.tag! :Request, :version => '2' do
           add_authentication(xml)
           xml.tag! :Transaction do
             xml.tag! :CardTxn do
@@ -436,15 +194,6 @@ module ActiveMerchant
         xml.target!
       end
 
-
-      # Adds the authentication element to the passed builder xml doc
-      #
-      # Parameters:
-      #   -xml: Builder document that is being built up
-      #
-      # Returns:
-      #   -none: The results is stored in the passed xml document
-      #
       def add_authentication(xml)
         xml.tag! :Authentication do
           xml.tag! :client, @options[:login]
@@ -452,16 +201,6 @@ module ActiveMerchant
         end
       end
 
-      # Add credit_card details to the passed XML Builder doc
-      #
-      # Parameters:
-      #   -xml: Builder document that is being built up
-      #   -credit_card: ActiveMerchant::Billing::CreditCard object
-      #   -billing_address: Hash containing all of the billing address details
-      #
-      # Returns:
-      #   -none: The results is stored in the passed xml document
-      #
       def add_credit_card(xml, credit_card, address)
 
         xml.tag! :Card do
@@ -520,44 +259,19 @@ module ActiveMerchant
         end
       end
 
-      # Send the passed data to DataCash for processing
-      #
-      # Parameters:
-      #   -request: The XML data that is to be sent to Datacash
-      #
-      # Returns:
-      #   - ActiveMerchant::Billing::Response object
-      #
       def commit(request)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, request))
 
-        Response.new(response[:status] == DATACASH_SUCCESS, response[:reason], response,
+        Response.new(response[:status] == '1', response[:reason], response,
           :test => test?,
           :authorization => "#{response[:datacash_reference]};#{response[:authcode]};#{response[:ca_reference]}"
         )
       end
 
-      # Returns a date string in the format Datacash expects
-      #
-      # Parameters:
-      #   -month: integer, the month
-      #   -year: integer, the year
-      #
-      # Returns:
-      #   -String: date in MM/YY format
-      #
       def format_date(month, year)
         "#{format(month,:two_digits)}/#{format(year, :two_digits)}"
       end
 
-      # Parse the datacash response and create a Response object
-      #
-      # Parameters:
-      #   -body: The XML returned from Datacash
-      #
-      # Returns:
-      #   -a hash with all of the values returned in the Datacash XML response
-      #
       def parse(body)
 
         response = {}
@@ -571,14 +285,6 @@ module ActiveMerchant
         response
       end
 
-      # Parse an xml element
-      #
-      # Parameters:
-      #   -response: The hash that the values are being returned in
-      #   -node: The node that is currently being read
-      #
-      # Returns:
-      # -  none (results are stored in the passed hash)
       def parse_element(response, node)
         if node.has_elements?
           node.elements.each{|e| parse_element(response, e) }