activemerchant 1.100.0 → 1.133.0

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

@@ -6,24 +6,24 @@ 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={})
+      def initialize(options = {})
         requires!(options, :merchant_id, :secret_key)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         MultiResponse.run(false) do |r|
           r.process { authorize(amount, payment_method, options) }
           r.process { capture(amount, r.authorization, options) }
         end
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         post = {}
         add_amount(post, amount)
         add_invoice(post, amount, options)
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         post = {}
         add_amount(post, amount)
         add_reference(post, authorization)
@@ -44,14 +44,14 @@ module ActiveMerchant #:nodoc:
         commit(:capture, post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_reference(post, authorization)
 
         commit(:void, post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = {}
         add_amount(post, amount)
         add_reference(post, authorization)
@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
         commit(:refund, post)
       end
 
-      def verify(credit_card, options={})
+      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) }
@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
+      CURRENCY_CODES = Hash.new { |_h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
       CURRENCY_CODES['USD'] = '840'
       CURRENCY_CODES['DKK'] = '208'
       CURRENCY_CODES['NOK'] = '578'

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

@@ -8,25 +8,25 @@ 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'
       self.display_name = 'Digitzs'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :app_key, :api_key)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         MultiResponse.run do |r|
           r.process { commit('auth/token', app_token_request(options)) }
           r.process { commit('payments', purchase_request(money, payment, options), options.merge({ app_token: app_token_from(r) })) }
         end
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         MultiResponse.run do |r|
           r.process { commit('auth/token', app_token_request(options)) }
           r.process { commit('payments', refund_request(money, authorization, options), options.merge({ app_token: app_token_from(r) })) }
@@ -151,7 +151,7 @@ module ActiveMerchant #:nodoc:
         post[:data][:type] = 'payments'
         post[:data][:attributes][:merchantId] = options[:merchant_id]
         post[:data][:attributes][:paymentType] = 'cardRefund'
-        post[:data][:attributes][:originalTransaction] = {id: authorization}
+        post[:data][:attributes][:originalTransaction] = { id: authorization }
         add_transaction(post, money, options)
 
         post
@@ -175,7 +175,7 @@ module ActiveMerchant #:nodoc:
         post[:data][:attributes] = {
           tokenType: 'card',
           customerId: options[:customer_id],
-          label: 'Credit Card',
+          label: 'Credit Card'
         }
         add_payment(post, payment, options)
         add_address(post, options)
@@ -188,6 +188,7 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_get(url + "/customers/#{options[:customer_id]}", headers(options)))
 
         return response.try(:[], 'data').try(:[], 'customerId') if success_from(response)
+
         return nil
       end
 
@@ -205,7 +206,7 @@ module ActiveMerchant #:nodoc:
         JSON.parse(body)
       end
 
-      def commit(action, parameters, options={})
+      def commit(action, parameters, options = {})
         url = (test? ? test_url : live_url)
         response = parse(ssl_post(url + "/#{action}", parameters.to_json, headers(options)))
 
@@ -228,12 +229,13 @@ module ActiveMerchant #:nodoc:
       def message_from(response)
         return response['message'] if response['message']
         return 'Success' if success_from(response)
+
         response['errors'].map { |error_hash| error_hash['detail'] }.join(', ')
       end
 
       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
@@ -276,6 +278,7 @@ module ActiveMerchant #:nodoc:
         return 'cardSplit' if options[:payment_type] == 'card_split'
         return 'tokenSplit' if options[:payment_type] == 'token_split'
         return 'token' if payment.is_a? String
+
         'card'
       end
 

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

@@ -4,20 +4,14 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://sandbox.ebanxpay.com/ws/'
       self.live_url = 'https://api.ebanxpay.com/ws/'
 
-      self.supported_countries = ['BR', 'MX', 'CO', 'CL', 'AR']
+      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 elo hipercard]
 
       self.homepage_url = 'http://www.ebanx.com/'
       self.display_name = 'EBANX'
 
-      CARD_BRAND = {
-        visa: 'visa',
-        master: 'master_card',
-        american_express: 'amex',
-        discover: 'discover',
-        diners_club: 'diners'
-      }
+      TAGS = ['Spreedly']
 
       URL_MAP = {
         purchase: 'direct',
@@ -25,7 +19,8 @@ module ActiveMerchant #:nodoc:
         capture: 'capture',
         refund: 'refund',
         void: 'cancel',
-        store: 'token'
+        store: 'token',
+        inquire: 'query'
       }
 
       HTTP_METHOD = {
@@ -34,51 +29,63 @@ module ActiveMerchant #:nodoc:
         capture: :get,
         refund: :post,
         void: :get,
-        store: :post
+        store: :post,
+        inquire: :get
+      }
+
+      VERIFY_AMOUNT_PER_COUNTRY = {
+        'br' => 100,
+        'ar' => 100,
+        'co' => 50000,
+        'pe' => 300,
+        'mx' => 2000,
+        'cl' => 80000
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :integration_key)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         post = { payment: {} }
         add_integration_key(post)
         add_operation(post)
         add_invoice(post, money, options)
         add_customer_data(post, payment, options)
-        add_card_or_token(post, payment)
+        add_card_or_token(post, payment, options)
         add_address(post, options)
         add_customer_responsible_person(post, payment, options)
+        add_additional_data(post, options)
 
         commit(:purchase, post)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         post = { payment: {} }
         add_integration_key(post)
         add_operation(post)
         add_invoice(post, money, options)
         add_customer_data(post, payment, options)
-        add_card_or_token(post, payment)
+        add_card_or_token(post, payment, options)
         add_address(post, options)
         add_customer_responsible_person(post, payment, options)
+        add_additional_data(post, options)
         post[:payment][:creditcard][:auto_capture] = false
 
         commit(:authorize, post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         add_integration_key(post)
         post[:hash] = authorization
-        post[:amount] = amount(money)
+        post[:amount] = amount(money) if options[:include_capture_amount].to_s == 'true'
 
         commit(:capture, post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
         add_integration_key(post)
         add_operation(post)
@@ -89,7 +96,7 @@ module ActiveMerchant #:nodoc:
         commit(:refund, post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_integration_key(post)
         add_authorization(post, authorization)
@@ -97,7 +104,7 @@ module ActiveMerchant #:nodoc:
         commit(:void, post)
       end
 
-      def store(credit_card, options={})
+      def store(credit_card, options = {})
         post = {}
         add_integration_key(post)
         add_payment_details(post, credit_card)
@@ -106,20 +113,28 @@ module ActiveMerchant #:nodoc:
         commit(:store, post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
-          r.process { authorize(100, credit_card, options) }
+          r.process { authorize(VERIFY_AMOUNT_PER_COUNTRY[customer_country(options)], credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
         end
       end
 
+      def inquire(authorization, options = {})
+        post = {}
+        add_integration_key(post)
+        add_authorization(post, authorization)
+
+        commit(:inquire, post)
+      end
+
       def supports_scrubbing?
         true
       end
 
       def scrub(transcript)
         transcript.
-          gsub(/(integration_key\\?":\\?")(\d*)/, '\1[FILTERED]').
+          gsub(/(integration_key\\?":\\?")(\w*)/, '\1[FILTERED]').
           gsub(/(card_number\\?":\\?")(\d*)/, '\1[FILTERED]').
           gsub(/(card_cvv\\?":\\?")(\d*)/, '\1[FILTERED]')
       end
@@ -140,7 +155,7 @@ module ActiveMerchant #:nodoc:
 
       def add_customer_data(post, payment, options)
         post[:payment][:name] = customer_name(payment, options)
-        post[:payment][:email] = options[:email] || 'unspecified@example.com'
+        post[:payment][:email] = options[:email]
         post[:payment][:document] = options[:document]
         post[:payment][:birth_date] = options[:birth_date] if options[:birth_date]
       end
@@ -170,20 +185,20 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, options)
         post[:payment][:amount_total] = amount(money)
         post[:payment][:currency_code] = (options[:currency] || currency(money))
-        post[:payment][:merchant_payment_code] = options[:order_id]
+        post[:payment][:merchant_payment_code] = Digest::MD5.hexdigest(options[:order_id])
         post[:payment][:instalments] = options[:instalments] || 1
+        post[:payment][:order_number] = options[:order_id][0..39] if options[:order_id]
       end
 
-      def add_card_or_token(post, payment)
-        if payment.is_a?(String)
-          payment, brand = payment.split('|')
-        end
-        post[:payment][:payment_type_code] = payment.is_a?(String) ? brand : CARD_BRAND[payment.brand.to_sym]
+      def add_card_or_token(post, payment, options)
+        payment = payment.split('|')[0] if payment.is_a?(String)
+        post[:payment][:payment_type_code] = 'creditcard'
         post[:payment][:creditcard] = payment_details(payment)
+        post[:payment][:creditcard][:soft_descriptor] = options[:soft_descriptor] if options[:soft_descriptor]
       end
 
       def add_payment_details(post, payment)
-        post[:payment_type_code] = CARD_BRAND[payment.brand.to_sym]
+        post[:payment_type_code] = 'creditcard'
         post[:creditcard] = payment_details(payment)
       end
 
@@ -200,13 +215,23 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      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]
+        post[:processing_type] = options[:processing_type] if options[:processing_type]
+        post[:payment][:tags] = TAGS
+      end
+
       def parse(body)
         JSON.parse(body)
       end
 
       def commit(action, parameters)
         url = url_for((test? ? test_url : live_url), action, parameters)
-        response = parse(ssl_request(HTTP_METHOD[action], url, post_data(action, parameters), {}))
+
+        response = parse(ssl_request(HTTP_METHOD[action], url, post_data(action, parameters), headers(parameters)))
 
         success = success_from(action, response)
 
@@ -220,14 +245,29 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def headers(params)
+        processing_type = params[:processing_type]
+        commit_headers = { 'x-ebanx-client-user-agent': "ActiveMerchant/#{ActiveMerchant::VERSION}" }
+
+        add_processing_type_to_commit_headers(commit_headers, processing_type) if processing_type == 'local'
+
+        commit_headers
+      end
+
+      def add_processing_type_to_commit_headers(commit_headers, processing_type)
+        commit_headers['x-ebanx-api-processing-type'] = processing_type
+      end
+
       def success_from(action, response)
-        if [:purchase, :capture, :refund].include?(action)
-          response.try(:[], 'payment').try(:[], 'status') == 'CO'
+        payment_status = response.try(:[], 'payment').try(:[], 'status')
+
+        if %i[purchase capture refund].include?(action)
+          payment_status == 'CO'
         elsif action == :authorize
-          response.try(:[], 'payment').try(:[], 'status') == 'PE'
+          payment_status == 'PE'
         elsif action == :void
-          response.try(:[], 'payment').try(:[], 'status') == 'CA'
-        elsif action == :store
+          payment_status == 'CA'
+        elsif %i[store inquire].include?(action)
           response.try(:[], 'status') == 'SUCCESS'
         else
           false
@@ -236,12 +276,17 @@ module ActiveMerchant #:nodoc:
 
       def message_from(response)
         return response['status_message'] if response['status'] == 'ERROR'
+
         response.try(:[], 'payment').try(:[], 'transaction_status').try(:[], 'description')
       end
 
       def authorization_from(action, parameters, response)
         if action == :store
-          "#{response.try(:[], "token")}|#{CARD_BRAND[parameters[:payment_type_code].to_sym]}"
+          if success_from(action, response)
+            "#{response.try(:[], 'token')}|#{response['payment_type_code']}"
+          else
+            response.try(:[], 'token')
+          end
         else
           response.try(:[], 'payment').try(:[], 'hash')
         end
@@ -250,22 +295,26 @@ module ActiveMerchant #:nodoc:
       def post_data(action, parameters = {})
         return nil if requires_http_get(action)
         return convert_to_url_form_encoded(parameters) if action == :refund
+
         "request_body=#{parameters.to_json}"
       end
 
       def url_for(hostname, action, parameters)
         return "#{hostname}#{URL_MAP[action]}?#{convert_to_url_form_encoded(parameters)}" if requires_http_get(action)
+
         "#{hostname}#{URL_MAP[action]}"
       end
 
       def requires_http_get(action)
-        return true if [:capture, :void].include?(action)
+        return true if %i[capture void inquire].include?(action)
+
         false
       end
 
       def convert_to_url_form_encoded(parameters)
         parameters.map do |key, value|
           next if value != false && value.blank?
+
           "#{key}=#{value}"
         end.compact.join('&')
       end
@@ -273,6 +322,7 @@ module ActiveMerchant #:nodoc:
       def error_code_from(response, success)
         unless success
           return response['status_code'] if response['status'] == 'ERROR'
+
           response.try(:[], 'payment').try(:[], 'transaction_status').try(:[], 'code')
         end
       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,8 +53,8 @@ module ActiveMerchant #:nodoc:
 
       def void(identification, options = {})
         requires!(options, :order_id)
-        original_transaction_id, _ = identification.split(';')
-        commit(:void_transaction, {:reference_number => format_reference_number(options[:order_id]), :transaction_id => original_transaction_id})
+        original_transaction_id, = identification.split(';')
+        commit(:void_transaction, { reference_number: format_reference_number(options[:order_id]), transaction_id: original_transaction_id })
       end
 
       def voice_authorize(money, authorization_code, creditcard, options = {})
@@ -81,11 +81,11 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
 
         {
-          :reference_number => format_reference_number(options[:order_id]),
-          :transaction_amount => amount(money),
-          :original_transaction_amount => original_transaction_amount,
-          :original_transaction_id => original_transaction_id,
-          :client_ip_address => options[:ip]
+          reference_number: format_reference_number(options[:order_id]),
+          transaction_amount: amount(money),
+          original_transaction_amount: original_transaction_amount,
+          original_transaction_id: original_transaction_id,
+          client_ip_address: options[:ip]
         }
       end
 
@@ -93,10 +93,10 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
 
         post = {
-          :reference_number => format_reference_number(options[:order_id]),
-          :authorization_number => options[:authorization_number],
-          :transaction_amount => amount(money),
-          :client_ip_address => options[:ip]
+          reference_number: format_reference_number(options[:order_id]),
+          authorization_number: options[:authorization_number],
+          transaction_amount: amount(money),
+          client_ip_address: options[:ip]
 
         }
         add_creditcard(post, creditcard)
@@ -111,46 +111,45 @@ module ActiveMerchant #:nodoc:
       def add_address(post, options)
         if address = options[:billing_address] || options[:address]
           if address[:address2]
-            post[:billing_address]    = address[:address1].to_s << ' ' <<  address[:address2].to_s
+            post[:billing_address]    = address[:address1].to_s << ' ' << address[:address2].to_s
           else
             post[:billing_address]    = address[:address1].to_s
           end
           post[:billing_city]         = address[:city].to_s
-          post[:billing_state]        = address[:state].blank?  ? 'n/a' : address[:state]
+          post[:billing_state]        = address[:state].blank? ? 'n/a' : address[:state]
           post[:billing_postal_code]  = address[:zip].to_s
           post[:billing_country]      = address[:country].to_s
         end
 
         if address = options[:shipping_address]
           if address[:address2]
-            post[:shipping_address]   = address[:address1].to_s << ' ' <<  address[:address2].to_s
+            post[:shipping_address]   = address[:address1].to_s << ' ' << address[:address2].to_s
           else
             post[:shipping_address]   = address[:address1].to_s
           end
           post[:shipping_city]        = address[:city].to_s
-          post[:shipping_state]       = address[:state].blank?  ? 'n/a' : address[:state]
+          post[:shipping_state]       = address[:state].blank? ? 'n/a' : address[:state]
           post[:shipping_postal_code] = address[:zip].to_s
           post[:shipping_country]     = address[:country].to_s
         end
       end
 
       def add_creditcard(post, creditcard)
-        post[:billing_name]  = creditcard.name if creditcard.name
-        post[:account_number]  = creditcard.number
+        post[:billing_name] = creditcard.name if creditcard.name
+        post[:account_number] = creditcard.number
         post[:card_verification_value] = creditcard.verification_value if creditcard.verification_value?
-        post[:expiration_month]  = sprintf('%.2i', creditcard.month)
-        post[:expiration_year]  = sprintf('%.4i', creditcard.year)[-2..-1]
+        post[:expiration_month] = sprintf('%.2i', creditcard.month)
+        post[:expiration_year] = sprintf('%.4i', creditcard.year)[-2..-1]
       end
 
       def commit(action, parameters)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(action, parameters), 'Content-Type' => 'text/xml'))
 
         Response.new(success?(response), message_from(response[:result_message]), response,
-          :test => test?,
-          :authorization => authorization_from(response, parameters),
-          :avs_result => { :code => response[:avs_response_code] },
-          :cvv_result => response[:cvv_response_code]
-        )
+          test: test?,
+          authorization: authorization_from(response, parameters),
+          avs_result: { code: response[:avs_response_code] },
+          cvv_result: response[:cvv_response_code])
       end
 
       def success?(response)
@@ -158,7 +157,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response, params)
-        [ response[:transaction_id], params[:transaction_amount] ].compact.join(';')
+        [response[:transaction_id], params[:transaction_amount]].compact.join(';')
       end
 
       def parse(xml)
@@ -190,6 +189,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(message)
         return 'Unspecified error' if message.blank?
+
         message.gsub(/[^\w]/, ' ').split.join(' ').capitalize
       end
 
@@ -197,18 +197,18 @@ module ActiveMerchant #:nodoc:
         ACTIONS
       end
 
-      CREDIT_CARD_FIELDS =  %w(AuthorizationNumber ClientIpAddress BillingAddress BillingCity BillingState BillingPostalCode BillingCountry BillingName CardVerificationValue ExpirationMonth ExpirationYear ReferenceNumber TransactionAmount AccountNumber )
+      CREDIT_CARD_FIELDS = %w(AuthorizationNumber ClientIpAddress BillingAddress BillingCity BillingState BillingPostalCode BillingCountry BillingName CardVerificationValue ExpirationMonth ExpirationYear ReferenceNumber TransactionAmount AccountNumber)
 
       ACTIONS = {
-           :credit_card_authorize       => CREDIT_CARD_FIELDS,
-           :credit_card_charge          => CREDIT_CARD_FIELDS,
-           :credit_card_voice_authorize => CREDIT_CARD_FIELDS,
-           :credit_card_capture         => CREDIT_CARD_FIELDS,
-           :credit_card_credit          => CREDIT_CARD_FIELDS + ['OriginalTransactionAmount'],
-           :credit_card_refund          => %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
-           :void_transaction            => %w(ReferenceNumber TransactionID),
-           :credit_card_settle          => %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
-           :system_check                => %w(SystemCheck),
+        credit_card_authorize: CREDIT_CARD_FIELDS,
+        credit_card_charge: CREDIT_CARD_FIELDS,
+        credit_card_voice_authorize: CREDIT_CARD_FIELDS,
+        credit_card_capture: CREDIT_CARD_FIELDS,
+        credit_card_credit: CREDIT_CARD_FIELDS + ['OriginalTransactionAmount'],
+        credit_card_refund: %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
+        void_transaction: %w(ReferenceNumber TransactionID),
+        credit_card_settle: %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
+        system_check: %w(SystemCheck)
       }
     end
   end