activemerchant 1.13.0 → 1.14.0

data/CHANGELOG

@@ -1,5 +1,24 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.14.0 (Apr 29, 2011)
+
+* SagePayForm: Implement #cancelled? for Return. [wisq]
+* Add #cancelled? to Integrations::Return [wisq]
+* Bogus gateway: Add refund support and better tests [wisq]
+* Beanstream: Add support for storing cards [duffomelia]
+* eWay: Add support for storing cards [duffomelia]
+* Add validation mode to update profile request [Ken Miller]
+* Authorize.net CIM: Add oldLiveMode [ntalbott]
+* Authorize.net CIM: Add extra transaction types [Ken Miller]
+* JetPay: gateway tweaks [ntalbott]
+* Deprecate a bunch more #credit methods [ntalbott]
+* RealEx: Add authorize/capture/credit/void [ntalbott]
+* SecurePay AU: Add authorize/capture/credit/void [ntalbott]
+* PayPal Express: Make response parsing more robust [ntalbott]
+* Test deprecation warnings; add deprecation line numbers [ntabott]
+* Add Orbital direct gateway [ntalbott]
+* Add WorldPay direct gateway [ntalbott]
+
 == Version 1.13.0 (Apr 19, 2011)
 
 * Add a Gemfile for optional bundler support [ssoroka]

data/CONTRIBUTORS

@@ -26,6 +26,7 @@ Linkpoint Gateway
 eWay Gateway
 
 * Originally contributed by Lucas Carlson  (mailto:lucas@rufy.com)
+* Managed Payments support by Jason Stirk with improvements by Keith Pitt
 
 CardStream Gateway
 
@@ -83,6 +84,7 @@ PaypalNVGateway (Apr 12, 2008)
 Beanstream (May 13, 2008)
 
 * Created by xiaobozz ( xiaobozzz at gmail dot com )
+* Secure Profiles support by Forrest Zeisler (http://github.com/forrest)
 
 Sage (June, 2008)
 
@@ -211,7 +213,17 @@ NMI
 QBMS
 
 * Will Glozer (wg)
-WorldPay (Feb 17, 2011)
+
+WorldPay Integration (Feb 17, 2011)
 
 * Original code by Unknown from this patch: https://jadedpixel.lighthouseapp.com/projects/11599/tickets/3-patch-integration-support-for-worldpay-uk
-* Refactored by Soleone
+* Refactored by Soleone
+
+WorldPay Gateway
+
+* Original code by Amit kumar (ask4amit@gmail.com)
+* Refactored by Nathaniel Talbott (ntalbott)
+
+Orbital Paymentech Gateway (July, 2009)
+
+* Sam Vincent - http://ecommerce.versapay.com

data/README.rdoc

@@ -43,6 +43,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {NETbilling}[http://www.netbilling.com] - US
 * {NMI}[http://nmi.com/] - US
 * {Ogone DirectLink}[http://www.ogone.com] - BE, DE, FR, NL, AT, CH
+* {Orbital Paymentech}[http://chasepaymentech.com/] - CA, US
 * {PayBox Direct}[http://www.paybox.com] - FR
 * {PayJunction}[http://www.payjunction.com/] - US
 * {PaySecure}[http://www.commsecure.com.au/paysecure.shtml] - AU
@@ -75,6 +76,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Verifi}[http://www.verifi.com/] - US
 * {ViaKLIX}[http://viaklix.com] - US
 * {Wirecard}[http://www.wirecard.com] - DE
+* {WorldPay}[http://www.worldpay.com] - AU, HK, GB, US
 
 == Supported Offsite Payment Gateways
 

data/lib/active_merchant/billing/credit_card.rb

@@ -65,19 +65,19 @@ module ActiveMerchant #:nodoc:
       end
       
       def name?
-        first_name? && last_name?
+        first_name? || last_name?
       end
       
       def first_name?
-        !@first_name.blank?
+        @first_name.present?
       end
       
       def last_name?
-        !@last_name.blank?
+        @last_name.present?
       end
             
       def name
-        "#{@first_name} #{@last_name}"
+        [@first_name, @last_name].compact.join(' ')
       end
             
       def verification_value?

data/lib/active_merchant/billing/gateway.rb

@@ -135,7 +135,7 @@ module ActiveMerchant #:nodoc:
       def amount(money)
         return nil if money.nil?
         cents = if money.respond_to?(:cents)
-          warn "Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents"
+          deprecated "Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents"
           money.cents
         else
           money

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

@@ -134,21 +134,21 @@ module ActiveMerchant #:nodoc:
         commit('VOID', nil, post)
       end
 
-      # Credit an account.
+      # Refund a transaction.
       #
-      # This transaction is also referred to as a Refund and indicates to the gateway that
+      # This transaction indicates to the gateway that
       # money should flow from the merchant to the customer.
       #
       # ==== Parameters
       #
       # * <tt>money</tt> -- The amount to be credited to the customer as an Integer value in cents.
-      # * <tt>identification</tt> -- The ID of the original transaction against which the credit is being issued.
+      # * <tt>identification</tt> -- The ID of the original transaction against which the refund is being issued.
       # * <tt>options</tt> -- A hash of parameters.
       #
       # ==== Options
       #
-      # * <tt>:card_number</tt> -- The credit card number the credit is being issued to. (REQUIRED)
-      def credit(money, identification, options = {})
+      # * <tt>:card_number</tt> -- The credit card number the refund is being issued to. (REQUIRED)
+      def refund(money, identification, options = {})
         requires!(options, :card_number)
 
         post = { :trans_id => identification,
@@ -159,6 +159,11 @@ module ActiveMerchant #:nodoc:
         commit('CREDIT', money, post)
       end
 
+      def credit(money, identification, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, identification, options)
+      end
+
       # Create a recurring payment.
       #
       # This transaction creates a new Automated Recurring Billing (ARB) subscription. Your account must have ARB enabled.

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

@@ -54,13 +54,17 @@ module ActiveMerchant #:nodoc:
       CIM_TRANSACTION_TYPES = {
         :auth_capture => 'profileTransAuthCapture',
         :auth_only => 'profileTransAuthOnly',
-        :capture_only => 'profileTransCaptureOnly'
+        :capture_only => 'profileTransCaptureOnly',
+        :prior_auth_capture => 'profileTransPriorAuthCapture',
+        :refund => 'profileTransRefund',
+        :void => 'profileTransVoid'
       }
 
       CIM_VALIDATION_MODES = {
         :none => 'none',
         :test => 'testMode',
-        :live => 'liveMode'
+        :live => 'liveMode',
+        :old => 'oldLiveMode'
       }
       
       BANK_ACCOUNT_TYPES = {
@@ -309,14 +313,105 @@ module ActiveMerchant #:nodoc:
       #
       # ==== Transaction
       #
-      # * <tt>:type</tt> -- The type of transaction. Can be either <tt>:auth_only</tt>, <tt>:capture_only</tt>, or <tt>:auth_capture</tt>. (REQUIRED)
-      # * <tt>:amount</tt> -- The amount for the tranaction. Formatted with a decimal. For example "4.95" (REQUIRED)
-      # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction. (REQUIRED)
-      # * <tt>:customer_payment_profile_id</tt> -- The Customer Payment Profile ID of the Customer Payment Profile to use in this transaction. (REQUIRED)
+      # * <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)
+      #
+      # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction. (CONDITIONAL)
+      #     - :type == (:void, :prior_auth_capture) (OPTIONAL)
+      #     - :type == :refund (CONDITIONAL - required if masked information is not being submitted [see below])
+      #     - :type == (:auth_only, :capture_only, :auth_capture) (REQUIRED)
+      #
+      # * <tt>:customer_payment_profile_id</tt> -- The Customer Payment Profile ID of the Customer Payment Profile to use in this transaction. (CONDITIONAL)
+      #     - :type == (:void, :prior_auth_capture) (OPTIONAL)
+      #     - :type == :refund (CONDITIONAL - required if masked information is not being submitted [see below])
+      #     - :type == (:auth_only, :capture_only, :auth_capture) (REQUIRED)
+      #
+      # * <tt>:trans_id</tt> -- The payment gateway assigned transaction ID of the original transaction (CONDITIONAL):
+      #     - :type = (:void, :refund, :prior_auth_capture) (REQUIRED)
+      #     - :type = (:auth_only, :capture_only, :auth_capture) (NOT USED)
+      #
+      # * <tt>customer_shipping_address_id</tt> -- Payment gateway assigned ID associated with the customer shipping address (CONDITIONAL)
+      #     - :type = (:void, :refund) (OPTIONAL)
+      #     - :type = (:auth_only, :capture_only, :auth_capture) (NOT USED)
+      #     - :type = (:prior_auth_capture) (OPTIONAL)
+      #
+      # ==== For :type == :refund only
+      # * <tt>:credit_card_number_masked</tt> -- (CONDITIONAL - requied for credit card refunds is :customer_profile_id AND :customer_payment_profile_id are missing)
+      # * <tt>:bank_routing_number_masked && :bank_account_number_masked</tt> -- (CONDITIONAL - requied for electronic check refunds is :customer_profile_id AND :customer_payment_profile_id are missing) (NOT ABLE TO TEST - I keep getting "ACH transactions are not accepted by this merchant." when trying to make a payment and, until that's possible I can't refund (wiseleyb@gmail.com))
       def create_customer_profile_transaction(options)
         requires!(options, :transaction)
-        requires!(options[:transaction], :type, :amount, :customer_profile_id, :customer_payment_profile_id)
+        requires!(options[:transaction], :type)
+        case options[:transaction][:type]
+          when :void
+            requires!(options[:transaction], :trans_id)
+          when :refund
+            requires!(options[:transaction], :trans_id) &&
+              (
+                (options[:transaction][:customer_profile_id] && options[:transaction][:customer_payment_profile_id]) ||
+                options[:transaction][:credit_card_number_masked] ||
+                (options[:transaction][:bank_routing_number_masked] && options[:transaction][:bank_account_number_masked])
+              )
+          when :prior_auth_capture
+            requires!(options[:transaction], :amount, :trans_id)
+          else
+            requires!(options[:transaction], :amount, :customer_profile_id, :customer_payment_profile_id)
+        end
+        request = build_request(:create_customer_profile_transaction, options)
+        commit(:create_customer_profile_transaction, request)
+      end
 
+      # Creates a new payment transaction for refund from an existing customer profile
+      #
+      # This is what is used to refund a transaction you have stored in a Customer Profile.
+      #
+      # Returns a Response object that contains the result of the transaction in <tt>params['direct_response']</tt>
+      #
+      # ==== Options
+      #
+      # * <tt>:transaction</tt> -- A hash containing information on the transaction that is being requested. (REQUIRED)
+      #
+      # ==== Transaction
+      #
+      # * <tt>:amount</tt> -- The total amount to be refunded (REQUIRED)
+      #
+      # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction. (CONDITIONAL :customer_payment_profile_id must be included if used)
+      # * <tt>:customer_payment_profile_id</tt> -- The Customer Payment Profile ID of the Customer Payment Profile to use in this transaction. (CONDITIONAL :customer_profile_id must be included if used)
+      #
+      # * <tt>:credit_card_number_masked</tt> -- Four Xs follwed by the last four digits of the credit card (CONDITIONAL - used if customer_profile_id and customer_payment_profile_id aren't given)
+      #
+      # * <tt>:bank_routing_number_masked</tt> -- The last four gidits of the routing number to be refunded (CONDITIONAL - must be used with :bank_account_number_masked)
+      # * <tt>:bank_account_number_masked</tt> -- The last four digis of the bank account number to be refunded, Ex. XXXX1234 (CONDITIONAL - must be used with :bank_routing_number_masked)
+      def create_customer_profile_transaction_for_refund(options)
+        requires!(options, :transaction)
+        options[:transaction][:type] = :refund
+        requires!(options[:transaction], :trans_id)
+        requires!(options[:transaction], :amount)
+        request = build_request(:create_customer_profile_transaction, options)
+        commit(:create_customer_profile_transaction, request)
+      end
+
+      # Creates a new payment transaction for void from an existing customer profile
+      #
+      # This is what is used to void a transaction you have stored in a Customer Profile.
+      #
+      # Returns a Response object that contains the result of the transaction in <tt>params['direct_response']</tt>
+      #
+      # ==== Options
+      #
+      # * <tt>:transaction</tt> -- A hash containing information on the transaction that is being requested. (REQUIRED)
+      #
+      # ==== Transaction
+      #
+      # * <tt>:trans_id</tt> -- The payment gateway assigned transaction id of the original transaction. (REQUIRED)
+      # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction.
+      # * <tt>:customer_payment_profile_id</tt> -- The Customer Payment Profile ID of the Customer Payment Profile to use in this transaction.
+      # * <tt>:customer_shipping_address_id</tt> -- Payment gateway assigned ID associated with the customer shipping address.
+      def create_customer_profile_transaction_for_void(options)
+        requires!(options, :transaction)
+        options[:transaction][:type] = :void
+        requires!(options[:transaction], :trans_id)
         request = build_request(:create_customer_profile_transaction, options)
         commit(:create_customer_profile_transaction, request)
       end
@@ -443,6 +538,8 @@ module ActiveMerchant #:nodoc:
           add_payment_profile(xml, options[:payment_profile]) 
         end
 
+        xml.tag!('validationMode', CIM_VALIDATION_MODES[options[:validation_mode]]) if options[:validation_mode]
+		
         xml.target!
       end
 
@@ -502,10 +599,31 @@ module ActiveMerchant #:nodoc:
         xml.tag!('transaction') do
           xml.tag!(CIM_TRANSACTION_TYPES[transaction[:type]]) do
             # The amount to be billed to the customer
-            xml.tag!('amount', transaction[:amount])
-            xml.tag!('customerProfileId', transaction[:customer_profile_id])
-            xml.tag!('customerPaymentProfileId', transaction[:customer_payment_profile_id])
-            xml.tag!('approvalCode', transaction[:approval_code]) if transaction[:type] == :capture_only
+            case transaction[:type]
+              when :void
+                tag_unless_blank(xml,'customerProfileId', transaction[:customer_profile_id])
+                tag_unless_blank(xml,'customerPaymentProfileId', transaction[:customer_payment_profile_id])
+                tag_unless_blank(xml,'customerShippingAddressId', transaction[:customer_shipping_address_id])
+                xml.tag!('transId', transaction[:trans_id])
+              when :refund
+                #TODO - add support for all the other options fields
+                xml.tag!('amount', transaction[:amount])
+                tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
+                tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
+                tag_unless_blank(xml, 'customerShippingAddressId', transaction[:customer_shipping_address_id])
+                tag_unless_blank(xml, 'creditCardNumberMasked', transaction[:credit_card_number_masked])
+                tag_unless_blank(xml, 'bankRoutingNumberMasked', transaction[:bank_routing_number_masked])
+                tag_unless_blank(xml, 'bankAccountNumberMasked', transaction[:bank_account_number_masked])
+                xml.tag!('transId', transaction[:trans_id])
+              when :prior_auth_capture
+                xml.tag!('amount', transaction[:amount])
+                xml.tag!('transId', transaction[:trans_id])
+              else
+                xml.tag!('amount', transaction[:amount])
+                xml.tag!('customerProfileId', transaction[:customer_profile_id])
+                xml.tag!('customerPaymentProfileId', transaction[:customer_payment_profile_id])
+                xml.tag!('approvalCode', transaction[:approval_code]) if transaction[:type] == :capture_only
+            end
             add_order(xml, transaction[:order]) if transaction[:order]
           end
         end
@@ -648,6 +766,10 @@ module ActiveMerchant #:nodoc:
         response
       end
       
+      def tag_unless_blank(xml, tag_name, data)
+        xml.tag!(tag_name, data) unless data.blank? || data.nil?
+      end
+
       def parse_direct_response(response)
         direct_response = {'raw' => response.params['direct_response']}
         direct_response_fields = response.params['direct_response'].split(',')

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

@@ -64,7 +64,7 @@ module ActiveMerchant #:nodoc:
       # code returned by ePDQ
       def credit(money, creditcard_or_authorization, options = {})
         if creditcard_or_authorization.is_a?(String)
-          warn CREDIT_DEPRECATION_MESSAGE
+          deprecated CREDIT_DEPRECATION_MESSAGE
           refund(money, creditcard_or_authorization, options)
         else
           credit_new_order(money, creditcard_or_authorization, options)

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

@@ -12,12 +12,19 @@ module ActiveMerchant #:nodoc:
     # * +PA+ - Pre Authorization
     # * +PAC+ - Pre Authorization Completion
     #  
+    # == Secure Payment Profiles:
+    # BeanStream supports payment profiles (vaults). This allows you to store cc information with BeanStream and process subsequent transactions with a customer id.
+    # Secure Payment Profiles must be enabled on your account (must be done over the phone).
+    # Your API Access Passcode must be set in Administration => account settings => order settings.
+    # To learn more about storing credit cards with the Beanstream gateway, please read the BEAN_Payment_Profiles.pdf (I had to phone BeanStream to request it.)
+    # 
     # == Notes 
     # * Recurring billing is not yet implemented.
     # * Adding of order products information is not implemented.
     # * Ensure that country and province data is provided as a code such as "CA", "US", "QC".
     # * login is the Beanstream merchant ID, username and password should be enabled in your Beanstream account and passed in using the <tt>:user</tt> and <tt>:password</tt> options.
     # * Test your app with your true merchant id and test credit card information provided in the api pdf document.
+    # * Beanstream does not allow Payment Profiles to be deleted with their API. The accounts are 'closed', but have to be deleted manually.  
     #  
     #  Example authorization (Beanstream PA transaction type):
     #  
@@ -58,11 +65,11 @@ module ActiveMerchant #:nodoc:
     class BeanstreamGateway < Gateway
       include BeanstreamCore
       
-      def authorize(money, credit_card, options = {})
+      def authorize(money, source, options = {})
         post = {}
         add_amount(post, money)
         add_invoice(post, options)
-        add_credit_card(post, credit_card)        
+        add_source(post, source)        
         add_address(post, options)
         add_transaction_type(post, :authorization)
         commit(post)
@@ -91,6 +98,36 @@ module ActiveMerchant #:nodoc:
       def interac
         @interac ||= BeanstreamInteracGateway.new(@options)
       end
+      
+      # To match the other stored-value gateways, like TrustCommerce,
+      # store and unstore need to be defined
+      def store(credit_card, options = {})
+        post = {}        
+        add_address(post, options)
+        add_credit_card(post, credit_card)      
+        add_secure_profile_variables(post,options)
+        commit(post, true)
+      end
+      
+      #can't actually delete a secure profile with the supplicaed API. This function sets the status of the profile to closed (C).
+      #Closed profiles will have to removed manually.
+      def delete(vault_id)
+        update(vault_id, false, {:status => "C"})
+      end
+      
+      alias_method :unstore, :delete
+      
+      # Update the values (such as CC expiration) stored at
+      # the gateway.  The CC number must be supplied in the
+      # CreditCard object.
+      def update(vault_id, credit_card, options = {})
+        post = {}
+        add_address(post, options)
+        add_credit_card(post, credit_card)
+        options.merge!({:vault_id => vault_id, :operation => secure_profile_action(:modify)})
+        add_secure_profile_variables(post,options)
+        commit(post, true)
+      end
 
       private
       def build_response(*args)

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

@@ -2,17 +2,24 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module BeanstreamCore
       URL = 'https://www.beanstream.com/scripts/process_transaction.asp'
+      SECURE_PROFILE_URL = 'https://www.beanstream.com/scripts/payment_profile.asp'
+      SP_SERVICE_VERSION = '1.1'
 
       TRANSACTIONS = {
         :authorization  => 'PA',
         :purchase       => 'P',
         :capture        => 'PAC',
-        :credit         => 'R',
+        :refund         => 'R',
         :void           => 'VP',
         :check_purchase => 'D',
-        :check_credit   => 'C',
+        :check_refund   => 'C',
         :void_purchase  => 'VP',
-        :void_credit    => 'VR'
+        :void_refund    => 'VR'
+      }
+
+      PROFILE_OPERATIONS = {
+        :new => 'N',
+        :modify => 'M'
       }
 
       CVD_CODES = {
@@ -48,7 +55,7 @@ module ActiveMerchant #:nodoc:
       
       # Only <tt>:login</tt> is required by default, 
       # which is the merchant's merchant ID. If you'd like to perform void, 
-      # capture or credit transactions then you'll also need to add a username
+      # capture or refund transactions then you'll also need to add a username
       # and password to your account under administration -> account settings ->
       # order settings -> Use username/password validation
       def initialize(options = {})
@@ -67,26 +74,35 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
       
-      def credit(money, source, options = {})
+      def refund(money, source, options = {})
         post = {}
         reference, amount, type = split_auth(source)
         add_reference(post, reference)
-        add_transaction_type(post, credit_action(type))
+        add_transaction_type(post, refund_action(type))
         add_amount(post, money)
         commit(post)
       end
+
+      def credit(money, source, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, source, options)
+      end
     
       private
       def purchase_action(source)
-        card_brand(source) == "check" ? :check_purchase : :purchase
+        (card_brand(source) == "check") ? :check_purchase : :purchase
       end
       
       def void_action(original_transaction_type)
-        original_transaction_type == TRANSACTIONS[:credit] ? :void_credit : :void_purchase
+        (original_transaction_type == TRANSACTIONS[:refund]) ? :void_refund : :void_purchase
+      end
+      
+      def refund_action(type)
+        (type == TRANSACTIONS[:check_purchase]) ? :check_refund : :refund
       end
       
-      def credit_action(type)
-        type == TRANSACTIONS[:check_purchase] ? :check_credit : :credit
+      def secure_profile_action(type)
+        PROFILE_OPERATIONS[type] || PROFILE_OPERATIONS[:new]
       end
       
       def split_auth(string)
@@ -154,11 +170,13 @@ module ActiveMerchant #:nodoc:
       end
       
       def add_credit_card(post, credit_card)
-        post[:trnCardOwner] = credit_card.name
-        post[:trnCardNumber] = credit_card.number
-        post[:trnExpMonth] = format(credit_card.month, :two_digits)
-        post[:trnExpYear] = format(credit_card.year, :two_digits)
-        post[:trnCardCvd] = credit_card.verification_value
+        if credit_card
+          post[:trnCardOwner] = credit_card.name
+          post[:trnCardNumber] = credit_card.number
+          post[:trnExpMonth] = format(credit_card.month, :two_digits)
+          post[:trnExpYear] = format(credit_card.year, :two_digits)
+          post[:trnCardCvd] = credit_card.verification_value
+        end
       end
             
       def add_check(post, check)
@@ -175,6 +193,16 @@ module ActiveMerchant #:nodoc:
         post[:accountNumber] = check.account_number
       end
       
+      def add_secure_profile_variables(post, options = {})
+        post[:serviceVersion] = SP_SERVICE_VERSION
+        post[:responseFormat] = 'QS'
+        post[:cardValidation] = (options[:cardValidation].to_i == 1) || '0'
+        
+        post[:operationType] = options[:operationType] || options[:operation] || secure_profile_action(:new)
+        post[:customerCode] = options[:billing_id] || options[:vault_id] || false
+        post[:status] = options[:status]
+      end
+      
       def parse(body)
         results = {}
         if !body.nil?
@@ -194,12 +222,13 @@ module ActiveMerchant #:nodoc:
         results
       end
       
-      def commit(params)
-        post(post_data(params))
+      def commit(params, use_profile_api = false)
+        post(post_data(params,use_profile_api),use_profile_api)
       end
       
-      def post(data)
-        response = parse(ssl_post(URL, data))
+      def post(data, use_profile_api=nil)
+        response = parse(ssl_post((use_profile_api ? SECURE_PROFILE_URL : URL), data))
+        response[:customer_vault_id] = response[:customerCode] if response[:customerCode]
         build_response(success?(response), message_from(response), response,
           :test => test? || response[:authCode] == "TEST",
           :authorization => authorization_from(response),
@@ -213,26 +242,35 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        response[:messageText]
+        response[:messageText] || response[:responseMessage]
       end
 
       def success?(response)
-        response[:responseType] == 'R' || response[:trnApproved] == '1'
+        response[:responseType] == 'R' || response[:trnApproved] == '1' || response[:responseCode] == '1'
       end
       
       def add_source(post, source)
-        card_brand(source) == "check" ? add_check(post, source) : add_credit_card(post, source)
+        if source.is_a?(String) or source.is_a?(Integer)
+          post[:customerCode] = source
+        else
+          card_brand(source) == "check" ? add_check(post, source) : add_credit_card(post, source)
+        end
       end
       
       def add_transaction_type(post, action)
         post[:trnType] = TRANSACTIONS[action]
       end
           
-      def post_data(params)
+      def post_data(params, use_profile_api)
         params[:requestType] = 'BACKEND'
-        params[:merchant_id] = @options[:login]
-        params[:username] = @options[:user] if @options[:user]
-        params[:password] = @options[:password] if @options[:password]
+        if use_profile_api
+          params[:merchantId] = @options[:login] 
+          params[:passCode] = @options[:secure_profile_api_key]
+        else
+          params[:username] = @options[:user] if @options[:user]
+          params[:password] = @options[:password] if @options[:password]
+          params[:merchant_id] = @options[:login]     
+        end
         params[:vbvEnabled] = '0'
         params[:scEnabled] = '0'