activemerchant 1.105.0 → 1.107.4

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

@@ -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)

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

@@ -92,9 +92,9 @@ module ActiveMerchant
 
       def build_void_or_capture_request(type, money, authorization, options)
         parsed_authorization = parse_authorization_string(authorization)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! :Request, :version => '2' do
+        xml.tag! :Request, version: '2' do
           add_authentication(xml)
 
           xml.tag! :Transaction do
@@ -107,7 +107,7 @@ module ActiveMerchant
             if money
               xml.tag! :TxnDetails do
                 xml.tag! :merchantreference, format_reference_number(options[:order_id])
-                xml.tag! :amount, amount(money), :currency => options[:currency] || currency(money)
+                xml.tag! :amount, amount(money), currency: options[:currency] || currency(money)
                 xml.tag! :capturemethod, 'ecomm'
               end
             end
@@ -117,20 +117,20 @@ module ActiveMerchant
       end
 
       def build_purchase_or_authorization_request_with_credit_card_request(type, money, credit_card, options)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! :Request, :version => '2' do
+        xml.tag! :Request, version: '2' do
           add_authentication(xml)
 
           xml.tag! :Transaction do
-            xml.tag! :ContAuthTxn, :type => 'setup' if options[:set_up_continuous_authority]
+            xml.tag! :ContAuthTxn, type: 'setup' if options[:set_up_continuous_authority]
             xml.tag! :CardTxn do
               xml.tag! :method, type
               add_credit_card(xml, credit_card, options[:billing_address])
             end
             xml.tag! :TxnDetails do
               xml.tag! :merchantreference, format_reference_number(options[:order_id])
-              xml.tag! :amount, amount(money), :currency => options[:currency] || currency(money)
+              xml.tag! :amount, amount(money), currency: options[:currency] || currency(money)
               xml.tag! :capturemethod, 'ecomm'
             end
           end
@@ -142,19 +142,19 @@ module ActiveMerchant
         parsed_authorization = parse_authorization_string(authorization)
         raise ArgumentError, 'The continuous authority reference is required for continuous authority transactions' if parsed_authorization[:ca_reference].blank?
 
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! :Request, :version => '2' do
+        xml.tag! :Request, version: '2' do
           add_authentication(xml)
           xml.tag! :Transaction do
-            xml.tag! :ContAuthTxn, :type => 'historic'
+            xml.tag! :ContAuthTxn, type: 'historic'
             xml.tag! :HistoricTxn do
               xml.tag! :reference, parsed_authorization[:ca_reference]
               xml.tag! :method, type
             end
             xml.tag! :TxnDetails do
               xml.tag! :merchantreference, format_reference_number(options[:order_id])
-              xml.tag! :amount, amount(money), :currency => options[:currency] || currency(money)
+              xml.tag! :amount, amount(money), currency: options[:currency] || currency(money)
               xml.tag! :capturemethod, 'cont_auth'
             end
           end
@@ -164,9 +164,9 @@ module ActiveMerchant
 
       def build_transaction_refund_request(money, authorization)
         parsed_authorization = parse_authorization_string(authorization)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! :Request, :version => '2' do
+        xml.tag! :Request, version: '2' do
           add_authentication(xml)
           xml.tag! :Transaction do
             xml.tag! :HistoricTxn do
@@ -185,9 +185,9 @@ module ActiveMerchant
       end
 
       def build_credit_request(money, credit_card, options)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! :Request, :version => '2' do
+        xml.tag! :Request, version: '2' do
           add_authentication(xml)
           xml.tag! :Transaction do
             xml.tag! :CardTxn do
@@ -235,23 +235,23 @@ module ActiveMerchant
             # a predefined one
             xml.tag! :ExtendedPolicy do
               xml.tag! :cv2_policy,
-                :notprovided =>   POLICY_REJECT,
-                :notchecked =>    POLICY_REJECT,
-                :matched =>       POLICY_ACCEPT,
-                :notmatched =>    POLICY_REJECT,
-                :partialmatch =>  POLICY_REJECT
+                notprovided: POLICY_REJECT,
+                notchecked: POLICY_REJECT,
+                matched: POLICY_ACCEPT,
+                notmatched: POLICY_REJECT,
+                partialmatch: POLICY_REJECT
               xml.tag! :postcode_policy,
-                :notprovided =>   POLICY_ACCEPT,
-                :notchecked =>    POLICY_ACCEPT,
-                :matched =>       POLICY_ACCEPT,
-                :notmatched =>    POLICY_REJECT,
-                :partialmatch =>  POLICY_ACCEPT
+                notprovided: POLICY_ACCEPT,
+                notchecked: POLICY_ACCEPT,
+                matched: POLICY_ACCEPT,
+                notmatched: POLICY_REJECT,
+                partialmatch: POLICY_ACCEPT
               xml.tag! :address_policy,
-                :notprovided =>   POLICY_ACCEPT,
-                :notchecked =>    POLICY_ACCEPT,
-                :matched =>       POLICY_ACCEPT,
-                :notmatched =>    POLICY_REJECT,
-                :partialmatch =>  POLICY_ACCEPT
+                notprovided: POLICY_ACCEPT,
+                notchecked: POLICY_ACCEPT,
+                matched: POLICY_ACCEPT,
+                notmatched: POLICY_REJECT,
+                partialmatch: POLICY_ACCEPT
             end
           end
         end
@@ -261,8 +261,8 @@ module ActiveMerchant
         response = parse(ssl_post(test? ? self.test_url : self.live_url, request))
 
         Response.new(response[:status] == '1', response[:reason], response,
-          :test => test?,
-          :authorization => "#{response[:datacash_reference]};#{response[:authcode]};#{response[:ca_reference]}"
+          test: test?,
+          authorization: "#{response[:datacash_reference]};#{response[:authcode]};#{response[:ca_reference]}"
         )
       end
 
@@ -296,7 +296,7 @@ module ActiveMerchant
 
       def parse_authorization_string(authorization)
         reference, auth_code, ca_reference = authorization.to_s.split(';')
-        {:reference => reference, :auth_code => auth_code, :ca_reference => ca_reference}
+        {reference: reference, auth_code: auth_code, ca_reference: ca_reference}
       end
     end
   end

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

@@ -37,6 +37,7 @@ module ActiveMerchant #:nodoc:
         56 => STANDARD_ERROR_CODE[:card_declined],
         57 => STANDARD_ERROR_CODE[:card_declined],
         76 => STANDARD_ERROR_CODE[:call_issuer],
+        91 => STANDARD_ERROR_CODE[:call_issuer],
         96 => STANDARD_ERROR_CODE[:processing_error],
         97 => STANDARD_ERROR_CODE[:processing_error],
       }
@@ -239,9 +240,8 @@ module ActiveMerchant #:nodoc:
         return response['message'] if response['message']
 
         message = nil
-
         if error = response.dig('status_details', 'error')
-          message = error.dig('reason', 'description')
+          message = "#{error.dig('reason', 'description')} | #{error['type']}"
         elsif response['error_type']
           message = response['validation_errors'].map { |errors| "#{errors['code']}: #{errors['param']}" }.join(', ') if response['validation_errors']
           message ||= response['error_type']
@@ -266,6 +266,11 @@ module ActiveMerchant #:nodoc:
           error_code ||= error['type']
         elsif response['error_type']
           error_code = response['error_type'] if response['validation_errors']
+        elsif error = response.dig('error')
+          validation_errors = error.dig('validation_errors', 0)
+          code = validation_errors['code'] if validation_errors && validation_errors['code']
+          param = validation_errors['param'] if validation_errors && validation_errors['param']
+          error_code = "#{error['error_type']} | #{code} | #{param}" if error['error_type']
         end
 
         error_code || STANDARD_ERROR_CODE[:processing_error]

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

@@ -37,6 +37,15 @@ module ActiveMerchant #:nodoc:
         store: :post
       }
 
+      VERIFY_AMOUNT_PER_COUNTRY = {
+        'br' => 100,
+        'ar' => 100,
+        'co' => 100,
+        'pe' => 300,
+        'mx' => 300,
+        'cl' => 5000
+      }
+
       def initialize(options={})
         requires!(options, :integration_key)
         super
@@ -65,6 +74,7 @@ module ActiveMerchant #:nodoc:
         add_card_or_token(post, payment)
         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)
@@ -109,7 +119,7 @@ module ActiveMerchant #:nodoc:
 
       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
@@ -171,7 +181,7 @@ 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
       end
 
@@ -202,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)

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

@@ -54,7 +54,7 @@ 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})
+        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)
@@ -146,10 +146,10 @@ module ActiveMerchant #:nodoc:
         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
 
@@ -201,15 +201,15 @@ module ActiveMerchant #:nodoc:
       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

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

@@ -17,15 +17,16 @@ module ActiveMerchant #:nodoc:
 
       self.delimiter = "\n"
       self.actions = {
-        :purchase => 'CCSALE',
-        :credit => 'CCCREDIT',
-        :refund => 'CCRETURN',
-        :authorize => 'CCAUTHONLY',
-        :capture => 'CCFORCE',
-        :capture_complete => 'CCCOMPLETE',
-        :void => 'CCDELETE',
-        :store => 'CCGETTOKEN',
-        :update => 'CCUPDATETOKEN',
+        purchase: 'CCSALE',
+        credit: 'CCCREDIT',
+        refund: 'CCRETURN',
+        authorize: 'CCAUTHONLY',
+        capture: 'CCFORCE',
+        capture_complete: 'CCCOMPLETE',
+        void: 'CCDELETE',
+        store: 'CCGETTOKEN',
+        update: 'CCUPDATETOKEN',
+        verify: 'CCVERIFY'
       }
 
       def initialize(options = {})
@@ -47,6 +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_level_3_fields(form, options) if options[:level_3_data]
         commit(:purchase, money, form, options)
       end
 
@@ -60,6 +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_level_3_fields(form, options) if options[:level_3_data]
         commit(:authorize, money, form, options)
       end
 
@@ -72,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
@@ -111,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 = {})
@@ -249,6 +257,50 @@ module ActiveMerchant #:nodoc:
         form[:cardholder_ip] = options[:ip] if options.has_key?(:ip)
       end
 
+      def add_ssl_dynamic_dba(form, options)
+        form[:dynamic_dba] = options[:dba] if options.has_key?(:dba)
+      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)
         success?(response) ? response['result_message'] : response['errorMessage']
       end
@@ -264,10 +316,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(parameters, options)))
 
         Response.new(response['result'] == '0', message_from(response), response,
-          :test => @options[:test] || test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => response['avs_response'] },
-          :cvv_result => response['cvv2_response']
+          test: @options[:test] || test?,
+          authorization: authorization_from(response),
+          avs_result: { code: response['avs_response'] },
+          cvv_result: response['cvv2_response']
         )
       end
 
@@ -278,7 +330,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)}"