activemerchant 1.28.0 → 1.29.0

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

@@ -91,7 +91,6 @@ module ActiveMerchant #:nodoc:
       # * <tt>:login</tt> -- The Balanced API Secret (REQUIRED)
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         initialize_marketplace(options[:marketplace] || load_marketplace)
         super
       end

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

@@ -10,7 +10,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
 
@@ -46,7 +45,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, creditcard, options)
         post[:address] = options[:billing_address][:address1]
-        post[:post_code] = options[:billing_address][:zipcode]
+        post[:post_code] = options[:billing_address][:zip]
       end
 
       def add_creditcard(post, creditcard)

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

@@ -10,13 +10,12 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.homepage_url = 'http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/'
       self.display_name = 'Barclays ePDQ'
-      
+
       def initialize(options = {})
         requires!(options, :login, :password, :client_id)
-        @options = options
         super
-      end  
-      
+      end
+
       def authorize(money, creditcard, options = {})
         document = Document.new(self, @options) do
           add_order_form(options[:order_id]) do
@@ -29,7 +28,7 @@ module ActiveMerchant #:nodoc:
 
         commit(document)
       end
-      
+
       def purchase(money, creditcard, options = {})
         # disable fraud checks if this is a repeat order:
         if options[:payment_number] && (options[:payment_number] > 1)
@@ -46,9 +45,9 @@ module ActiveMerchant #:nodoc:
           end
         end
         commit(document)
-      end                       
-    
-      # authorization is your unique order ID, not the authorization 
+      end
+
+      # authorization is your unique order ID, not the authorization
       # code returned by ePDQ
       def capture(money, authorization, options = {})
         document = Document.new(self, @options) do
@@ -60,7 +59,7 @@ module ActiveMerchant #:nodoc:
         commit(document)
       end
 
-      # authorization is your unique order ID, not the authorization 
+      # authorization is your unique order ID, not the authorization
       # code returned by ePDQ
       def credit(money, creditcard_or_authorization, options = {})
         if creditcard_or_authorization.is_a?(String)
@@ -85,7 +84,7 @@ module ActiveMerchant #:nodoc:
         commit(document)
       end
 
-      private                       
+      private
       def credit_new_order(money, creditcard, options)
         document = Document.new(self, @options) do
           add_order_form do
@@ -106,10 +105,10 @@ module ActiveMerchant #:nodoc:
             add_transaction(:Credit, money)
           end
         end
-        
+
         commit(document)
       end
-      
+
       def parse(body)
         parser = Parser.new(body)
         response = parser.parse
@@ -121,8 +120,8 @@ module ActiveMerchant #:nodoc:
           :order_id => response[:order_id],
           :raw_response => response[:raw_response]
         )
-      end     
-      
+      end
+
       def commit(document)
         url = (test? ? self.test_url : self.live_url)
         data = ssl_post(url, document.to_xml)
@@ -150,7 +149,7 @@ module ActiveMerchant #:nodoc:
             success = find(doc, "//Transaction/AuthCode").present?
           end
 
-          {       
+          {
             :success => success,
             :message => message,
             :transaction_id => find(doc, "//Transaction/Id"),
@@ -169,7 +168,7 @@ module ActiveMerchant #:nodoc:
       class Document
         attr_reader :type, :xml
 
-        PAYMENT_INTERVALS = { 
+        PAYMENT_INTERVALS = {
           :days => 'D',
           :months => 'M'
         }
@@ -180,7 +179,7 @@ module ActiveMerchant #:nodoc:
           :switch => 9,
           :maestro => 10,
         }
-      
+
         def initialize(gateway, options = {}, document_options = {}, &block)
           @gateway = gateway
           @options = options
@@ -206,7 +205,7 @@ module ActiveMerchant #:nodoc:
               end
               xml.Instructions do
                 if @document_options[:no_fraud]
-                  xml.Pipeline "PaymentNoFraud" 
+                  xml.Pipeline "PaymentNoFraud"
                 else
                   xml.Pipeline "Payment"
                 end
@@ -294,9 +293,9 @@ module ActiveMerchant #:nodoc:
         # date must be formatted MM/YY
         def format_expiry_date(creditcard)
           month_str = "%02d" % creditcard.month
-          if match = creditcard.year.to_s.match(/^\d{2}(\d{2})$/) 
+          if match = creditcard.year.to_s.match(/^\d{2}(\d{2})$/)
             year_str = "%02d" % match[1].to_i
-          else 
+          else
             year_str = "%02d" % creditcard.year
           end
           "#{month_str}/#{year_str}"

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

@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
         '5' => 'I',
         '9' => 'I'
       }
-      
+
       PERIODS = {
         :days   => 'D',
         :weeks  => 'W',
@@ -75,28 +75,27 @@ module ActiveMerchant #:nodoc:
         # The name of the gateway
         base.display_name = 'Beanstream.com'
       end
-      
-      # Only <tt>:login</tt> is required by default, 
-      # which is the merchant's merchant ID. If you'd like to perform void, 
+
+      # Only <tt>:login</tt> is required by default,
+      # which is the merchant's merchant ID. If you'd like to perform void,
       # 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 = {})
         requires!(options, :login)
-        @options = options
         super
       end
-      
+
       def capture(money, authorization, options = {})
         reference, amount, type = split_auth(authorization)
-        
+
         post = {}
         add_amount(post, money)
         add_reference(post, reference)
         add_transaction_type(post, :capture)
         commit(post)
       end
-      
+
       def refund(money, source, options = {})
         post = {}
         reference, amount, type = split_auth(source)
@@ -110,7 +109,7 @@ module ActiveMerchant #:nodoc:
         deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, source, options)
       end
-    
+
       private
       def purchase_action(source)
         if source.is_a?(Check)
@@ -119,38 +118,38 @@ module ActiveMerchant #:nodoc:
           :purchase
         end
       end
-      
+
       def void_action(original_transaction_type)
         (original_transaction_type == TRANSACTIONS[:refund]) ? :void_refund : :void_purchase
       end
-      
+
       def refund_action(type)
         (type == TRANSACTIONS[:check_purchase]) ? :check_refund : :refund
       end
-      
+
       def secure_profile_action(type)
         PROFILE_OPERATIONS[type] || PROFILE_OPERATIONS[:new]
       end
-      
+
       def split_auth(string)
         string.split(";")
       end
-      
+
       def add_amount(post, money)
         post[:trnAmount] = amount(money)
       end
-      
+
       def add_original_amount(post, amount)
         post[:trnAmount] = amount
       end
 
-      def add_reference(post, reference)                
+      def add_reference(post, reference)
         post[:adjId] = reference
       end
-      
+
       def add_address(post, options)
         prepare_address_for_non_american_countries(options)
-        
+
         if billing_address = options[:billing_address] || options[:address]
           post[:ordName]          = billing_address[:name]
           post[:ordEmailAddress]  = options[:email]
@@ -195,7 +194,7 @@ module ActiveMerchant #:nodoc:
         post[:ordTax2Price]     = amount(options[:tax2])
         post[:ref1]             = options[:custom]
       end
-      
+
       def add_credit_card(post, credit_card)
         if credit_card
           post[:trnCardOwner] = credit_card.name
@@ -205,31 +204,31 @@ module ActiveMerchant #:nodoc:
           post[:trnCardCvd] = credit_card.verification_value
         end
       end
-            
+
       def add_check(post, check)
         # The institution number of the consumer’s financial institution. Required for Canadian dollar EFT transactions.
         post[:institutionNumber] = check.institution_number
-        
+
         # The bank transit number of the consumer’s bank account. Required for Canadian dollar EFT transactions.
         post[:transitNumber] = check.transit_number
-        
+
         # The routing number of the consumer’s bank account.  Required for US dollar EFT transactions.
         post[:routingNumber] = check.routing_number
-        
+
         # The account number of the consumer’s bank account.  Required for both Canadian and US dollar EFT transactions.
         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 add_recurring_amount(post, money)
         post[:amount] = amount(money)
       end
@@ -293,14 +292,14 @@ module ActiveMerchant #:nodoc:
             results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
           end
         end
-        
+
         # Clean up the message text if there is any
         if results[:messageText]
           results[:messageText].gsub!(/<LI>/, "")
           results[:messageText].gsub!(/(\.)?<br>/, ". ")
           results[:messageText].strip!
         end
-        
+
         results
       end
 
@@ -314,7 +313,7 @@ module ActiveMerchant #:nodoc:
       def commit(params, use_profile_api = false)
         post(post_data(params,use_profile_api),use_profile_api)
       end
-      
+
       def recurring_commit(params)
         recurring_post(post_data(params, false))
       end
@@ -329,7 +328,7 @@ module ActiveMerchant #:nodoc:
           :avs_result => { :code => (AVS_CODES.include? response[:avsId]) ? AVS_CODES[response[:avsId]] : response[:avsId] }
         )
       end
-      
+
       def recurring_post(data)
         response = recurring_parse(ssl_post(RECURRING_URL, data))
         build_response(recurring_success?(response), recurring_message_from(response), response)
@@ -350,7 +349,7 @@ module ActiveMerchant #:nodoc:
       def success?(response)
         response[:responseType] == 'R' || response[:trnApproved] == '1' || response[:responseCode] == '1'
       end
-      
+
       def recurring_success?(response)
         response[:code] == '1'
       end
@@ -362,24 +361,24 @@ module ActiveMerchant #:nodoc:
           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, use_profile_api)
         params[:requestType] = 'BACKEND'
         if use_profile_api
-          params[:merchantId] = @options[:login] 
+          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]     
+          params[:merchant_id] = @options[:login]
         end
         params[:vbvEnabled] = '0'
         params[:scEnabled] = '0'
-        
+
         params.reject{|k, v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
 

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

@@ -7,9 +7,9 @@ module ActiveMerchant #:nodoc:
 
       self.live_url      = 'https://secure.bluepay.com/interfaces/bp20post'
       self.rebilling_url = 'https://secure.bluepay.com/interfaces/bp20rebadmin'
-      
+
       self.ignore_http_status = true
- 
+
       RESPONSE_CODE, RESPONSE_REASON_CODE, RESPONSE_REASON_TEXT = 0, 2, 3
       AVS_RESULT_CODE, TRANSACTION_ID, CARD_CODE_RESPONSE_CODE  = 5, 6, 38
 
@@ -35,10 +35,9 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>:account_id</tt> -- The BluePay gateway Account ID (REQUIRED)
       # * <tt>:secret_key</tt> -- The BluePay gateway Secret Key (REQUIRED)
-      # * <tt>:test</tt> -- set to true for TEST mode or false for LIVE mode 
+      # * <tt>:test</tt> -- set to true for TEST mode or false for LIVE mode
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
@@ -54,30 +53,30 @@ module ActiveMerchant #:nodoc:
       #   or a token. The token is called the Master ID. This is a unique transaction ID returned from a previous transaction. This token associates all the stored information for a previous transaction.
       # * <tt>options</tt> -- A hash of optional parameters.
       def authorize(money, payment_object, options = {})
-       	post = {}
-       	post[:MASTER_ID] = ''
-       	if payment_object != nil && payment_object.class() != String
-       	  payment_object.class() == ActiveMerchant::Billing::Check ?
+        post = {}
+        post[:MASTER_ID] = ''
+        if payment_object != nil && payment_object.class() != String
+          payment_object.class() == ActiveMerchant::Billing::Check ?
           add_check(post, payment_object) :
           add_creditcard(post, payment_object)
-       	else
-       	  post[:MASTER_ID] = payment_object
-       	end
-       	add_invoice(post, options)
+        else
+          post[:MASTER_ID] = payment_object
+        end
+        add_invoice(post, options)
         add_address(post, options)
         add_customer_data(post, options)
-       	if options[:rebill]     != nil
+        if options[:rebill]     != nil
           post[:DO_REBILL]       = '1'
           post[:REB_AMOUNT]      = amount(options[:rebill_amount])
           post[:REB_FIRST_DATE]  = options[:rebill_start_date]
           post[:REB_EXPR]        = options[:rebill_expression]
           post[:REB_CYCLES]      = options[:rebill_cycles]
         end
-       	post[:TRANS_TYPE]  = 'AUTH'
+        post[:TRANS_TYPE]  = 'AUTH'
         commit('AUTH_ONLY', money, post)
       end
 
-      # Perform a purchase, which is essentially an authorization and capture in a single operation. 
+      # Perform a purchase, which is essentially an authorization and capture in a single operation.
       # This is referred to a SALE transaction in BluePay
       #
       # ==== Parameters
@@ -89,26 +88,26 @@ module ActiveMerchant #:nodoc:
       #   or a token. The token is called the Master ID. This is a unique transaction ID returned from a previous transaction. This token associates all the stored information for a previous transaction.
       # * <tt>options</tt> -- A hash of optional parameters.,
       def purchase(money, payment_object, options = {})
-       	post = {}
-       	post[:MASTER_ID] = ''
-       	if payment_object != nil && payment_object.class() != String
-       	 payment_object.class() == ActiveMerchant::Billing::Check ? 
-       	 add_check(post, payment_object) :
-       	 add_creditcard(post, payment_object) 
-       	else
-       	  post[:MASTER_ID] = payment_object
-       	end
-       	add_invoice(post, options)
+        post = {}
+        post[:MASTER_ID] = ''
+        if payment_object != nil && payment_object.class() != String
+         payment_object.class() == ActiveMerchant::Billing::Check ?
+         add_check(post, payment_object) :
+         add_creditcard(post, payment_object)
+        else
+          post[:MASTER_ID] = payment_object
+        end
+        add_invoice(post, options)
         add_address(post, options)
         add_customer_data(post, options)
-       	if options[:rebill]     != nil
-       	  post[:DO_REBILL]       = '1'
-       	  post[:REB_AMOUNT]      = amount(options[:rebill_amount])
+        if options[:rebill]     != nil
+          post[:DO_REBILL]       = '1'
+          post[:REB_AMOUNT]      = amount(options[:rebill_amount])
           post[:REB_FIRST_DATE]  = options[:rebill_start_date]
           post[:REB_EXPR]        = options[:rebill_expression]
           post[:REB_CYCLES]      = options[:rebill_cycles]
         end
-       	post[:TRANS_TYPE]  = 'SALE'
+        post[:TRANS_TYPE]  = 'SALE'
         commit('AUTH_CAPTURE', money, post)
       end
 
@@ -120,11 +119,11 @@ module ActiveMerchant #:nodoc:
       # * <tt>money</tt> -- The amount to be captured as an Integer value in cents.
       # * <tt>identification</tt> -- The Master ID, or token, returned from the previous authorize transaction.
       def capture(money, identification, options = {})
-       	post = {}
-       	add_address(post, options)
-       	add_customer_data(post, options)
+        post = {}
+        add_address(post, options)
+        add_customer_data(post, options)
         post[:MASTER_ID] = identification
-       	post[:TRANS_TYPE] = 'CAPTURE'
+        post[:TRANS_TYPE] = 'CAPTURE'
         commit('PRIOR_AUTH_CAPTURE', money, post)
       end
 
@@ -135,9 +134,9 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>identification</tt> - The Master ID, or token, returned from a previous authorize transaction.
       def void(identification, options = {})
-       	post = {}
+        post = {}
         post[:MASTER_ID] = identification
-       	post[:TRANS_TYPE] = 'VOID'
+        post[:TRANS_TYPE] = 'VOID'
         commit('VOID', nil, post)
       end
 
@@ -156,20 +155,20 @@ module ActiveMerchant #:nodoc:
       #   If the payment_object is either a CreditCard or Check object, then the transaction type will be an unmatched credit placing funds in the specified account. This is referred to a CREDIT transaction in BluePay.
       # * <tt>options</tt> -- A hash of parameters.
       def refund(money, payment_object, options = {})
-       	post = {}
-       	post[:PAYMENT_ACCOUNT] = ''
+        post = {}
+        post[:PAYMENT_ACCOUNT] = ''
         if payment_object != nil && payment_object.class() != String
            payment_object.class() == ActiveMerchant::Billing::Check ?
            add_check(post, payment_object) :
            add_creditcard(post, payment_object)
-       	   post[:TRANS_TYPE] = 'CREDIT'
+           post[:TRANS_TYPE] = 'CREDIT'
         else
            post[:MASTER_ID]  = payment_object
-       	   post[:TRANS_TYPE] = 'REFUND'
+           post[:TRANS_TYPE] = 'REFUND'
         end
 
         options[:first_name] ? post[:NAME1] = options[:first_name] : post[:NAME1] = ''
-        post[:NAME2] = options[:last_name] if options[:last_name] 
+        post[:NAME2] = options[:last_name] if options[:last_name]
         post[:ZIP] = options[:zip] if options[:zip]
         add_invoice(post, options)
         add_address(post, options)
@@ -195,7 +194,7 @@ module ActiveMerchant #:nodoc:
 
       # ==== Options
       #
-      # * <tt>:rebill_start_date</tt> is a string that tells the gateway when to start the rebill. (REQUIRED) 
+      # * <tt>:rebill_start_date</tt> is a string that tells the gateway when to start the rebill. (REQUIRED)
       #   Has two valid formats:
       #   "YYYY-MM-DD HH:MM:SS" Hours, minutes, and seconds are optional.
       #   "XX UNITS" Relative date as explained below. Marked from the time of the
@@ -206,16 +205,16 @@ module ActiveMerchant #:nodoc:
       # * <tt>rebill_cycles</tt>: Number of times to rebill. Don't send or set to nil for infinite rebillings (or
       #   until canceled).
       # * <tt>rebill_amount</tt>:   Amount to rebill. Defaults to amount of transaction for rebillings.
-      # 
+      #
       #   For example, to charge the customer $19.95 now and then charge $39.95 in 60 days every 3 months for 5 times, the options hash would be as follows:
       #   :rebill_start_date => '60 DAYS',
       #   :rebill_expression => '3 MONTHS',
       #   :rebill_cycles     => '5',
-      #   :rebill_amount     => '39.95' 
+      #   :rebill_amount     => '39.95'
       #   A money object of 1995 cents would be passed into the 'money' parameter.
       def recurring(money, payment_object, options = {})
         requires!(options, :rebill_start_date, :rebill_expression)
-       	options[:rebill] = '1'
+        options[:rebill] = '1'
         money == nil ? authorize(money, payment_object, options) :
         purchase(money, payment_object, options)
       end
@@ -228,7 +227,7 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>rebill_id</tt> -- A string containing the rebill_id of the recurring billing that is already active (REQUIRED)
       def status_recurring(rebill_id)
-       	post = {}
+        post = {}
         requires!(rebill_id)
         post[:REBILL_ID] = rebill_id
         post[:TRANS_TYPE] = 'GET'
@@ -241,7 +240,7 @@ module ActiveMerchant #:nodoc:
       #
       # ==== Options
       #
-      # * <tt>:rebill_id</tt> -- The 12 digit rebill ID used to update a particular rebilling cycle. (REQUIRED) 
+      # * <tt>:rebill_id</tt> -- The 12 digit rebill ID used to update a particular rebilling cycle. (REQUIRED)
       # * <tt>:rebill_amount</tt> -- A string containing the new rebilling amount.
       # * <tt>:rebill_next_date</tt> -- A string containing the new rebilling next date.
       # * <tt>:rebill_expression</tt> -- A string containing the new rebilling expression.
@@ -249,16 +248,16 @@ module ActiveMerchant #:nodoc:
       # * <tt>:rebill_next_amount</tt> -- A string containing the next rebilling amount to charge the customer. This ONLY affects the next scheduled charge; all other rebillings will continue at the regular (rebill_amount) amount.
       #   Take a look above at the recurring_payment method for similar examples on how to use.
       def update_recurring(options = {})
-       	post = {}
-       	requires!(options, :rebill_id)
-       	post[:REBILL_ID]          = options[:rebill_id]
-       	post[:TRANS_TYPE]         = 'SET'
+        post = {}
+        requires!(options, :rebill_id)
+        post[:REBILL_ID]          = options[:rebill_id]
+        post[:TRANS_TYPE]         = 'SET'
         post[:REB_AMOUNT]         = amount(options[:rebill_amount]) if !options[:rebill_amount].nil?
         post[:NEXT_DATE]          = options[:rebill_next_date] if !options[:rebill_next_date].nil?
         post[:REB_EXPR]           = options[:rebill_expression] if !options[:rebill_expression].nil?
-        post[:REB_CYCLES]     	  = options[:rebill_cycles] if !options[:rebill_cycles].nil?
-       	post[:NEXT_AMOUNT]        = options[:rebill_next_amount] if !options[:rebill_next_amount].nil?
-       	commit('rebill', 'nil', post)	
+        post[:REB_CYCLES]         = options[:rebill_cycles] if !options[:rebill_cycles].nil?
+        post[:NEXT_AMOUNT]        = options[:rebill_next_amount] if !options[:rebill_next_amount].nil?
+        commit('rebill', 'nil', post)
       end
 
       # Cancel a recurring payment.
@@ -269,93 +268,91 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>rebill_id</tt> -- A string containing the rebill_id of the recurring billing that you wish to cancel/stop (REQUIRED)
       def cancel_recurring(rebill_id)
-       	post = {}
+        post = {}
         requires!(rebill_id)
         post[:REBILL_ID]         = rebill_id
         post[:TRANS_TYPE]        = 'SET'
-       	post[:STATUS]            = 'stopped'
+        post[:STATUS]            = 'stopped'
         commit('rebill', 'nil', post)
       end
 
       private
-      
+
       def commit(action, money, fields)
         fields[:AMOUNT] = amount(money) unless (fields[:TRANS_TYPE] == 'VOID' or action == 'rebill')
-       	test? == true || @options[:test] == true ? fields[:MODE] = 'TEST' : fields[:MODE] = 'LIVE'
-       	action == 'rebill' ? begin url = rebilling_url; fields[:TAMPER_PROOF_SEAL] = calc_rebill_tps(fields) end : begin url = live_url; fields[:TAMPER_PROOF_SEAL] = calc_tps(amount(money), fields) end
+        test? == true || @options[:test] == true ? fields[:MODE] = 'TEST' : fields[:MODE] = 'LIVE'
+        action == 'rebill' ? begin url = rebilling_url; fields[:TAMPER_PROOF_SEAL] = calc_rebill_tps(fields) end : begin url = live_url; fields[:TAMPER_PROOF_SEAL] = calc_tps(amount(money), fields) end
         fields[:ACCOUNT_ID] = @options[:login]
         data = ssl_post url, post_data(action, fields)
         response = parse(data)
         message = message_from(response)
-       	test_mode = test? || fields[:MODE] == 'TEST'
-       	if (response.has_key?('TRANS_ID'))
-       	  response_id = response['TRANS_ID'].to_s()
-       	elsif (response.has_key?('rebill_id'))
-       	  response_id = response['rebill_id'][0]
-       	else
-       	  response_id = response[TRANSACTION_ID]
-       	end
-       	response.has_key?('AVS') ? avs = response['AVS'] : avs = ''
-       	response[AVS_RESULT_CODE] != '' ? avs = response[AVS_RESULT_CODE] : avs = ''
-       	response.has_key?('CVV2') ? cvv2 = response['CVV2'] : cvv2 = ''
-       	response[CARD_CODE_RESPONSE_CODE] != '' ? cvv2 = response[CARD_CODE_RESPONSE_CODE] : cvv2 = ''
+        test_mode = test? || fields[:MODE] == 'TEST'
+        if (response.has_key?('TRANS_ID'))
+          response_id = response['TRANS_ID'].to_s()
+        elsif (response.has_key?('rebill_id'))
+          response_id = response['rebill_id'][0]
+        else
+          response_id = response[TRANSACTION_ID]
+        end
+        avs = (response[AVS_RESULT_CODE] != '' ? response[AVS_RESULT_CODE] : '')
+        cvv2 = (!response[CARD_CODE_RESPONSE_CODE].empty? ? response[CARD_CODE_RESPONSE_CODE] : '')
         Response.new(success?(response), message, response,
           :test          => test_mode,
           :authorization => response_id,
-	  :fraud_review => fraud_review?(response),
+          :fraud_review  => fraud_review?(response),
           :avs_result    => { :code => avs },
           :cvv_result    => cvv2
         )
       end
 
       def success?(response)
-       	if (response['STATUS'] == '1' || message_from(response) =~ /approved/ || response.has_key?('rebill_id') || response[RESPONSE_REASON_TEXT] =~ /approved/) 
-		  return true
-		else 
-		  return false
-		end
+        if (response['STATUS'] == '1' || message_from(response) =~ /approved/ || response.has_key?('rebill_id') || response[RESPONSE_REASON_TEXT] =~ /approved/)
+          return true
+        else
+          return false
+        end
       end
 
       def fraud_review?(response)
-       	response['STATUS'] == 'E' || response['STATUS'] == '0' || response[RESPONSE_REASON_TEXT] =~ /being reviewed/
+        response['STATUS'] == 'E' || response['STATUS'] == '0' || response[RESPONSE_REASON_TEXT] =~ /being reviewed/
       end
 
       def get_rebill_id(response)
-	return response['REBID'] if response_has.key?('REBID')
+        response['REBID'] if response_has.key?('REBID')
       end
-     
+
       def parse(body)
-       	fields = CGI::parse(body)
-       	if fields.has_key?('MESSAGE') or fields.has_key?('rebill_id')
-       	  if fields.has_key?('MESSAGE')
-       	    fields['MESSAGE'][0] == "Missing ACCOUNT_ID" ? message = "The merchant login ID or password is invalid" : message = fields['MESSAGE']
-       	    fields['MESSAGE'][0] =~ /Approved/ ? message = "This transaction has been approved" : message = fields['MESSAGE'] if message == fields['MESSAGE']
-       	    fields['MESSAGE'][0] =~ /Expired/ ? message = "The credit card has expired" : message = fields['MESSAGE'] if message == fields['MESSAGE']
-       	    fields.delete('MESSAGE')
-       	  end
-       	  fields.has_key?('STATUS') ? begin status = fields['STATUS']; fields.delete('STATUS') end : status = ''
-       	  fields.has_key?('AVS') ? begin avs = fields['AVS']; fields.delete('AVS') end : avs = ''
-       	  fields.has_key?('CVV2') ? begin cvv2 = fields['CVV2']; fields.delete('CVV2') end : cvv2 = ''
-       	  fields.has_key?('MASTER_ID') ? begin trans_id = fields['MASTER_ID']; fields.delete('MASTER_ID') end : trans_id = ''
-       	  fields[:avs_result_code] = avs
-       	  fields[:card_code] = cvv2
-       	  fields[:response_code] = status
-       	  fields[:response_reason_code] = ''
-       	  fields[:response_reason_text] = message
-	  fields[:transaction_id] = trans_id
-       	  return fields
-       	end 
-       	# parse response if using other old API
-       	hash = Hash.new
+        fields = CGI::parse(body)
+        if fields.has_key?('MESSAGE') or fields.has_key?('rebill_id')
+          if fields.has_key?('MESSAGE')
+            fields['MESSAGE'][0] == "Missing ACCOUNT_ID" ? message = "The merchant login ID or password is invalid" : message = fields['MESSAGE']
+            fields['MESSAGE'][0] =~ /Approved/ ? message = "This transaction has been approved" : message = fields['MESSAGE'] if message == fields['MESSAGE']
+            fields['MESSAGE'][0] =~ /Expired/ ? message = "The credit card has expired" : message = fields['MESSAGE'] if message == fields['MESSAGE']
+            fields.delete('MESSAGE')
+          end
+          fields.has_key?('STATUS') ? begin status = fields['STATUS']; fields.delete('STATUS') end : status = ''
+          fields.has_key?('AVS') ? begin avs = fields['AVS']; fields.delete('AVS') end : avs = ''
+          fields.has_key?('CVV2') ? begin cvv2 = fields['CVV2']; fields.delete('CVV2') end : cvv2 = ''
+          fields.has_key?('MASTER_ID') ? begin trans_id = fields['MASTER_ID']; fields.delete('MASTER_ID') end : trans_id = ''
+          fields[:avs_result_code] = avs
+          fields[:card_code] = cvv2
+          fields[:response_code] = status
+          fields[:response_reason_code] = ''
+          fields[:response_reason_text] = message
+          fields[:transaction_id] = trans_id
+          return fields
+        end
+        # parse response if using other old API
+        hash = Hash.new
         fields = fields.first[0].split(",")
-       	fields.each_index do |x|
-       	  hash[x] = fields[x].tr('$','')
-       	end
-       	hash
+        fields.each_index do |x|
+          hash[x] = fields[x].tr('$','')
+        end
+        hash
       end
 
       def add_invoice(post, options)
-       	post[:ORDER_ID]	   = options[:order_id] if options.has_key? :order_id
+        post[:ORDER_ID]    = options[:order_id] if options.has_key? :order_id
         post[:INVOICE_ID]  = options[:invoice] if options.has_key? :invoice
         post[:invoice_num] = options[:order_id] if options.has_key? :order_id
         post[:MEMO]        = options[:description] if options.has_key? :description
@@ -363,9 +360,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_creditcard(post, creditcard)
-       	post[:PAYMENT_TYPE]    = 'CREDIT'
+        post[:PAYMENT_TYPE]    = 'CREDIT'
         post[:PAYMENT_ACCOUNT] = creditcard.number
-        post[:CARD_CVV2]       = creditcard.verification_value if 
+        post[:CARD_CVV2]       = creditcard.verification_value if
                               creditcard.verification_value?
         post[:CARD_EXPIRE]     = expdate(creditcard)
         post[:NAME1]           = creditcard.first_name
@@ -373,34 +370,34 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_check(post, check)
-       	post[:PAYMENT_TYPE]     = 'ACH'
-       	post[:PAYMENT_ACCOUNT]  = check.account_type + ":" + check.routing_number + ":" + check.account_number
-       	post[:NAME1]            = check.first_name
-       	post[:NAME2]            = check.last_name 
+        post[:PAYMENT_TYPE]     = 'ACH'
+        post[:PAYMENT_ACCOUNT]  = check.account_type + ":" + check.routing_number + ":" + check.account_number
+        post[:NAME1]            = check.first_name
+        post[:NAME2]            = check.last_name
       end
 
       def add_customer_data(post, options)
           post[:EMAIL]     = options[:email] if options.has_key? :email
-       	  post[:CUSTOM_ID] = options[:customer] if options.has_key? :customer
+          post[:CUSTOM_ID] = options[:customer] if options.has_key? :customer
       end
 
       def add_duplicate_window(post)
         unless duplicate_window.nil?
           post[:duplicate_window] = duplicate_window
-       	  post[:DUPLICATE_OVERRIDE] = duplicate_window
+          post[:DUPLICATE_OVERRIDE] = duplicate_window
         end
       end
 
       def add_address(post, options)
-	if address = options[:billing_address] || options[:address]
-	  post[:NAME1]	      = address[:first_name]
-	  post[:NAME2]	      = address[:last_name]
+        if address = options[:billing_address] || options[:address]
+          post[:NAME1]        = address[:first_name]
+          post[:NAME2]        = address[:last_name]
           post[:ADDR1]        = address[:address1]
-	  post[:ADDR2]        = address[:address2]
+          post[:ADDR2]        = address[:address2]
           post[:COMPANY_NAME] = address[:company]
           post[:PHONE]        = address[:phone]
           post[:CITY]         = address[:city]
-	  post[:STATE]        = address[:state].blank?  ? 'n/a' : address[:state] 
+          post[:STATE]        = address[:state].blank?  ? 'n/a' : address[:state]
           post[:ZIP]          = address[:zip]
           post[:COUNTRY]      = address[:country]
         end
@@ -408,13 +405,13 @@ module ActiveMerchant #:nodoc:
           post[:NAME1]        = address[:first_name]
           post[:NAME2]        = address[:last_name]
           post[:ADDR1]        = address[:address1]
-       	  post[:ADDR1]        = address[:address1]
+          post[:ADDR1]        = address[:address1]
           post[:COMPANY_NAME] = address[:company]
           post[:PHONE]        = address[:phone]
           post[:ZIP]          = address[:zip]
           post[:CITY]         = address[:city]
           post[:COUNTRY]      = address[:country]
-          post[:STATE]        = address[:state].blank?  ? 'n/a' : address[:state] 
+          post[:STATE]        = address[:state].blank?  ? 'n/a' : address[:state]
         end
       end
 
@@ -428,8 +425,8 @@ module ActiveMerchant #:nodoc:
         post[:delim_data]     = "TRUE"
         post[:delim_char]     = ","
         post[:encap_char]     = "$"
-	post[:card_num]	      = '4111111111111111'
-	post[:exp_date]       = '1212'
+        post[:card_num]       = '4111111111111111'
+        post[:exp_date]       = '1212'
         post[:solution_ID]    = application_id if application_id.present? && application_id != "ActiveMerchant"
         request = post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
         request
@@ -441,15 +438,15 @@ module ActiveMerchant #:nodoc:
           if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
             return AVSResult.messages[ results[:avs_result_code] ]
           end
-	  return (results[:response_reason_text] ? results[:response_reason_text].chomp('.') : '')
+          return (results[:response_reason_text] ? results[:response_reason_text].chomp('.') : '')
+        end
+        if results.has_key?(:response_reason_text)
+          return results[:response_reason_text].to_s()
+        end
+        if !results.has_key?('STATUS')
+          return results[RESPONSE_REASON_TEXT] ? results[RESPONSE_REASON_TEXT].chomp('.') : ''
         end
-	if results.has_key?(:response_reason_text)
-	  return results[:response_reason_text].to_s()
-	end
-	if !results.has_key?('STATUS')
-	  return results[RESPONSE_REASON_TEXT] ? results[RESPONSE_REASON_TEXT].chomp('.') : ''
-	end
-	end	
+      end
 
       def expdate(creditcard)
         year  = sprintf("%.4i", creditcard.year)
@@ -459,21 +456,20 @@ module ActiveMerchant #:nodoc:
       end
 
       def calc_tps(amount, post)
-	post[:NAME1] = '' if post[:NAME1].nil?
-        digest = Digest::MD5.hexdigest(@options[:password] + 
-        @options[:login] + post[:TRANS_TYPE] + 
-        amount.to_s() + post[:MASTER_ID].to_s() + 
+        post[:NAME1] = '' if post[:NAME1].nil?
+        digest = Digest::MD5.hexdigest(@options[:password] +
+        @options[:login] + post[:TRANS_TYPE] +
+        amount.to_s() + post[:MASTER_ID].to_s() +
         post[:NAME1].to_s() + post[:PAYMENT_ACCOUNT].to_s())
-	return digest
+        return digest
       end
 
-
       def calc_rebill_tps(post)
-        digest = Digest::MD5.hexdigest(@options[:password] + 
+        digest = Digest::MD5.hexdigest(@options[:password] +
         @options[:login] + post[:TRANS_TYPE] + post[:REBILL_ID][0].to_s())
         return digest
       end
-   
+
       def handle_response(response)
         if ignore_http_status then
           return response.body
@@ -486,7 +482,6 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-
     end
   end
 end