activemerchant 1.26.0 → 1.27.0

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

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class NetbillingGateway < Gateway
-      URL = 'https://secure.netbilling.com:1402/gw/sas/direct3.1'
+      self.live_url = self.test_url = 'https://secure.netbilling.com:1402/gw/sas/direct3.1'
 
       TRANSACTIONS = {
         :authorization => 'A',
@@ -143,7 +143,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        response = parse(ssl_post(URL, post_data(action, parameters)))
+        response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
         Response.new(success?(response), message_from(response), response,
           :test => test_response?(response),

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

@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
     #               :user                      => "my_ogone_user_id",
     #               :password                  => "my_ogone_pswd",
     #               :signature                 => "my_ogone_sha_signature", # Only if you configured your Ogone environment so.
-    #               :signature_encryptor       => "sha512", # Can be "sha1" (default), "sha256" or "sha512".
+    #               :signature_encryptor       => "sha512", # Can be "none" (default), "sha1", "sha256" or "sha512".
     #                                                       # Must be the same as the one configured in your Ogone account.
     #            )
     #
@@ -122,10 +122,12 @@ module ActiveMerchant #:nodoc:
                                       :pop_ix      => 'POPIX' } # display the identification page in a pop-up window
                                                                 # and remain in the pop-up window.
 
-      OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = "Signature usage will be required from a future release of ActiveMerchant's Ogone Gateway. Please update your Ogone account to use it."
-      OGONE_LOW_ENCRYPTION_DEPRECATION_MESSAGE = "SHA512 signature encryptor will be required from a future release of ActiveMerchant's Ogone Gateway. Please update your Ogone account to use it."
+      OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = "Signature usage will be the default for a future release of ActiveMerchant. You should either begin using it, or update your configuration to explicitly disable it (signature_encryptor: none)"
       OGONE_STORE_OPTION_DEPRECATION_MESSAGE   = "The 'store' option has been renamed to 'billing_id', and its usage is deprecated."
 
+      self.test_url = URLS[:order] % "test"
+      self.live_url = URLS[:order] % "prod"
+
       self.supported_countries = ['BE', 'DE', 'FR', 'NL', 'AT', 'CH']
       # also supports Airplus and UATP
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro]
@@ -370,12 +372,15 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, parameters = {})
         add_pair parameters, 'Operation', action
-        @options[:signature] ? add_signature(parameters) : deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE)
+        add_signature(parameters)
         parameters.to_query
       end
 
       def add_signature(parameters)
-        deprecated(OGONE_LOW_ENCRYPTION_DEPRECATION_MESSAGE) unless @options[:signature_encryptor] == 'sha512'
+        if @options[:signature].blank?
+           deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == "none")
+           return
+        end
 
         sha_encryptor = case @options[:signature_encryptor]
                         when 'sha256'

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

@@ -1,8 +1,8 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class OptimalPaymentGateway < Gateway
-      TEST_URL = 'https://webservices.test.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
-      LIVE_URL = 'https://webservices.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
+      self.test_url = 'https://webservices.test.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
+      self.live_url = 'https://webservices.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['CA', 'US', 'GB']
@@ -91,7 +91,7 @@ module ActiveMerchant #:nodoc:
           raise 'Unknown Action'
         end
         txnRequest = URI.encode(xml)
-        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, "txnMode=#{action}&txnRequest=#{txnRequest}"))
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, "txnMode=#{action}&txnRequest=#{txnRequest}"))
 
         Response.new(successful?(response), message_from(response), hash_from_xml(response),
           :test          => test?,

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

@@ -41,12 +41,12 @@ module ActiveMerchant #:nodoc:
       
       SUCCESS, APPROVED = '0', '00'
       
-      class_attribute :primary_test_url, :secondary_test_url, :primary_live_url, :secondary_live_url
+      class_attribute :secondary_test_url, :secondary_live_url
       
-      self.primary_test_url = "https://orbitalvar1.paymentech.net/authorize"
+      self.test_url = "https://orbitalvar1.paymentech.net/authorize"
       self.secondary_test_url = "https://orbitalvar2.paymentech.net/authorize"
       
-      self.primary_live_url = "https://orbital1.paymentech.net/authorize"
+      self.live_url = "https://orbital1.paymentech.net/authorize"
       self.secondary_live_url = "https://orbital2.paymentech.net/authorize"
       
       self.supported_countries = ["US", "CA"]
@@ -223,7 +223,7 @@ module ActiveMerchant #:nodoc:
       
       def remote_url
         unless $!.class == ActiveMerchant::ConnectionError
-          self.test? ? self.primary_test_url : self.primary_live_url
+          self.test? ? self.test_url : self.live_url
         else
           self.test? ? self.secondary_test_url : self.secondary_live_url
         end

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

@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
     # threed     - must remain blank unless you are using your own 3D Secure server
     #
     class PayGateXmlGateway < Gateway
-      LIVE_URL = 'https://www.paygate.co.za/payxml/process.trans'
+      self.live_url = 'https://www.paygate.co.za/payxml/process.trans'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['US', 'ZA']
@@ -250,7 +250,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, request)
-        response = parse(action, ssl_post(LIVE_URL, request))
+        response = parse(action, ssl_post(self.live_url, request))
         Response.new(successful?(response), message_from(response), response,
           :test           => test?,
           :authorization  => response[:tid]

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

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaySecureGateway < Gateway
-      URL = 'https://clearance.commsecure.com.au/cgi-bin/PSDirect'
+      self.live_url = self.test_url = 'https://clearance.commsecure.com.au/cgi-bin/PSDirect'
       
       self.money_format = :cents
 
@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
       end
        
       def commit(action, money, parameters)
-        response = parse( ssl_post(URL, post_data(action, parameters)) )
+        response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
         
         Response.new(successful?(response), message_from(response), response, 
           :test => test_response?(response), 

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

@@ -1,9 +1,11 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PayboxDirectGateway < Gateway
-      TEST_URL = 'https://preprod-ppps.paybox.com/PPPS.php'
-      LIVE_URL = 'https://ppps.paybox.com/PPPS.php'
-      LIVE_URL_BACKUP = 'https://ppps1.paybox.com/PPPS.php'
+      class_attribute :live_url_backup
+
+      self.test_url   = 'https://preprod-ppps.paybox.com/PPPS.php'
+      self.live_url   = 'https://ppps.paybox.com/PPPS.php'
+      self.live_url_backup = 'https://ppps1.paybox.com/PPPS.php'
 
       # Payment API Version
       API_VERSION = '00103'
@@ -141,8 +143,8 @@ module ActiveMerchant #:nodoc:
         parameters[:montant] = ('0000000000' + (money ? amount(money) : ''))[-10..-1]
         parameters[:devise] = CURRENCY_CODES[options[:currency] || currency(money)]
         request_data = post_data(action,parameters)
-        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request_data))
-        response = parse(ssl_post(LIVE_URL_BACKUP, request_data)) if service_unavailable?(response) && !test?
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, request_data))
+        response = parse(ssl_post(self.live_url_backup, request_data)) if service_unavailable?(response) && !test?
         Response.new(success?(response), message_from(response), response.merge(
           :timestamp => parameters[:dateq]),
           :test => test?,

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

@@ -6,25 +6,25 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PayflowGateway < Gateway
       include PayflowCommonAPI
-      
+
       RECURRING_ACTIONS = Set.new([:add, :modify, :cancel, :inquiry, :reactivate, :payment])
-       
+
       self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :discover, :diners_club]
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_payflow-pro-overview-outside'
       self.display_name = 'PayPal Payflow Pro'
-    
+
       def authorize(money, credit_card_or_reference, options = {})
         request = build_sale_or_authorization_request(:authorization, money, credit_card_or_reference, options)
-      
+
         commit(request, options)
       end
-      
+
       def purchase(money, credit_card_or_reference, options = {})
         request = build_sale_or_authorization_request(:purchase, money, credit_card_or_reference, options)
 
         commit(request, options)
       end
-      
+
       def credit(money, identification_or_credit_card, options = {})
         if identification_or_credit_card.is_a?(String)
           deprecated CREDIT_DEPRECATION_MESSAGE
@@ -36,13 +36,14 @@ module ActiveMerchant #:nodoc:
           commit(request, options)
         end
       end
-      
+
       def refund(money, reference, options = {})
         commit(build_reference_request(:credit, money, reference, options), options)
       end
+
       # Adds or modifies a recurring Payflow profile.  See the Payflow Pro Recurring Billing Guide for more details:
       # https://www.paypal.com/en_US/pdf/PayflowPro_RecurringBilling_Guide.pdf
-      #    
+      #
       # Several options are available to customize the recurring profile:
       #
       # * <tt>profile_id</tt> - is only required for editing a recurring profile
@@ -51,7 +52,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>periodicity</tt> - The frequency that the recurring payments will occur at.  Can be one of
       # :bimonthly, :monthly, :biweekly, :weekly, :yearly, :daily, :semimonthly, :quadweekly, :quarterly, :semiyearly
       # * <tt>payments</tt> - The term, or number of payments that will be made
-      # * <tt>comment</tt> - A comment associated with the profile            
+      # * <tt>comment</tt> - A comment associated with the profile
       def recurring(money, credit_card, options = {})
         options[:name] = credit_card.name if options[:name].blank? && credit_card
         request = build_recurring_request(options[:profile_id] ? :modify : :add, money, options) do |xml|
@@ -59,30 +60,30 @@ module ActiveMerchant #:nodoc:
         end
         commit(request, options.merge(:request_type => :recurring))
       end
-      
+
       def cancel_recurring(profile_id)
         request = build_recurring_request(:cancel, 0, :profile_id => profile_id)
         commit(request, options.merge(:request_type => :recurring))
       end
-      
+
       def recurring_inquiry(profile_id, options = {})
         request = build_recurring_request(:inquiry, nil, options.update( :profile_id => profile_id ))
         commit(request, options.merge(:request_type => :recurring))
-      end   
-      
+      end
+
       def express
         @express ||= PayflowExpressGateway.new(@options)
       end
-      
+
       private
       def build_sale_or_authorization_request(action, money, credit_card_or_reference, options)
         if credit_card_or_reference.is_a?(String)
           build_reference_sale_or_authorization_request(action, money, credit_card_or_reference, options)
-        else  
+        else
           build_credit_card_request(action, money, credit_card_or_reference, options)
-        end  
+        end
       end
-      
+
       def build_reference_sale_or_authorization_request(action, money, reference, options)
         xml = Builder::XmlMarkup.new
         xml.tag! TRANSACTIONS[action] do
@@ -114,9 +115,9 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-      
+
       def build_credit_card_request(action, money, credit_card, options)
-        xml = Builder::XmlMarkup.new 
+        xml = Builder::XmlMarkup.new
         xml.tag! TRANSACTIONS[action] do
           xml.tag! 'PayData' do
             xml.tag! 'Invoice' do
@@ -134,18 +135,18 @@ module ActiveMerchant #:nodoc:
               billing_address = options[:billing_address] || options[:address]
               add_address(xml, 'BillTo', billing_address, options) if billing_address
               add_address(xml, 'ShipTo', options[:shipping_address], options) if options[:shipping_address]
-              
+
               xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
             end
-            
+
             xml.tag! 'Tender' do
               add_credit_card(xml, credit_card)
             end
-          end 
+          end
         end
         xml.target!
       end
-    
+
       def add_credit_card(xml, credit_card)
         xml.tag! 'Card' do
           xml.tag! 'CardType', credit_card_type(credit_card)
@@ -153,7 +154,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'ExpDate', expdate(credit_card)
           xml.tag! 'NameOnCard', credit_card.first_name
           xml.tag! 'CVNum', credit_card.verification_value if credit_card.verification_value?
-          
+
           if requires_start_date_or_issue_number?(credit_card)
             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' => format(credit_card.issue_number, :two_digits)) unless credit_card.issue_number.blank?
@@ -161,33 +162,33 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'ExtData', 'Name' => 'LASTNAME', 'Value' =>  credit_card.last_name
         end
       end
-      
+
       def credit_card_type(credit_card)
         return '' if card_brand(credit_card).blank?
-        
+
         CARD_MAPPING[card_brand(credit_card).to_sym]
       end
-      
+
       def expdate(creditcard)
         year  = sprintf("%.4i", creditcard.year.to_s.sub(/^0+/, ''))
         month = sprintf("%.2i", creditcard.month.to_s.sub(/^0+/, ''))
 
         "#{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_recurring_request(action, money, options)
         unless RECURRING_ACTIONS.include?(action)
           raise StandardError, "Invalid Recurring Profile Action: #{action}"
         end
 
-        xml = Builder::XmlMarkup.new 
+        xml = Builder::XmlMarkup.new
         xml.tag! 'RecurringProfiles' do
           xml.tag! 'RecurringProfile' do
             xml.tag! action.to_s.capitalize do
@@ -199,23 +200,24 @@ module ActiveMerchant #:nodoc:
                   xml.tag! 'Term', options[:payments] unless options[:payments].nil?
                   xml.tag! 'Comment', options[:comment] unless options[:comment].nil?
                   xml.tag! 'RetryNumDays', options[:retry_num_days] unless options[:retry_num_days].nil?
-                
+                  xml.tag! 'MaxFailPayments', options[:max_fail_payments] unless options[:max_fail_payments].nil?
+
                   if initial_tx = options[:initial_transaction]
                     requires!(initial_tx, [:type, :authorization, :purchase])
                     requires!(initial_tx, :amount) if initial_tx[:type] == :purchase
-                      
+
                     xml.tag! 'OptionalTrans', TRANSACTIONS[initial_tx[:type]]
                     xml.tag! 'OptionalTransAmt', amount(initial_tx[:amount]) unless initial_tx[:amount].blank?
                   end
-                  
+
                   if action == :add
                     xml.tag! 'Start', format_rp_date(options[:starting_at] || Date.today + 1 )
                   else
                     xml.tag! 'Start', format_rp_date(options[:starting_at]) unless options[:starting_at].nil?
                   end
-                  
+
                   xml.tag! 'EMail', options[:email] unless options[:email].nil?
-                  
+
                   billing_address = options[:billing_address] || options[:address]
                   add_address(xml, 'BillTo', billing_address, options) if billing_address
                   add_address(xml, 'ShipTo', options[:shipping_address], options) if options[:shipping_address]
@@ -256,8 +258,8 @@ module ActiveMerchant #:nodoc:
           time.to_s
         end
       end
-      
-      def build_response(success, message, response, options = {}) 
+
+      def build_response(success, message, response, options = {})
         PayflowResponse.new(success, message, response, options)
       end
     end

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

@@ -13,6 +13,9 @@ module ActiveMerchant #:nodoc:
         
         base.class_attribute :timeout
         base.timeout = 60
+
+        base.test_url = 'https://pilot-payflowpro.paypal.com'
+        base.live_url = 'https://payflowpro.paypal.com'
         
         # Enable safe retry of failed connections
         # Payflow is safe to retry because retried transactions use the same
@@ -24,8 +27,6 @@ module ActiveMerchant #:nodoc:
       end
       
       XMLNS = 'http://www.paypal.com/XMLPay'
-      TEST_URL = 'https://pilot-payflowpro.paypal.com'
-      LIVE_URL = 'https://payflowpro.paypal.com'
       
       CARD_MAPPING = {
         :visa => 'Visa',
@@ -197,7 +198,7 @@ module ActiveMerchant #:nodoc:
         request = build_request(request_body, options)
         headers = build_headers(request.size)
         
-    	  response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request, headers))
+    	  response = parse(ssl_post(test? ? self.test_url : self.live_url, request, headers))
 
     	  build_response(response[:result] == "0", response[:message], response,
     	    :test => test?,

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.paymentexpress.com/'
       self.display_name = 'PaymentExpress'
 
-      URL = 'https://sec.paymentexpress.com/pxpost.aspx'
+      self.live_url = self.test_url = 'https://sec.paymentexpress.com/pxpost.aspx'
       
       APPROVED = '1'
       
@@ -236,7 +236,7 @@ module ActiveMerchant #:nodoc:
         add_transaction_type(request, action)
         
         # Parse the XML response
-        response = parse( ssl_post(URL, request.to_s) )
+        response = parse( ssl_post(self.live_url, request.to_s) )
         
         # Return a response
         PaymentExpressResponse.new(response[:success] == APPROVED, response[:card_holder_help_text], response,

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

@@ -2,24 +2,18 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # This module is included in both PaypalGateway and PaypalExpressGateway
     module PaypalCommonAPI
-      def self.included(base)
-        base.default_currency = 'USD'
-        base.cattr_accessor :pem_file
-        base.cattr_accessor :signature
-      end
-      
       API_VERSION = '72'
-      
+
       URLS = {
         :test => { :certificate => 'https://api.sandbox.paypal.com/2.0/',
                    :signature   => 'https://api-3t.sandbox.paypal.com/2.0/' },
         :live => { :certificate => 'https://api-aa.paypal.com/2.0/',
                    :signature   => 'https://api-3t.paypal.com/2.0/' }
       }
-      
+
       PAYPAL_NAMESPACE = 'urn:ebay:api:PayPalAPI'
       EBAY_NAMESPACE = 'urn:ebay:apis:eBLBaseComponents'
-      
+
       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'
@@ -28,7 +22,7 @@ module ActiveMerchant #:nodoc:
                                  'xmlns:n1' => EBAY_NAMESPACE,
                                  'env:mustUnderstand' => '0'
                                }
-      
+
       AUSTRALIAN_STATES = {
         'ACT' => 'Australian Capital Territory',
         'NSW' => 'New South Wales',
@@ -39,11 +33,19 @@ module ActiveMerchant #:nodoc:
         'VIC' => 'Victoria',
         'WA'  => 'Western Australia'
       }
-      
+
       SUCCESS_CODES = [ 'Success', 'SuccessWithWarning' ]
-      
+
       FRAUD_REVIEW_CODE = "11610"
-      
+
+      def self.included(base)
+        base.default_currency = 'USD'
+        base.cattr_accessor :pem_file
+        base.cattr_accessor :signature
+        base.live_url = URLS[:live][:signature]
+        base.test_url = URLS[:test][:signature]
+      end
+
       # The gateway must be configured with either your PayPal PEM file
       # or your PayPal API Signature.  Only one is required.
       #
@@ -54,15 +56,14 @@ module ActiveMerchant #:nodoc:
       #                       globally and then you won't need to
       #                       include this option
       #
-      # <tt>:signature</tt>   The text of your PayPal signature. 
+      # <tt>:signature</tt>   The text of your PayPal signature.
       #                       If you are only using one API Signature
       #                       on your site you can declare it
       #                       globally and then you won't need to
       #                       include this option
-      
       def initialize(options = {})
         requires!(options, :login, :password)
-        
+
         headers = {'X-PP-AUTHORIZATION' => options.delete(:auth_signature), 'X-PAYPAL-MESSAGE-PROTOCOL' => 'SOAP11'} if options[:auth_signature]
         @options = {
           :pem => pem_file,
@@ -70,14 +71,14 @@ module ActiveMerchant #:nodoc:
           :headers => headers || {}
         }.update(options)
 
-        
+
         if @options[:pem].blank? && @options[:signature].blank?
-          raise ArgumentError, "An API Certificate or API Signature is required to make requests to PayPal" 
+          raise ArgumentError, "An API Certificate or API Signature is required to make requests to PayPal"
         end
-        
+
         super
       end
-      
+
       def test?
         @options[:test] || Base.gateway_mode == :test
       end
@@ -85,11 +86,11 @@ module ActiveMerchant #:nodoc:
       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
-      
+
       # Transfer money to one or more recipients.
       #
       #   gateway.transfer 1000, 'bob@example.com',
@@ -107,7 +108,19 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options = {})
         commit 'DoVoid', build_void_request(authorization, options)
       end
-      
+
+      # Refunds a transaction.
+      #
+      # For a full refund pass nil for the amount:
+      #
+      #    gateway.refund nil, 'G39883289DH238'
+      #
+      # This will automatically make the :refund_type be "Full".
+      #
+      # For a partial refund just pass the amount as usual:
+      #
+      #    gateway.refund 100, 'UBU83983N920'
+      #
       def refund(money, identification, options = {})
         commit 'RefundTransaction', build_refund_request(money, identification, options)
       end
@@ -135,7 +148,7 @@ module ActiveMerchant #:nodoc:
       #
       #     0 – You do not require that the buyer’s shipping address be a confirmed address.
       #     1 – You require that the buyer’s shipping address be a confirmed address.
-      #     
+      #
       # * <tt>:merchant_session_id</tt> -- (Optional) Your buyer session identification token.
       # * <tt>:return_fmf_details</tt> -- (Optional) Flag to indicate whether you want the results returned by Fraud Management Filters. By default, you do not receive this information. It is one of the following values:
       #
@@ -146,13 +159,13 @@ module ActiveMerchant #:nodoc:
       #
       #     <PP * | PAYPAL *><Merchant descriptor as set in the Payment Receiving Preferences><1 space><soft descriptor>
       #     The soft descriptor can contain only the following characters:
-      #     
+      #
       #     Alphanumeric characters
       #     - (dash)
       #     * (asterisk)
       #     . (period)
       #     {space}
-      # 
+      #
       def reference_transaction(money, options = {})
         requires!(options, :reference_id)
         commit 'DoReferenceTransaction', build_reference_transaction_request(money, options)
@@ -191,7 +204,7 @@ module ActiveMerchant #:nodoc:
       #     Shipping – Only transactions involving UPS shipping fees
       #     BalanceAffecting – Only transactions that affect the account balance
       #     ECheck – Only transactions involving eCheck
-      # 
+      #
       # * <tt>:currency_code </tt> -- (Optional) Search by currency code.
       # * <tt>:status</tt> -- (Optional) Search by transaction status. It is one of the following values:
       #     One of:
@@ -200,7 +213,7 @@ module ActiveMerchant #:nodoc:
       #     Success – The payment has been completed and the funds have been added successfully to your account balance.
       #     Denied – You denied the payment. This happens only if the payment was previously pending.
       #     Reversed – A payment was reversed due to a chargeback or other type of reversal. The funds have been removed from your account balance and returned to the buyer.
-      #   
+      #
       def transaction_search(options)
         requires!(options, :start_date)
         commit 'TransactionSearch', build_transaction_search(options)
@@ -222,24 +235,24 @@ module ActiveMerchant #:nodoc:
 
       # DoAuthorization takes the transaction_id returned when you call
       # DoExpressCheckoutPayment with a PaymentAction of 'Order'.
-      # When you did that, you created an order authorization subject to settlement 
+      # When you did that, you created an order authorization subject to settlement
       # with PayPal DoAuthorization and DoCapture
-      # 
+      #
       # ==== Parameters:
       # * <tt>:transaction_id</tt> -- The ID returned by DoExpressCheckoutPayment with a PaymentAction of 'Order'.
       # * <tt>:money</tt> -- The amount of money to be authorized for this purchase.
-      # 
+      #
       def authorize_transaction(transaction_id, money, options = {})
         commit 'DoAuthorization', build_do_authorize(transaction_id, money, options)
       end
 
-      # The ManagePendingTransactionStatus API operation accepts or denys a 
+      # The ManagePendingTransactionStatus API operation accepts or denys a
       # pending transaction held by Fraud Management Filters.
       #
       # ==== Parameters:
       # * <tt>:transaction_id</tt> -- The ID of the transaction held by Fraud Management Filters.
       # * <tt>:action</tt> -- Either 'Accept' or 'Deny'
-      # 
+      #
       def manage_pending_transaction(transaction_id, action)
         commit 'ManagePendingTransactionStatus', build_manage_pending_transaction_status(transaction_id, action)
       end
@@ -271,7 +284,7 @@ module ActiveMerchant #:nodoc:
 
       def build_reauthorize_request(money, authorization, options)
         xml = Builder::XmlMarkup.new
-        
+
         xml.tag! 'DoReauthorizationReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoReauthorizationRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
@@ -280,12 +293,12 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        xml.target!        
+        xml.target!
       end
-          
-      def build_capture_request(money, authorization, options)   
+
+      def build_capture_request(money, authorization, options)
         xml = Builder::XmlMarkup.new
-        
+
         xml.tag! 'DoCaptureReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoCaptureRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
@@ -297,28 +310,28 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        xml.target!        
+        xml.target!
       end
-      
+
       def build_refund_request(money, identification, options)
         xml = Builder::XmlMarkup.new
-            
+
         xml.tag! 'RefundTransactionReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'RefundTransactionRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'TransactionID', identification
-            xml.tag! 'Amount', amount(money), 'currencyID' => options[:currency] || currency(money)
-            xml.tag! 'RefundType', 'Partial'
+            xml.tag! 'Amount', amount(money), 'currencyID' => (options[:currency] || currency(money)) if money.present?
+            xml.tag! 'RefundType', (options[:refund_type] || (money.present? ? 'Partial' : 'Full'))
             xml.tag! 'Memo', options[:note] unless options[:note].blank?
           end
         end
-      
-        xml.target!        
+
+        xml.target!
       end
-      
+
       def build_void_request(authorization, options)
         xml = Builder::XmlMarkup.new
-        
+
         xml.tag! 'DoVoidReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoVoidRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
@@ -327,15 +340,15 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        xml.target!        
+        xml.target!
       end
-      
-      def build_mass_pay_request(*args)   
+
+      def build_mass_pay_request(*args)
         default_options = args.last.is_a?(Hash) ? args.pop : {}
         recipients = args.first.is_a?(Array) ? args : [args]
-        
+
         xml = Builder::XmlMarkup.new
-        
+
         xml.tag! 'MassPayReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'MassPayRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
@@ -351,7 +364,7 @@ module ActiveMerchant #:nodoc:
             end
           end
         end
-        
+
         xml.target!
       end
 
@@ -361,12 +374,12 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Action', action
         end
       end
-      
+
       def build_reference_transaction_request(money, options)
         opts = options.dup
         opts[:ip_address] ||= opts[:ip]
         currency_code = opts[:currency] || currency(money)
-        reference_transaction_optional_fields = %w{ n2:ReferenceID n2:PaymentAction 
+        reference_transaction_optional_fields = %w{ n2:ReferenceID n2:PaymentAction
                                                     n2:PaymentType n2:IPAddress
                                                     n2:ReqConfirmShipping n2:MerchantSessionId
                                                     n2:ReturnFMFDetails n2:SoftDescriptor }
@@ -426,18 +439,18 @@ module ActiveMerchant #:nodoc:
 
       def legacy_parse(action, xml)
         response = {}
-        
+
         error_messages = []
         error_codes = []
-        
+
         xml = REXML::Document.new(xml)
         if root = REXML::XPath.first(xml, "//#{action}Response")
-          root.elements.each do |node|            
+          root.elements.each do |node|
             case node.name
             when 'Errors'
               short_message = nil
               long_message = nil
-              
+
               node.elements.each do |child|
                 case child.name
                 when "LongMessage"
@@ -479,20 +492,20 @@ module ActiveMerchant #:nodoc:
 
       def build_request(body)
         xml = Builder::XmlMarkup.new
-        
+
         xml.instruct!
         xml.tag! 'env:Envelope', ENVELOPE_NAMESPACES do
           xml.tag! 'env:Header' do
             add_credentials(xml) unless @options[:headers] && @options[:headers]['X-PP-AUTHORIZATION']
           end
-          
+
           xml.tag! 'env:Body' do
             xml << body
           end
         end
         xml.target!
       end
-     
+
       def add_credentials(xml)
         xml.tag! 'RequesterCredentials', CREDENTIALS_NAMESPACES do
           xml.tag! 'n1:Credentials' do
@@ -503,7 +516,7 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-      
+
       def add_address(xml, element, address)
         return if address.nil?
         xml.tag! element do
@@ -517,7 +530,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:PostalCode', address[:zip]
         end
       end
-      
+
       def add_payment_details_items_xml(xml, options, currency_code)
         options[:items].each do |item|
           xml.tag! 'n2:PaymentDetailsItem' do
@@ -533,11 +546,11 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-      
+
       def add_payment_details(xml, money, currency_code, options = {})
         xml.tag! 'n2:PaymentDetails' do
           xml.tag! 'n2:OrderTotal', localized_amount(money, currency_code), 'currencyID' => currency_code
-          
+
           # All of the values must be included together and add up to the order total
           if [:subtotal, :shipping, :handling, :tax].all?{ |o| options.has_key?(o) }
             xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal], currency_code), 'currencyID' => currency_code
@@ -551,36 +564,36 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:InsuranceOptionOffered', options[:insurance_option_offered] if options.has_key?(:insurance_option_offered)
 
           xml.tag! 'n2:OrderDescription', options[:description] unless options[:description].blank?
-          
+
           # Custom field Character length and limitations: 256 single-byte alphanumeric characters
-          xml.tag! 'n2:Custom', options[:custom] unless options[:custom].blank? 
+          xml.tag! 'n2:Custom', options[:custom] unless options[:custom].blank?
 
           xml.tag! 'n2:InvoiceID', (options[:order_id] || options[:invoice_id]) unless (options[:order_id] || options[:invoice_id]).blank?
-          xml.tag! 'n2:ButtonSource', application_id.to_s.slice(0,32) unless application_id.blank? 
+          xml.tag! 'n2:ButtonSource', application_id.to_s.slice(0,32) unless application_id.blank?
 
-          # The notify URL applies only to DoExpressCheckoutPayment. 
+          # The notify URL applies only to DoExpressCheckoutPayment.
           # This value is ignored when set in SetExpressCheckout or GetExpressCheckoutDetails
-          xml.tag! 'n2:NotifyURL', options[:notify_url] unless options[:notify_url].blank? 
-                    
+          xml.tag! 'n2:NotifyURL', options[:notify_url] unless options[:notify_url].blank?
+
           add_address(xml, 'n2:ShipToAddress', options[:shipping_address]) unless options[:shipping_address].blank?
-          
+
           add_payment_details_items_xml(xml, options, currency_code) unless options[:items].blank?
 
           add_express_only_payment_details(xml, options) if options[:express_request]
 
           # Any value other than Y – This is not a recurring transaction
-          # To pass Y in this field, you must have established a billing agreement with 
+          # To pass Y in this field, you must have established a billing agreement with
           # the buyer specifying the amount, frequency, and duration of the recurring payment.
           # requires version 80.0 of the API
-          xml.tag! 'n2:Recurring', options[:recurring] unless options[:recurring].blank? 
+          xml.tag! 'n2:Recurring', options[:recurring] unless options[:recurring].blank?
         end
       end
 
       def add_express_only_payment_details(xml, options = {})
-        add_optional_fields(xml, 
-                            %w{n2:NoteText          n2:SoftDescriptor 
-                               n2:TransactionId     n2:AllowedPaymentMethodType 
-                               n2:PaymentRequestID  n2:PaymentAction}, 
+        add_optional_fields(xml,
+                            %w{n2:NoteText          n2:SoftDescriptor
+                               n2:TransactionId     n2:AllowedPaymentMethodType
+                               n2:PaymentRequestID  n2:PaymentAction},
                             options)
       end
 
@@ -599,14 +612,14 @@ module ActiveMerchant #:nodoc:
         end
         xml
       end
-      
+
       def endpoint_url
         URLS[test? ? :test : :live][@options[:signature].blank? ? :certificate : :signature]
       end
 
       def commit(action, request)
         response = parse(action, ssl_post(endpoint_url, build_request(request), @options[:headers]))
-       
+
         build_response(successful?(response), message_from(response), response,
     	    :test => test?,
     	    :authorization => authorization_from(response),
@@ -615,19 +628,19 @@ module ActiveMerchant #:nodoc:
     	    :cvv_result => response[:cvv2_code]
         )
       end
-      
+
       def fraud_review?(response)
         response[:error_codes] == FRAUD_REVIEW_CODE
       end
-      
+
       def authorization_from(response)
         response[:transaction_id] || response[:authorization_id] || response[:refund_transaction_id] # middle one is from reauthorization
       end
-      
+
       def successful?(response)
         SUCCESS_CODES.include?(response[:ack])
       end
-      
+
       def message_from(response)
         response[:message] || response[:ack]
       end