activemerchant 1.90.0 → 1.99.0

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

@@ -13,7 +13,7 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://www.barclaycardsmartpay.com/'
       self.display_name = 'Barclaycard Smartpay'
 
-      API_VERSION = 'v30'
+      API_VERSION = 'v40'
 
       def initialize(options = {})
         requires!(options, :company, :merchant, :password)
@@ -37,7 +37,9 @@ module ActiveMerchant #:nodoc:
         post[:card] = credit_card_hash(creditcard)
         post[:billingAddress] = billing_address_hash(options) if options[:billing_address]
         post[:deliveryAddress] = shipping_address_hash(options) if options[:shipping_address]
-        add_3ds(post, options) if options[:execute_threed]
+        post[:shopperStatement] = options[:shopper_statement] if options[:shopper_statement]
+
+        add_3ds(post, options)
         commit('authorise', post)
       end
 
@@ -186,7 +188,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse_avs_code(response)
-        AVS_MAPPING[response['avsResult'][0..1].strip] if response['avsResult']
+        AVS_MAPPING[response['additionalData']['avsResult'][0..1].strip] if response.dig('additionalData', 'avsResult')
       end
 
       def flatten_hash(hash, prefix = nil)
@@ -210,12 +212,18 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(response)
-        Hash[
-          response.split('&').map do |x|
-            key, val = x.split('=', 2)
-            [key.split('.').last, CGI.unescape(val)]
+        parsed_response = {}
+        params = CGI.parse(response)
+        params.each do |key, value|
+          parsed_key = key.split('.', 2)
+          if parsed_key.size > 1
+            parsed_response[parsed_key[0]] ||= {}
+            parsed_response[parsed_key[0]][parsed_key[1]] = value[0]
+          else
+            parsed_response[parsed_key[0]] = value[0]
           end
-        ]
+        end
+        parsed_response
       end
 
       def post_data(data)
@@ -343,8 +351,33 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_3ds(post, options)
-        post[:additionalData] = { executeThreeD: 'true' }
-        post[:browserInfo] = { userAgent: options[:user_agent], acceptHeader: options[:accept_header] }
+        if three_ds_2_options = options[:three_ds_2]
+          device_channel = three_ds_2_options[:channel]
+          if device_channel == 'app'
+            post[:threeDS2RequestData] = { deviceChannel: device_channel }
+          else
+            add_browser_info(three_ds_2_options[:browser_info], post)
+            post[:threeDS2RequestData] = { deviceChannel: device_channel, notificationURL: three_ds_2_options[:notification_url] }
+          end
+        else
+          return unless options[:execute_threed] || options[:threed_dynamic]
+          post[:browserInfo] = { userAgent: options[:user_agent], acceptHeader: options[:accept_header] }
+          post[:additionalData] = { executeThreeD: 'true' } if options[:execute_threed]
+        end
+      end
+
+      def add_browser_info(browser_info, post)
+        return unless browser_info
+        post[:browserInfo] = {
+          acceptHeader: browser_info[:accept_header],
+          colorDepth: browser_info[:depth],
+          javaEnabled: browser_info[:java],
+          language: browser_info[:language],
+          screenHeight: browser_info[:height],
+          screenWidth: browser_info[:width],
+          timeZoneOffset: browser_info[:timezone],
+          userAgent: browser_info[:user_agent]
+        }
       end
     end
   end

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -315,6 +315,9 @@ module ActiveMerchant #:nodoc:
         post[:operationType] = options[:operationType] || options[:operation] || secure_profile_action(:new)
         post[:customerCode] = options[:billing_id] || options[:vault_id] || false
         post[:status] = options[:status]
+
+        billing_address = options[:billing_address] || options[:address]
+        post[:trnCardOwner] = billing_address ? billing_address[:name] : nil
       end
 
       def add_recurring_amount(post, money)

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

@@ -93,12 +93,15 @@ module ActiveMerchant #:nodoc:
 
       def void(authorization, options = {})
         reference, amount, type = split_auth(authorization)
-
-        post = {}
-        add_reference(post, reference)
-        add_original_amount(post, amount)
-        add_transaction_type(post, void_action(type))
-        commit(post)
+        if type == TRANSACTIONS[:authorization]
+          capture(0, authorization, options)
+        else
+          post = {}
+          add_reference(post, reference)
+          add_original_amount(post, amount)
+          add_transaction_type(post, void_action(type))
+          commit(post)
+        end
       end
 
       def verify(source, options={})
@@ -153,6 +156,8 @@ module ActiveMerchant #:nodoc:
 
       # To match the other stored-value gateways, like TrustCommerce,
       # store and unstore need to be defined
+      #
+      # When passing a single-use token the :name option is required
       def store(payment_method, options = {})
         post = {}
         add_address(post, options)

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

@@ -24,7 +24,7 @@ module ActiveMerchant #:nodoc:
         'REBID' => :rebid,
         'TRANS_TYPE' => :trans_type,
         'PAYMENT_ACCOUNT_MASK' => :acct_mask,
-        'CARD_TYPE' => :card_type,
+        'CARD_TYPE' => :card_type
       }
 
       REBILL_FIELD_MAP = {
@@ -41,6 +41,7 @@ module ActiveMerchant #:nodoc:
         'REB_AMOUNT' => :rebill_amount,
         'NEXT_AMOUNT' => :next_amount,
         'USUAL_DATE' => :undoc_usual_date, # Not found in the bp20rebadmin API doc.
+        'CUST_TOKEN' => :cust_token
       }
 
       self.supported_countries = ['US', 'CA']
@@ -84,7 +85,7 @@ module ActiveMerchant #:nodoc:
         add_rebill(post, options) if options[:rebill]
         add_duplicate_override(post, options)
         post[:TRANS_TYPE]  = 'AUTH'
-        commit('AUTH_ONLY', money, post)
+        commit('AUTH_ONLY', money, post, options)
       end
 
       # Perform a purchase, which is essentially an authorization and capture in a single operation.
@@ -107,7 +108,7 @@ module ActiveMerchant #:nodoc:
         add_rebill(post, options) if options[:rebill]
         add_duplicate_override(post, options)
         post[:TRANS_TYPE]  = 'SALE'
-        commit('AUTH_CAPTURE', money, post)
+        commit('AUTH_CAPTURE', money, post, options)
       end
 
       # Captures the funds from an authorize transaction.
@@ -123,7 +124,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         post[:MASTER_ID] = identification
         post[:TRANS_TYPE] = 'CAPTURE'
-        commit('PRIOR_AUTH_CAPTURE', money, post)
+        commit('PRIOR_AUTH_CAPTURE', money, post, options)
       end
 
       # Void a previous transaction
@@ -136,7 +137,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:MASTER_ID] = identification
         post[:TRANS_TYPE] = 'VOID'
-        commit('VOID', nil, post)
+        commit('VOID', nil, post, options)
       end
 
       # Performs a credit.
@@ -169,7 +170,7 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, options)
         add_address(post, options)
         add_customer_data(post, options)
-        commit('CREDIT', money, post)
+        commit('CREDIT', money, post, options)
       end
 
       def credit(money, payment_object, options = {})
@@ -189,7 +190,7 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, options)
         add_address(post, options)
         add_customer_data(post, options)
-        commit('CREDIT', money, post)
+        commit('CREDIT', money, post, options)
       end
 
       # Create a new recurring payment.
@@ -313,10 +314,11 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      def commit(action, money, fields)
+      def commit(action, money, fields, options = {})
         fields[:AMOUNT] = amount(money) unless(fields[:TRANS_TYPE] == 'VOID' || action == 'rebill')
         fields[:MODE] = (test? ? 'TEST' : 'LIVE')
         fields[:ACCOUNT_ID] = @options[:login]
+        fields[:CUSTOMER_IP] = options[:ip] if options[:ip]
 
         if action == 'rebill'
           url = rebilling_url

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

@@ -5,10 +5,10 @@ module ActiveMerchant
     class BlueSnapGateway < Gateway
       self.test_url = 'https://sandbox.bluesnap.com/services/2'
       self.live_url = 'https://ws.bluesnap.com/services/2'
-      self.supported_countries = %w(US CA GB AT BE BG HR CY CZ DK EE FI FR DE GR HU IE IT LV LT LU MT NL PL PT RO SK SI ES SE)
+      self.supported_countries = %w(US CA GB AT BE BG HR CY CZ DK EE FI FR DE GR HU IE IT LV LT LU MT NL PL PT RO SK SI ES SE AR BO BR BZ CL CO CR DO EC GF GP GT HN HT MF MQ MX NI PA PE PR PY SV UY VE)
 
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club, :maestro]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club, :maestro, :naranja, :cabal]
 
       self.homepage_url = 'https://home.bluesnap.com/'
       self.display_name = 'BlueSnap'
@@ -59,14 +59,29 @@ module ActiveMerchant
         'line1: N, zip: N, name: N' => 'N',
       }
 
+      BANK_ACCOUNT_TYPE_MAPPING = {
+        'personal_checking' => 'CONSUMER_CHECKING',
+        'personal_savings' => 'CONSUMER_SAVINGS',
+        'business_checking' => 'CORPORATE_CHECKING',
+        'business_savings' => 'CORPORATE_SAVINGS'
+      }
+
+      STATE_CODE_COUNTRIES = %w(US CA)
+
       def initialize(options={})
         requires!(options, :api_username, :api_password)
         super
       end
 
       def purchase(money, payment_method, options={})
-        commit(:purchase) do |doc|
-          add_auth_purchase(doc, money, payment_method, options)
+        payment_method_details = PaymentMethodDetails.new(payment_method)
+
+        commit(:purchase, :post, payment_method_details) do |doc|
+          if payment_method_details.alt_transaction?
+            add_alt_transaction_purchase(doc, money, payment_method_details, options)
+          else
+            add_auth_purchase(doc, money, payment_method, options)
+          end
         end
       end
 
@@ -80,6 +95,7 @@ module ActiveMerchant
         commit(:capture, :put) do |doc|
           add_authorization(doc, authorization)
           add_order(doc, options)
+          add_amount(doc, money, options) if options[:include_capture_amount] == true
         end
       end
 
@@ -102,18 +118,33 @@ module ActiveMerchant
         authorize(0, payment_method, options)
       end
 
-      def store(credit_card, options = {})
-        commit(:store) do |doc|
-          add_personal_info(doc, credit_card, options)
+      def store(payment_method, options = {})
+        payment_method_details = PaymentMethodDetails.new(payment_method)
+
+        commit(:store, :post, payment_method_details) do |doc|
+          add_personal_info(doc, payment_method, options)
+          add_echeck_company(doc, payment_method) if payment_method_details.check?
           doc.send('payment-sources') do
-            doc.send('credit-card-info') do
-              add_credit_card(doc, credit_card)
-            end
+            payment_method_details.check? ? store_echeck(doc, payment_method) : store_credit_card(doc, payment_method)
           end
           add_order(doc, options)
         end
       end
 
+      def store_credit_card(doc, payment_method)
+        doc.send('credit-card-info') do
+          add_credit_card(doc, payment_method)
+        end
+      end
+
+      def store_echeck(doc, payment_method)
+        doc.send('ecp-info') do
+          doc.send('ecp') do
+            add_echeck(doc, payment_method)
+          end
+        end
+      end
+
       def verify_credentials
         begin
           ssl_get(url.to_s, headers)
@@ -132,7 +163,9 @@ module ActiveMerchant
         transcript.
           gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
           gsub(%r((<card-number>).+(</card-number>)), '\1[FILTERED]\2').
-          gsub(%r((<security-code>).+(</security-code>)), '\1[FILTERED]\2')
+          gsub(%r((<security-code>).+(</security-code>)), '\1[FILTERED]\2').
+          gsub(%r((<(?:public-)?account-number>).+(</(?:public-)?account-number>)), '\1[FILTERED]\2').
+          gsub(%r((<(?:public-)?routing-number>).+(</(?:public-)?routing-number>)), '\1[FILTERED]\2')
       end
 
       private
@@ -140,11 +173,9 @@ module ActiveMerchant
       def add_auth_purchase(doc, money, payment_method, options)
         doc.send('recurring-transaction', options[:recurring] ? 'RECURRING' : 'ECOMMERCE')
         add_order(doc, options)
-        doc.send('storeCard', options[:store_card] || false)
+        doc.send('store-card', options[:store_card] || false)
         add_amount(doc, money, options)
-        doc.send('transaction-fraud-info') do
-          doc.send('shopper-ip-address', options[:ip]) if options[:ip]
-        end
+        add_fraud_info(doc, options)
 
         if payment_method.is_a?(String)
           doc.send('vaulted-shopper-id', payment_method)
@@ -161,9 +192,10 @@ module ActiveMerchant
         doc.currency(options[:currency] || currency(money))
       end
 
-      def add_personal_info(doc, credit_card, options)
-        doc.send('first-name', credit_card.first_name)
-        doc.send('last-name', credit_card.last_name)
+      def add_personal_info(doc, payment_method, options)
+        doc.send('first-name', payment_method.first_name)
+        doc.send('last-name', payment_method.last_name)
+        doc.send('personal-identification-number', options[:personal_identification_number]) if options[:personal_identification_number]
         doc.email(options[:email]) if options[:email]
         add_address(doc, options)
       end
@@ -191,6 +223,8 @@ module ActiveMerchant
         doc.send('merchant-transaction-id', truncate(options[:order_id], 50)) if options[:order_id]
         doc.send('soft-descriptor', options[:soft_descriptor]) if options[:soft_descriptor]
         add_description(doc, options[:description]) if options[:description]
+        add_3ds(doc, options[:three_d_secure]) if options[:three_d_secure]
+        add_level_3_data(doc, options)
       end
 
       def add_address(doc, options)
@@ -198,16 +232,114 @@ module ActiveMerchant
         return unless address
 
         doc.country(address[:country]) if address[:country]
-        doc.state(address[:state]) if address[:state]
+        doc.state(address[:state]) if address[:state] && STATE_CODE_COUNTRIES.include?(address[:country])
         doc.address(address[:address]) if address[:address]
         doc.city(address[:city]) if address[:city]
         doc.zip(address[:zip]) if address[:zip]
       end
 
+      def add_3ds(doc, three_d_secure_options)
+        eci = three_d_secure_options[:eci]
+        cavv = three_d_secure_options[:cavv]
+        xid = three_d_secure_options[:xid]
+        ds_transaction_id = three_d_secure_options[:ds_transaction_id]
+        version = three_d_secure_options[:version]
+
+        doc.send('three-d-secure') do
+          doc.eci(eci) if eci
+          doc.cavv(cavv) if cavv
+          doc.xid(xid) if xid
+          doc.send('three-d-secure-version', version) if version
+          doc.send('ds-transaction-id', ds_transaction_id) if ds_transaction_id
+        end
+      end
+
+      def add_level_3_data(doc, options)
+        return unless options[:customer_reference_number]
+        doc.send('level-3-data') do
+          send_when_present(doc, :customer_reference_number, options)
+          send_when_present(doc, :sales_tax_amount, options)
+          send_when_present(doc, :freight_amount, options)
+          send_when_present(doc, :duty_amount, options)
+          send_when_present(doc, :destination_zip_code, options)
+          send_when_present(doc, :destination_country_code, options)
+          send_when_present(doc, :ship_from_zip_code, options)
+          send_when_present(doc, :discount_amount, options)
+          send_when_present(doc, :tax_amount, options)
+          send_when_present(doc, :tax_rate, options)
+          add_level_3_data_items(doc, options[:level_3_data_items]) if options[:level_3_data_items]
+        end
+      end
+
+      def send_when_present(doc, options_key, options, xml_element_name = nil)
+        return unless options[options_key]
+        xml_element_name ||= options_key.to_s
+
+        doc.send(xml_element_name.dasherize, options[options_key])
+      end
+
+      def add_level_3_data_items(doc, items)
+        items.each do |item|
+          doc.send('level-3-data-item') do
+            item.each do |key, value|
+              key = key.to_s.dasherize
+              doc.send(key, value)
+            end
+          end
+        end
+      end
+
       def add_authorization(doc, authorization)
         doc.send('transaction-id', authorization)
       end
 
+      def add_fraud_info(doc, options)
+        doc.send('transaction-fraud-info') do
+          doc.send('shopper-ip-address', options[:ip]) if options[:ip]
+        end
+      end
+
+      def add_alt_transaction_purchase(doc, money, payment_method_details, options)
+        doc.send('merchant-transaction-id', truncate(options[:order_id], 50)) if options[:order_id]
+        doc.send('soft-descriptor', options[:soft_descriptor]) if options[:soft_descriptor]
+        add_amount(doc, money, options)
+
+        vaulted_shopper_id = payment_method_details.vaulted_shopper_id
+        doc.send('vaulted-shopper-id', vaulted_shopper_id) if vaulted_shopper_id
+
+        if payment_method_details.check?
+          add_echeck_transaction(doc, payment_method_details.payment_method, options, vaulted_shopper_id.present?)
+        end
+
+        add_fraud_info(doc, options)
+        add_description(doc, options)
+      end
+
+      def add_echeck_transaction(doc, check, options, vaulted_shopper)
+        unless vaulted_shopper
+          doc.send('payer-info') do
+            add_personal_info(doc, check, options)
+            add_echeck_company(doc, check)
+          end
+        end
+
+        doc.send('ecp-transaction') do
+          add_echeck(doc, check) unless vaulted_shopper
+        end
+
+        doc.send('authorized-by-shopper', options[:authorized_by_shopper])
+      end
+
+      def add_echeck_company(doc, check)
+        doc.send('company-name', truncate(check.name, 50)) if check.account_holder_type = 'business'
+      end
+
+      def add_echeck(doc, check)
+        doc.send('account-number', check.account_number)
+        doc.send('routing-number', check.routing_number)
+        doc.send('account-type', BANK_ACCOUNT_TYPE_MAPPING["#{check.account_holder_type}_#{check.account_type}"])
+      end
+
       def parse(response)
         return bad_authentication_response if response.code.to_i == 401
         return forbidden_response(response.body) if response.code.to_i == 403
@@ -236,15 +368,15 @@ module ActiveMerchant
         end
       end
 
-      def api_request(action, request, verb)
-        ssl_request(verb, url(action), request, headers)
+      def api_request(action, request, verb, payment_method_details)
+        ssl_request(verb, url(action, payment_method_details), request, headers)
       rescue ResponseError => e
         e.response
       end
 
-      def commit(action, verb = :post)
-        request = build_xml_request(action) { |doc| yield(doc) }
-        response = api_request(action, request, verb)
+      def commit(action, verb = :post, payment_method_details = PaymentMethodDetails.new())
+        request = build_xml_request(action, payment_method_details) { |doc| yield(doc) }
+        response = api_request(action, request, verb, payment_method_details)
         parsed = parse(response)
 
         succeeded = success_from(action, response)
@@ -252,7 +384,7 @@ module ActiveMerchant
           succeeded,
           message_from(succeeded, parsed),
           parsed,
-          authorization: authorization_from(action, parsed),
+          authorization: authorization_from(action, parsed, payment_method_details),
           avs_result: avs_result(parsed),
           cvv_result: cvv_result(parsed),
           error_code: error_code_from(parsed),
@@ -260,9 +392,9 @@ module ActiveMerchant
         )
       end
 
-      def url(action = nil)
+      def url(action = nil, payment_method_details = PaymentMethodDetails.new())
         base = test? ? test_url : live_url
-        resource = action == :store ? 'vaulted-shoppers' : 'transactions'
+        resource = action == :store ? 'vaulted-shoppers' : payment_method_details.resource_url
         "#{base}/#{resource}"
       end
 
@@ -287,13 +419,15 @@ module ActiveMerchant
         parsed_response['description']
       end
 
-      def authorization_from(action, parsed_response)
-        action == :store ? vaulted_shopper_id(parsed_response) : parsed_response['transaction-id']
+      def authorization_from(action, parsed_response, payment_method_details)
+        action == :store ? vaulted_shopper_id(parsed_response, payment_method_details) : parsed_response['transaction-id']
       end
 
-      def vaulted_shopper_id(parsed_response)
+      def vaulted_shopper_id(parsed_response, payment_method_details)
         return nil unless parsed_response['content-location-header']
-        parsed_response['content-location-header'].split('/').last
+        vaulted_shopper_id = parsed_response['content-location-header'].split('/').last
+        vaulted_shopper_id += "|#{payment_method_details.payment_method_type}" if payment_method_details.alt_transaction?
+        vaulted_shopper_id
       end
 
       def error_code_from(parsed_response)
@@ -306,8 +440,8 @@ module ActiveMerchant
         }
       end
 
-      def root_element(action)
-        action == :store ? 'vaulted-shopper' : 'card-transaction'
+      def root_element(action, payment_method_details)
+        action == :store ? 'vaulted-shopper' : payment_method_details.root_element
       end
 
       def headers
@@ -317,10 +451,10 @@ module ActiveMerchant
         }
       end
 
-      def build_xml_request(action)
+      def build_xml_request(action, payment_method_details)
         builder = Nokogiri::XML::Builder.new
-        builder.__send__(root_element(action), root_attributes) do |doc|
-          doc.send('card-transaction-type', TRANSACTIONS[action]) if TRANSACTIONS[action]
+        builder.__send__(root_element(action, payment_method_details), root_attributes) do |doc|
+          doc.send('card-transaction-type', TRANSACTIONS[action]) if TRANSACTIONS[action] && !payment_method_details.alt_transaction?
           yield(doc)
         end
         builder.doc.root.to_xml
@@ -343,5 +477,46 @@ module ActiveMerchant
         { 'description' => body }
       end
     end
+
+    class PaymentMethodDetails
+      attr_reader :payment_method, :vaulted_shopper_id, :payment_method_type
+
+      def initialize(payment_method = nil)
+        @payment_method = payment_method
+        @payment_method_type = nil
+        parse(payment_method)
+      end
+
+      def check?
+        @payment_method.is_a?(Check) || @payment_method_type == 'check'
+      end
+
+      def alt_transaction?
+        check?
+      end
+
+      def root_element
+        alt_transaction? ? 'alt-transaction' : 'card-transaction'
+      end
+
+      def resource_url
+        alt_transaction? ? 'alt-transactions' : 'transactions'
+      end
+
+      private
+
+      def parse(payment_method)
+        return unless payment_method
+
+        if payment_method.is_a?(String)
+          @vaulted_shopper_id, payment_method_type = payment_method.split('|')
+          @payment_method_type = payment_method_type if payment_method_type.present?
+        elsif payment_method.is_a?(Check)
+          @payment_method_type = payment_method.type
+        else
+          @payment_method_type = 'credit_card'
+        end
+      end
+    end
   end
 end

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

@@ -163,10 +163,10 @@ module ActiveMerchant #:nodoc:
         xml.send('PaymentType', payment_type)
         xml.send('TxnType', 'WEB_SHOP')
         xml.send('BillerCode', options.fetch(:biller_code, ''))
-        xml.send('MerchantReference', '')
-        xml.send('CRN1', '')
-        xml.send('CRN2', '')
-        xml.send('CRN3', '')
+        xml.send('MerchantReference', options[:order_id]) if options[:order_id]
+        xml.send('CRN1', options[:crn1]) if options[:crn1]
+        xml.send('CRN2', options[:crn2]) if options[:crn2]
+        xml.send('CRN3', options[:crn3]) if options[:crn3]
         xml.send('Amount', amount)
       end