activemerchant 1.28.0 → 1.29.0

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # ==== USA ePay Advanced SOAP Interface
     #
-    # This class encapuslates USA ePay's Advanced SOAP Interface. The Advanced Soap Interface allows 
+    # This class encapuslates USA ePay's Advanced SOAP Interface. The Advanced Soap Interface allows
     # standard transactions, storing customer information, and recurring billing. Storing sensitive
     # information on USA ePay's servers can help with PCI DSS compliance, since customer and card data
     # do not need to be stored locally.
@@ -63,7 +63,7 @@ module ActiveMerchant #:nodoc:
     #
     class UsaEpayAdvancedGateway < Gateway
       API_VERSION = "1.4"
-      
+
       TEST_URL_BASE = 'https://sandbox.usaepay.com/soap/gate/' #:nodoc:
       LIVE_URL_BASE = 'https://www.usaepay.com/soap/gate/' #:nodoc:
 
@@ -71,7 +71,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = LIVE_URL_BASE
 
       FAILURE_MESSAGE = "Default Failure" #:nodoc:
-      
+
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
       self.homepage_url = 'http://www.usaepay.com/'
@@ -154,7 +154,7 @@ module ActiveMerchant #:nodoc:
         :currency => [:string, 'Currency'],
         :non_tax => [:boolean, 'NonTax'],
       } #:nodoc:
-      
+
       TRANSACTION_DETAIL_MONEY_OPTIONS = {
         :amount => [:double, 'Amount'],
         :tax => [:double, 'Tax'],
@@ -235,15 +235,14 @@ module ActiveMerchant #:nodoc:
       # * <tt>:soap_response</tt> -- set to +true+ to add :soap_response to the params hash containing the entire soap xml message
       #
       def initialize(options = {})
-        requires! options, :login, :password
-        @options = options
+        requires!(options, :login, :password)
 
-        if @options[:software_id]
-          self.live_url = "#{LIVE_URL_BASE}#{@options[:software_id].to_s}"
-          self.test_url = "#{TEST_URL_BASE}#{@options[:software_id].to_s}"
+        if options[:software_id]
+          self.live_url = "#{LIVE_URL_BASE}#{options[:software_id].to_s}"
+          self.test_url = "#{TEST_URL_BASE}#{options[:software_id].to_s}"
         else
-          self.live_url = @options[:live_url].to_s
-          self.test_url = @options[:test_url].to_s if @options[:test_url]
+          self.live_url = options[:live_url].to_s
+          self.test_url = options[:test_url].to_s if options[:test_url]
         end
 
         super
@@ -251,7 +250,7 @@ module ActiveMerchant #:nodoc:
 
       # Standard Gateway Methods ======================================
 
-      # Make a purchase with a credit card. (Authorize and 
+      # Make a purchase with a credit card. (Authorize and
       # capture for settlement.)
       #
       # Note: See run_transaction for additional options.
@@ -302,7 +301,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>:data</tt> -- base64 data about customer
       # * <tt>:url</tt> -- customer website
       # * <tt>:billing_address</tt> -- usual options
-      # * <tt>:payment_methods</tt> -- array of payment method hashes. 
+      # * <tt>:payment_methods</tt> -- array of payment method hashes.
       #   * <tt>:method</tt> -- credit_card or check
       #   * <tt>:name</tt> -- optional name/label for the method
       #   * <tt>:sort</tt> -- optional integer value specifying the backup sort order, 0 is default
@@ -531,7 +530,7 @@ module ActiveMerchant #:nodoc:
       # Run a transaction.
       #
       # Note: run_sale, run_auth_only, run_credit, run_check_sale, run_check_credit
-      # methods are also available. Each takes the same options as 
+      # methods are also available. Each takes the same options as
       # run_transaction, but the :command option is not required.
       #
       # Recurring Note: If recurring options are included USA ePay will create a
@@ -589,7 +588,7 @@ module ActiveMerchant #:nodoc:
       end
 
       TRANSACTION_METHODS = [
-        :run_sale, :run_auth_only, :run_credit, 
+        :run_sale, :run_auth_only, :run_credit,
         :run_check_sale, :run_check_credit
       ] #:nodoc:
 
@@ -639,7 +638,7 @@ module ActiveMerchant #:nodoc:
         request = build_request(__method__, options)
         commit(__method__, request)
       end
-    
+
       # Void a transaction.
       #
       # Note: Can only be voided before being settled.
@@ -656,7 +655,7 @@ module ActiveMerchant #:nodoc:
         request = build_request(__method__, options)
         commit(__method__, request)
       end
-    
+
       # Refund transaction.
       #
       # Note: Required after a transaction has been settled. Refunds
@@ -675,7 +674,7 @@ module ActiveMerchant #:nodoc:
         request = build_request(__method__, options)
         commit(__method__, request)
       end
-    
+
       # Override transaction flagged for mananager approval.
       #
       # Note: Checks only!
@@ -812,7 +811,7 @@ module ActiveMerchant #:nodoc:
       end
 
       # Check status of a transaction (custom).
-      # 
+      #
       # ==== Required
       # * <tt>:reference_number</tt>
       # * <tt>:fields</tt> -- string array of fields to retrieve
@@ -937,7 +936,7 @@ module ActiveMerchant #:nodoc:
       end
 
       # Builders ======================================================
-      
+
       private
 
       # Build soap header, etc.
@@ -1062,7 +1061,7 @@ module ActiveMerchant #:nodoc:
       end
 
       # Transactions ==================================================
-      
+
       def build_run_transaction(soap, options)
         soap.tag! 'ns1:runTransaction' do |soap|
           build_token soap, options
@@ -1213,7 +1212,7 @@ module ActiveMerchant #:nodoc:
       def build_customer_payments(soap, options)
         if options[:payment_methods]
           length = options[:payment_methods].length
-          soap.PaymentMethods 'SOAP-ENC:arrayType' => "ns1:PaymentMethod[#{length}]", 
+          soap.PaymentMethods 'SOAP-ENC:arrayType' => "ns1:PaymentMethod[#{length}]",
             'xsi:type' =>"ns1:PaymentMethodArray" do |soap|
             build_customer_payment_methods soap, options
           end
@@ -1239,7 +1238,7 @@ module ActiveMerchant #:nodoc:
         case
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::CreditCard)
           build_tag soap, :string, 'CardNumber', payment_method[:method].number
-          build_tag soap, :string, 'CardExpiration', 
+          build_tag soap, :string, 'CardExpiration',
             "#{"%02d" % payment_method[:method].month}#{payment_method[:method].year}"
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
@@ -1319,7 +1318,7 @@ module ActiveMerchant #:nodoc:
       def build_credit_card_data(soap, options)
         soap.CreditCardData 'xsi:type' => "ns1:CreditCardData" do |soap|
           build_tag soap, :string, 'CardNumber', options[:payment_method].number
-          build_tag soap, :string, 'CardExpiration', 
+          build_tag soap, :string, 'CardExpiration',
             "#{"%02d" % options[:payment_method].month}#{options[:payment_method].year}"
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
@@ -1397,7 +1396,7 @@ module ActiveMerchant #:nodoc:
 
       def build_line_items(soap, options) # TODO
       end
-      
+
       def build_custom_fields(soap, options) # TODO
       end
 
@@ -1444,7 +1443,7 @@ module ActiveMerchant #:nodoc:
         fault = (!response) || (response.length < 1) || response.has_key?('faultcode')
         return [response, success, response['faultstring'], authorization, avs, cvv] if fault
 
-        if response.respond_to?(:[]) && p = response["#{action}_return"] 
+        if response.respond_to?(:[]) && p = response["#{action}_return"]
           if p.respond_to?(:key?) && p.key?('result_code')
             success = p['result_code'] == 'A' ? true : false
             authorization = p['ref_num']
@@ -1481,8 +1480,8 @@ module ActiveMerchant #:nodoc:
                 response[key] = [response[key], value]
               end
             else
-              response[key] = parse_element(e) 
-            end 
+              response[key] = parse_element(e)
+            end
           end
         else
           response = node.text

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

@@ -19,7 +19,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
 
@@ -66,10 +65,6 @@ module ActiveMerchant #:nodoc:
         commit(:void, post)
       end
 
-      def test?
-        @options[:test] || super
-      end
-
       private
 
       def add_amount(post, money)

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

@@ -2,53 +2,53 @@ require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    class VerifiGateway < Gateway 
+    class VerifiGateway < Gateway
       class VerifiPostData < PostData
         # Fields that will be sent even if they are blank
         self.required_fields = [ :amount, :type, :ccnumber, :ccexp, :firstname, :lastname,
-          :company, :address1, :address2, :city, :state, :zip, :country, :phone ]   
+          :company, :address1, :address2, :city, :state, :zip, :country, :phone ]
       end
 
       self.live_url = self.test_url = 'https://secure.verifi.com/gw/api/transact.php'
-            
+
       RESPONSE_CODE_MESSAGES = {
-        "100" => "Transaction was Approved", 
-        "200" => "Transaction was Declined by Processor", 
-        "201" => "Do Not Honor", 
-        "202" => "Insufficient Funds", 
-        "203" => "Over Limit", 
-        "204" => "Transaction not allowed", 
-        "220" => "Incorrect payment Data", 
-        "221" => "No Such Card Issuer", 
-        "222" => "No Card Number on file with Issuer", 
-        "223" => "Expired Card", 
-        "224" => "Invalid Expiration Date", 
-        "225" => "Invalid Card Security Code", 
-        "240" => "Call Issuer for Further Information", 
-        "250" => "Pick Up Card", 
-        "251" => "Lost Card", 
-        "252" => "Stolen Card", 
-        "253" => "Fraudulent Card", 
-        "260" => "Declined With further Instructions Available (see response text)", 
-        "261" => "Declined - Stop All Recurring Payments", 
-        "262" => "Declined - Stop this Recurring Program", 
-        "263" => "Declined - Update Cardholder Data Available", 
-        "264" => "Declined - Retry in a few days", 
-        "300" => "Transaction was Rejected by Gateway", 
-        "400" => "Transaction Error Returned by Processor", 
-        "410" => "Invalid Merchant Configuration", 
-        "411" => "Merchant Account is Inactive", 
-        "420" => "Communication Error", 
-        "421" => "Communication Error with Issuer", 
-        "430" => "Duplicate Transaction at Processor", 
-        "440" => "Processor Format Error", 
-        "441" => "Invalid Transaction Information", 
-        "460" => "Processor Feature Not Available", 
+        "100" => "Transaction was Approved",
+        "200" => "Transaction was Declined by Processor",
+        "201" => "Do Not Honor",
+        "202" => "Insufficient Funds",
+        "203" => "Over Limit",
+        "204" => "Transaction not allowed",
+        "220" => "Incorrect payment Data",
+        "221" => "No Such Card Issuer",
+        "222" => "No Card Number on file with Issuer",
+        "223" => "Expired Card",
+        "224" => "Invalid Expiration Date",
+        "225" => "Invalid Card Security Code",
+        "240" => "Call Issuer for Further Information",
+        "250" => "Pick Up Card",
+        "251" => "Lost Card",
+        "252" => "Stolen Card",
+        "253" => "Fraudulent Card",
+        "260" => "Declined With further Instructions Available (see response text)",
+        "261" => "Declined - Stop All Recurring Payments",
+        "262" => "Declined - Stop this Recurring Program",
+        "263" => "Declined - Update Cardholder Data Available",
+        "264" => "Declined - Retry in a few days",
+        "300" => "Transaction was Rejected by Gateway",
+        "400" => "Transaction Error Returned by Processor",
+        "410" => "Invalid Merchant Configuration",
+        "411" => "Merchant Account is Inactive",
+        "420" => "Communication Error",
+        "421" => "Communication Error with Issuer",
+        "430" => "Duplicate Transaction at Processor",
+        "440" => "Processor Format Error",
+        "441" => "Invalid Transaction Information",
+        "460" => "Processor Feature Not Available",
         "461" => "Unsupported Card Type"
       }
-      
+
       SUCCESS = 1
-      
+
       TRANSACTIONS = {
         :authorization => 'auth',
         :purchase => 'sale',
@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         :credit => 'credit',
         :refund => 'refund'
       }
-      
+
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://www.verifi.com/'
@@ -65,7 +65,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
@@ -76,15 +75,15 @@ module ActiveMerchant #:nodoc:
       def authorize(money, credit_card, options = {})
         sale_authorization_or_credit_template(:authorization, money, credit_card, options)
       end
-                       
+
       def capture(money, authorization, options = {})
         capture_void_or_refund_template(:capture, money, authorization, options)
       end
-      
+
       def void(authorization, options = {})
         capture_void_or_refund_template(:void, 0, authorization, options)
       end
-      
+
       def credit(money, credit_card_or_authorization, options = {})
         if credit_card_or_authorization.is_a?(String)
           deprecated CREDIT_DEPRECATION_MESSAGE
@@ -98,8 +97,8 @@ module ActiveMerchant #:nodoc:
         capture_void_or_refund_template(:refund, money, reference, options)
       end
 
-      private  
-             
+      private
+
       def sale_authorization_or_credit_template(trx_type, money, credit_card, options = {})
         post = VerifiPostData.new
         add_security_key_data(post, options, money)
@@ -108,24 +107,24 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_invoice_data(post, options)
         add_optional_data(post, options)
-        commit(trx_type, money, post)  
+        commit(trx_type, money, post)
       end
 
       def capture_void_or_refund_template(trx_type, money, authorization, options)
         post = VerifiPostData.new
         post[:transactionid] = authorization
-        
+
         commit(trx_type, money, post)
       end
-                    
+
       def add_credit_card(post, credit_card)
         post[:ccnumber]  = credit_card.number
         post[:ccexp]     = expdate(credit_card)
         post[:firstname] = credit_card.first_name
-        post[:lastname]  = credit_card.last_name      
+        post[:lastname]  = credit_card.last_name
         post[:cvv]       = credit_card.verification_value
-      end      
-                 
+      end
+
       def expdate(credit_card)
         year  = sprintf("%.4i", credit_card.year)
         month = sprintf("%.2i", credit_card.month)
@@ -138,33 +137,33 @@ module ActiveMerchant #:nodoc:
           post[:company]    = billing_address[:company]
           post[:address1]   = billing_address[:address1]
           post[:address2]   = billing_address[:address2]
-          post[:city]       = billing_address[:city]                           
+          post[:city]       = billing_address[:city]
           post[:state]      = billing_address[:state]
-          post[:zip]        = billing_address[:zip]                               
+          post[:zip]        = billing_address[:zip]
           post[:country]    = billing_address[:country]
           post[:phone]      = billing_address[:phone]
-          post[:fax]        = billing_address[:fax]             
+          post[:fax]        = billing_address[:fax]
         end
-        
+
         if shipping_address = options[:shipping_address]
           post[:shipping_firstname] = shipping_address[:first_name]
-          post[:shipping_lastname]  = shipping_address[:last_name]  
-          post[:shipping_company]   = shipping_address[:company]    
-          post[:shipping_address1]  = shipping_address[:address1]   
-          post[:shipping_address2]  = shipping_address[:address2]   
-          post[:shipping_city]      = shipping_address[:city]       
-          post[:shipping_state]     = shipping_address[:state]      
-          post[:shipping_zip]       = shipping_address[:zip]        
-          post[:shipping_country]   = shipping_address[:country]    
-          post[:shipping_email]     = shipping_address[:email]      
-        end        
-      end
-             
+          post[:shipping_lastname]  = shipping_address[:last_name]
+          post[:shipping_company]   = shipping_address[:company]
+          post[:shipping_address1]  = shipping_address[:address1]
+          post[:shipping_address2]  = shipping_address[:address2]
+          post[:shipping_city]      = shipping_address[:city]
+          post[:shipping_state]     = shipping_address[:state]
+          post[:shipping_zip]       = shipping_address[:zip]
+          post[:shipping_country]   = shipping_address[:country]
+          post[:shipping_email]     = shipping_address[:email]
+        end
+      end
+
       def add_customer_data(post, options)
         post[:email]     = options[:email]
         post[:ipaddress] = options[:ip]
       end
-      
+
       def add_invoice_data(post, options)
         post[:orderid]            = options[:order_id]
         post[:ponumber]           = options[:invoice]
@@ -172,18 +171,18 @@ module ActiveMerchant #:nodoc:
         post[:tax]                = options[:tax]
         post[:shipping]           = options[:shipping]
       end
-      
+
       def add_optional_data(post, options)
-        post[:billing_method]     = options[:billing_method]    
-        post[:website]            = options[:website]   
-        post[:descriptor]         = options[:descriptor]         
-        post[:descriptor_phone]   = options[:descriptor_phone]   
-        post[:cardholder_auth]    = options[:cardholder_auth]    
-        post[:cavv]               = options[:cavv]               
-        post[:xid]                = options[:xid]                
+        post[:billing_method]     = options[:billing_method]
+        post[:website]            = options[:website]
+        post[:descriptor]         = options[:descriptor]
+        post[:descriptor_phone]   = options[:descriptor_phone]
+        post[:cardholder_auth]    = options[:cardholder_auth]
+        post[:cavv]               = options[:cavv]
+        post[:xid]                = options[:xid]
         post[:customer_receipt]   = options[:customer_receipt]
       end
-                       
+
       def add_security_key_data(post, options, money)
         # MD5(username|password|orderid|amount|time)
         now = Time.now.to_i.to_s
@@ -195,13 +194,13 @@ module ActiveMerchant #:nodoc:
         md5 << now
         post[:key]  = md5.hexdigest
         post[:time] = now
-      end                  
-                                                    
+      end
+
       def commit(trx_type, money, post)
         post[:amount] = amount(money)
-        
+
         response = parse( ssl_post(self.live_url, post_data(trx_type, post)) )
-                         
+
         Response.new(response[:response].to_i == SUCCESS, message_from(response), response,
           :test => test?,
           :authorization => response[:transactionid],
@@ -209,25 +208,25 @@ module ActiveMerchant #:nodoc:
           :cvv_result => response[:cvvresponse]
         )
       end
-      
+
       def message_from(response)
         response[:response_code_message] ? response[:response_code_message] : ""
       end
-                                                      
+
       def parse(body)
         results = {}
         CGI.parse(body).each { |key, value| results[key.intern] = value[0] }
         results[:response_code_message] = RESPONSE_CODE_MESSAGES[results[:response_code]] if results[:response_code]
         results
-      end   
-      
+      end
+
       def post_data(trx_type, post)
-        post[:username]   = @options[:login]  
+        post[:username]   = @options[:login]
         post[:password]   = @options[:password]
         post[:type]       = TRANSACTIONS[trx_type]
-        
+
         post.to_s
       end
-    end 
+    end
   end
 end