activemerchant 1.28.0 → 1.29.1

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

@@ -63,13 +63,13 @@ 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
       def purchase(money, creditcard, options = {})
         form = {}
+        add_salestax(form, options)
         add_invoice(form, options)
         add_creditcard(form, creditcard)
         add_address(form, options)
@@ -87,6 +87,7 @@ module ActiveMerchant #:nodoc:
       #   * <tt>:billing_address</tt> - The billing address for the cardholder.
       def authorize(money, creditcard, options = {})
         form = {}
+        add_salestax(form, options)
         add_invoice(form, options)
         add_creditcard(form, creditcard)
         add_address(form, options)
@@ -106,6 +107,7 @@ module ActiveMerchant #:nodoc:
         requires!(options, :credit_card)
 
         form = {}
+        add_salestax(form, options)
         add_approval_code(form, authorization)
         add_invoice(form, options)
         add_creditcard(form, options[:credit_card])
@@ -205,6 +207,10 @@ module ActiveMerchant #:nodoc:
         form[:customer_code] = options[:customer].to_s.slice(0, 10) unless options[:customer].blank?
       end
 
+      def add_salestax(form, options)
+        form[:salestax] = options[:tax] if options[:tax].present?
+      end
+
       def expdate(creditcard)
         year  = sprintf("%.4i", creditcard.year)
         month = sprintf("%.2i", creditcard.month)

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

@@ -54,7 +54,6 @@ module ActiveMerchant #:nodoc:
       # password: referrer url (for authorize authentication)
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
 

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

@@ -3,7 +3,7 @@ require 'rexml/document'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # First, make sure you have everything setup correctly and all of your dependencies in place with:
-    # 
+    #
     #   require 'rubygems'
     #   require 'active_merchant'
     #
@@ -17,10 +17,10 @@ module ActiveMerchant #:nodoc:
     # Next, create a credit card object using a eWay approved test card number (4444333322221111).
     #
     #   creditcard = ActiveMerchant::Billing::CreditCard.new(
-    #	    :number => '4444333322221111',
-    #	    :month => 8,
-    #	    :year => 2006,
-    #	    :first_name => 'Longbob',
+    #     :number => '4444333322221111',
+    #     :month => 8,
+    #     :year => 2006,
+    #     :first_name => 'Longbob',
     #     :last_name => 'Longsen',
     #     :verification_value => '123'
     #   )
@@ -28,7 +28,7 @@ module ActiveMerchant #:nodoc:
     #     :order_id => '1230123',
     #     :email => 'bob@testbob.com',
     #     :address => { :address1 => '47 Bobway',
-    #                   :city => 'Bobville', 
+    #                   :city => 'Bobville',
     #                   :state => 'WA',
     #                   :country => 'Australia',
     #                   :zip => '2000'
@@ -63,88 +63,87 @@ module ActiveMerchant #:nodoc:
     # This should be enough to get you started with eWay and active_merchant. For further information, review the methods
     # below and the rest of active_merchant's documentation.
 
-    class EwayGateway < Gateway 
+    class EwayGateway < Gateway
       self.test_url = 'https://www.eway.com.au/gateway/xmltest/testpage.asp'
       self.live_url = 'https://www.eway.com.au/gateway/xmlpayment.asp'
 
       class_attribute :test_cvn_url, :live_cvn_url
       self.test_cvn_url = 'https://www.eway.com.au/gateway_cvn/xmltest/testpage.asp'
       self.live_cvn_url = 'https://www.eway.com.au/gateway_cvn/xmlpayment.asp'
-      
+
       MESSAGES = {
         "00" => "Transaction Approved",
         "01" => "Refer to Issuer",
-        "02" => "Refer to Issuer, special",	
+        "02" => "Refer to Issuer, special",
         "03" => "No Merchant",
-        "04" => "Pick Up Card",	
-        "05" => "Do Not Honour",	
+        "04" => "Pick Up Card",
+        "05" => "Do Not Honour",
         "06" => "Error",
-        "07" => "Pick Up Card, Special",	
-        "08" => "Honour With Identification",	
+        "07" => "Pick Up Card, Special",
+        "08" => "Honour With Identification",
         "09" => "Request In Progress",
-        "10" => "Approved For Partial Amount",	
-        "11" => "Approved, VIP",	
-        "12" => "Invalid Transaction",	
+        "10" => "Approved For Partial Amount",
+        "11" => "Approved, VIP",
+        "12" => "Invalid Transaction",
         "13" => "Invalid Amount",
-        "14" => "Invalid Card Number",	
-        "15" => "No Issuer",	
-        "16" => "Approved, Update Track 3",	
-        "19" => "Re-enter Last Transaction",	
-        "21" => "No Action Taken",	
-        "22" => "Suspected Malfunction",	
-        "23" => "Unacceptable Transaction Fee",	
-        "25" => "Unable to Locate Record On File",	
-        "30" => "Format Error",	
-        "31" => "Bank Not Supported By Switch",	
-        "33" => "Expired Card, Capture",	
-        "34" => "Suspected Fraud, Retain Card",	
-        "35" => "Card Acceptor, Contact Acquirer, Retain Card",	
-        "36" => "Restricted Card, Retain Card",	
-        "37" => "Contact Acquirer Security Department, Retain Card",	
-        "38" => "PIN Tries Exceeded, Capture",	
-        "39" => "No Credit Account",	
-        "40" => "Function Not Supported",	
-        "41" => "Lost Card",	
-        "42" => "No Universal Account",	
-        "43" => "Stolen Card",	
-        "44" => "No Investment Account",	
-        "51" => "Insufficient Funds",	
-        "52" => "No Cheque Account",	
-        "53" => "No Savings Account",	
-        "54" => "Expired Card",	
-        "55" => "Incorrect PIN",	
-        "56" => "No Card Record",	
-        "57" => "Function Not Permitted to Cardholder",	
-        "58" => "Function Not Permitted to Terminal",	
-        "59" => "Suspected Fraud",	
-        "60" => "Acceptor Contact Acquirer",	
-        "61" => "Exceeds Withdrawal Limit",	
-        "62" => "Restricted Card",	
-        "63" => "Security Violation",	
-        "64" => "Original Amount Incorrect",	
-        "66" => "Acceptor Contact Acquirer, Security",	
-        "67" => "Capture Card",	
-        "75" => "PIN Tries Exceeded",	
-        "82" => "CVV Validation Error",	
-        "90" => "Cutoff In Progress",	
-        "91" => "Card Issuer Unavailable",	
-        "92" => "Unable To Route Transaction",	
-        "93" => "Cannot Complete, Violation Of The Law",	
-        "94" => "Duplicate Transaction",	
+        "14" => "Invalid Card Number",
+        "15" => "No Issuer",
+        "16" => "Approved, Update Track 3",
+        "19" => "Re-enter Last Transaction",
+        "21" => "No Action Taken",
+        "22" => "Suspected Malfunction",
+        "23" => "Unacceptable Transaction Fee",
+        "25" => "Unable to Locate Record On File",
+        "30" => "Format Error",
+        "31" => "Bank Not Supported By Switch",
+        "33" => "Expired Card, Capture",
+        "34" => "Suspected Fraud, Retain Card",
+        "35" => "Card Acceptor, Contact Acquirer, Retain Card",
+        "36" => "Restricted Card, Retain Card",
+        "37" => "Contact Acquirer Security Department, Retain Card",
+        "38" => "PIN Tries Exceeded, Capture",
+        "39" => "No Credit Account",
+        "40" => "Function Not Supported",
+        "41" => "Lost Card",
+        "42" => "No Universal Account",
+        "43" => "Stolen Card",
+        "44" => "No Investment Account",
+        "51" => "Insufficient Funds",
+        "52" => "No Cheque Account",
+        "53" => "No Savings Account",
+        "54" => "Expired Card",
+        "55" => "Incorrect PIN",
+        "56" => "No Card Record",
+        "57" => "Function Not Permitted to Cardholder",
+        "58" => "Function Not Permitted to Terminal",
+        "59" => "Suspected Fraud",
+        "60" => "Acceptor Contact Acquirer",
+        "61" => "Exceeds Withdrawal Limit",
+        "62" => "Restricted Card",
+        "63" => "Security Violation",
+        "64" => "Original Amount Incorrect",
+        "66" => "Acceptor Contact Acquirer, Security",
+        "67" => "Capture Card",
+        "75" => "PIN Tries Exceeded",
+        "82" => "CVV Validation Error",
+        "90" => "Cutoff In Progress",
+        "91" => "Card Issuer Unavailable",
+        "92" => "Unable To Route Transaction",
+        "93" => "Cannot Complete, Violation Of The Law",
+        "94" => "Duplicate Transaction",
         "96" => "System Error"
       }
-      
-	    self.money_format = :cents
+
+      self.money_format = :cents
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY'
-	    
-    	def initialize(options = {})
+
+      def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
-    	end
+      end
 
       # ewayCustomerEmail, ewayCustomerAddress, ewayCustomerPostcode
       def purchase(money, creditcard, options = {})
@@ -152,20 +151,16 @@ module ActiveMerchant #:nodoc:
 
         post = {}
         add_creditcard(post, creditcard)
-        add_address(post, options)  
+        add_address(post, options)
         add_customer_data(post, options)
         add_invoice_data(post, options)
         # The request fails if all of the fields aren't present
         add_optional_data(post)
-    
+
         commit(money, post)
       end
-      
-      def test?
-        @options[:test] || super
-      end
-      
-      private                       
+
+      private
 
       def requires_address!(options)
         raise ArgumentError.new("Missing eWay required parameters: address or billing_address") unless (options.has_key?(:address) or options.has_key?(:billing_address))
@@ -178,9 +173,9 @@ module ActiveMerchant #:nodoc:
         post[:CustomerFirstName] = creditcard.first_name
         post[:CustomerLastName]  = creditcard.last_name
         post[:CardHoldersName] = creditcard.name
-              
+
         post[:CVN] = creditcard.verification_value if creditcard.verification_value?
-      end 
+      end
 
       def add_address(post, options)
         if address = options[:billing_address] || options[:address]
@@ -192,7 +187,7 @@ module ActiveMerchant #:nodoc:
       def add_customer_data(post, options)
         post[:CustomerEmail] = options[:email]
       end
-      
+
       def add_invoice_data(post, options)
         post[:CustomerInvoiceRef] = options[:order_id]
         post[:CustomerInvoiceDescription] = options[:description]
@@ -202,10 +197,10 @@ module ActiveMerchant #:nodoc:
         post[:TrxnNumber] = nil
         post[:Option1] = nil
         post[:Option2] = nil
-        post[:Option3] = nil     
+        post[:Option3] = nil
       end
 
-      def commit(money, parameters)       
+      def commit(money, parameters)
         parameters[:TotalAmount] = amount(money)
 
         response = parse( ssl_post(gateway_url(parameters[:CVN], test?), post_data(parameters)) )
@@ -213,13 +208,13 @@ module ActiveMerchant #:nodoc:
         Response.new(success?(response), message_from(response[:ewaytrxnerror]), response,
           :authorization => response[:ewayauthcode],
           :test => /\(Test( CVN)? Gateway\)/ === response[:ewaytrxnerror]
-        )      
+        )
       end
-      
+
       def success?(response)
         response[:ewaytrxnstatus] == "True"
       end
-                                             
+
       # Parse eway response xml into a convinient hash
       def parse(xml)
         #  "<?xml version=\"1.0\"?>".
@@ -233,10 +228,10 @@ module ActiveMerchant #:nodoc:
         #  <ewayReturnAmount>10</ewayReturnAmount>
         #  <ewayAuthCode>123456</ewayAuthCode>
         #  <ewayTrxnReference>987654321</ewayTrxnReference>
-        #  </ewayResponse>     
+        #  </ewayResponse>
 
         response = {}
-        xml = REXML::Document.new(xml)          
+        xml = REXML::Document.new(xml)
         xml.elements.each('//ewayResponse/*') do |node|
 
           response[node.name.downcase.to_sym] = normalize(node.text)
@@ -244,20 +239,20 @@ module ActiveMerchant #:nodoc:
         end unless xml.root.nil?
 
         response
-      end   
+      end
 
       def post_data(parameters = {})
         parameters[:CustomerID] = @options[:login]
-        
+
         xml   = REXML::Document.new
         root  = xml.add_element("ewaygateway")
-        
+
         parameters.each do |key, value|
           root.add_element("eway#{key}").text = value
-        end    
+        end
         xml.to_s
       end
-    
+
       def message_from(message)
         return '' if message.blank?
         MESSAGES[message[0,2]] || message
@@ -271,9 +266,9 @@ module ActiveMerchant #:nodoc:
         when ""       then nil
         when "null"   then nil
         else field
-        end        
+        end
       end
-      
+
       def gateway_url(cvn, test)
         if cvn
           test ? self.test_cvn_url : self.live_cvn_url
@@ -281,7 +276,7 @@ module ActiveMerchant #:nodoc:
           test ? self.test_url : self.live_url
         end
       end
-      
+
     end
   end
 end

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

@@ -3,71 +3,70 @@ module ActiveMerchant #:nodoc:
     class EwayManagedGateway < Gateway
       self.test_url = 'https://www.eway.com.au/gateway/ManagedPaymentService/test/managedCreditCardPayment.asmx'
       self.live_url = 'https://www.eway.com.au/gateway/ManagedPaymentService/managedCreditCardPayment.asmx'
-      
+
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['AU']
-      
+
       # The card types supported by the payment gateway
       self.supported_cardtypes = [:visa, :master]
-      
+
       self.default_currency = 'AUD'
-      
+
       #accepted money format
       self.money_format = :cents
-      
+
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.eway.com.au/'
-      
+
       # The name of the gateway
       self.display_name = 'eWay Managed Payments'
-      
+
       def initialize(options = {})
         requires!(options, :login, :username, :password)
-        @options = options
 
         # eWay returns 500 code for faults, which AM snaffles.
         # So, we tell it to allow them.
-        @options[:ignore_http_status]=true
+        options[:ignore_http_status] = true
         super
-      end  
-      
+      end
+
       # add a new customer CC to your eway account and return unique ManagedCustomerID
       # supports storing details required by eway see "add_creditcard" and "add_address"
       def store(creditcard, options = {})
         post = {}
-        
+
         # Handle our required fields
         requires!(options, :billing_address)
 
         # Handle eWay specific required fields.
         billing_address = options[:billing_address]
         eway_requires!(billing_address)
-        
+
         add_creditcard(post, creditcard)
         add_address(post, billing_address)
         add_misc_fields(post, options)
-             
+
         commit("CreateCustomer", post)
       end
-      
+
       def update(billing_id, creditcard, options={})
         post = {}
-        
+
         # Handle our required fields
         requires!(options, :billing_address)
 
         # Handle eWay specific required fields.
         billing_address = options[:billing_address]
         eway_requires!(billing_address)
-        
+
         post[:managedCustomerID]=billing_id
         add_creditcard(post, creditcard)
         add_address(post, billing_address)
         add_misc_fields(post, options)
-             
+
         commit("UpdateCustomer", post)
       end
-      
+
       # Process a payment in the given amount against the stored credit card given by billing_id
       #
       # ==== Parameters
@@ -81,39 +80,36 @@ module ActiveMerchant #:nodoc:
       # * <tt>:order_id</tt> -- The order number, passed to eWay as the "Invoice Reference"
       # * <tt>:invoice</tt> -- The invoice number, passed to eWay as the "Invoice Reference" unless :order_id is also given
       # * <tt>:description</tt> -- A description of the payment, passed to eWay as the "Invoice Description"
-      def purchase(money, billing_id, options={})        
-        post = {}  
+      def purchase(money, billing_id, options={})
+        post = {}
         post[:managedCustomerID] = billing_id.to_s
         post[:amount]=money
         add_invoice(post, options)
-        
+
         commit("ProcessPayment", post)
       end
-      
+
       # TODO: eWay API also provides QueryCustomer
       # TODO: eWay API also provides QueryPayment
-    
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-private                       
+
+      private
 
       def eway_requires!(hash)
         raise ArgumentError.new("Missing eWay required parameter in `billing_address`: title") unless hash.has_key?(:title)
         raise ArgumentError.new("Missing eWay required parameter in `billing_address`: country") unless hash.has_key?(:country)
       end
-      
-      def add_address(post, address) 
+
+      def add_address(post, address)
         post[:Address]  = address[:address1].to_s
         post[:Phone]    = address[:phone].to_s
-        post[:PostCode] = address[:zip].to_s       
+        post[:PostCode] = address[:zip].to_s
         post[:Suburb]   = address[:city].to_s
         post[:Country]  = address[:country].to_s.downcase
-        post[:State]    = address[:state].to_s  
+        post[:State]    = address[:state].to_s
         post[:Mobile]   = address[:mobile].to_s
         post[:Fax]      = address[:fax].to_s
       end
-      
+
       def add_misc_fields(post, options)
         post[:CustomerRef]=options[:billing_address][:customer_ref] || options[:customer]
         post[:Title]=options[:billing_address][:title]
@@ -123,13 +119,13 @@ private
         post[:URL]=options[:billing_address][:url]
         post[:Comments]=options[:description]
       end
-      
+
       def add_invoice(post, options)
         post[:invoiceReference] = options[:order_id] || options[:invoice]
         post[:invoiceDescription] = options[:description]
       end
-      
-      
+
+
       # add credit card details to be stored by eway. NOTE eway requires "title" field
       def add_creditcard(post, creditcard)
         post[:CCNumber]  = creditcard.number
@@ -139,7 +135,7 @@ private
         post[:FirstName] = creditcard.first_name
         post[:LastName]  = creditcard.last_name
       end
-      
+
       def parse(body)
         reply = {}
         xml = REXML::Document.new(body)
@@ -175,23 +171,23 @@ private
         end
         return reply
       end
-      
+
       def parse_fault(node)
         reply={}
         reply[:message]=REXML::XPath.first(node, '//soap:Reason/soap:Text').text
         reply[:success]=false
         reply
       end
-      
+
       def parse_purchase(node)
         reply={}
         reply[:message]=REXML::XPath.first(node, '//ewayTrxnError').text
         reply[:success]=(REXML::XPath.first(node, '//ewayTrxnStatus').text == 'True')
         reply[:auth_code]=REXML::XPath.first(node, '//ewayAuthCode').text
-        reply[:transaction_number]=REXML::XPath.first(node, '//ewayTrxnNumber').text        
+        reply[:transaction_number]=REXML::XPath.first(node, '//ewayTrxnNumber').text
         reply
       end
-      
+
       def commit(action, post)
         raw = begin
           ssl_post(test? ? self.test_url : self.live_url, soap_request(post, action), 'Content-Type' => 'application/soap+xml; charset=utf-8')
@@ -199,23 +195,23 @@ private
           e.response.body
         end
         response = parse(raw)
-                                        
-        EwayResponse.new(response[:success], response[:message], response, 
+
+        EwayResponse.new(response[:success], response[:message], response,
           :test => test?,
           :authorization => response[:auth_code]
         )
       end
-      
+
       # Where we build the full SOAP 1.2 request using builder
       def soap_request(arguments, action)
         # eWay demands all fields be sent, but contain an empty string if blank
         post = case action
         when 'ProcessPayment'
           default_payment_fields.merge(arguments)
-        else    
+        else
           default_customer_fields.merge(arguments)
         end
-        
+
         xml = Builder::XmlMarkup.new :indent => 2
           xml.instruct!
           xml.tag! 'soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'} do
@@ -230,13 +226,13 @@ private
               x.tag! "#{action}", {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
                 post.each do |key, value|
                   y.tag! "#{key}", "#{value}"
-                end 
+                end
               end
             end
           end
         xml.target!
       end
-      
+
       def default_customer_fields
         hash={}
         %w( CustomerRef Title FirstName LastName Company JobDesc Email Address Suburb State PostCode Country Phone Mobile Fax URL Comments CCNumber CCNameOnCard CCExpiryMonth CCExpiryYear ).each do |field|
@@ -244,7 +240,7 @@ private
         end
         return hash
       end
-      
+
       def default_payment_fields
         hash={}
         %w( managedCustomerID amount invoiceReference invoiceDescription ).each do |field|
@@ -252,14 +248,14 @@ private
         end
         return hash
       end
-      
+
       class EwayResponse < Response
         # add a method to response so we can easily get the eway token "ManagedCustomerID"
         def token
           @params['CreateCustomerResult']
         end
       end
-      
+
     end
   end
 end