activemerchant 1.45.0 → 1.126.0

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

@@ -5,11 +5,12 @@ module ActiveMerchant #:nodoc:
                                     GI GR HR HU IE IL IM IS IT LI LT LU LV MC MT
                                     NL NO PL PT RO SE SI SK TR VA)
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :union_pay, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club discover union_pay jcb]
       self.homepage_url = 'https://paymill.com'
       self.display_name = 'PAYMILL'
       self.money_format = :cents
       self.default_currency = 'EUR'
+      self.live_url = 'https://api.paymill.com/v2/'
 
       def initialize(options = {})
         requires!(options, :public_key, :private_key)
@@ -29,43 +30,73 @@ module ActiveMerchant #:nodoc:
 
         add_amount(post, money, options)
         post[:preauthorization] = preauth(authorization)
-        post[:description] = options[:description]
+        post[:description] = options[:order_id]
         post[:source] = 'active_merchant'
         commit(:post, 'transactions', post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
 
         post[:amount] = amount(money)
-        post[:description] = options[:description]
+        post[:description] = options[:order_id]
         commit(:post, "refunds/#{transaction_id(authorization)}", post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         commit(:delete, "preauthorizations/#{preauth(authorization)}")
       end
 
-      def store(credit_card, options={})
-        save_card(credit_card)
+      def store(credit_card, options = {})
+        # The store request requires a currency and amount of at least $1 USD.
+        # This is used for an authorization that is handled internally by Paymill.
+        options[:currency] = 'USD'
+        options[:money] = 100
+
+        save_card(credit_card, options)
+      end
+
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(/(account.number=)(\d*)/, '\1[FILTERED]').
+          gsub(/(account.verification=)(\d*)/, '\1[FILTERED]')
+      end
+
+      def verify_credentials
+        begin
+          ssl_get(live_url + 'transactions/nonexistent', headers)
+        rescue ResponseError => e
+          return false if e.response.code.to_i == 401
+        end
+
+        true
       end
 
       private
 
-      def add_credit_card(post, credit_card)
+      def add_credit_card(post, credit_card, options)
+        post['account.holder'] = (credit_card.try(:name) || '')
         post['account.number'] = credit_card.number
-        post['account.expiry.month'] = sprintf("%.2i", credit_card.month)
-        post['account.expiry.year'] = sprintf("%.4i", credit_card.year)
+        post['account.expiry.month'] = sprintf('%.2i', credit_card.month)
+        post['account.expiry.year'] = sprintf('%.4i', credit_card.year)
         post['account.verification'] = credit_card.verification_value
+        post['account.email'] = (options[:email] || nil)
+        post['presentation.amount3D'] = (options[:money] || nil)
+        post['presentation.currency3D'] = (options[:currency] || currency(options[:money]))
       end
 
       def headers
         { 'Authorization' => ('Basic ' + Base64.strict_encode64("#{@options[:private_key]}:X").chomp) }
       end
 
-      def commit(method, url, parameters=nil)
+      def commit(method, action, parameters = nil)
         begin
-          raw_response = ssl_request(method, "https://api.paymill.com/v2/#{url}", post_data(parameters), headers)
+          raw_response = ssl_request(method, live_url + action, post_data(parameters), headers)
         rescue ResponseError => e
           begin
             parsed = JSON.parse(e.response.body)
@@ -81,11 +112,11 @@ module ActiveMerchant #:nodoc:
       def response_from(raw_response)
         parsed = JSON.parse(raw_response)
         options = {
-          :authorization => authorization_from(parsed),
-          :test => (parsed['mode'] == 'test'),
+          authorization: authorization_from(parsed),
+          test: (parsed['mode'] == 'test')
         }
 
-        succeeded = (parsed['data'] == []) || (parsed['data']['response_code'] == 20000)
+        succeeded = (parsed['data'] == []) || (parsed['data']['response_code'].to_i == 20000)
         Response.new(succeeded, response_message(parsed), parsed, options)
       end
 
@@ -96,16 +127,17 @@ module ActiveMerchant #:nodoc:
         [
           parsed_data['id'],
           parsed_data['preauthorization'].try(:[], 'id')
-        ].join(";")
+        ].join(';')
       end
 
       def action_with_token(action, money, payment_method, options)
+        options[:money] = money
         case payment_method
         when String
           self.send("#{action}_with_token", money, payment_method, options)
         else
           MultiResponse.run do |r|
-            r.process { save_card(payment_method) }
+            r.process { save_card(payment_method, options) }
             r.process { self.send("#{action}_with_token", money, r.authorization, options) }
           end
         end
@@ -116,7 +148,7 @@ module ActiveMerchant #:nodoc:
 
         add_amount(post, money, options)
         post[:token] = card_token
-        post[:description] = options[:description]
+        post[:description] = options[:order_id]
         post[:source] = 'active_merchant'
         commit(:post, 'transactions', post)
       end
@@ -126,15 +158,15 @@ module ActiveMerchant #:nodoc:
 
         add_amount(post, money, options)
         post[:token] = card_token
-        post[:description] = options[:description]
+        post[:description] = options[:order_id]
         post[:source] = 'active_merchant'
         commit(:post, 'preauthorizations', post)
       end
 
-      def save_card(credit_card)
+      def save_card(credit_card, options)
         post = {}
 
-        add_credit_card(post, credit_card)
+        add_credit_card(post, credit_card, options)
         post['channel.id'] = @options[:public_key]
         post['jsonPFunction'] = 'jsonPFunction'
         post['transaction.mode'] = (test? ? 'CONNECTOR_TEST' : 'LIVE')
@@ -142,14 +174,14 @@ module ActiveMerchant #:nodoc:
         begin
           raw_response = ssl_request(:get, "#{save_card_url}?#{post_data(post)}", nil, {})
         rescue ResponseError => e
-          return Response.new(false, e.response.body, e.response.body, {})
+          return Response.new(false, e.response.body)
         end
 
         response_for_save_from(raw_response)
       end
 
       def response_for_save_from(raw_response)
-        options = { :test => test? }
+        options = { test: test? }
 
         parser = ResponseParser.new(raw_response, options)
         parser.generate_response
@@ -166,8 +198,8 @@ module ActiveMerchant #:nodoc:
       def post_data(params)
         return nil unless params
 
-        no_blanks = params.reject { |key, value| value.blank? }
-        no_blanks.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        no_blanks = params.reject { |_key, value| value.blank? }
+        no_blanks.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def add_amount(post, money, options)
@@ -176,7 +208,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def preauth(authorization)
-        authorization.split(";").last
+        authorization.split(';').last
       end
 
       def transaction_id(authorization)
@@ -184,61 +216,119 @@ module ActiveMerchant #:nodoc:
       end
 
       RESPONSE_CODES = {
-        10001 => "General undefined response.",
-        10002 => "Still waiting on something.",
-
-        20000 => "General success response.",
-
-        40000 => "General problem with data.",
-        40001 => "General problem with payment data.",
-        40100 => "Problem with credit card data.",
-        40101 => "Problem with cvv.",
-        40102 => "Card expired or not yet valid.",
-        40103 => "Limit exceeded.",
-        40104 => "Card invalid.",
-        40105 => "Expiry date not valid.",
-        40106 => "Credit card brand required.",
-        40200 => "Problem with bank account data.",
-        40201 => "Bank account data combination mismatch.",
-        40202 => "User authentication failed.",
-        40300 => "Problem with 3d secure data.",
-        40301 => "Currency / amount mismatch",
-        40400 => "Problem with input data.",
-        40401 => "Amount too low or zero.",
-        40402 => "Usage field too long.",
-        40403 => "Currency not allowed.",
-
-        50000 => "General problem with backend.",
-        50001 => "Country blacklisted.",
-        50100 => "Technical error with credit card.",
-        50101 => "Error limit exceeded.",
-        50102 => "Card declined by authorization system.",
-        50103 => "Manipulation or stolen card.",
-        50104 => "Card restricted.",
-        50105 => "Invalid card configuration data.",
-        50200 => "Technical error with bank account.",
-        50201 => "Card blacklisted.",
-        50300 => "Technical error with 3D secure.",
-        50400 => "Decline because of risk issues.",
-        50500 => "General timeout.",
-        50501 => "Timeout on side of the acquirer.",
-        50502 => "Risk management transaction timeout.",
-        50600 => "Duplicate transaction."
+        10001 => 'Undefined response',
+        10002 => 'Waiting for something',
+        11000 => 'Retry request at a later time',
+
+        20000 => 'Operation successful',
+        20100 => 'Funds held by acquirer',
+        20101 => 'Funds held by acquirer because merchant is new',
+        20200 => 'Transaction reversed',
+        20201 => 'Reversed due to chargeback',
+        20202 => 'Reversed due to money-back guarantee',
+        20203 => 'Reversed due to complaint by buyer',
+        20204 => 'Payment has been refunded',
+        20300 => 'Reversal has been canceled',
+        22000 => 'Initiation of transaction successful',
+
+        30000 => 'Transaction still in progress',
+        30100 => 'Transaction has been accepted',
+        31000 => 'Transaction pending',
+        31100 => 'Pending due to address',
+        31101 => 'Pending due to uncleared eCheck',
+        31102 => 'Pending due to risk review',
+        31103 => 'Pending due regulatory review',
+        31104 => 'Pending due to unregistered/unconfirmed receiver',
+        31200 => 'Pending due to unverified account',
+        31201 => 'Pending due to non-captured funds',
+        31202 => 'Pending due to international account (accept manually)',
+        31203 => 'Pending due to currency conflict (accept manually)',
+        31204 => 'Pending due to fraud filters (accept manually)',
+
+        40000 => 'Problem with transaction data',
+        40001 => 'Problem with payment data',
+        40002 => 'Invalid checksum',
+        40100 => 'Problem with credit card data',
+        40101 => 'Problem with CVV',
+        40102 => 'Card expired or not yet valid',
+        40103 => 'Card limit exceeded',
+        40104 => 'Card is not valid',
+        40105 => 'Expiry date not valid',
+        40106 => 'Credit card brand required',
+        40200 => 'Problem with bank account data',
+        40201 => 'Bank account data combination mismatch',
+        40202 => 'User authentication failed',
+        40300 => 'Problem with 3-D Secure data',
+        40301 => 'Currency/amount mismatch',
+        40400 => 'Problem with input data',
+        40401 => 'Amount too low or zero',
+        40402 => 'Usage field too long',
+        40403 => 'Currency not allowed',
+        40410 => 'Problem with shopping cart data',
+        40420 => 'Problem with address data',
+        40500 => 'Permission error with acquirer API',
+        40510 => 'Rate limit reached for acquirer API',
+        42000 => 'Initiation of transaction failed',
+        42410 => 'Initiation of transaction expired',
+
+        50000 => 'Problem with back end',
+        50001 => 'Country blacklisted',
+        50002 => 'IP address blacklisted',
+        50004 => 'Live mode not allowed',
+        50005 => 'Insufficient permissions (API key)',
+        50100 => 'Technical error with credit card',
+        50101 => 'Error limit exceeded',
+        50102 => 'Card declined',
+        50103 => 'Manipulation or stolen card',
+        50104 => 'Card restricted',
+        50105 => 'Invalid configuration data',
+        50200 => 'Technical error with bank account',
+        50201 => 'Account blacklisted',
+        50300 => 'Technical error with 3-D Secure',
+        50400 => 'Declined because of risk issues',
+        50401 => 'Checksum was wrong',
+        50402 => 'Bank account number was invalid (formal check)',
+        50403 => 'Technical error with risk check',
+        50404 => 'Unknown error with risk check',
+        50405 => 'Unknown bank code',
+        50406 => 'Open chargeback',
+        50407 => 'Historical chargeback',
+        50408 => 'Institution / public bank account (NCA)',
+        50409 => 'KUNO/Fraud',
+        50410 => 'Personal Account Protection (PAP)',
+        50420 => 'Rejected due to acquirer fraud settings',
+        50430 => 'Rejected due to acquirer risk settings',
+        50440 => 'Failed due to restrictions with acquirer account',
+        50450 => 'Failed due to restrictions with user account',
+        50500 => 'General timeout',
+        50501 => 'Timeout on side of the acquirer',
+        50502 => 'Risk management transaction timeout',
+        50600 => 'Duplicate operation',
+        50700 => 'Cancelled by user',
+        50710 => 'Failed due to funding source',
+        50711 => 'Payment method not usable, use other payment method',
+        50712 => 'Limit of funding source was exceeded',
+        50713 => 'Means of payment not reusable (canceled by user)',
+        50714 => 'Means of payment not reusable (expired)',
+        50720 => 'Rejected by acquirer',
+        50730 => 'Transaction denied by merchant',
+        50800 => 'Preauthorisation failed',
+        50810 => 'Authorisation has been voided',
+        50820 => 'Authorisation period expired'
       }
 
       def response_message(parsed_response)
-        return parsed_response["error"] if parsed_response["error"]
-        return "Transaction approved." if (parsed_response['data'] == [])
+        return parsed_response['error'] if parsed_response['error']
+        return 'Transaction approved.' if parsed_response['data'] == []
 
-        code = parsed_response["data"]["response_code"]
+        code = parsed_response['data']['response_code'].to_i
         RESPONSE_CODES[code] || code.to_s
       end
 
-
       class ResponseParser
         attr_reader :raw_response, :parsed, :succeeded, :message, :options
 
-        def initialize(raw_response="", options={})
+        def initialize(raw_response = '', options = {})
           @raw_response = raw_response
           @options = options
         end
@@ -267,12 +357,10 @@ module ActiveMerchant #:nodoc:
 
         def handle_response_correct_parsing
           @message = parsed['transaction']['processing']['return']['message']
-          if @succeeded = is_ack?
-            @options[:authorization] = parsed['transaction']['identification']['uniqueId']
-          end
+          @options[:authorization] = parsed['transaction']['identification']['uniqueId'] if @succeeded = ack?
         end
 
-        def is_ack?
+        def ack?
           parsed['transaction']['processing']['result'] == 'ACK'
         end
       end

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

@@ -2,7 +2,10 @@ 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'
+      API_VERSION_3DS2 = '214.0'
 
       URLS = {
         :test => { :certificate => 'https://api.sandbox.paypal.com/2.0/',
@@ -38,6 +41,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
@@ -253,7 +270,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
@@ -556,7 +587,7 @@ module ActiveMerchant #:nodoc:
           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) }
+          if [:subtotal, :shipping, :handling, :tax].all?{ |o| options[o].present? }
             xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal], currency_code), 'currencyID' => currency_code
             xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping], currency_code),'currencyID' => currency_code
             xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling], currency_code),'currencyID' => currency_code
@@ -573,7 +604,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 +624,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 +666,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
@@ -659,7 +707,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def item_amount(amount, currency_code)
-        if amount.to_i < 0 && Gateway.non_fractional_currency?(currency_code)
+        if amount.to_i < 0 && non_fractional_currency?(currency_code)
           amount(amount).to_f.floor
         else
           localized_amount(amount, currency_code)

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:

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

@@ -1,6 +1,6 @@
-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:
@@ -8,8 +8,8 @@ module ActiveMerchant #:nodoc:
       include PaypalCommonAPI
       include PaypalRecurringApi
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      self.supported_countries = ['US']
+      self.supported_countries = %w[CA NZ GB US]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'https://www.paypal.com/us/webapps/mpp/paypal-payments-pro'
       self.display_name = 'PayPal Payments Pro (US)'
 
@@ -50,18 +50,19 @@ module ActiveMerchant #:nodoc:
 
       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 = Builder::XmlMarkup.new indent: 2
         xml.tag! transaction_type + 'Req', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! transaction_type + 'Request', 'xmlns:n2' => EBAY_NAMESPACE do
-            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'n2:Version', api_version(options)
             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]
@@ -72,19 +73,19 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def api_version(options)
+        return API_VERSION_3DS2 if options.dig(:three_d_secure, :version) =~ /^2/
+
+        API_VERSION
+      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
@@ -95,6 +96,26 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'n2:Payer', options[:email]
             add_address(xml, 'n2:Address', address)
           end
+
+          add_three_d_secure(xml, options) if options[:three_d_secure]
+        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 add_three_d_secure(xml, options)
+        three_d_secure = options[:three_d_secure]
+        xml.tag! 'ThreeDSecureRequest' do
+          xml.tag! 'MpiVendor3ds', 'Y'
+          xml.tag! 'AuthStatus3ds', three_d_secure[:authentication_response_status] || three_d_secure[:trans_status] if three_d_secure[:authentication_response_status] || three_d_secure[:trans_status]
+          xml.tag! 'Cavv', three_d_secure[:cavv] unless three_d_secure[:cavv].blank?
+          xml.tag! 'Eci3ds', three_d_secure[:eci] unless three_d_secure[:eci].blank?
+          xml.tag! 'Xid', three_d_secure[:xid] unless three_d_secure[:xid].blank?
+          xml.tag! 'ThreeDSVersion', three_d_secure[:version] unless three_d_secure[:version].blank?
+          xml.tag! 'DSTransactionId', three_d_secure[:ds_transaction_id] unless three_d_secure[:ds_transaction_id].blank?
         end
       end
 
@@ -104,13 +125,11 @@ module ActiveMerchant #:nodoc:
         when 'master'           then 'MasterCard'
         when 'discover'         then 'Discover'
         when 'american_express' then 'Amex'
-        when 'switch'           then 'Switch'
-        when 'solo'             then 'Solo'
         end
       end
 
       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,10 +1,10 @@
-require File.dirname(__FILE__) + '/paypal'
+require 'active_merchant/billing/gateways/paypal'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # The PayPal gateway for PayPal Website Payments Pro Canada only supports Visa and MasterCard
     class PaypalCaGateway < PaypalGateway
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = %i[visa master]
       self.supported_countries = ['CA']
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside'
       self.display_name = 'PayPal Website Payments Pro (CA)'