activemerchant 1.0.3 → 1.1.0

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

@@ -127,6 +127,9 @@ module ActiveMerchant #:nodoc:
       
       TEST_URL  = 'https://staging.linkpt.net:1129/'
       LIVE_URL  = 'https://secure.linkpt.net:1129/'
+      
+      # We don't have the certificate to verify LinkPoint
+      self.ssl_strict = false
            
       # @options = {
       #  :store_number => options[:login],
@@ -136,12 +139,11 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login)
         
         @options = {
-          :result => 'LIVE'
+          :result => 'LIVE',
+          :pem => LinkpointGateway.pem_file
         }.update(options)
         
-        @pem = @options[:pem] || LinkpointGateway.pem_file
-        
-        raise ArgumentError, "You need to pass in your pem file using the :pem parameter or set it globally using ActiveMerchant::Billing::LinkpointGateway.pem_file = File.read( File.dirname(__FILE__) + '/../mycert.pem' ) or similar" if @pem.nil?
+        raise ArgumentError, "You need to pass in your pem file using the :pem parameter or set it globally using ActiveMerchant::Billing::LinkpointGateway.pem_file = File.read( File.dirname(__FILE__) + '/../mycert.pem' ) or similar" if @options[:pem].blank?
       end
       
       # Send a purchase request with periodic options
@@ -245,16 +247,16 @@ module ActiveMerchant #:nodoc:
       end
       
       private
-      
       # Commit the transaction by posting the XML file to the LinkPoint server
       def commit(money, creditcard, options = {})
         parameters = parameters(money, creditcard, options)
+        url = test? ? TEST_URL : LIVE_URL
         
         if creditcard and result = test_result_from_cc_number(parameters[:creditcard][:cardnumber])
           return result
         end
         
-        data = ssl_post post_data(parameters)
+        data = ssl_post(url, post_data(parameters))
                 
         @response = parse(data)
         
@@ -288,7 +290,7 @@ module ActiveMerchant #:nodoc:
         
         return xml.to_s
       end
-      
+            
       # Set up the parameters hash just once so we don't have to do it
       # for every action. 
       def parameters(money, creditcard, options = {})
@@ -408,23 +410,6 @@ module ActiveMerchant #:nodoc:
         
         response
       end
-      
-      # Redefine ssl_post to use our PEM file
-      def ssl_post(data)
-        
-        raise "PEM file invalid or missing!" unless @pem =~ %r{RSA.*CERTIFICATE}m
-        
-        uri = URI.parse(test? ? TEST_URL : LIVE_URL)
-        
-        http = Net::HTTP.new(uri.host, uri.port) 
-        
-        http.verify_mode    = OpenSSL::SSL::VERIFY_NONE unless @ssl_strict
-        http.use_ssl        = true
-        http.cert           = OpenSSL::X509::Certificate.new(@pem)
-        http.key            = OpenSSL::PKey::RSA.new(@pem)
-        
-        http.post(uri.path, data).body      
-      end
     
       # Make a ruby type out of the response string
       def normalize(field)

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

@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
      
       # Moneris requires both the order_id and the transaction number of
       # the original authorization.  To maintain the same interface as the other
-      # gateways the two numbers are concatenated together with an _ separator as
+      # gateways the two numbers are concatenated together with a ; separator as
       # the authorization number returned by authorization
       def capture(money, authorization, options = {})
         txn_number, order_id = authorization.split(';')

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

@@ -48,6 +48,8 @@ module ActiveMerchant #:nodoc:
               add_address(xml, 'ShipTo', shipping_address, options)
               
               xml.tag! 'TotalAmt', amount(money), 'Currency' => currency(money)
+              
+             
             end
             
             xml.tag! 'Tender' do
@@ -65,6 +67,11 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'ExpDate', expdate(credit_card)
           xml.tag! 'NameOnCard', credit_card.name
           xml.tag! 'CVNum', credit_card.verification_value if credit_card.verification_value?
+          
+          if [ 'switch', 'solo' ].include?(credit_card.type.to_s)
+            xml.tag!('ExtData', 'Name' => 'CardStart', 'Value' => startdate(credit_card)) unless credit_card.start_month.blank? || credit_card.start_year.blank?
+            xml.tag!('ExtData', 'Name' => 'CardIssue', 'Value' => credit_card.issue_number) unless credit_card.issue_number.blank?
+          end
         end
       end
       
@@ -75,6 +82,13 @@ module ActiveMerchant #:nodoc:
         "#{year}#{month}"
       end
       
+      def startdate(creditcard)
+        year  = format(creditcard.start_year, :two_digits)
+        month = format(creditcard.start_month, :two_digits)
+
+        "#{month}#{year}"
+      end
+      
       def build_response(success, message, response, options = {})
         Response.new(success, message, response, options)
       end

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -111,20 +111,7 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-    
-      def ssl_post(url, data, headers)
-        uri = URI.parse(url)
-
-        http = Net::HTTP.new(uri.host, uri.port)
-
-        http.verify_mode    = OpenSSL::SSL::VERIFY_PEER
-        http.verify_depth   = 5
-        http.use_ssl        = true
-        http.ca_file        = File.dirname(__FILE__) + '/f73e89fd.0'
-
-        http.post(uri.path, data, headers).body
-      end
-            
+          
       def parse(data)
         response = {}
         xml = REXML::Document.new(data)

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

@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'DoDirectPaymentReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoDirectPaymentRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'n2:DoDirectPaymentRequestDetails' do
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:PaymentDetails' do
@@ -64,10 +64,16 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'n2:CreditCard' do
           xml.tag! 'n2:CreditCardType', credit_card_type(credit_card.type)
           xml.tag! 'n2:CreditCardNumber', credit_card.number
-          xml.tag! 'n2:ExpMonth', sprintf("%.2i", credit_card.month)
-          xml.tag! 'n2:ExpYear', sprintf("%.4i", credit_card.year)
+          xml.tag! 'n2:ExpMonth', format(credit_card.month, :two_digits)
+          xml.tag! 'n2:ExpYear', format(credit_card.year, :four_digits)
           xml.tag! 'n2:CVV2', credit_card.verification_value
           
+          if [ 'switch', 'solo' ].include?(credit_card.type.to_s)
+            xml.tag! 'n2:StartMonth', format(credit_card.start_month, :two_digits) unless credit_card.start_month.blank?
+            xml.tag! 'n2:StartYear', format(credit_card.start_year, :four_digits) unless credit_card.start_year.blank?
+            xml.tag! 'n2:IssueNumber', format(credit_card.issue_number, :two_digits) unless credit_card.issue_number.blank?
+          end
+          
           xml.tag! 'n2:CardOwner' do
             xml.tag! 'n2:PayerName' do
               xml.tag! 'n2:FirstName', credit_card.first_name
@@ -86,6 +92,8 @@ module ActiveMerchant #:nodoc:
         when 'master'           then 'MasterCard'
         when 'discover'         then 'Discover'
         when 'american_express' then 'Amex'
+        when 'switch'           then 'Switch'
+        when 'solo'             then 'Solo'
         end
       end
       

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -7,6 +7,7 @@ module ActiveMerchant #:nodoc:
         base.cattr_accessor :pem_file
       end
       
+      API_VERSION = '2.0'
       TEST_URL = 'https://api.sandbox.paypal.com/2.0/'
       LIVE_URL = 'https://api-aa.paypal.com/2.0/'
       
@@ -21,6 +22,17 @@ module ActiveMerchant #:nodoc:
                                  'xmlns:n1' => EBAY_NAMESPACE,
                                  'env:mustUnderstand' => '0'
                                }
+      
+      AUSTRALIAN_STATES = {
+        'ACT' => 'Australian Capital Territory',
+        'NSW' => 'New South Wales',
+        'NT'  => 'Northern Territory',
+        'QLD' => 'Queensland',
+        'SA'  => 'South Australia',
+        'TAS' => 'Tasmania',
+        'VIC' => 'Victoria',
+        'WA'  => 'Western Australia'
+      }
     
       # <tt>:pem</tt>         The text of your PayPal PEM file. Note
       #                       this is not the path to file, but its
@@ -42,6 +54,10 @@ module ActiveMerchant #:nodoc:
         @options[:test] || Base.gateway_mode == :test
       end
 
+      def reauthorize(money, authorization, options = {})
+        commit 'DoReauthorization', build_reauthorize_request(money, authorization, options)
+      end
+      
       def capture(money, authorization, options = {})
         commit 'DoCapture', build_capture_request(money, authorization, options)
       end
@@ -69,13 +85,26 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+      def build_reauthorize_request(money, authorization, options)
+        xml = Builder::XmlMarkup.new :indent => 2
+        
+        xml.tag! 'DoReauthorizationReq', 'xmlns' => PAYPAL_NAMESPACE do
+          xml.tag! 'DoReauthorizationRequest', 'xmlns:n2' => EBAY_NAMESPACE do
+            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'AuthorizationID', authorization
+            xml.tag! 'Amount', amount(money), 'currencyID' => currency(money)
+          end
+        end
+
+        xml.target!        
+      end
           
       def build_capture_request(money, authorization, options)
         xml = Builder::XmlMarkup.new :indent => 2
         
         xml.tag! 'DoCaptureReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoCaptureRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'AuthorizationID', authorization
             xml.tag! 'Amount', amount(money), 'currencyID' => currency(money)
             xml.tag! 'CompleteType', 'Complete'
@@ -91,7 +120,7 @@ module ActiveMerchant #:nodoc:
             
         xml.tag! 'RefundTransactionReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'RefundTransactionRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'TransactionID', identification
             xml.tag! 'Amount', amount(money), 'currencyID' => currency(money)
             xml.tag! 'RefundType', 'Partial'
@@ -107,7 +136,7 @@ module ActiveMerchant #:nodoc:
         
         xml.tag! 'DoVoidReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoVoidRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'AuthorizationID', authorization
             xml.tag! 'Note', options[:description]
           end
@@ -124,7 +153,7 @@ module ActiveMerchant #:nodoc:
         
         xml.tag! 'MassPayReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'MassPayRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'EmailSubject', default_options[:subject] if default_options[:subject]
             recipients.each do |money, recipient, options|
               options ||= default_options
@@ -132,6 +161,7 @@ module ActiveMerchant #:nodoc:
                 xml.tag! 'ReceiverEmail', recipient
                 xml.tag! 'Amount', amount(money), 'currencyID' => currency(money)
                 xml.tag! 'Note', options[:note] if options[:note]
+                xml.tag! 'UniqueId', options[:unique_id] if options[:unique_id]
               end
             end
           end
@@ -139,21 +169,7 @@ module ActiveMerchant #:nodoc:
         
         xml.target!
       end
-
-      def ssl_post(data)
-        uri = URI.parse(test? ? TEST_URL : LIVE_URL)
-
-        http = Net::HTTP.new(uri.host, uri.port)
-
-        http.verify_mode    = OpenSSL::SSL::VERIFY_PEER
-        http.use_ssl        = true
-        http.cert           = OpenSSL::X509::Certificate.new(@options[:pem])
-        http.key            = OpenSSL::PKey::RSA.new(@options[:pem])
-        http.ca_file        = File.dirname(__FILE__) + '/api_cert_chain.crt'
-
-        http.post(uri.path, data).body
-      end
-
+      
       def parse(action, xml)
         response = {}
         xml = REXML::Document.new(xml)
@@ -229,19 +245,28 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:Street1', address[:address1]
           xml.tag! 'n2:Street2', address[:address2]
           xml.tag! 'n2:CityName', address[:city]
-          xml.tag! 'n2:StateOrProvince', address[:state]
+          xml.tag! 'n2:StateOrProvince', lookup_state(address)
           xml.tag! 'n2:Country', address[:country]
           xml.tag! 'n2:PostalCode', address[:zip]
           xml.tag! 'n2:Phone', address[:phone]
         end
       end
+      
+      def lookup_state(address)
+        state = if address[:country].to_s.upcase == 'AU' || address[:country] == 'Australia'
+          AUSTRALIAN_STATES[address[:state]] || address[:state] 
+        else
+          address[:state]
+        end
+      end
 
       def currency(money)
         money.respond_to?(:currency) ? money.currency : 'USD'
       end
       
       def commit(action, request)
-        data = ssl_post build_request(request)
+        url = test? ? TEST_URL : LIVE_URL
+        data = ssl_post(url, build_request(request))
         
         @response = parse(action, data)
        
@@ -250,7 +275,7 @@ module ActiveMerchant #:nodoc:
 
         build_response(success, message, @response,
     	    :test => test?,
-    	    :authorization => @response[:transaction_id]
+    	    :authorization => @response[:transaction_id] || @response[:authorization_id] # latter one is from reauthorization
         )
       end
     end

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

@@ -50,7 +50,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'GetExpressCheckoutDetailsReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'GetExpressCheckoutDetailsRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'Token', token
           end
         end
@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'DoExpressCheckoutPaymentReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoExpressCheckoutPaymentRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'n2:DoExpressCheckoutPaymentRequestDetails' do
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:Token', options[:token]
@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'SetExpressCheckoutReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'SetExpressCheckoutRequest', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', '2.0'
+            xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'n2:SetExpressCheckoutRequestDetails' do
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:OrderTotal', amount(money), 'currencyID' => currency(money)

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

@@ -100,7 +100,9 @@ module ActiveMerchant #:nodoc:
           return result
         end
         
-        data = ssl_post post_data(parameters)
+        url = test? ? TEST_URL : LIVE_URL
+        
+        data = ssl_post(url, post_data(parameters))
         @response = parse(data)
         success = (@response[:approved] == "APPROVED")
         message = message_form(@response)
@@ -159,12 +161,9 @@ module ActiveMerchant #:nodoc:
         xml.to_s
       end
       
-      
       # Set up the parameters hash just once so we don't have to do it
       # for every action. 
-      def parameters(money, creditcard, options = {})
-        
-        
+      def parameters(money, creditcard, options = {})  
         params = {
           # General order paramters
           :StoreID => @options[:store_id],
@@ -227,20 +226,6 @@ module ActiveMerchant #:nodoc:
         return params
       end
       
-      # Redefine ssl_post to use correct url depending on test mode
-      def ssl_post(data)
-        # In my case I only want the LIVE_URL to be used when in prodcution mode 
-        # because Psigate charges for all transactions
-        uri = URI.parse(test? ? TEST_URL : LIVE_URL )
-        http = Net::HTTP.new(uri.host, uri.port) 
-
-        http.verify_mode    = OpenSSL::SSL::VERIFY_NONE unless @ssl_strict
-        http.use_ssl        = true
-
-        http.post(uri.path, data).body 
-      end
-      
-      
       def message_form(response)
         if response[:approved] == "APPROVED"
           return 'Success'

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

@@ -3,6 +3,7 @@ module ActiveMerchant #:nodoc:
         
     class UsaEpayGateway < Gateway
     	GATEWAY_URL = 'https://www.usaepay.com/gate.php'
+      POST_HEADERS = { 'Content-Type' => 'application/x-www-form-urlencoded' }
       
       attr_reader :url 
       attr_reader :response
@@ -46,10 +47,10 @@ module ActiveMerchant #:nodoc:
       private                       
     
       def expdate(creditcard)
-        year  = sprintf("%.4i", creditcard.year)
-        month = sprintf("%.2i", creditcard.month)
+        year  = format(creditcard.year, :two_digits)
+        month = format(creditcard.month, :two_digits)
 
-        "#{year[-2..-1]}#{month}"
+        "#{month}#{year}"
       end
       
       def add_customer_data(post, options)
@@ -151,9 +152,7 @@ module ActiveMerchant #:nodoc:
           return result
         end
                    
-        data = ssl_post GATEWAY_URL, 
-                        post_data(action, parameters),
-                        { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        data = ssl_post(GATEWAY_URL, post_data(action, parameters), POST_HEADERS)
         
         @response = parse(data)
         success = @response[:status] == 'Approved'

data/lib/active_merchant/billing/integrations.rb

@@ -5,6 +5,7 @@ require 'active_merchant/billing/integrations/chronopay'
 require 'active_merchant/billing/integrations/paypal'
 require 'active_merchant/billing/integrations/nochex'
 require 'active_merchant/billing/integrations/gestpay'
+require 'active_merchant/billing/integrations/two_checkout'
 
 # make the bogus gateway be classified correctly by the inflector
 Inflector.inflections do |inflect|