activemerchant 1.107.2 → 1.110.0

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

@@ -4,9 +4,9 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://sandbox.dlocal.com'
       self.live_url = 'https://api.dlocal.com'
 
-      self.supported_countries = ['AR', 'BR', 'CL', 'CO', 'MX', 'PE', 'UY', 'TR']
+      self.supported_countries = %w[AR BR CL CO MX PE UY TR]
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club, :maestro, :naranja, :cabal]
+      self.supported_cardtypes = %i[visa master american_express discover jcb diners_club maestro naranja cabal]
 
       self.homepage_url = 'https://dlocal.com/'
       self.display_name = 'dLocal'
@@ -93,8 +93,10 @@ module ActiveMerchant #:nodoc:
         post[:country] = lookup_country_code(address[:country])
       end
 
-      def lookup_country_code(country)
-        Country.find(country).code(:alpha2).value
+      def lookup_country_code(country_field)
+        Country.find(country_field).code(:alpha2).value
+      rescue InvalidCountryCodeError
+        nil
       end
 
       def add_payer(post, card, options)
@@ -116,12 +118,26 @@ module ActiveMerchant #:nodoc:
         address_object = {}
         address_object[:state] = address[:state] if address[:state]
         address_object[:city] = address[:city] if address[:city]
-        address_object[:zip_code] = address[:zip_code] if address[:zip_code]
-        address_object[:street] = address[:street] if address[:street]
-        address_object[:number] = address[:number] if address[:number]
+        address_object[:zip_code] = address[:zip] if address[:zip]
+        address_object[:street] = address[:street] || parse_street(address) if parse_street(address)
+        address_object[:number] = address[:number] || parse_house_number(address) if parse_house_number(address)
         address_object
       end
 
+      def parse_street(address)
+        return unless address[:address1]
+
+        street = address[:address1].split(/\s+/).keep_if { |x| x !~ /\d/ }.join(' ')
+        street.empty? ? nil : street
+      end
+
+      def parse_house_number(address)
+        return unless address[:address1]
+
+        house = address[:address1].split(/\s+/).keep_if { |x| x =~ /\d/ }.join(' ')
+        house.empty? ? nil : house
+      end
+
       def add_card(post, card, action, options={})
         post[:card] = {}
         post[:card][:holder_name] = card.name
@@ -168,7 +184,7 @@ module ActiveMerchant #:nodoc:
       def success_from(action, response)
         return false unless response['status_code']
 
-        ['100', '200', '400', '600'].include? response['status_code'].to_s
+        %w[100 200 400 600].include? response['status_code'].to_s
       end
 
       def message_from(action, response)

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

@@ -6,7 +6,7 @@ module ActiveMerchant
       self.default_currency = 'GBP'
       self.supported_countries = ['GB']
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb maestro]
 
       self.homepage_url = 'http://www.datacash.com/'
       self.display_name = 'DataCash'

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

@@ -121,6 +121,7 @@ module ActiveMerchant #:nodoc:
 
         add_invoice(post, money, options)
         add_payment(post, credit_card, options)
+        add_aggregate_data(post, options) if options[:aggregate_data]
       end
 
       def add_payment_method_id(credit_card, options)
@@ -180,6 +181,29 @@ module ActiveMerchant #:nodoc:
         post[:card_data] = card_data
       end
 
+      def add_aggregate_data(post, options)
+        aggregate_data = {}
+        data = options[:aggregate_data]
+        aggregate_data[:indicator] = data[:indicator] if data[:indicator]
+        aggregate_data[:identification_number] = data[:identification_number] if data[:identification_number]
+        aggregate_data[:bill_to_pay] = data[:bill_to_pay] if data[:bill_to_pay]
+        aggregate_data[:bill_to_refund] = data[:bill_to_refund] if data[:bill_to_refund]
+        aggregate_data[:merchant_name] = data[:merchant_name] if data[:merchant_name]
+        aggregate_data[:street] = data[:street] if data[:street]
+        aggregate_data[:number] = data[:number] if data[:number]
+        aggregate_data[:postal_code] = data[:postal_code] if data[:postal_code]
+        aggregate_data[:category] = data[:category] if data[:category]
+        aggregate_data[:channel] = data[:channel] if data[:channel]
+        aggregate_data[:geographic_code] = data[:geographic_code] if data[:geographic_code]
+        aggregate_data[:city] = data[:city] if data[:city]
+        aggregate_data[:merchant_id] = data[:merchant_id] if data[:merchant_id]
+        aggregate_data[:province] = data[:province] if data[:province]
+        aggregate_data[:country] = data[:country] if data[:country]
+        aggregate_data[:merchant_email] = data[:merchant_email] if data[:merchant_email]
+        aggregate_data[:merchant_phone] = data[:merchant_phone] if data[:merchant_phone]
+        post[:aggregate_data] = aggregate_data
+      end
+
       def add_fraud_detection(options = {})
         {}.tap do |hsh|
           hsh[:send_to_cs] = options[:send_to_cs] if valid_fraud_detection_option?(options[:send_to_cs]) # true/false

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

@@ -6,10 +6,10 @@ module ActiveMerchant #:nodoc:
 
       self.live_url = 'https://api.dibspayment.com/merchant/v1/JSON/Transaction/'
 
-      self.supported_countries = ['US', 'FI', 'NO', 'SE', 'GB']
+      self.supported_countries = %w[US FI NO SE GB]
       self.default_currency = 'USD'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       def initialize(options={})
         requires!(options, :merchant_id, :secret_key)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.money_format = :cents
 
       self.homepage_url = 'https://digitzs.com'
@@ -235,7 +235,7 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(response)
         if customer_id = response.try(:[], 'data').try(:[], 'attributes').try(:[], 'customerId')
-          "#{customer_id}|#{response.try(:[], "data").try(:[], "id")}"
+          "#{customer_id}|#{response.try(:[], 'data').try(:[], 'id')}"
         else
           response.try(:[], 'data').try(:[], 'id')
         end

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(BR MX CO CL AR PE)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club]
 
       self.homepage_url = 'http://www.ebanx.com/'
       self.display_name = 'EBANX'
@@ -212,6 +212,8 @@ module ActiveMerchant #:nodoc:
       def add_additional_data(post, options)
         post[:device_id] = options[:device_id] if options[:device_id]
         post[:metadata] = options[:metadata] if options[:metadata]
+        post[:metadata] = {} if post[:metadata].nil?
+        post[:metadata][:merchant_payment_code] = options[:order_id] if options[:order_id]
       end
 
       def parse(body)
@@ -235,7 +237,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(action, response)
-        if [:purchase, :capture, :refund].include?(action)
+        if %i[purchase capture refund].include?(action)
           response.try(:[], 'payment').try(:[], 'status') == 'CO'
         elsif action == :authorize
           response.try(:[], 'payment').try(:[], 'status') == 'PE'
@@ -256,7 +258,7 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(action, parameters, response)
         if action == :store
-          "#{response.try(:[], "token")}|#{CARD_BRAND[parameters[:payment_type_code].to_sym]}"
+          "#{response.try(:[], 'token')}|#{CARD_BRAND[parameters[:payment_type_code].to_sym]}"
         else
           response.try(:[], 'payment').try(:[], 'hash')
         end
@@ -276,7 +278,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def requires_http_get(action)
-        return true if [:capture, :void].include?(action)
+        return true if %i[capture void].include?(action)
 
         false
       end

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class EfsnetGateway < Gateway
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://www.concordefsnet.com/'
       self.display_name = 'Efsnet'
 
@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
 
       def void(identification, options = {})
         requires!(options, :order_id)
-        original_transaction_id, _ = identification.split(';')
+        original_transaction_id, = identification.split(';')
         commit(:void_transaction, {reference_number: format_reference_number(options[:order_id]), transaction_id: original_transaction_id})
       end
 

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
 
       self.display_name = 'Elavon MyVirtualMerchant'
       self.supported_countries = %w(US CA PR DE IE NO PL LU BE NL MX)
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://www.elavon.com/'
 
       self.delimiter = "\n"
@@ -26,6 +26,7 @@ module ActiveMerchant #:nodoc:
         void: 'CCDELETE',
         store: 'CCGETTOKEN',
         update: 'CCUPDATETOKEN',
+        verify: 'CCVERIFY'
       }
 
       def initialize(options = {})
@@ -47,7 +48,8 @@ module ActiveMerchant #:nodoc:
         add_customer_data(form, options)
         add_test_mode(form, options)
         add_ip(form, options)
-        add_ssl_dynamic_dba(form, options)
+        add_auth_purchase_params(form, options)
+        add_level_3_fields(form, options) if options[:level_3_data]
         commit(:purchase, money, form, options)
       end
 
@@ -61,7 +63,8 @@ module ActiveMerchant #:nodoc:
         add_customer_data(form, options)
         add_test_mode(form, options)
         add_ip(form, options)
-        add_ssl_dynamic_dba(form, options)
+        add_auth_purchase_params(form, options)
+        add_level_3_fields(form, options) if options[:level_3_data]
         commit(:authorize, money, form, options)
       end
 
@@ -74,6 +77,7 @@ module ActiveMerchant #:nodoc:
           add_invoice(form, options)
           add_creditcard(form, options[:credit_card])
           add_currency(form, money, options)
+          add_address(form, options)
           add_customer_data(form, options)
           add_test_mode(form, options)
         else
@@ -113,10 +117,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def verify(credit_card, options = {})
-        MultiResponse.run(:use_first_response) do |r|
-          r.process { authorize(100, credit_card, options) }
-          r.process(:ignore_result) { void(r.authorization, options) }
-        end
+        form = {}
+        add_creditcard(form, credit_card)
+        add_address(form, options)
+        add_test_mode(form, options)
+        add_ip(form, options)
+        commit(:verify, 0, form, options)
       end
 
       def store(creditcard, options = {})
@@ -251,8 +257,49 @@ module ActiveMerchant #:nodoc:
         form[:cardholder_ip] = options[:ip] if options.has_key?(:ip)
       end
 
-      def add_ssl_dynamic_dba(form, options)
+      def add_auth_purchase_params(form, options)
         form[:dynamic_dba] = options[:dba] if options.has_key?(:dba)
+        form[:merchant_initiated_unscheduled] = options[:merchant_initiated_unscheduled] if options.has_key?(:merchant_initiated_unscheduled)
+      end
+
+      def add_level_3_fields(form, options)
+        level_3_data = options[:level_3_data]
+        form[:customer_code] = level_3_data[:customer_code] if level_3_data[:customer_code]
+        form[:salestax] = level_3_data[:salestax] if level_3_data[:salestax]
+        form[:salestax_indicator] = level_3_data[:salestax_indicator] if level_3_data[:salestax_indicator]
+        form[:level3_indicator] = level_3_data[:level3_indicator] if level_3_data[:level3_indicator]
+        form[:ship_to_zip] = level_3_data[:ship_to_zip] if level_3_data[:ship_to_zip]
+        form[:ship_to_country] = level_3_data[:ship_to_country] if level_3_data[:ship_to_country]
+        form[:shipping_amount] = level_3_data[:shipping_amount] if level_3_data[:shipping_amount]
+        form[:ship_from_postal_code] = level_3_data[:ship_from_postal_code] if level_3_data[:ship_from_postal_code]
+        form[:discount_amount] = level_3_data[:discount_amount] if level_3_data[:discount_amount]
+        form[:duty_amount] = level_3_data[:duty_amount] if level_3_data[:duty_amount]
+        form[:national_tax_indicator] = level_3_data[:national_tax_indicator] if level_3_data[:national_tax_indicator]
+        form[:national_tax_amount] = level_3_data[:national_tax_amount] if level_3_data[:national_tax_amount]
+        form[:order_date] = level_3_data[:order_date] if level_3_data[:order_date]
+        form[:other_tax] = level_3_data[:other_tax] if level_3_data[:other_tax]
+        form[:summary_commodity_code] = level_3_data[:summary_commodity_code] if level_3_data[:summary_commodity_code]
+        form[:merchant_vat_number] = level_3_data[:merchant_vat_number] if level_3_data[:merchant_vat_number]
+        form[:customer_vat_number] = level_3_data[:customer_vat_number] if level_3_data[:customer_vat_number]
+        form[:freight_tax_amount] = level_3_data[:freight_tax_amount] if level_3_data[:freight_tax_amount]
+        form[:vat_invoice_number] = level_3_data[:vat_invoice_number] if level_3_data[:vat_invoice_number]
+        form[:tracking_number] = level_3_data[:tracking_number] if level_3_data[:tracking_number]
+        form[:shipping_company] = level_3_data[:shipping_company] if level_3_data[:shipping_company]
+        form[:other_fees] = level_3_data[:other_fees] if level_3_data[:other_fees]
+        add_line_items(form, level_3_data) if level_3_data[:line_items]
+      end
+
+      def add_line_items(form, level_3_data)
+        items = []
+        level_3_data[:line_items].each do |line_item|
+          item = {}
+          line_item.each do |key, value|
+            prefixed_key = "ssl_line_Item_#{key}"
+            item[prefixed_key.to_sym] = value
+          end
+          items << item
+        end
+        form[:LineItemProducts] = { product: items }
       end
 
       def message_from(response)
@@ -284,7 +331,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data_string(key, value, options)
-        if custom_field?(key, options)
+        if custom_field?(key, options) || key == :LineItemProducts
           "#{key}=#{CGI.escape(value.to_s)}"
         else
           "ssl_#{key}=#{CGI.escape(value.to_s)}"

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
       self.homepage_url = 'http://www.elementps.com'
       self.display_name = 'Element'
@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options={})
-        trans_id, _ = split_authorization(authorization)
+        trans_id, = split_authorization(authorization)
         options[:trans_id] = trans_id
 
         request = build_soap_request do |xml|
@@ -68,7 +68,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options={})
-        trans_id, _ = split_authorization(authorization)
+        trans_id, = split_authorization(authorization)
         options[:trans_id] = trans_id
 
         request = build_soap_request do |xml|
@@ -111,10 +111,18 @@ module ActiveMerchant #:nodoc:
       end
 
       def verify(credit_card, options={})
-        MultiResponse.run(:use_first_response) do |r|
-          r.process { authorize(100, credit_card, options) }
-          r.process(:ignore_result) { void(r.authorization, options) }
+        request = build_soap_request do |xml|
+          xml.CreditCardAVSOnly(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, credit_card)
+            add_transaction(xml, 0, options)
+            add_terminal(xml, options)
+            add_address(xml, options)
+          end
         end
+
+        # send request with the transaction amount set to 0
+        commit('CreditCardAVSOnly', request, 0)
       end
 
       def supports_scrubbing?
@@ -185,8 +193,8 @@ module ActiveMerchant #:nodoc:
 
       def add_terminal(xml, options)
         xml.terminal do
-          xml.TerminalID '01'
-          xml.CardPresentCode 'UseDefault'
+          xml.TerminalID options[:terminal_id] || '01'
+          xml.CardPresentCode options[:card_present_code] || 'UseDefault'
           xml.CardholderPresentCode 'UseDefault'
           xml.CardInputCode 'UseDefault'
           xml.CVVPresenceCode 'UseDefault'

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

@@ -5,9 +5,9 @@ module ActiveMerchant #:nodoc:
 
       self.default_currency = 'DKK'
       self.money_format = :cents
-      self.supported_cardtypes = [:dankort, :forbrugsforeningen, :visa, :master,
-                                  :american_express, :diners_club, :jcb, :maestro]
-      self.supported_countries = ['DK', 'SE', 'NO']
+      self.supported_countries = %w[DK SE NO]
+      self.supported_cardtypes = %i[dankort forbrugsforeningen visa master
+                                    american_express diners_club jcb maestro]
       self.homepage_url = 'http://epay.dk/'
       self.display_name = 'ePay'
 

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

@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://secure.evoepay.com/api/transact.php'
 
       self.supported_countries  = ['CA']
-      self.supported_cardtypes  = [:visa, :master, :american_express, :jcb, :discover]
+      self.supported_cardtypes  = %i[visa master american_express jcb discover]
       self.money_format         = :dollars
       self.homepage_url         = 'http://www.evocanada.com/'
       self.display_name         = 'EVO Canada'

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
 
       self.money_format = :cents
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express diners_club]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY'
 

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['AU']
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = %i[visa master]
 
       self.default_currency = 'AUD'
 

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

@@ -7,8 +7,8 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://api.ewaypayments.com/'
 
       self.money_format = :cents
-      self.supported_countries = ['AU', 'NZ', 'GB', 'SG', 'MY', 'HK']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_countries = %w[AU NZ GB SG MY HK]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY Rapid 3.1'
       self.default_currency = 'AUD'

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

@@ -28,10 +28,10 @@ module ActiveMerchant #:nodoc:
 
       SUCCESS = 'true'
 
-      SENSITIVE_FIELDS = [:verification_str2, :expiry_date, :card_number]
+      SENSITIVE_FIELDS = %i[verification_str2 expiry_date card_number]
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :discover]
-      self.supported_countries = ['CA', 'US']
+      self.supported_countries = %w[CA US]
+      self.supported_cardtypes = %i[visa master american_express jcb discover]
       self.homepage_url = 'http://www.e-xact.com'
       self.display_name = 'E-xact'