activemerchant 1.90.0 → 1.99.0

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w[MX EC VE CO BR CL]
       self.default_currency = 'USD'
-      self.supported_cardtypes = %i[visa master american_express diners_club]
+      self.supported_cardtypes = %i[visa master american_express diners_club elo]
 
       self.homepage_url = 'https://secure.paymentez.com/'
       self.display_name = 'Paymentez'
@@ -38,7 +38,8 @@ module ActiveMerchant #:nodoc:
         'visa' => 'vi',
         'master' => 'mc',
         'american_express' => 'ax',
-        'diners_club' => 'di'
+        'diners_club' => 'di',
+        'elo' => 'el'
       }.freeze
 
       def initialize(options = {})
@@ -171,15 +172,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_extra_params(post, options)
-        if options[:extra_params]
-          items = {}
-          options[:extra_params].each do |param|
-            param.each do |key, value|
-              items[key.to_sym] = value
-            end
-          end
-          post[:extra_params] = items
-        end
+        extra_params = {}
+        extra_params.merge!(options[:extra_params]) if options[:extra_params]
+
+        post['extra_params'] = extra_params unless extra_params.empty?
       end
 
       def parse(body)

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

@@ -48,6 +48,11 @@ module ActiveMerchant #:nodoc:
       end
 
       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
 

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       include PaypalRecurringApi
 
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      self.supported_countries = ['US']
+      self.supported_countries = ['CA', 'NZ', 'GB', 'US']
       self.homepage_url = 'https://www.paypal.com/us/webapps/mpp/paypal-payments-pro'
       self.display_name = 'PayPal Payments Pro (US)'
 
@@ -90,6 +90,8 @@ 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
 
@@ -98,6 +100,17 @@ module ActiveMerchant #:nodoc:
         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[:trans_status] unless three_d_secure[:trans_status].blank?
+          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?
+        end
+      end
+
       def credit_card_type(type)
         case type
         when 'visa'             then 'Visa'

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

@@ -146,7 +146,9 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:cpp-payflow-color', options[:background_color] unless options[:background_color].blank?
               if options[:allow_guest_checkout]
                 xml.tag! 'n2:SolutionType', 'Sole'
-                xml.tag! 'n2:LandingPage', options[:landing_page] || 'Billing'
+                unless options[:paypal_chooses_landing_page]
+                  xml.tag! 'n2:LandingPage', options[:landing_page] || 'Billing'
+                end
               end
               xml.tag! 'n2:BuyerEmail', options[:email] unless options[:email].blank?
 

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

@@ -12,13 +12,15 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['AR', 'BR', 'CL', 'CO', 'MX', 'PA', 'PE']
       self.default_currency = 'USD'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :naranja, :cabal]
 
       BRAND_MAP = {
         'visa' => 'VISA',
         'master' => 'MASTERCARD',
         'american_express' => 'AMEX',
-        'diners_club' => 'DINERS'
+        'diners_club' => 'DINERS',
+        'naranja' => 'NARANJA',
+        'cabal' => 'CABAL'
       }
 
       MINIMUMS = {
@@ -195,6 +197,7 @@ module ActiveMerchant #:nodoc:
           buyer[:fullName] = buyer_hash[:name]
           buyer[:dniNumber] = buyer_hash[:dni_number]
           buyer[:dniType] = buyer_hash[:dni_type]
+          buyer[:merchantBuyerId] = buyer_hash[:merchant_buyer_id]
           buyer[:cnpj] = buyer_hash[:cnpj] if @options[:payment_country] == 'BR'
           buyer[:emailAddress] = buyer_hash[:email]
           buyer[:contactPhone] = (options[:billing_address][:phone] if options[:billing_address]) || (options[:shipping_address][:phone] if options[:shipping_address]) || ''
@@ -203,6 +206,7 @@ module ActiveMerchant #:nodoc:
           buyer[:fullName] = payment_method.name.strip
           buyer[:dniNumber] = options[:dni_number]
           buyer[:dniType] = options[:dni_type]
+          buyer[:merchantBuyerId] = options[:merchant_buyer_id]
           buyer[:cnpj] = options[:cnpj] if @options[:payment_country] == 'BR'
           buyer[:emailAddress] = options[:email]
           buyer[:contactPhone] = (options[:billing_address][:phone] if options[:billing_address]) || (options[:shipping_address][:phone] if options[:shipping_address]) || ''

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

@@ -1,14 +1,14 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PinGateway < Gateway
-      self.test_url = 'https://test-api.pin.net.au/1'
-      self.live_url = 'https://api.pin.net.au/1'
+      self.test_url = 'https://test-api.pinpayments.com/1'
+      self.live_url = 'https://api.pinpayments.com/1'
 
       self.default_currency = 'AUD'
       self.money_format = :cents
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express]
-      self.homepage_url = 'http://www.pin.net.au/'
+      self.homepage_url = 'http://www.pinpayments.com/'
       self.display_name = 'Pin Payments'
 
       def initialize(options = {})
@@ -67,6 +67,7 @@ module ActiveMerchant #:nodoc:
       # Updates the credit card for the customer.
       def update(token, creditcard, options = {})
         post = {}
+        token = get_customer_token(token)
 
         add_creditcard(post, creditcard)
         add_customer_data(post, options)
@@ -137,13 +138,21 @@ module ActiveMerchant #:nodoc:
           )
         elsif creditcard.kind_of?(String)
           if creditcard =~ /^card_/
-            post[:card_token] = creditcard
+            post[:card_token] = get_card_token(creditcard)
           else
             post[:customer_token] = creditcard
           end
         end
       end
 
+      def get_customer_token(token)
+        token.split(/;(?=cus)/).last
+      end
+
+      def get_card_token(token)
+        token.split(/;(?=cus)/).first
+      end
+
       def add_metadata(post, options)
         post[:metadata] = options[:metadata] if options[:metadata]
       end
@@ -200,13 +209,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def unparsable_response(raw_response)
-        message = 'Invalid JSON response received from Pin Payments. Please contact support@pin.net.au if you continue to receive this message.'
+        message = 'Invalid JSON response received from Pin Payments. Please contact support@pinpayments.com if you continue to receive this message.'
         message += " (The raw response returned by the API was #{raw_response.inspect})"
         return Response.new(false, message)
       end
 
       def token(response)
-        response['token']
+        if response['token'].start_with?('cus')
+          "#{response.dig('card', 'token')};#{response['token']}"
+        else
+          response['token']
+        end
       end
 
       def parse(body)

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

@@ -234,7 +234,7 @@ module ActiveMerchant #:nodoc:
           xml.aptNum address[:address2]
           xml.city address[:city]
           xml.state address[:state]
-          xml.zip address[:zip]
+          xml.zip address[:zip].to_s.delete('-')
         end
       end
 

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

@@ -103,7 +103,7 @@ module ActiveMerchant
         post = {}
 
         add_amount(post, money, options)
-        add_credit_card_or_reference(post, credit_card_or_reference)
+        add_credit_card_or_reference(post, credit_card_or_reference, options)
         add_additional_params(:authorize, post, options)
 
         post
@@ -217,6 +217,12 @@ module ActiveMerchant
           post[:card][:expiration] = expdate(credit_card_or_reference)
           post[:card][:issued_to]  = credit_card_or_reference.name
         end
+
+        if options[:three_d_secure]
+          post[:card][:cavv]= options.dig(:three_d_secure, :cavv)
+          post[:card][:eci] = options.dig(:three_d_secure, :eci)
+          post[:card][:xav] = options.dig(:three_d_secure, :xid)
+        end
       end
 
       def parse(body)

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

@@ -12,6 +12,10 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners]
 
+      CVV_CODE_MAPPING = {
+        'S' => 'D'
+      }
+
       def initialize(options={})
         requires!(options, :username, :password, :merchant, :pem, :pem_password)
         super
@@ -23,6 +27,7 @@ module ActiveMerchant #:nodoc:
         add_order_number(post, options)
         add_payment_method(post, payment_method)
         add_verification_value(post, payment_method)
+        add_stored_credential_data(post, payment_method, options)
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
@@ -35,6 +40,7 @@ module ActiveMerchant #:nodoc:
         add_order_number(post, options)
         add_payment_method(post, payment_method)
         add_verification_value(post, payment_method)
+        add_stored_credential_data(post, payment_method, options)
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
 
@@ -57,6 +63,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization, options)
         add_customer_data(post, options)
         add_soft_descriptors(post, options)
+        post['order.ECI'] = options[:eci] || 'SSL'
 
         commit('refund', post)
       end
@@ -120,7 +127,6 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, options)
         post['order.amount'] = amount(money)
         post['card.currency'] = CURRENCY_CODES[options[:currency] || currency(money)]
-        post['order.ECI'] = options[:eci] || 'SSL'
       end
 
       def add_payment_method(post, payment_method)
@@ -130,6 +136,46 @@ module ActiveMerchant #:nodoc:
         post['card.expiryMonth'] = format(payment_method.month, :two_digits)
       end
 
+      def add_stored_credential_data(post, payment_method, options)
+        post['order.ECI'] = options[:eci] || eci(options)
+        if (stored_credential = options[:stored_credential]) && %w(visa master).include?(payment_method.brand)
+          post['card.posEntryMode'] = stored_credential[:initial_transaction] ? 'MANUAL' : 'STORED_CREDENTIAL'
+          stored_credential_usage(post, payment_method, options) unless stored_credential[:initiator] && stored_credential[:initiator] == 'cardholder'
+          post['order.authTraceId'] = stored_credential[:network_transaction_id] if stored_credential[:network_transaction_id]
+        end
+      end
+
+      def stored_credential_usage(post, payment_method, options)
+        return unless payment_method.brand == 'visa'
+        stored_credential = options[:stored_credential]
+        if stored_credential[:initial_transaction]
+          post['card.storedCredentialUsage'] = 'INITIAL_STORAGE'
+        elsif stored_credential[:reason_type] == ('recurring' || 'installment')
+          post['card.storedCredentialUsage'] = 'RECURRING'
+        elsif stored_credential[:reason_type] == 'unscheduled'
+          post['card.storedCredentialUsage'] = 'UNSCHEDULED'
+        end
+      end
+
+      def eci(options)
+        if options.dig(:stored_credential, :initial_transaction)
+          'SSL'
+        elsif options.dig(:stored_credential, :initiator) && options[:stored_credential][:initiator] == 'cardholder'
+          'MTO'
+        elsif options.dig(:stored_credential, :reason_type)
+          case options[:stored_credential][:reason_type]
+          when 'recurring'
+            'REC'
+          when 'installment'
+            'INS'
+          when 'unscheduled'
+            'MTO'
+          end
+        else
+          'SSL'
+        end
+      end
+
       def add_verification_value(post, payment_method)
         post['card.CVN'] = payment_method.verification_value
       end
@@ -168,11 +214,18 @@ module ActiveMerchant #:nodoc:
           message_from(succeeded, raw),
           raw,
           authorization: raw['response.orderNumber'] || raw['response.customerReferenceNumber'],
+          cvv_result: cvv_result(succeeded, raw),
           error_code: error_code_from(succeeded, raw),
           test: test?
         )
       end
 
+      def cvv_result(succeeded, raw)
+        return unless succeeded
+        code = CVV_CODE_MAPPING[raw['response.cvnResponse']] || raw['response.cvnResponse']
+        CVVResult.new(code)
+      end
+
       def headers
         {
           'Content-Type'  => 'application/x-www-form-urlencoded'

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

@@ -42,7 +42,8 @@ module ActiveMerchant
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        options[:refund_hash] = Digest::SHA1.hexdigest(options[:rebate_secret]) if options.has_key?(:rebate_secret)
+        options[:refund_hash] = Digest::SHA1.hexdigest(options[:rebate_secret]) if options[:rebate_secret].present?
+        options[:credit_hash] = Digest::SHA1.hexdigest(options[:refund_secret]) if options[:refund_secret].present?
         super
       end
 
@@ -70,9 +71,9 @@ module ActiveMerchant
         commit(request)
       end
 
-      def credit(money, authorization, options = {})
-        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, authorization, options)
+      def credit(money, creditcard, options = {})
+        request = build_credit_request(money, creditcard, options)
+        commit(request)
       end
 
       def void(authorization, options = {})
@@ -145,7 +146,11 @@ module ActiveMerchant
           add_card(xml, credit_card)
           xml.tag! 'autosettle', 'flag' => auto_settle_flag(action)
           add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), amount(money), (options[:currency] || currency(money)), credit_card.number)
-          add_network_tokenization_card(xml, credit_card) if credit_card.is_a?(NetworkTokenizationCreditCard)
+          if credit_card.is_a?(NetworkTokenizationCreditCard)
+            add_network_tokenization_card(xml, credit_card)
+          else
+            add_three_d_secure(xml, options)
+          end
           add_comments(xml, options)
           add_address_and_customer_info(xml, options)
         end
@@ -180,6 +185,22 @@ module ActiveMerchant
         xml.target!
       end
 
+      def build_credit_request(money, credit_card, options)
+        timestamp = new_timestamp
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'credit' do
+          add_merchant_details(xml, options)
+          xml.tag! 'orderid', sanitize_order_id(options[:order_id])
+          add_amount(xml, money, options)
+          add_card(xml, credit_card)
+          xml.tag! 'refundhash', @options[:credit_hash] if @options[:credit_hash]
+          xml.tag! 'autosettle', 'flag' => 1
+          add_comments(xml, options)
+          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), amount(money), (options[:currency] || currency(money)), credit_card.number)
+        end
+        xml.target!
+      end
+
       def build_void_request(authorization, options)
         timestamp = new_timestamp
         xml = Builder::XmlMarkup.new :indent => 2
@@ -284,6 +305,22 @@ module ActiveMerchant
         end
       end
 
+      def add_three_d_secure(xml, options)
+        return unless three_d_secure = options[:three_d_secure]
+        version = three_d_secure.fetch(:version, '')
+        xml.tag! 'mpi' do
+          if version =~ /^2/
+            xml.tag! 'authentication_value', three_d_secure[:cavv]
+            xml.tag! 'ds_trans_id', three_d_secure[:ds_transaction_id]
+          else
+            xml.tag! 'cavv', three_d_secure[:cavv]
+            xml.tag! 'xid', three_d_secure[:xid]
+          end
+          xml.tag! 'eci', three_d_secure[:eci]
+          xml.tag! 'message_version', version
+        end
+      end
+
       def format_address_code(address)
         code = [address[:zip].to_s, address[:address1].to_s + address[:address2].to_s]
         code.collect { |e| e.gsub(/\D/, '') }.reject(&:empty?).join('|')