activemerchant 1.28.0 → 1.29.0

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

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

@@ -2,67 +2,58 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class ExactGateway < Gateway
       self.live_url = self.test_url = 'https://secure2.e-xact.com/vplug-in/transaction/rpc-enc/service.asmx'
-      
+
       API_VERSION = "8.5"
-      
+
       TEST_LOGINS = [ {:login => "A00049-01", :password => "test1"},
                       {:login => "A00427-01", :password => "testus"} ]
-      
+
       TRANSACTIONS = { :sale          => "00",
                        :authorization => "01",
                        :capture       => "32",
                        :credit        => "34" }
-      
+
 
       ENVELOPE_NAMESPACES = { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
                               'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
                               'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
                             }
-                            
+
       SEND_AND_COMMIT_ATTRIBUTES = { 'xmlns:n1' => "http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Request",
                                      'env:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'
                                    }
-                                   
+
       SEND_AND_COMMIT_SOURCE_ATTRIBUTES = { 'xmlns:n2' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes',
                                             'xsi:type' => 'n2:Transaction'
                                           }
-      
+
       POST_HEADERS = { 'soapAction' => "http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/SendAndCommit",
-                       'Content-Type' => 'text/xml' 
+                       'Content-Type' => 'text/xml'
                      }
-                     
+
       SUCCESS = "true"
-      
+
       SENSITIVE_FIELDS = [ :verification_str2, :expiry_date, :card_number ]
-      
+
       self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :discover]
       self.supported_countries = ['CA', 'US']
       self.homepage_url = 'http://www.e-xact.com'
       self.display_name = 'E-xact'
-  
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
-        
-        if TEST_LOGINS.include?( { :login => options[:login], :password => options[:password] } )
-          @test_mode = true
-        end
-      
+
         super
       end
-      
-      def test?
-        @test_mode || Base.gateway_mode == :test
-      end
-      
+
       def authorize(money, credit_card, options = {})
         commit(:authorization, build_sale_or_authorization_request(money, credit_card, options))
       end
-      
+
       def purchase(money, credit_card, options = {})
         commit(:sale, build_sale_or_authorization_request(money, credit_card, options))
       end
-    
+
       def capture(money, authorization, options = {})
         commit(:capture, build_capture_or_credit_request(money, authorization, options))
       end
@@ -75,11 +66,11 @@ module ActiveMerchant #:nodoc:
       def refund(money, authorization, options = {})
         commit(:credit, build_capture_or_credit_request(money, authorization, options))
       end
-         
-      private                       
+
+      private
       def build_request(action, body)
         xml = Builder::XmlMarkup.new
-        
+
         xml.instruct!
         xml.tag! 'env:Envelope', ENVELOPE_NAMESPACES do
           xml.tag! 'env:Body' do
@@ -94,59 +85,59 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-                
+
       def build_sale_or_authorization_request(money, credit_card, options)
         xml = Builder::XmlMarkup.new
- 
+
         add_amount(xml, money)
         add_credit_card(xml, credit_card)
         add_customer_data(xml, options)
         add_invoice(xml, options)
-        
-        xml.target!        
+
+        xml.target!
       end
-      
+
       def build_capture_or_credit_request(money, identification, options)
         xml = Builder::XmlMarkup.new
-  
+
         add_identification(xml, identification)
         add_amount(xml, money)
         add_customer_data(xml, options)
-    
+
         xml.target!
       end
-      
+
       def add_credentials(xml)
         xml.tag! 'ExactID', @options[:login]
         xml.tag! 'Password', @options[:password]
       end
-      
+
       def add_transaction_type(xml, action)
         xml.tag! 'Transaction_Type', TRANSACTIONS[action]
       end
-      
+
       def add_identification(xml, identification)
         authorization_num, transaction_tag = identification.split(';')
- 
+
         xml.tag! 'Authorization_Num', authorization_num
         xml.tag! 'Transaction_Tag', transaction_tag
       end
-      
+
       def add_amount(xml, money)
         xml.tag! 'DollarAmount', amount(money)
       end
-      
+
       def add_credit_card(xml, credit_card)
         xml.tag! 'Card_Number', credit_card.number
         xml.tag! 'Expiry_Date', expdate(credit_card)
         xml.tag! 'CardHoldersName', credit_card.name
-        
+
         if credit_card.verification_value?
           xml.tag! 'CVD_Presence_Ind', '1'
           xml.tag! 'VerificationStr2', credit_card.verification_value
         end
       end
-      
+
       def add_customer_data(xml, options)
         xml.tag! 'Customer_Ref', options[:customer]
         xml.tag! 'Client_IP', options[:ip]
@@ -155,22 +146,22 @@ module ActiveMerchant #:nodoc:
 
       def add_address(xml, options)
         if address = options[:billing_address] || options[:address]
-          xml.tag! 'ZipCode', address[:zip]       
-        end    
+          xml.tag! 'ZipCode', address[:zip]
+        end
       end
 
       def add_invoice(xml, options)
         xml.tag! 'Reference_No', options[:order_id]
         xml.tag! 'Reference_3',  options[:description]
       end
-      
+
       def expdate(credit_card)
         "#{format(credit_card.month, :two_digits)}#{format(credit_card.year, :two_digits)}"
       end
-      
+
       def commit(action, request)
          response = parse(ssl_post(self.live_url, build_request(action, request), POST_HEADERS))
-      
+
          Response.new(successful?(response), message_from(response), response,
            :test => test?,
            :authorization => authorization_from(response),
@@ -178,19 +169,19 @@ module ActiveMerchant #:nodoc:
            :cvv_result => response[:cvv2]
          )
       end
-      
+
       def successful?(response)
         response[:transaction_approved] == SUCCESS
       end
-      
+
       def authorization_from(response)
         if response[:authorization_num] && response[:transaction_tag]
-           "#{response[:authorization_num]};#{response[:transaction_tag]}"        
+           "#{response[:authorization_num]};#{response[:transaction_tag]}"
         else
            ''
         end
       end
-      
+
       def message_from(response)
         if response[:faultcode] && response[:faultstring]
           response[:faultstring]
@@ -202,11 +193,11 @@ module ActiveMerchant #:nodoc:
           result
         end
       end
-      
+
       def parse(xml)
         response = {}
         xml = REXML::Document.new(xml)
-        
+
         if root = REXML::XPath.first(xml, "//types:TransactionResult")
           parse_elements(response, root)
         elsif root = REXML::XPath.first(xml, "//soap:Fault")