activemerchant 1.32.0 → 1.33.0

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

@@ -1,3 +1,4 @@
+require 'nokogiri'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module PayflowCommonAPI
@@ -140,17 +141,18 @@ module ActiveMerchant #:nodoc:
 
       def parse(data)
         response = {}
-        xml = REXML::Document.new(data)
-        root = REXML::XPath.first(xml, "//ResponseData")
+        xml = Nokogiri::XML(data)
+        xml.remove_namespaces!
+        root = xml.xpath("//ResponseData")
 
         # REXML::XPath in Ruby 1.8.6 is now unable to match nodes based on their attributes
-        tx_result = REXML::XPath.first(root, "//TransactionResult")
+        tx_result = root.xpath(".//TransactionResult").first
 
-        if tx_result && tx_result.attributes['Duplicate'] == "true"
+        if tx_result && tx_result.attributes['Duplicate'].to_s == "true"
           response[:duplicate] = true
         end
 
-        root.elements.to_a.each do |node|
+        root.xpath(".//*").each do |node|
           parse_element(response, node)
         end
 
@@ -166,14 +168,14 @@ module ActiveMerchant #:nodoc:
           # in an RPPaymentResults element so we'll come here multiple times
           response[node_name] ||= []
           response[node_name] << ( payment_result_response = {} )
-          node.elements.each{ |e| parse_element(payment_result_response, e) }
-        when node.has_elements?
-          node.elements.each{|e| parse_element(response, e) }
+          node.xpath(".//*").each{ |e| parse_element(payment_result_response, e) }
+        when node.xpath(".//*").to_a.any?
+          node.xpath(".//*").each{|e| parse_element(response, e) }
         when node_name.to_s =~ /amt$/
           # *Amt elements don't put the value in the #text - instead they use a Currency attribute
-          response[node_name] = node.attributes['Currency']
+          response[node_name] = node.attributes['Currency'].to_s
         when node_name == :ext_data
-          response[node.attributes['Name'].underscore.to_sym] = node.attributes['Value']
+          response[node.attributes['Name'].to_s.underscore.to_sym] = node.attributes['Value'].to_s
         else
           response[node_name] = node.text
         end

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

@@ -1,13 +1,13 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaymillGateway < Gateway
-      self.supported_countries = %w(AD AT BE CY CZ DE DK EE ES FI FO FR GB GR
-                                    HU IE IL IS IT LI LT LU LV MT NL NO PL PT
-                                    SE SI SK TR VA)
+      self.supported_countries = %w(AD AT BE CH CY CZ DE DK EE ES FI FO FR GB GR
+                                    HU IE IL IS IT LI LT LU LV MT NL NO PL PT SE
+                                    SI SK TR VA)
 
       self.supported_cardtypes = [:visa, :master]
       self.homepage_url = 'https://paymill.com'
-      self.display_name = 'Paymill'
+      self.display_name = 'PAYMILL'
       self.money_format = :cents
       self.default_currency = 'EUR'
 
@@ -16,17 +16,27 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def purchase(money, credit_card, options = {})
-        MultiResponse.run do |r|
-          r.process { save_card(credit_card) }
-          r.process { purchase_with_token(money, r.authorization, options) }
+      def purchase(money, payment_method, options = {})
+        case payment_method
+        when String
+          purchase_with_token(money, payment_method, options)
+        else
+          MultiResponse.run do |r|
+            r.process { save_card(payment_method) }
+            r.process { purchase_with_token(money, r.authorization, options) }
+          end
         end
       end
 
-      def authorize(money, credit_card, options = {})
-        MultiResponse.run do |r|
-          r.process { save_card(credit_card) }
-          r.process { authorize_with_token(money, r.authorization, options) }
+      def authorize(money, payment_method, options = {})
+        case payment_method
+        when String
+          authorize_with_token(money, payment_method, options)
+        else
+          MultiResponse.run do |r|
+            r.process { save_card(payment_method) }
+            r.process { authorize_with_token(money, r.authorization, options) }
+          end
         end
       end
 
@@ -47,6 +57,10 @@ module ActiveMerchant #:nodoc:
         commit(:post, "refunds/#{transaction_id(authorization)}", post)
       end
 
+      def store(credit_card, options={})
+        save_card(credit_card)
+      end
+
       private
 
       def add_credit_card(post, credit_card)
@@ -140,7 +154,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def save_card_url
-        (test? ? 'https://test-token.paymill.com' : 'https://token-v2.paymill.com')
+        (test? ? 'https://test-token.paymill.com' : 'https://token-v2.paymill.de')
       end
 
       def post_data(params)

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

@@ -617,11 +617,11 @@ module ActiveMerchant #:nodoc:
         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),
-    	    :fraud_review => fraud_review?(response),
-    	    :avs_result => { :code => response[:avs_code] },
-    	    :cvv_result => response[:cvv2_code]
+          :test => test?,
+          :authorization => authorization_from(response),
+          :fraud_review => fraud_review?(response),
+          :avs_result => { :code => response[:avs_code] },
+          :cvv_result => response[:cvv2_code]
         )
       end
 
@@ -630,7 +630,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
-        response[:transaction_id] || response[:authorization_id] || response[:refund_transaction_id] # middle one is from reauthorization
+        (
+          response[:transaction_id] ||
+          response[:authorization_id] ||
+          response[:refund_transaction_id] ||
+          response[:billing_agreement_id]
+        )
       end
 
       def successful?(response)

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

@@ -59,9 +59,19 @@ module ActiveMerchant #:nodoc:
         commit 'DoExpressCheckoutPayment', build_sale_or_authorization_request('Sale', money, options)
       end
 
-      def reference_transaction(money, options = {})
+      def store(token, options = {})
+        commit 'CreateBillingAgreement', build_create_billing_agreement_request(token, options)
+      end
+
+      def authorize_reference_transaction(money, options = {})
         requires!(options, :reference_id, :payment_type, :invoice_id, :description, :ip)
 
+        commit 'DoReferenceTransaction', build_reference_transaction_request('Authorization', money, options)
+      end
+
+      def reference_transaction(money, options = {})
+        requires!(options, :reference_id)
+
         commit 'DoReferenceTransaction', build_reference_transaction_request('Sale', money, options)
       end
 
@@ -142,7 +152,7 @@ module ActiveMerchant #:nodoc:
               end
               xml.tag! 'n2:CallbackURL', options[:callback_url] unless options[:callback_url].blank?
 
-              add_payment_details(xml, with_money_default(money), currency_code, options)
+              add_payment_details(xml, money, currency_code, options)
               if options[:shipping_options]
                 options[:shipping_options].each do |shipping_option|
                   xml.tag! 'n2:FlatRateShippingOptions' do
@@ -166,6 +176,18 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_create_billing_agreement_request(token, options = {})
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag! 'CreateBillingAgreementReq', 'xmlns' => PAYPAL_NAMESPACE do
+          xml.tag! 'CreateBillingAgreementRequest', 'xmlns:n2' => EBAY_NAMESPACE do
+            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'Token', token
+          end
+        end
+
+        xml.target!
+      end
+
       def build_reference_transaction_request(action, money, options)
         currency_code = options[:currency] || currency(money)
 
@@ -179,7 +201,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:ReferenceID', options[:reference_id]
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:PaymentType', options[:payment_type] || 'Any'
-              add_payment_details(xml, with_money_default(money), currency_code, options)
+              add_payment_details(xml, money, currency_code, options)
               xml.tag! 'n2:IPAddress', options[:ip]
             end
           end
@@ -192,10 +214,6 @@ module ActiveMerchant #:nodoc:
         PaypalExpressResponse.new(success, message, response, options)
       end
 
-      def with_money_default(money)
-        amount(money).to_f.zero? ? 100 : money
-      end
-
       def locale_code(country_code)
         NON_STANDARD_LOCALE_CODES[country_code] || country_code
       end

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

@@ -29,7 +29,7 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard)
         add_address(post, creditcard, options)
 
-        commit('charges', post)
+        commit('charges', post, options)
       end
 
       # Create a customer and associated credit card. The token that is returned
@@ -40,14 +40,14 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard)
         add_customer_data(post, options)
         add_address(post, creditcard, options)
-        commit('customers', post)
+        commit('customers', post, options)
       end
 
       # Refund a transaction, note that the money attribute is ignored at the
       # moment as the API does not support partial refunds. The parameter is
       # kept for compatibility reasons
       def refund(money, token, options = {})
-        commit("charges/#{CGI.escape(token)}/refunds", :amount => amount(money))
+        commit("charges/#{CGI.escape(token)}/refunds", { :amount => amount(money) }, options)
       end
 
       private
@@ -112,11 +112,11 @@ module ActiveMerchant #:nodoc:
         result
       end
 
-      def commit(action, params)
+      def commit(action, params, options)
         url = "#{test? ? test_url : live_url}/#{action}"
 
         begin
-          body = parse(ssl_post(url, post_data(params), headers(params)))
+          body = parse(ssl_post(url, post_data(params), headers(options)))
         rescue ResponseError => e
           body = parse(e.response.body)
         end

data/lib/active_merchant/billing/gateways/sage/sage_bankcard.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       include SageCore
       self.live_url = 'https://www.sagepayments.net/cgi-bin/eftBankcard.dll?transaction'
       self.source = 'bankcard'
-          
+
       # Credit cards supported by Sage
       # * VISA
       # * MasterCard
@@ -17,42 +17,47 @@ module ActiveMerchant #:nodoc:
       # * JCB
       # * Sears
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
-      
+
       def authorize(money, credit_card, options = {})
         post = {}
         add_credit_card(post, credit_card)
         add_transaction_data(post, money, options)
         commit(:authorization, post)
       end
-      
+
       def purchase(money, credit_card, options = {})
         post = {}
         add_credit_card(post, credit_card)
         add_transaction_data(post, money, options)
         commit(:purchase, post)
-      end                       
-    
-      # The +money+ amount is not used. The entire amount of the 
+      end
+
+      # The +money+ amount is not used. The entire amount of the
       # initial authorization will be captured.
       def capture(money, reference, options = {})
         post = {}
         add_reference(post, reference)
         commit(:capture, post)
       end
-      
+
       def void(reference, options = {})
         post = {}
         add_reference(post, reference)
         commit(:void, post)
       end
-      
+
       def credit(money, credit_card, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, credit_card, options)
+      end
+
+      def refund(money, credit_card, options = {})
         post = {}
         add_credit_card(post, credit_card)
         add_transaction_data(post, money, options)
         commit(:credit, post)
       end
-          
+
       private
       def exp_date(credit_card)
         year  = sprintf("%.4i", credit_card.year)
@@ -67,7 +72,7 @@ module ActiveMerchant #:nodoc:
         post[:C_exp]        = exp_date(credit_card)
         post[:C_cvv]        = credit_card.verification_value if credit_card.verification_value?
       end
-      
+
       def parse(data)
         response = {}
         response[:success]          = data[1,1]
@@ -78,7 +83,7 @@ module ActiveMerchant #:nodoc:
         response[:avs_result]       = data[43, 1].strip
         response[:risk]             = data[44, 2]
         response[:reference]        = data[46, 10]
-        
+
         response[:order_number], response[:recurring] = data[57...-1].split("\034")
         response
       end

data/lib/active_merchant/billing/gateways/sage/sage_core.rb

@@ -45,7 +45,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        post[:T_customer_number] = options[:customer]
+        post[:T_customer_number] = options[:customer] if Float(options[:customer]) rescue nil
       end
 
       def add_addresses(post, options)

data/lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       include SageCore
       self.live_url = 'https://www.sagepayments.net/cgi-bin/eftVirtualCheck.dll?transaction'
       self.source = 'virtual_check'
-      
+
       def purchase(money, credit_card, options = {})
         post = {}
         add_check(post, credit_card)
@@ -14,21 +14,26 @@ module ActiveMerchant #:nodoc:
         add_transaction_data(post, money, options)
         commit(:purchase, post)
       end
-      
+
       def void(reference, options = {})
         post = {}
         add_reference(post, reference)
         commit(:void, post)
       end
-      
+
       def credit(money, credit_card, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, source, options)
+      end
+
+      def refund(money, credit_card, options = {})
         post = {}
         add_check(post, credit_card)
         add_check_customer_data(post, options)
         add_transaction_data(post, money, options)
         commit(:credit, post)
       end
-      
+
       private
       def add_check(post, check)
         post[:C_first_name]   = check.first_name
@@ -38,37 +43,37 @@ module ActiveMerchant #:nodoc:
         post[:C_check_number] = check.number
         post[:C_acct_type]    = account_type(check)
       end
-      
+
       def add_check_customer_data(post, options)
         # Required  Customer Type – (NACHA Transaction Class)
-        # CCD for Commercial, Merchant Initiated 
+        # CCD for Commercial, Merchant Initiated
         # PPD for Personal, Merchant Initiated
-        # WEB for Internet, Consumer Initiated 
-        # RCK for Returned Checks 
-        # ARC for Account Receivable Entry 
+        # WEB for Internet, Consumer Initiated
+        # RCK for Returned Checks
+        # ARC for Account Receivable Entry
         # TEL for TelephoneInitiated
         post[:C_customer_type] = "WEB"
 
-        # Optional  10  Digit Originator  ID – Assigned  By for  each transaction  class  or  business  purpose. If  not provided, the default Originator ID for the specific  Customer Type will be applied.  
+        # Optional  10  Digit Originator  ID – Assigned  By for  each transaction  class  or  business  purpose. If  not provided, the default Originator ID for the specific  Customer Type will be applied. 
         post[:C_originator_id] = options[:originator_id]
 
         # Optional  Transaction Addenda
         post[:T_addenda] = options[:addenda]
 
-        # Required  Check  Writer  Social  Security  Number  (  Numbers Only, No Dashes )  
+        # Required  Check  Writer  Social  Security  Number  (  Numbers Only, No Dashes ) 
         post[:C_ssn] = options[:ssn].to_s.gsub(/[^\d]/, '')
 
         post[:C_dl_state_code] = options[:drivers_license_state]
         post[:C_dl_number]     = options[:drivers_license_number]
         post[:C_dob]           = format_birth_date(options[:date_of_birth])
       end
-      
+
       def format_birth_date(date)
         date.respond_to?(:strftime) ? date.strftime("%m/%d/%Y") : date
       end
 
-      # DDA for Checking 
-      # SAV for Savings  
+      # DDA for Checking
+      # SAV for Savings 
       def account_type(check)
         case check.account_type
         when 'checking' then 'DDA'
@@ -76,7 +81,7 @@ module ActiveMerchant #:nodoc:
         else raise ArgumentError, "Unknown account type #{check.account_type}"
         end
       end
-      
+
       def parse(data)
         response = {}
         response[:success]          = data[1,1]
@@ -84,7 +89,7 @@ module ActiveMerchant #:nodoc:
         response[:message]          = data[8,32].strip
         response[:risk]             = data[40, 2]
         response[:reference]        = data[42, 10]
-        
+
         extra_data = data[53...-1].split("\034")
         response[:order_number] = extra_data[0]
         response[:authentication_indicator] = extra_data[1]

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

@@ -119,17 +119,22 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Performs a credit transaction. (Sage +Credit+ transaction).
+      def credit(money, source, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, source, options)
+      end
+
+      # Performs a refund transaction.
       #
       # ==== Parameters
       #
       # * <tt>money</tt> - The amount to be authorized as an integer value in cents.
-      # * <tt>source</tt> - The CreditCard or Check object to be used as the target for the credit.
-      def credit(money, source, options = {})
+      # * <tt>source</tt> - The CreditCard or Check object to be used as the target for the refund.
+      def refund(money, source, options = {})
         if card_brand(source) == "check"
-          virtual_check.credit(money, source, options)
+          virtual_check.refund(money, source, options)
         else
-          bankcard.credit(money, source, options)
+          bankcard.refund(money, source, options)
         end
       end
 

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

@@ -160,6 +160,7 @@ module ActiveMerchant #:nodoc:
 
       def add_optional_data(post, options)
         add_pair(post, :GiftAidPayment, options[:gift_aid_payment]) unless options[:gift_aid_payment].blank?
+        add_pair(post, :Apply3DSecure, options[:apply_3d_secure]) unless options[:apply_3d_secure].blank?
       end
 
       def add_address(post, options)