activemerchant 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,5 +1,33 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.4.2 (April 24, 2009)
+
+* Fix typo in Authorize.net CIM [infused]
+* Add missing ISO countries [Edward Ocampo-Gooding]
+* Add support for Guernsey to country.rb [cody]
+* Add American Express to the MonerisGateway [cody]
+* Use :words_connector instead of connector in RequiresParameters [cody]
+* Fixed CreditCard not validating start_month and start_year when set as string [Tekin]
+* Update PostsData to support get requests [cody]
+* Fix broken Quickpay remote test [cody]
+* Update Quickpay gateway to v3. Add support for offsite integration for Danish Dankort cards [Lars Pind]
+* Use default partner id when passed in :partner is blank with PayflowGateway [cody]
+* Remove PayflowGateway.certification_id [cody]
+* Set Response#test? to true in TrustCommerce gateway when using the demo account in production [cody]
+* Correctly set Sage.supported_countries [cody]
+* Add BogusGateway#void [Donald Ball]
+* Fix PSL gateway capturing [cody]
+* Fix failed Visa debit purchases with PSL gateway start date info is present [cody]
+* Support personal fixtures file on Windows [cody]
+* Clearer variable naming for BraintreeGateway#authorize [Jonathan S. Katz]
+* Fix brittle Authorize.net tests [cody]
+* Add support for Authorize.net duplicate window [Seamus Abshere]
+* Return transaction id for PayPal refunds [jxtps435]
+* Allow storage of e-checks with BraintreeGateway [jimiray]
+* Add test URL to PayJunction gateway [boomtowndesigngroup]
+* More robust parsing for Wirecard gateway [Soleone]
+* Pass the issue number to CardStream verbatim and update test card numbers [Soleone]
+
 == Version 1.4.1 (December 9, 2008)
 
 * Update CardStream URL. Note that you will also need to update your login id. [cody]

data/Rakefile

@@ -4,11 +4,9 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require File.dirname(__FILE__) + '/lib/tasks/cia'
 require File.dirname(__FILE__) + '/lib/support/gateway_support'
 
-
-PKG_VERSION = "1.4.1"
+PKG_VERSION = "1.4.2"
 PKG_NAME = "activemerchant"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
@@ -86,7 +84,7 @@ spec = Gem::Specification.new do |s|
   s.email = "tobi@leetsoft.com"
   s.homepage = "http://activemerchant.org/"
   
-  s.add_dependency('activesupport', '>= 1.4.1')
+  s.add_dependency('activesupport', '>= 2.3.2')
   s.add_dependency('builder', '>= 2.0.0')
   
   s.signing_key = ENV['GEM_PRIVATE_KEY']

data/lib/active_merchant/billing/credit_card.rb

@@ -112,6 +112,8 @@ module ActiveMerchant #:nodoc:
       def before_validate #:nodoc: 
         self.month = month.to_i
         self.year  = year.to_i
+        self.start_month = start_month.to_i unless start_month.nil?
+        self.start_year = start_year.to_i unless start_year.nil?
         self.number = number.to_s.gsub(/[^\d]/, "")
         self.type.downcase! if type.respond_to?(:downcase)
         self.type = self.class.type?(number) if type.blank?

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

@@ -33,6 +33,8 @@ module ActiveMerchant #:nodoc:
 
       self.arb_test_url = 'https://apitest.authorize.net/xml/v1/request.api'
       self.arb_live_url = 'https://api.authorize.net/xml/v1/request.api'
+      
+      class_inheritable_accessor :duplicate_window
 
       APPROVED, DECLINED, ERROR, FRAUD_REVIEW = 1, 2, 3, 4
 
@@ -86,6 +88,7 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard)
         add_address(post, options)
         add_customer_data(post, options)
+        add_duplicate_window(post)
 
         commit('AUTH_ONLY', money, post)
       end
@@ -103,6 +106,7 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard)
         add_address(post, options)
         add_customer_data(post, options)
+        add_duplicate_window(post)
 
         commit('AUTH_CAPTURE', money, post)
       end
@@ -319,6 +323,15 @@ module ActiveMerchant #:nodoc:
           post[:customer_ip] = options[:ip]
         end
       end
+      
+      # x_duplicate_window won't be sent by default, because sending it changes the response.
+      # "If this field is present in the request with or without a value, an enhanced duplicate transaction response will be sent."
+      # (as of 2008-12-30) http://www.authorize.net/support/AIM_guide_SCC.pdf
+      def add_duplicate_window(post)
+        unless duplicate_window.nil?
+          post[:duplicate_window] = duplicate_window
+        end
+      end
 
       def add_address(post, options)
 

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

@@ -1,6 +1,6 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    # ==== Custotmer Information Manager (CIM)
+    # ==== Customer Information Manager (CIM)
     # 
     # The Authorize.Net Customer Information Manager (CIM) is an optional additional service that allows you to store sensitive payment information on
     # Authorize.Net's servers, simplifying payments for returning customers and recurring transactions. It can also help with Payment Card Industry (PCI) 

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

@@ -10,6 +10,7 @@ module ActiveMerchant #:nodoc:
       CREDIT_ERROR_MESSAGE = "Bogus Gateway: Use trans_id 1 for success, 2 for exception and anything else for error"
       UNSTORE_ERROR_MESSAGE = "Bogus Gateway: Use trans_id 1 for success, 2 for exception and anything else for error"
       CAPTURE_ERROR_MESSAGE = "Bogus Gateway: Use authorization number 1 for exception, 2 for error and anything else for success"
+      VOID_ERROR_MESSAGE = "Bogus Gateway: Use authorization number 1 for exception, 2 for error and anything else for success"
       
       self.supported_countries = ['US']
       self.supported_cardtypes = [:bogus]
@@ -59,6 +60,17 @@ module ActiveMerchant #:nodoc:
           Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money.to_s}, :test => true)
         end
       end
+
+      def void(ident, options = {})
+        case ident
+        when '1'
+          raise Error, VOID_ERROR_MESSAGE
+        when '2'
+          Response.new(false, FAILURE_MESSAGE, {:authorization => ident, :error => FAILURE_MESSAGE }, :test => true)
+        else
+          Response.new(true, SUCCESS_MESSAGE, {:authorization => ident}, :test => true)
+        end
+      end
       
       def store(creditcard, options = {})
         case creditcard.number
@@ -83,4 +95,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

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

@@ -22,11 +22,11 @@ module ActiveMerchant #:nodoc:
       # Pass :store => some_number_or_string to specify the
       # customer_vault_id BrainTree should use (make sure it's
       # unique).
-      def authorize(money, creditcard, options = {})
+      def authorize(money, payment_source, options = {})
         post = {}
         add_invoice(post, options)
-        add_payment_source(post, creditcard,options)        
-        add_address(post, creditcard, options)        
+        add_payment_source(post, payment_source, options)        
+        add_address(post, payment_source, options)        
         add_customer_data(post, options)
         
         commit('auth', money, post)
@@ -77,9 +77,17 @@ module ActiveMerchant #:nodoc:
     
       # To match the other stored-value gateways, like TrustCommerce,
       # store and unstore need to be defined
-      def store(creditcard, options = {})
+      def store(payment_source, options = {})
         billing_id = options.delete(:billing_id).to_s || true
-        authorize(100, creditcard, options.merge(:store => billing_id))
+        post = {}
+        post[:customer_vault] = 'add_customer'
+        if billing_id
+          post[:customer_vault_id] = billing_id
+        end
+        add_payment_source(post, payment_source, options)
+        add_address(post, payment_source, options)
+        add_customer_data(post, options)
+        commit(nil,nil, post)
       end
       
       alias_method :unstore, :delete

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

@@ -151,16 +151,12 @@ module ActiveMerchant #:nodoc:
           add_pair(post, :StartDateMM, format(credit_card.start_month, :two_digits))
           add_pair(post, :StartDateYY, format(credit_card.start_year, :two_digits))
           
-          add_pair(post, :IssueNumber, format_issue_number(credit_card))
+          add_pair(post, :IssueNumber, credit_card.issue_number)
         end
         
         add_pair(post, :CV2, credit_card.verification_value)
       end
       
-      def format_issue_number(credit_card)
-        card_brand(credit_card).to_s == 'solo' ? format(credit_card.issue_number, :two_digits) : credit_card.issue_number
-      end
-
       def commit(action, parameters)
         response = parse( ssl_post(URL, post_data(action, parameters)) )
 

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

@@ -14,7 +14,7 @@ module ActiveMerchant #:nodoc:
       LIVE_URL = 'https://www3.moneris.com/gateway2/servlet/MpgRequest'
       
       self.supported_countries = ['CA']
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = [:visa, :master, :american_express]
       self.homepage_url = 'http://www.moneris.com/'
       self.display_name = 'Moneris'
   

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

@@ -98,8 +98,12 @@ module ActiveMerchant #:nodoc:
     # See #recurring for periodic transaction fields
     class PayJunctionGateway < Gateway
       API_VERSION   = '1.2'
-      URL      = 'https://payjunction.com/quick_link' # also handles test requests 
-      
+
+      class_inheritable_accessor :test_url, :live_url
+
+      self.test_url = "https://demo.payjunction.com/quick_link"
+      self.live_url = "https://payjunction.com/quick_link"
+
       TEST_LOGIN = 'pj-ql-01'
       TEST_PASSWORD = 'pj-ql-01p'
       
@@ -318,7 +322,9 @@ module ActiveMerchant #:nodoc:
       end
       
       def commit(action, parameters)
-        response = parse( ssl_post(URL, post_data(action, parameters)) )
+        url = test? ? self.test_url : self.live_url
+
+        response = parse( ssl_post(url, post_data(action, parameters)) )
         
         Response.new(successful?(response), message_from(response), response, 
           :test => test?, 

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

@@ -4,10 +4,6 @@ module ActiveMerchant #:nodoc:
       def self.included(base)
         base.default_currency = 'USD'
           
-        # The certification id requirement has been removed by Payflow
-        # This is no longer being sent in the requests to the gateway
-        base.class_inheritable_accessor :certification_id
-
         base.class_inheritable_accessor :partner
         
         # Set the default partner to PayPal
@@ -59,11 +55,9 @@ module ActiveMerchant #:nodoc:
           
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = {
-          :certification_id => self.class.certification_id,
-          :partner => self.class.partner
-        }.update(options)
         
+        @options = options
+        @options[:partner] = partner if @options[:partner].blank?
         super
       end  
       

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

@@ -310,7 +310,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def authorization_from(response)
-        response[:transaction_id] || response[:authorization_id] # latter one is from reauthorization
+        response[:transaction_id] || response[:authorization_id] || response[:refund_transaction_id] # middle one is from reauthorization
       end
       
       def successful?(response)

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

@@ -163,6 +163,7 @@ module ActiveMerchant
       
         add_amount(post, money, DISPATCH_NOW, options)
         add_reference(post, authorization)
+        add_purchase_details(post)
 
         commit(post)
       end
@@ -175,9 +176,12 @@ module ActiveMerchant
         post[:EMVTerminalType] = EMV_TERMINAL_TYPE
         post[:ExpMonth] = credit_card.month
         post[:ExpYear] = credit_card.year
-        post[:IssueNumber] = credit_card.issue_number unless credit_card.issue_number.blank?
-        post[:StartMonth] = credit_card.start_month unless credit_card.start_month.blank?
-        post[:StartYear] = credit_card.start_year unless credit_card.start_year.blank?
+        
+        if requires_start_date_or_issue_number?(credit_card)        
+          post[:IssueNumber] = credit_card.issue_number unless credit_card.issue_number.blank?
+          post[:StartMonth] = credit_card.start_month unless credit_card.start_month.blank?
+          post[:StartYear] = credit_card.start_year unless credit_card.start_year.blank?
+        end
         
         # CV2 check
         post[:AVSCV2Check] = credit_card.verification_value? ? 'YES' : 'NO'

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

@@ -4,7 +4,7 @@ require 'digest/md5'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class QuickpayGateway < Gateway
-      URL = 'https://secure.quickpay.dk/transaction.php'
+      URL = 'https://secure.quickpay.dk/api'
 
       self.default_currency = 'DKK'  
       self.money_format = :cents
@@ -13,31 +13,19 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://quickpay.dk/'
       self.display_name = 'Quickpay'
       
-      TRANSACTIONS = {
-        :authorization => '1100',
-        :capture       => '1220',
-        :void          => '1420',
-        :credit        => 'credit'
-      }
-      
-      POS_CODES = {
-        :mail               => '100020100110',
-        :phone              => '100030100110',
-        :internet           => 'L00500L00130',
-        :internet_secure    => 'K00500K00130',
-        :internet_edankort  => 'KM0500R00130',
-        :internet_recurring => 'K00540K00130' 
-      }
+      PROTOCOL = 3
       
       MD5_CHECK_FIELDS = {
-        :authorization    => [:msgtype, :cardnumber, :amount, :expirationdate, :posc, :ordernum, :currency, :cvd, :merchant, :authtype, :reference, :transaction],
-        :capture => [:msgtype, :amount, :merchant, :transaction],
-        :void    => [:msgtype, :merchant, :transaction],
-        :credit  => [:msgtype, :amount, :merchant, :transaction]
+        :authorize => [:protocol, :msgtype, :merchant, :ordernumber, :amount, :currency, :autocapture, :cardnumber, :expirationdate, :cvd, :cardtypelock],
+        :capture   => [:protocol, :msgtype, :merchant, :amount, :transaction],
+        :cancel    => [:protocol, :msgtype, :merchant, :transaction],
+        :refund    => [:protocol, :msgtype, :merchant, :amount, :transaction],
+        :subscribe => [:protocol, :msgtype, :merchant, :ordernumber, :cardnumber, :expirationdate, :cvd, :cardtypelock, :description],
+        :recurring => [:protocol, :msgtype, :merchant, :ordernumber, :amount, :currency, :autocapture, :transaction],
+        :status    => [:protocol, :msgtype, :merchant, :transaction],
+        :chstatus  => [:protocol, :msgtype, :merchant],
       }
       
-      CURRENCIES = [ 'DKK', 'EUR', 'NOK', 'GBP', 'USD' ]
-      
       APPROVED = '000'
       
       # The login is the QuickpayId
@@ -48,26 +36,33 @@ module ActiveMerchant #:nodoc:
         super
       end  
       
-      def authorize(money, creditcard, options = {})
+      def authorize(money, credit_card_or_reference, options = {})
+        post = {}
+        
+        add_amount(post, money, options)
+        add_invoice(post, options)
+        add_creditcard_or_reference(post, credit_card_or_reference, options)
+        add_autocapture(post, false)
+
+        commit(recurring_or_authorize(credit_card_or_reference), post)
+      end
+            
+      def purchase(money, credit_card_or_reference, options = {})
         post = {}
         
         add_amount(post, money, options)
-        add_creditcard(post, creditcard)        
+        add_creditcard_or_reference(post, credit_card_or_reference, options)
         add_invoice(post, options)
+        add_autocapture(post, true)
 
-        commit(:authorization, post)
+        commit(recurring_or_authorize(credit_card_or_reference), post)
       end
       
-      def purchase(money, creditcard, options = {})
-        auth = authorize(money, creditcard, options)
-        auth.success? ? capture(money, auth.authorization) : auth
-      end                       
-    
       def capture(money, authorization, options = {})
         post = {}
         
         add_reference(post, authorization)
-        add_amount(post, money)
+        add_amount_without_currency(post, money)
         
         commit(:capture, post)
       end
@@ -77,18 +72,28 @@ module ActiveMerchant #:nodoc:
         
         add_reference(post, identification)
         
-        commit(:void, post)
+        commit(:cancel, post)
       end
       
       def credit(money, identification, options = {})
         post = {}
-        
-        add_amount(post, money)
+
+        add_amount_without_currency(post, money)
         add_reference(post, identification)
+
+        commit(:refund, post)
+      end
+      
+      def store(creditcard, options = {})                       
+        post = {}
         
-        commit(:credit, post)
+        add_creditcard(post, creditcard, options)
+        add_invoice(post, options)
+        add_description(post, options)
+
+        commit(:subscribe, post)
       end
-    
+      
       private                       
   
       def add_amount(post, money, options = {})
@@ -96,21 +101,45 @@ module ActiveMerchant #:nodoc:
         post[:currency] = options[:currency] || currency(money)
       end
       
+      def add_amount_without_currency(post, money, options = {})
+        post[:amount] = amount(money)
+      end
+      
       def add_invoice(post, options)
-        post[:ordernum] = format_order_number(options[:order_id])
-        post[:posc]   = POS_CODES[:internet_secure]
+        post[:ordernumber] = format_order_number(options[:order_id])
       end
       
-      def add_creditcard(post, credit_card)
+      def add_creditcard(post, credit_card, options)
         post[:cardnumber]     = credit_card.number   
         post[:cvd]            = credit_card.verification_value
-        post[:expirationdate] = expdate(credit_card) 
+        post[:expirationdate] = expdate(credit_card)
+        post[:cardtypelock]   = options[:cardtypelock] unless options[:cardtypelock].blank?
       end
       
       def add_reference(post, identification)
         post[:transaction] = identification
       end
       
+      def add_creditcard_or_reference(post, credit_card_or_reference, options)
+        if credit_card_or_reference.is_a?(String)
+          add_reference(post, credit_card_or_reference)
+        else
+          add_creditcard(post, credit_card_or_reference, options)
+        end
+      end        
+      
+      def add_autocapture(post, autocapture)
+        post[:autocapture] = autocapture ? 1 : 0
+      end
+      
+      def recurring_or_authorize(credit_card_or_reference)
+        credit_card_or_reference.is_a?(String) ? :recurring : :authorize
+      end
+
+      def add_description(post, options)
+        post[:description] = options[:description]
+      end
+      
       def commit(action, params)
         response = parse(ssl_post(URL, post_data(action, params)))
         
@@ -129,8 +158,8 @@ module ActiveMerchant #:nodoc:
         
         doc = REXML::Document.new(data)
         
-        doc.root.attributes.each do |name, value|
-          response[name.to_sym] = value
+        doc.root.elements.each do |element|
+          response[element.name.to_sym] = element.text
         end
         
         response
@@ -138,22 +167,22 @@ module ActiveMerchant #:nodoc:
 
       def message_from(response)
         case response[:qpstat]
-        when '008'
-          response[:qpstatmsg].to_s.scan(/[A-Z][a-z0-9 \/]+/).to_sentence
-        else
+        when '008'   # Error in request data
+          response[:qpstatmsg].to_s
+          #.scan(/[A-Z][a-z0-9 \/]+/).to_sentence
+        else          
           response[:qpstatmsg].to_s
         end
       end
       
       def post_data(action, params = {})
-        params[:merchant]   = @options[:login]
-        params[:msgtype]    = TRANSACTIONS[action]
-        
-        check_field = (action == :authorization) ? :md5checkV2 : :md5check
-        params[check_field] = generate_check_hash(action, params)
+        params[:protocol] = PROTOCOL
+        params[:msgtype]  = action.to_s
+        params[:merchant] = @options[:login]
+        #params[:testmode] = '1' if test?
+        params[:md5check] = generate_check_hash(action, params)
         
-        request = params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
-        request
+        params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
   
       def generate_check_hash(action, params)
@@ -163,7 +192,7 @@ module ActiveMerchant #:nodoc:
         
         # Add the md5checkword
         string << @options[:password].to_s
-        
+
         Digest::MD5.hexdigest(string)
       end
       
@@ -174,8 +203,9 @@ module ActiveMerchant #:nodoc:
         "#{year}#{month}"
       end
       
+      # Limited to 20 digits max
       def format_order_number(number)
-        number.to_s.gsub(/[^0-9]/, '').rjust(4, "0")
+        number.to_s.gsub(/[^\w_]/, '').rjust(4, "0")[0...20]
       end
     end
   end