activemerchant 1.28.0 → 1.29.1

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

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

@@ -6,24 +6,24 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://demo.viaklix.com/process.asp'
       self.live_url = 'https://www.viaklix.com/process.asp'
       self.delimiter = "\r\n"
-      
+
       self.actions = {
         :purchase => 'SALE',
         :credit => 'CREDIT'
       }
-      
+
       APPROVED = '0'
-      
+
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = ['US']
       self.display_name = 'ViaKLIX'
       self.homepage_url = 'http://viaklix.com'
-      
+
       # Initialize the Gateway
       #
       # The gateway requires that a valid login and password be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:login</tt> -- Merchant ID
@@ -32,55 +32,54 @@ module ActiveMerchant #:nodoc:
       # * <tt>:test => +true+ or +false+</tt> -- Force test transactions
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
-      
-      # Make a purchase  
+
+      # Make a purchase
       def purchase(money, creditcard, options = {})
         form = {}
         add_invoice(form, options)
-        add_creditcard(form, creditcard)        
-        add_address(form, options)   
+        add_creditcard(form, creditcard)
+        add_address(form, options)
         add_customer_data(form, options)
         add_test_mode(form, options)
         commit(:purchase, money, form)
       end
-      
+
       # Make a credit to a card (Void can only be done from the virtual terminal)
       # Viaklix does not support credits by reference. You must pass in the credit card
       def credit(money, creditcard, options = {})
         if creditcard.is_a?(String)
           raise ArgumentError, "Reference credits are not supported. Please supply the original credit card"
         end
-        
+
         form = {}
         add_invoice(form, options)
-        add_creditcard(form, creditcard)        
-        add_address(form, options)   
+        add_creditcard(form, creditcard)
+        add_address(form, options)
         add_customer_data(form, options)
         add_test_mode(form, options)
         commit(:credit, money, form)
       end
-      
+
       private
       def add_test_mode(form, options)
         form[:test_mode] = 'TRUE' if options[:test_mode]
       end
-      
+
       def add_customer_data(form, options)
         form[:email] = options[:email].to_s.slice(0, 100) unless options[:email].blank?
         form[:customer_code] = options[:customer].to_s.slice(0, 10) unless options[:customer].blank?
       end
-      
+
       def add_invoice(form,options)
         form[:invoice_number] = (options[:order_id] || options[:invoice]).to_s.slice(0, 10)
         form[:description] = options[:description].to_s.slice(0, 255)
       end
-      
+
       def add_address(form,options)
-        billing_address = options[:billing_address] || options[:address] 
-        
+        billing_address = options[:billing_address] || options[:address]
+
         if billing_address
           form[:avs_address]    = billing_address[:address1].to_s.slice(0, 30)
           form[:address2]       = billing_address[:address2].to_s.slice(0, 30)
@@ -91,7 +90,7 @@ module ActiveMerchant #:nodoc:
           form[:phone]          = billing_address[:phone].to_s.slice(0, 20)
           form[:country]        = billing_address[:country].to_s.slice(0, 50)
         end
-                
+
         if shipping_address = options[:shipping_address]
           first_name, last_name = parse_first_and_last_name(shipping_address[:name])
           form[:ship_to_first_name]     = first_name.to_s.slice(0, 20)
@@ -104,82 +103,78 @@ module ActiveMerchant #:nodoc:
           form[:ship_to_zip]            = shipping_address[:zip].to_s.slice(0, 10)
         end
       end
-      
+
       def parse_first_and_last_name(value)
         name = value.to_s.split(' ')
-        
+
         last_name = name.pop || ''
         first_name = name.join(' ')
-        [ first_name, last_name ] 
+        [ first_name, last_name ]
       end
-      
+
       def add_creditcard(form, creditcard)
         form[:card_number] = creditcard.number
         form[:exp_date] = expdate(creditcard)
-        
+
         if creditcard.verification_value?
           add_verification_value(form, creditcard)
         end
-        
+
         form[:first_name] = creditcard.first_name.to_s.slice(0, 20)
         form[:last_name] = creditcard.last_name.to_s.slice(0, 30)
       end
-      
+
       def add_verification_value(form, creditcard)
-        form[:cvv2cvc2] = creditcard.verification_value 
+        form[:cvv2cvc2] = creditcard.verification_value
         form[:cvv2] = 'present'
       end
-      
+
       def preamble
         result = {
           'merchant_id'   => @options[:login],
           'pin'           => @options[:password],
           'show_form'     => 'false',
-          'result_format' => 'ASCII'          
+          'result_format' => 'ASCII'
         }
-        
+
         result['user_id'] = @options[:user] unless @options[:user].blank?
         result
       end
-      
-      def test?
-        @options[:test] || super
-      end
-      
+
       def commit(action, money, parameters)
         parameters[:amount] = amount(money)
         parameters[:transaction_type] = self.actions[action]
-            
+
         response = parse( ssl_post(test? ? self.test_url : self.live_url, post_data(parameters)) )
 
-        Response.new(response['result'] == APPROVED, message_from(response), response, 
-          :test => @options[:test] || test?, 
+        Response.new(response['result'] == APPROVED, message_from(response), response,
+          :test => @options[:test] || test?,
           :authorization => authorization_from(response),
           :avs_result => { :code => response['avs_response'] },
           :cvv_result => response['cvv2_response']
         )
       end
-      
+
       def authorization_from(response)
         response['txn_id']
       end
-      
+
       def message_from(response)
         response['result_message']
       end
-      
+
       def post_data(parameters)
         result = preamble
-        result.merge!(parameters)        
+        result.merge!(parameters)
         result.collect { |key, value| "ssl_#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
-      
+
       def expdate(creditcard)
         year  = sprintf("%.4i", creditcard.year)
         month = sprintf("%.2i", creditcard.month)
         "#{month}#{year[2..3]}"
       end
-      
+
       # Parse the response message
       def parse(msg)
         resp = {}
@@ -191,4 +186,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end