activemerchant 1.42.6 → 1.90.0

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

@@ -2,12 +2,14 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # This module is included in both PaypalGateway and PaypalExpressGateway
     module PaypalCommonAPI
-      API_VERSION = '72'
+      include Empty
+
+      API_VERSION = '124'
 
       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/',
+        :live => { :certificate => 'https://api.paypal.com/2.0/',
                    :signature   => 'https://api-3t.paypal.com/2.0/' }
       }
 
@@ -38,6 +40,20 @@ module ActiveMerchant #:nodoc:
 
       FRAUD_REVIEW_CODE = "11610"
 
+      STANDARD_ERROR_CODE_MAPPING = {
+        '15005' => :card_declined,
+        '10754' => :card_declined,
+        '10752' => :card_declined,
+        '10759' => :card_declined,
+        '10761' => :card_declined,
+        '15002' => :card_declined,
+        '11084' => :card_declined,
+        '15004' => :incorrect_cvc,
+        '10762' => :invalid_cvc,
+      }
+
+      STANDARD_ERROR_CODE_MAPPING.default = :processing_error
+
       def self.included(base)
         base.default_currency = 'USD'
         base.cattr_accessor :pem_file
@@ -122,7 +138,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -253,7 +269,21 @@ module ActiveMerchant #:nodoc:
         commit 'ManagePendingTransactionStatus', build_manage_pending_transaction_status(transaction_id, action)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<n1:Password>).+(</n1:Password>)), '\1[FILTERED]\2').
+          gsub(%r((<n1:Username>).+(</n1:Username>)), '\1[FILTERED]\2').
+          gsub(%r((<n1:Signature>).+(</n1:Signature>)), '\1[FILTERED]\2').
+          gsub(%r((<n2:CreditCardNumber>).+(</n2:CreditCardNumber)), '\1[FILTERED]\2').
+          gsub(%r((<n2:CVV2>)\d+(</n2:CVV2)), '\1[FILTERED]\2')
+      end
+
       private
+
       def build_request_wrapper(action, options = {})
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! action + 'Req', 'xmlns' => PAYPAL_NAMESPACE do
@@ -573,7 +603,7 @@ module ActiveMerchant #:nodoc:
           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?
+          add_button_source(xml)
 
           # The notify URL applies only to DoExpressCheckoutPayment.
           # This value is ignored when set in SetExpressCheckout or GetExpressCheckoutDetails
@@ -593,11 +623,18 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_button_source(xml)
+        button_source = (@options[:button_source] || application_id)
+        if !empty?(button_source)
+          xml.tag! 'n2:ButtonSource', button_source.to_s.slice(0, 32)
+        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},
+                            %w{n2:NoteText          n2:PaymentAction
+                               n2:TransactionId     n2:AllowedPaymentMethod
+                               n2:PaymentRequestID  n2:SoftDescriptor  },
                             options)
       end
 
@@ -628,11 +665,21 @@ module ActiveMerchant #:nodoc:
           :test => test?,
           :authorization => authorization_from(response),
           :fraud_review => fraud_review?(response),
+          :error_code => standardized_error_code(response),
           :avs_result => { :code => response[:avs_code] },
           :cvv_result => response[:cvv2_code]
         )
       end
 
+      def standardized_error_code(response)
+        STANDARD_ERROR_CODE_MAPPING[error_codes(response).first]
+      end
+
+      def error_codes(response)
+        return [] unless response.has_key?(:error_codes)
+        response[:error_codes].split(',')
+      end
+
       def fraud_review?(response)
         response[:error_codes] == FRAUD_REVIEW_CODE
       end

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

@@ -56,6 +56,10 @@ module ActiveMerchant #:nodoc:
            'name'     => shipping['ShippingOptionName']
         }
       end
+
+      def note
+        @params['note_text']
+      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/paypal_common_api'
+require 'active_merchant/billing/gateways/paypal/paypal_common_api'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -23,8 +23,10 @@ module ActiveMerchant #:nodoc:
       # * <tt>:cycles</tt> -- Limit to certain # of cycles (OPTIONAL)
       # * <tt>:start_date</tt> -- When does the charging starts (REQUIRED)
       # * <tt>:description</tt> -- The description to appear in the profile (REQUIRED)
-      
+
       def recurring(amount, credit_card, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         options[:credit_card] = credit_card
         options[:amount] = amount
         requires!(options, :description, :start_date, :period, :frequency, :amount)
@@ -34,7 +36,7 @@ module ActiveMerchant #:nodoc:
       # Update a recurring payment's details.
       #
       # This transaction updates an existing Recurring Billing Profile
-      # and the subscription must have already been created previously 
+      # and the subscription must have already been created previously
       # by calling +recurring()+. The ability to change certain
       # details about a recurring payment is dependent on transaction history
       # and the type of plan you're subscribed with paypal. Web Payment Pro
@@ -49,6 +51,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:profile_id</tt> -- A string containing the <tt>:profile_id</tt>
       # of the recurring payment already in place for a given credit card. (REQUIRED)
       def update_recurring(options={})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         requires!(options, :profile_id)
         opts = options.dup
         commit 'UpdateRecurringPaymentsProfile', build_change_profile_request(opts.delete(:profile_id), opts)
@@ -65,6 +69,8 @@ module ActiveMerchant #:nodoc:
       # recurring payment already in place for a given credit card. (REQUIRED)
       # * <tt>options</tt> -- A hash with extra info ('note' for ex.)
       def cancel_recurring(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(profile_id, 'Cancel', options)
       end
@@ -76,6 +82,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def status_recurring(profile_id)
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'GetRecurringPaymentsProfileDetails', build_get_profile_details_request(profile_id)
       end
@@ -87,6 +95,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def suspend_recurring(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(profile_id, 'Suspend', options)
       end
@@ -98,6 +108,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def reactivate_recurring(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
 commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(profile_id, 'Reactivate', options)
       end
@@ -109,6 +121,8 @@ commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(prof
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def bill_outstanding_amount(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'BillOutstandingAmount', build_bill_outstanding_amount(profile_id, options)
       end

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

@@ -1,18 +1,18 @@
-require File.dirname(__FILE__) + '/paypal/paypal_common_api'
-require File.dirname(__FILE__) + '/paypal/paypal_recurring_api'
-require File.dirname(__FILE__) + '/paypal_express'
+require 'active_merchant/billing/gateways/paypal/paypal_common_api'
+require 'active_merchant/billing/gateways/paypal/paypal_recurring_api'
+require 'active_merchant/billing/gateways/paypal_express'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaypalGateway < Gateway
       include PaypalCommonAPI
       include PaypalRecurringApi
-      
+
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = ['US']
       self.homepage_url = 'https://www.paypal.com/us/webapps/mpp/paypal-payments-pro'
       self.display_name = 'PayPal Payments Pro (US)'
-      
+
       def authorize(money, credit_card_or_referenced_id, options = {})
         requires!(options, :ip)
         commit define_transaction_type(credit_card_or_referenced_id), build_sale_or_authorization_request('Authorization', money, credit_card_or_referenced_id, options)
@@ -22,13 +22,24 @@ module ActiveMerchant #:nodoc:
         requires!(options, :ip)
         commit define_transaction_type(credit_card_or_referenced_id), build_sale_or_authorization_request('Sale', money, credit_card_or_referenced_id, options)
       end
-      
+
+      def verify(credit_card, options = {})
+        if %w(visa master).include?(credit_card.brand)
+          authorize(0, credit_card, options)
+        else
+          MultiResponse.run(:use_first_response) do |r|
+            r.process { authorize(100, credit_card, options) }
+            r.process(:ignore_result) { void(r.authorization, options) }
+          end
+        end
+      end
+
       def express
         @express ||= PaypalExpressGateway.new(@options)
       end
-      
+
       private
-      
+
       def define_transaction_type(transaction_arg)
         if transaction_arg.is_a?(String)
           return 'DoReferenceTransaction'
@@ -36,14 +47,14 @@ module ActiveMerchant #:nodoc:
           return 'DoDirectPayment'
         end
       end
-      
+
       def build_sale_or_authorization_request(action, money, credit_card_or_referenced_id, options)
         transaction_type = define_transaction_type(credit_card_or_referenced_id)
-        reference_id = credit_card_or_referenced_id if transaction_type == "DoReferenceTransaction"
-        
+        reference_id = credit_card_or_referenced_id if transaction_type == 'DoReferenceTransaction'
+
         billing_address = options[:billing_address] || options[:address]
         currency_code = options[:currency] || currency(money)
-       
+
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! transaction_type + 'Req', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! transaction_type + 'Request', 'xmlns:n2' => EBAY_NAMESPACE do
@@ -51,6 +62,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'n2:' + transaction_type + 'RequestDetails' do
               xml.tag! 'n2:ReferenceID', reference_id if transaction_type == 'DoReferenceTransaction'
               xml.tag! 'n2:PaymentAction', action
+              add_descriptors(xml, options)
               add_payment_details(xml, money, currency_code, options)
               add_credit_card(xml, credit_card_or_referenced_id, billing_address, options) unless transaction_type == 'DoReferenceTransaction'
               xml.tag! 'n2:IPAddress', options[:ip]
@@ -58,48 +70,45 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        xml.target!        
+        xml.target!
       end
-      
+
       def add_credit_card(xml, credit_card, address, options)
         xml.tag! 'n2:CreditCard' do
           xml.tag! 'n2:CreditCardType', credit_card_type(card_brand(credit_card))
           xml.tag! 'n2:CreditCardNumber', credit_card.number
           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?(card_brand(credit_card).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:CVV2', credit_card.verification_value unless credit_card.verification_value.blank?
+
           xml.tag! 'n2:CardOwner' do
             xml.tag! 'n2:PayerName' do
               xml.tag! 'n2:FirstName', credit_card.first_name
               xml.tag! 'n2:LastName', credit_card.last_name
             end
-            
+
             xml.tag! 'n2:Payer', options[:email]
             add_address(xml, 'n2:Address', address)
           end
         end
       end
 
+      def add_descriptors(xml, options)
+        xml.tag! 'n2:SoftDescriptor', options[:soft_descriptor] unless options[:soft_descriptor].blank?
+        xml.tag! 'n2:SoftDescriptorCity', options[:soft_descriptor_city] unless options[:soft_descriptor_city].blank?
+      end
+
       def credit_card_type(type)
         case type
         when 'visa'             then 'Visa'
         when 'master'           then 'MasterCard'
         when 'discover'         then 'Discover'
         when 'american_express' then 'Amex'
-        when 'switch'           then 'Switch'
-        when 'solo'             then 'Solo'
         end
       end
-      
+
       def build_response(success, message, response, options = {})
-         Response.new(success, message, response, options)
+        Response.new(success, message, response, options)
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/paypal'
+require 'active_merchant/billing/gateways/paypal'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:

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

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/paypal/paypal_common_api'
-require File.dirname(__FILE__) + '/paypal/paypal_express_response'
-require File.dirname(__FILE__) + '/paypal_express_common'
+require 'active_merchant/billing/gateways/paypal/paypal_common_api'
+require 'active_merchant/billing/gateways/paypal/paypal_express_response'
+require 'active_merchant/billing/gateways/paypal_express_common'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -11,9 +11,10 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = %w(AU CA CN FI GB ID IN IT MY NO NZ PH PL SE SG TH VN)
       self.homepage_url = 'https://www.x.com/community/ppx/xspaces/digital_goods'
       self.display_name = 'PayPal Express Checkout for Digital Goods'
-      
+
       def redirect_url_for(token, options = {})
-        "#{redirect_url}?token=#{token}&useraction=commit"
+        options[:review] ||= false
+        super
       end
 
       # GATEWAY.setup_purchase(100,
@@ -29,7 +30,7 @@ module ActiveMerchant #:nodoc:
       #                            :category => "Digital" } ] )
       def build_setup_request(action, money, options)
         requires!(options, :items)
-        raise ArgumentError, "Must include at least 1 Item" unless options[:items].length > 0
+        raise ArgumentError, 'Must include at least 1 Item' unless options[:items].length > 0
         options[:items].each do |item|
           requires!(item, :name, :number, :quantity, :amount, :description, :category)
           raise ArgumentError, "Each of the items must have the category 'Digital'" unless item[:category] == 'Digital'

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

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/paypal/paypal_common_api'
-require File.dirname(__FILE__) + '/paypal/paypal_express_response'
-require File.dirname(__FILE__) + '/paypal/paypal_recurring_api'
-require File.dirname(__FILE__) + '/paypal_express_common'
+require 'active_merchant/billing/gateways/paypal/paypal_common_api'
+require 'active_merchant/billing/gateways/paypal/paypal_express_response'
+require 'active_merchant/billing/gateways/paypal/paypal_recurring_api'
+require 'active_merchant/billing/gateways/paypal_express_common'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -30,6 +30,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside'
       self.display_name = 'PayPal Express Checkout'
+      self.currencies_without_fractions = %w(HUF JPY TWD)
 
       def setup_authorization(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
@@ -67,6 +68,10 @@ module ActiveMerchant #:nodoc:
         commit 'BAUpdate', build_cancel_billing_agreement_request(token)
       end
 
+      def agreement_details(reference_id, options = {})
+        commit 'BAUpdate', build_details_billing_agreement_request(reference_id)
+      end
+
       def authorize_reference_transaction(money, options = {})
         requires!(options, :reference_id, :payment_type, :invoice_id, :description, :ip)
 
@@ -127,12 +132,14 @@ module ActiveMerchant #:nodoc:
               if options[:max_amount]
                 xml.tag! 'n2:MaxAmount', localized_amount(options[:max_amount], currency_code), 'currencyID' => currency_code
               end
+              xml.tag! 'n2:ReqBillingAddress', options[:req_billing_address] ? '1' : '0'
               xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
               xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'
               xml.tag! 'n2:LocaleCode', locale_code(options[:locale]) unless options[:locale].blank?
               xml.tag! 'n2:BrandName', options[:brand_name] unless options[:brand_name].blank?
               # Customization of the payment page
               xml.tag! 'n2:PageStyle', options[:page_style] unless options[:page_style].blank?
+              xml.tag! 'n2:cpp-logo-image', options[:logo_image] unless options[:logo_image].blank?
               xml.tag! 'n2:cpp-header-image', options[:header_image] unless options[:header_image].blank?
               xml.tag! 'n2:cpp-header-border-color', options[:header_border_color] unless options[:header_border_color].blank?
               xml.tag! 'n2:cpp-header-back-color', options[:header_background_color] unless options[:header_background_color].blank?
@@ -154,6 +161,13 @@ module ActiveMerchant #:nodoc:
               if !options[:allow_note].nil?
                 xml.tag! 'n2:AllowNote', options[:allow_note] ? '1' : '0'
               end
+
+              if options[:funding_sources]
+                xml.tag! 'n2:FundingSourceDetails' do
+                  xml.tag! 'n2:UserSelectedFundingSource', options[:funding_sources][:source]
+                end
+              end
+
               xml.tag! 'n2:CallbackURL', options[:callback_url] unless options[:callback_url].blank?
 
               add_payment_details(xml, money, currency_code, options)
@@ -173,6 +187,8 @@ module ActiveMerchant #:nodoc:
               if options.has_key?(:allow_buyer_optin)
                 xml.tag! 'n2:BuyerEmailOptInEnable', (options[:allow_buyer_optin] ? '1' : '0')
               end
+
+              xml.tag! 'n2:TotalType', options[:total_type] unless options[:total_type].blank?
             end
           end
         end
@@ -205,6 +221,18 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_details_billing_agreement_request(reference_id)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag! 'BillAgreementUpdateReq', 'xmlns' => PAYPAL_NAMESPACE do
+          xml.tag! 'BAUpdateRequest', 'xmlns:n2' => EBAY_NAMESPACE do
+            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'ReferenceID', reference_id
+          end
+        end
+
+        xml.target!
+      end
+
       def build_reference_transaction_request(action, money, options)
         currency_code = options[:currency] || currency(money)
 

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

@@ -9,13 +9,13 @@ module ActiveMerchant
           base.class_inheritable_accessor :test_redirect_url
           base.class_inheritable_accessor :live_redirect_url
         end
-        base.live_redirect_url = 'https://www.paypal.com/cgibin/webscr'
+        base.live_redirect_url = 'https://www.paypal.com/cgi-bin/webscr'
       end
-      
+
       def redirect_url
         test? ? test_redirect_url : live_redirect_url
       end
-      
+
       def redirect_url_for(token, options = {})
         options = {:review => true, :mobile => false}.update(options)
 

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

@@ -9,8 +9,6 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.payscout.com/'
       self.display_name = 'Payscout'
 
-      self.ssl_version = 'SSLv3'
-
       def initialize(options = {})
         requires!(options, :username, :password)
         super
@@ -43,7 +41,6 @@ module ActiveMerchant #:nodoc:
         commit('capture', money, post)
       end
 
-
       def refund(money, authorization, options = {})
         post = {}
         post[:transactionid] = authorization
@@ -105,7 +102,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[body.split('&').map{|x|x.split('=')}]
+        Hash[body.split('&').map { |x| x.split('=') }]
       end
 
       def commit(action, money, parameters)
@@ -155,17 +152,9 @@ module ActiveMerchant #:nodoc:
         post[:password]       = @options[:password]
         post[:type]           = action
 
-        request = post.merge(parameters).collect { |key, value| "#{key}=#{URI.escape(value.to_s)}" }.join("&")
+        request = post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
         request
       end
-
-      def expdate(creditcard)
-        year  = sprintf("%.4i", creditcard.year)
-        month = sprintf("%.2i", creditcard.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
     end
   end
 end
-