activemerchant 1.31.1 → 1.32.0

data/CHANGELOG

@@ -1,5 +1,30 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.32.0 (April 1, 2013)
+
+* Optimal: Submit shipping address with requests [jduff]
+* Iridium: Enable reference transactions for authorize [ntalbott]
+* Stripe: Add authorize and capture methods [melari]
+* Pin: Add a default description if none is specified to fix failures [melari]
+* Litle: Add support for passing optional fields in token based transactions [forest]
+* Add Finansbank gateway [scamurcuoglu]
+* Paymill: Use .com instead of .de for save card url [besi]
+* Worldpay integration: Use more robust endpoint urls [nashbridges]
+* Braintree Blue: Return CC token in transaction hash [cyu]
+* Robokassa: Fix signature for empty amount [ukolovda]
+* Worldpay gateway: Fix error messages for some failures [duff]
+* Worldpay gateway: Allow settled payments to be refunded [dougal]
+* Spreedly: Update urls and terminology [duff]
+* Make card brand error more user friendly [oggy]
+* DataCash: Update test Mastercard number [jamesshipton]
+* DataCash: Update test response fixtures [jamesshipton]
+* Pin: Add Pin.js card token support [nagash]
+* PayPal Express gateway: Fix error when no address information is in response [pierre]
+* Ogone: Use BYPSP for ALIASOPERATION [ntalbott]
+* Paymill: Handle error storing card [duff]
+* SagePay integration: Add referrer field [melari]
+* Pin: Add extra headers [duff]
+
 == Version 1.31.1 (February 25, 2013)
 
 * Cybersource: Bug fixes [natejgreene, jduff]

data/CONTRIBUTORS

@@ -346,6 +346,10 @@ Balanced gateway (July 2012)
 
 * Marshall Jones (mjallday)
 
+PayFast integration (October 2012)
+
+* Vasiliy Ermolovich (nashby)
+
 A1Agregator (November 2012)
 
 * Roman Ivanilov (england)
@@ -384,3 +388,7 @@ Paymill (February 2013)
 EVO Canada (February 2013)
 
 * Alex Dunae (alexdunae)
+
+Finansbank WebPOS (March 2013)
+
+* scamurcuoglu

data/README.md

@@ -100,6 +100,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [E-xact](http://www.e-xact.com) - CA, US
 * [Fat Zebra](https://www.fatzebra.com.au) - AU
 * [Federated Canada](http://www.federatedcanada.com/) - CA
+* [Finansbank WebPOS](https://www.fbwebpos.com/) - US, TR
 * [FirstData Global Gateway e4](http://www.firstdata.com) - CA, US
 * [FirstPay](http://www.first-pay.com) - US
 * [Garanti Sanal POS](https://ccpos.garanti.com.tr/ccRaporlar/garanti/ccReports) - US, TR
@@ -130,6 +131,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Optimal Payments](http://www.optimalpayments.com/) - CA, US, UK
 * [Orbital Paymentech](http://chasepaymentech.com/) - CA, US, UK, GB
 * [PayBox Direct](http://www.paybox.com) - FR
+* [PayFast](https://www.payfast.co.za/) - ZA
 * [PayGate PayXML](http://paygate.co.za/) - US, ZA
 * [PayJunction](http://www.payjunction.com/) - US
 * [PaymentExpress](http://www.paymentexpress.com/) - AU, MY, NZ, SG, ZA, UK, US

data/lib/active_merchant/billing/credit_card.rb

@@ -229,7 +229,7 @@ module ActiveMerchant #:nodoc:
         end
 
         unless errors.on(:number) || errors.on(:brand)
-          errors.add :brand, "is not the correct card brand" unless CreditCard.matching_brand?(number, brand)
+          errors.add :brand, "does not match the card number" unless CreditCard.matching_brand?(number, brand)
         end
       end
 

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

@@ -338,7 +338,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:type</tt> -- The type of transaction. Can be either <tt>:auth_only</tt>, <tt>:capture_only</tt>, <tt>:auth_capture</tt>, <tt>:prior_auth_capture</tt>, <tt>:refund</tt> or <tt>:void</tt>. (REQUIRED)
       # * <tt>:amount</tt> -- The amount for the tranaction. Formatted with a decimal. For example "4.95" (CONDITIONAL)
       #     - :type == :void (NOT USED)
-      #     - :type == (:refund, :auth_only, :capture_only, :auth_capture, :prior_auth_capture) (REQUIRED)
+      #     - :type == :refund (OPTIONAL)
+      #     - :type == (:auth_only, :capture_only, :auth_capture, :prior_auth_capture) (REQUIRED)
       #
       # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction. (CONDITIONAL)
       #     - :type == (:void, :prior_auth_capture) (OPTIONAL)

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -239,6 +239,7 @@ module ActiveMerchant #:nodoc:
 
       def add_recurring_invoice(post, options)
         post[:rbApplyTax1] = options[:apply_tax1]
+        post[:rbApplyTax2] = options[:apply_tax2]
       end
 
       def add_recurring_operation_type(post, operation)

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

@@ -340,6 +340,7 @@ module ActiveMerchant #:nodoc:
           "bin"                 => transaction.credit_card_details.bin,
           "last_4"              => transaction.credit_card_details.last_4,
           "card_type"           => transaction.credit_card_details.card_type,
+          "token"               => transaction.credit_card_details.token
         }
 
         {

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

@@ -0,0 +1,160 @@
+if RUBY_VERSION < '1.9' && $KCODE == "NONE"
+  $KCODE = 'u'
+end
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    # CC5 API is used by many banks in Turkey. Extend this base class to provide
+    # concrete implementations.
+    class CC5Gateway < Gateway
+      self.default_currency = 'TRY'
+
+      CURRENCY_CODES = {
+        'TRY' => 949,
+        'YTL' => 949,
+        'TRL' => 949,
+        'TL'  => 949,
+        'USD' => 840,
+        'EUR' => 978,
+        'GBP' => 826,
+        'JPY' => 392
+      }
+
+      def initialize(options = {})
+        requires!(options, :login, :password, :client_id)
+        super
+      end
+
+      def purchase(money, creditcard, options = {})
+        commit(build_sale_request('Auth', money, creditcard, options))
+      end
+
+      def authorize(money, creditcard, options = {})
+        commit(build_sale_request('PreAuth', money, creditcard, options))
+      end
+
+      def capture(money, authorization, options = {})
+        commit(build_capture_request(money, authorization, options))
+      end
+
+      protected
+
+      def build_sale_request(type, money, creditcard, options = {})
+        requires!(options,  :order_id)
+
+        xml = Builder::XmlMarkup.new :indent => 2
+
+        xml.tag! 'CC5Request' do
+          add_login_tags(xml)
+          xml.tag! 'OrderId', options[:order_id]
+          xml.tag! 'Type', type
+          xml.tag! 'Number', creditcard.number
+          xml.tag! 'Expires', [format(creditcard.month, :two_digits), format(creditcard.year, :two_digits)].join('/')
+          xml.tag! 'Cvv2Val', creditcard.verification_value
+          add_amount_tags(money, options, xml)
+          xml.tag! 'Email', options[:email] if options[:email]
+
+          if(address = (options[:billing_address] || options[:address]))
+            xml.tag! 'BillTo' do
+              add_address(xml, address)
+            end
+            xml.tag! 'ShipTo' do
+              add_address(xml, address)
+            end
+          end
+
+        end
+
+        xml.target!
+      end
+
+      def build_capture_request(money, authorization, options = {})
+        xml = Builder::XmlMarkup.new :indent => 2
+
+        xml.tag! 'CC5Request' do
+          add_login_tags(xml)
+          xml.tag! 'OrderId', authorization
+          xml.tag! 'Type', 'PostAuth'
+          add_amount_tags(money, options, xml)
+        end
+      end
+
+      def add_address(xml, address)
+        xml.tag! 'Name', normalize(address[:name])
+        xml.tag! 'Street1', normalize(address[:address1])
+        xml.tag! 'Street2', normalize(address[:address2]) if address[:address2]
+        xml.tag! 'City', normalize(address[:city])
+        xml.tag! 'PostalCode', address[:zip]
+        xml.tag! 'Country', normalize(address[:country])
+        xml.tag! 'Company', normalize(address[:company])
+        xml.tag! 'TelVoice', address[:phone].to_s.gsub(/[^0-9]/, '') if address[:phone]
+      end
+
+      def add_login_tags(xml)
+        xml.tag! 'Name', @options[:login]
+        xml.tag! 'Password', @options[:password]
+        xml.tag! 'ClientId', @options[:client_id]
+        xml.tag! 'Mode', (test? ? 'T' : 'P')
+      end
+
+      def add_amount_tags(money, options, xml)
+        xml.tag! 'Total', amount(money)
+        xml.tag! 'Currency', currency_code(options[:currency] || currency(money))
+      end
+
+      def currency_code(currency)
+        (CURRENCY_CODES[currency] || CURRENCY_CODES[default_currency])
+      end
+
+      def commit(request)
+        raw_response = ssl_post((test? ? self.test_url : self.live_url), "DATA=" + request)
+
+        response = parse(raw_response)
+
+        success = success?(response)
+
+        Response.new(
+          success,
+          (success ? 'Approved' : "Declined (Reason: #{response[:proc_return_code]} - #{response[:err_msg]})"),
+          response,
+          :test => test?,
+          :authorization => response[:order_id]
+        )
+      end
+
+      def parse(body)
+        xml = REXML::Document.new(body)
+
+        response = {}
+        xml.root.elements.to_a.each do |node|
+          parse_element(response, node)
+        end
+        response
+      end
+
+      def parse_element(response, node)
+        if node.has_elements?
+          node.elements.each{|element| parse_element(response, element) }
+        else
+          response[node.name.underscore.to_sym] = node.text
+        end
+      end
+
+      def success?(response)
+        (response[:response] == "Approved")
+      end
+
+      def normalize(text)
+        return unless text
+
+        if ActiveSupport::Inflector.method(:transliterate).arity == -2
+          ActiveSupport::Inflector.transliterate(text,'')
+        elsif RUBY_VERSION >= '1.9'
+          text.gsub(/[^\x00-\x7F]+/, '')
+        else
+          ActiveSupport::Inflector.transliterate(text).to_s
+        end
+      end
+    end
+  end
+end

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

@@ -65,7 +65,7 @@ module ActiveMerchant
       #      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_referece'] if you have requested one
+      # 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)
 
@@ -93,7 +93,7 @@ module ActiveMerchant
       #      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_referece'] if you have requested one
+      # 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)
 
@@ -448,7 +448,7 @@ module ActiveMerchant
         end
       end
 
-      # Add credit_card detals to the passed XML Builder doc
+      # Add credit_card details to the passed XML Builder doc
       #
       # Parameters:
       #   -xml: Builder document that is being built up

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

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/cc5'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class FinansbankGateway < CC5Gateway
+      self.live_url = self.test_url = 'https://www.fbwebpos.com/servlet/cc5ApiServer'
+
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['US', 'TR']
+
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master]
+
+      # The homepage URL of the gateway
+      self.homepage_url = 'https://www.fbwebpos.com/'
+
+      # The name of the gateway
+      self.display_name = 'Finansbank WebPOS'
+    end
+  end
+end
+

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

@@ -38,8 +38,14 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def authorize(money, creditcard, options = {})
-        commit(build_purchase_request('PREAUTH', money, creditcard, options), options)
+      def authorize(money, payment_source, options = {})
+        setup_address_hash(options)
+
+        if payment_source.respond_to?(:number)
+          commit(build_purchase_request('PREAUTH', money, payment_source, options), options)
+        else
+          commit(build_reference_request('PREAUTH', money, payment_source, options), options)
+        end
       end
 
       def purchase(money, payment_source, options = {})

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

@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://www.testlitle.com/sandbox/communicator/online'
       self.live_url = 'https://payments.litle.com/vap/communicator/online'
 
-      LITLE_SCHEMA_VERSION = '8.10'
+      LITLE_SCHEMA_VERSION     = '8.13'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['US']
@@ -46,10 +46,10 @@ module ActiveMerchant #:nodoc:
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
 
       # The homepage URL of the gateway
-      self.homepage_url = 'http://www.litle.com/'
+      self.homepage_url        = 'http://www.litle.com/'
 
       # The name of the gateway
-      self.display_name = 'Litle & Co.'
+      self.display_name        = 'Litle & Co.'
 
       self.default_currency = 'USD'
 
@@ -91,8 +91,8 @@ module ActiveMerchant #:nodoc:
         build_response(:void, @litle.void(to_pass))
       end
 
-      def credit(money, identification, options = {})
-        to_pass = create_credit_hash(money, identification, options)
+      def credit(money, identification_or_token, options = {})
+        to_pass = build_credit_request(money, identification_or_token, options)
         build_response(:credit, @litle.credit(to_pass))
       end
 
@@ -104,30 +104,30 @@ module ActiveMerchant #:nodoc:
       private
 
       CARD_TYPE = {
-        'visa' => 'VI',
-        'master' => 'MC',
-        'american_express' => 'AX',
-        'discover' => 'DI',
-        'jcb' => 'DI',
-        'diners_club' => 'DI'
+          'visa'             => 'VI',
+          'master'           => 'MC',
+          'american_express' => 'AX',
+          'discover'         => 'DI',
+          'jcb'              => 'DI',
+          'diners_club'      => 'DI'
       }
 
       AVS_RESPONSE_CODE = {
-        '00' => 'Y',
-        '01' => 'X',
-        '02' => 'D',
-        '10' => 'Z',
-        '11' => 'W',
-        '12' => 'A',
-        '13' => 'A',
-        '14' => 'P',
-        '20' => 'N',
-        '30' => 'S',
-        '31' => 'R',
-        '32' => 'U',
-        '33' => 'R',
-        '34' => 'I',
-        '40' => 'E'
+          '00' => 'Y',
+          '01' => 'X',
+          '02' => 'D',
+          '10' => 'Z',
+          '11' => 'W',
+          '12' => 'A',
+          '13' => 'A',
+          '14' => 'P',
+          '20' => 'N',
+          '30' => 'S',
+          '31' => 'R',
+          '32' => 'U',
+          '33' => 'R',
+          '34' => 'I',
+          '40' => 'E'
       }
 
       def url
@@ -140,22 +140,22 @@ module ActiveMerchant #:nodoc:
         response = Hash.from_xml(litle_response.raw_xml.to_s)['litleOnlineResponse']
 
         if response['response'] == "0"
-          detail = response["#{kind}Response"]
-          fraud = fraud_result(detail)
+          detail        = response["#{kind}Response"]
+          fraud         = fraud_result(detail)
           authorization = case kind
-          when :registerToken
-            response['registerTokenResponse']['litleToken']
-          else
-            detail['litleTxnId']
-          end
+                          when :registerToken
+                            response['registerTokenResponse']['litleToken']
+                          else
+                            detail['litleTxnId']
+                          end
           Response.new(
-            valid_responses.include?(detail['response']),
-            detail['message'],
-            {:litleOnlineResponse => response},
-            :authorization => authorization,
-            :avs_result => {:code => fraud['avs']},
-            :cvv_result => fraud['cvv'],
-            :test => test?
+              valid_responses.include?(detail['response']),
+              detail['message'],
+              { :litleOnlineResponse => response },
+              :authorization => authorization,
+              :avs_result    => { :code => fraud['avs'] },
+              :cvv_result    => fraud['cvv'],
+              :test          => test?
           )
         else
           Response.new(false, response['message'], :litleOnlineResponse => response, :test => test?)
@@ -163,39 +163,83 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_authorize_request(money, creditcard_or_token, options)
+        payment_method = build_payment_method(creditcard_or_token, options)
+
         hash = create_hash(money, options)
 
-        add_credit_card_or_token_hash(hash, creditcard_or_token)
+        add_creditcard_or_cardtoken_hash(hash, payment_method)
 
         hash
       end
 
       def build_purchase_request(money, creditcard_or_token, options)
+        payment_method = build_payment_method(creditcard_or_token, options)
+
+        hash = create_hash(money, options)
+
+        add_creditcard_or_cardtoken_hash(hash, payment_method)
+
+        hash
+      end
+
+      def build_credit_request(money, identification_or_token, options)
+        payment_method = build_payment_method(identification_or_token, options)
+
         hash = create_hash(money, options)
 
-        add_credit_card_or_token_hash(hash, creditcard_or_token)
+        add_identification_or_cardtoken_hash(hash, payment_method)
+
+        unless payment_method.is_a?(LitleCardToken)
+          hash['orderSource'] = nil
+          hash['orderId']     = nil
+        end
 
         hash
       end
 
-      def add_credit_card_or_token_hash(hash, creditcard_or_token)
-        if creditcard_or_token.is_a?(String)
-          add_token_hash(hash, creditcard_or_token)
+      def build_payment_method(payment_method, options)
+        result = payment_method
+
+        # Build instance of the LitleCardToken class for internal use if this is a token request.
+        if payment_method.is_a?(String) && options.has_key?(:token)
+          result                    = LitleCardToken.new(:token => payment_method)
+          result.month              = options[:token][:month]
+          result.year               = options[:token][:year]
+          result.verification_value = options[:token][:verification_value]
+          result.brand              = options[:token][:brand]
+        end
+
+        result
+      end
+
+      def add_creditcard_or_cardtoken_hash(hash, creditcard_or_cardtoken)
+        if creditcard_or_cardtoken.is_a?(LitleCardToken)
+          add_cardtoken_hash(hash, creditcard_or_cardtoken)
         else
-          add_credit_card_hash(hash, creditcard_or_token)
+          add_creditcard_hash(hash, creditcard_or_cardtoken)
         end
       end
 
-      def add_token_hash(hash, creditcard_or_token)
-        token_info = {
-            'litleToken' => creditcard_or_token
-        }
+      def add_identification_or_cardtoken_hash(hash, identification_or_cardtoken)
+        if identification_or_cardtoken.is_a?(LitleCardToken)
+          add_cardtoken_hash(hash, identification_or_cardtoken)
+        else
+          hash['litleTxnId'] = identification_or_cardtoken
+        end
+      end
+
+      def add_cardtoken_hash(hash, cardtoken)
+        token_info               = {}
+        token_info['litleToken'] = cardtoken.token
+        token_info['expDate'] = cardtoken.exp_date if cardtoken.exp_date?
+        token_info['cardValidationNum'] = cardtoken.verification_value unless cardtoken.verification_value.blank?
+        token_info['type'] = cardtoken.type unless cardtoken.type.blank?
 
         hash['token'] = token_info
         hash
       end
 
-      def add_credit_card_hash(hash, creditcard)
+      def add_creditcard_hash(hash, creditcard)
         cc_type     = CARD_TYPE[creditcard.brand]
         exp_date_yr = creditcard.year.to_s[2..3]
         exp_date_mo = '%02d' % creditcard.month.to_i
@@ -213,27 +257,19 @@ module ActiveMerchant #:nodoc:
       end
 
       def create_capture_hash(money, authorization, options)
-        hash = create_hash(money, options)
+        hash               = create_hash(money, options)
         hash['litleTxnId'] = authorization
         hash
       end
 
-      def create_credit_hash(money, identification, options)
-        hash = create_hash(money, options)
-        hash['litleTxnId'] = identification
-        hash['orderSource'] = nil
-        hash['orderId'] = nil
-        hash
-      end
-
       def create_token_hash(creditcard, options)
-        hash = create_hash(0, options)
+        hash                  = create_hash(0, options)
         hash['accountNumber'] = creditcard.number
         hash
       end
 
       def create_void_hash(identification, options)
-        hash = create_hash(nil, options)
+        hash               = create_hash(nil, options)
         hash['litleTxnId'] = identification
         hash
       end
@@ -255,54 +291,54 @@ module ActiveMerchant #:nodoc:
 
         if options[:billing_address]
           bill_to_address = {
-            'name' => options[:billing_address][:name],
-            'companyName' => options[:billing_address][:company],
-            'addressLine1' => options[:billing_address][:address1],
-            'addressLine2' => options[:billing_address][:address2],
-            'city' => options[:billing_address][:city],
-            'state' => options[:billing_address][:state],
-            'zip' => options[:billing_address][:zip],
-            'country' => options[:billing_address][:country],
-            'email' => options[:email],
-            'phone' => options[:billing_address][:phone]
+              'name'         => options[:billing_address][:name],
+              'companyName'  => options[:billing_address][:company],
+              'addressLine1' => options[:billing_address][:address1],
+              'addressLine2' => options[:billing_address][:address2],
+              'city'         => options[:billing_address][:city],
+              'state'        => options[:billing_address][:state],
+              'zip'          => options[:billing_address][:zip],
+              'country'      => options[:billing_address][:country],
+              'email'        => options[:email],
+              'phone'        => options[:billing_address][:phone]
           }
         end
         if options[:shipping_address]
           ship_to_address = {
-            'name' => options[:shipping_address][:name],
-            'companyName' => options[:shipping_address][:company],
-            'addressLine1' => options[:shipping_address][:address1],
-            'addressLine2' => options[:shipping_address][:address2],
-            'city' => options[:shipping_address][:city],
-            'state' => options[:shipping_address][:state],
-            'zip' => options[:shipping_address][:zip],
-            'country' => options[:shipping_address][:country],
-            'email' => options[:email],
-            'phone' => options[:shipping_address][:phone]
+              'name'         => options[:shipping_address][:name],
+              'companyName'  => options[:shipping_address][:company],
+              'addressLine1' => options[:shipping_address][:address1],
+              'addressLine2' => options[:shipping_address][:address2],
+              'city'         => options[:shipping_address][:city],
+              'state'        => options[:shipping_address][:state],
+              'zip'          => options[:shipping_address][:zip],
+              'country'      => options[:shipping_address][:country],
+              'email'        => options[:email],
+              'phone'        => options[:shipping_address][:phone]
           }
         end
 
         hash = {
-          'billToAddress' => bill_to_address,
-          'shipToAddress' => ship_to_address,
-          'orderId' => (options[:order_id] || @options[:order_id]),
-          'customerId' => options[:customer],
-          'reportGroup' => (options[:merchant] || @options[:merchant]),
-          'merchantId' => (options[:merchant_id] || @options[:merchant_id]),
-          'orderSource' => (options[:order_source] || 'ecommerce'),
-          'enhancedData' => enhanced_data,
-          'fraudCheckType' => fraud_check_type,
-          'user' => (options[:user] || @options[:user]),
-          'password' => (options[:password] || @options[:password]),
-          'version' => (options[:version] || @options[:version]),
-          'url' => (options[:url] || url),
-          'proxy_addr' => (options[:proxy_addr] || @options[:proxy_addr]),
-          'proxy_port' => (options[:proxy_port] || @options[:proxy_port]),
-          'id' => (options[:id] || options[:order_id] || @options[:order_id])
+            'billToAddress'  => bill_to_address,
+            'shipToAddress'  => ship_to_address,
+            'orderId'        => (options[:order_id] || @options[:order_id]),
+            'customerId'     => options[:customer],
+            'reportGroup'    => (options[:merchant] || @options[:merchant]),
+            'merchantId'     => (options[:merchant_id] || @options[:merchant_id]),
+            'orderSource'    => (options[:order_source] || 'ecommerce'),
+            'enhancedData'   => enhanced_data,
+            'fraudCheckType' => fraud_check_type,
+            'user'           => (options[:user] || @options[:user]),
+            'password'       => (options[:password] || @options[:password]),
+            'version'        => (options[:version] || @options[:version]),
+            'url'            => (options[:url] || url),
+            'proxy_addr'     => (options[:proxy_addr] || @options[:proxy_addr]),
+            'proxy_port'     => (options[:proxy_port] || @options[:proxy_port]),
+            'id'             => (options[:id] || options[:order_id] || @options[:order_id])
         }
 
-        if( !money.nil? && money.to_s.length > 0 )
-          hash.merge!({'amount' => money})
+        if (!money.nil? && money.to_s.length > 0)
+          hash.merge!({ 'amount' => money })
         end
         hash
       end
@@ -315,7 +351,159 @@ module ActiveMerchant #:nodoc:
 
           avs_to_pass = AVS_RESPONSE_CODE[result['avsResult']] unless result['avsResult'].blank?
         end
-        {'cvv'=>cvv_to_pass, 'avs'=>avs_to_pass}
+        { 'cvv' => cvv_to_pass, 'avs' => avs_to_pass }
+      end
+
+      # A +LitleCardToken+ object represents a tokenized credit card, and is capable of validating the various
+      # data associated with these.
+      #
+      # == Example Usage
+      #   token = LitleCardToken.new(
+      #     :token              => '1234567890123456',
+      #     :month              => '9',
+      #     :year               => '2010',
+      #     :brand              => 'visa',
+      #     :verification_value => '123'
+      #   )
+      #
+      #   token.valid? # => true
+      #   cc.exp_date # => 0910
+      #
+      class LitleCardToken
+        include Validateable
+
+        # Returns or sets the token. (required)
+        #
+        # @return [String]
+        attr_accessor :token
+
+        # Returns or sets the expiry month for the card associated with token. (optional)
+        #
+        # @return [Integer]
+        attr_accessor :month
+
+        # Returns or sets the expiry year for the card associated with token. (optional)
+        #
+        # @return [Integer]
+        attr_accessor :year
+
+        # Returns or sets the card verification value. (optional)
+        #
+        # @return [String] the verification value
+        attr_accessor :verification_value
+
+        # Returns or sets the credit card brand. (optional)
+        #
+        # Valid card types are
+        #
+        # * +'visa'+
+        # * +'master'+
+        # * +'discover'+
+        # * +'american_express'+
+        # * +'diners_club'+
+        # * +'jcb'+
+        # * +'switch'+
+        # * +'solo'+
+        # * +'dankort'+
+        # * +'maestro'+
+        # * +'forbrugsforeningen'+
+        # * +'laser'+
+        #
+        # @return (String) the credit card brand
+        attr_accessor :brand
+
+        # Returns the Litle credit card type identifier.
+        #
+        # @return (String) the credit card type identifier
+        def type
+          CARD_TYPE[brand] unless brand.blank?
+        end
+
+        # Returns true if the expiration date is set.
+        #
+        # @return (Boolean)
+        def exp_date?
+          !month.to_i.zero? && !year.to_i.zero?
+        end
+
+        # Returns the card token expiration date in MMYY format.
+        #
+        # @return (String) the expiration date in MMYY format
+        def exp_date
+          result = ''
+          if exp_date?
+            exp_date_yr = year.to_s[2..3]
+            exp_date_mo = '%02d' % month.to_i
+
+            result = exp_date_mo + exp_date_yr
+          end
+          result
+        end
+
+        # Validates the card token details.
+        #
+        # Any validation errors are added to the {#errors} attribute.
+        def validate
+          validate_card_token
+          validate_expiration_date
+          validate_card_brand
+        end
+
+        def check?
+          false
+        end
+
+        private
+
+        CARD_TYPE = {
+            'visa'             => 'VI',
+            'master'           => 'MC',
+            'american_express' => 'AX',
+            'discover'         => 'DI',
+            'jcb'              => 'DI',
+            'diners_club'      => 'DI'
+        }
+
+        def before_validate #:nodoc:
+          self.month = month.to_i
+          self.year  = year.to_i
+        end
+
+        # Litle XML Reference Guide 1.8.2
+        #
+        # The length of the original card number is reflected in the token, so a
+        # submitted 16-digit number results in a 16-digit token. Also, all tokens
+        # use only numeric characters, so you do not have to change your
+        # systems to accept alpha-numeric characters.
+        #
+        # The credit card token numbers themselves have two parts.
+        # The last four digits match the last four digits of the card number.
+        # The remaining digits (length can vary based upon original card number
+        # length) are a randomly generated.
+        def validate_card_token #:nodoc:
+          if token.to_s.length < 12 || token.to_s.match(/\A\d+\Z/).nil?
+            errors.add :token, "is not a valid card token"
+          end
+        end
+
+        def validate_expiration_date #:nodoc:
+          if !month.to_i.zero? || !year.to_i.zero?
+            errors.add :month, "is not a valid month" unless valid_month?(month)
+            errors.add :year, "is not a valid year" unless valid_expiry_year?(year)
+          end
+        end
+
+        def validate_card_brand #:nodoc:
+          errors.add :brand, "is invalid" unless brand.blank? || CreditCard.card_companies.keys.include?(brand)
+        end
+
+        def valid_month?(month)
+          (1..12).include?(month.to_i)
+        end
+
+        def valid_expiry_year?(year)
+          year.to_s =~ /\A\d{4}\Z/ && year.to_i > 1987
+        end
       end
     end
   end