activemerchant 1.125.0 → 1.129.0

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

@@ -83,6 +83,11 @@ module ActiveMerchant #:nodoc:
         commit(:post, "payments/#{authorization}/refunds", post)
       end
 
+      def inquire(authorization, options = {})
+        options[:action] = 'inquire'
+        commit(:get, "payments/#{authorization}", nil, options)
+      end
+
       def verify(credit_card, options = {})
         raise ArgumentError, 'Verify is not supported on Decidir gateways unless the preauth_mode option is enabled' unless @options[:preauth_mode]
 
@@ -117,11 +122,11 @@ module ActiveMerchant #:nodoc:
         post[:establishment_name] = options[:establishment_name] if options[:establishment_name]
         post[:fraud_detection] = add_fraud_detection(options[:fraud_detection]) if options[:fraud_detection].present?
         post[:site_id] = options[:site_id] if options[:site_id]
-        post[:sub_payments] = []
 
         add_invoice(post, money, options)
         add_payment(post, credit_card, options)
         add_aggregate_data(post, options) if options[:aggregate_data]
+        add_sub_payments(post, options)
       end
 
       def add_payment_method_id(credit_card, options)
@@ -210,6 +215,22 @@ module ActiveMerchant #:nodoc:
         post[:aggregate_data] = aggregate_data
       end
 
+      def add_sub_payments(post, options)
+        # sub_payments field is required for purchase transactions, even if empty
+        post[:sub_payments] = []
+
+        return unless sub_payments = options[:sub_payments]
+
+        sub_payments.each do |sub_payment|
+          sub_payment_hash = {
+            site_id: sub_payment[:site_id],
+            installments: sub_payment[:installments].to_i,
+            amount: sub_payment[:amount].to_i
+          }
+          post[:sub_payments] << sub_payment_hash
+        end
+      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
@@ -251,7 +272,7 @@ module ActiveMerchant #:nodoc:
           response = parse(raw_response)
         end
 
-        success = success_from(response)
+        success = success_from(response, options)
         Response.new(
           success,
           message_from(success, response),
@@ -263,7 +284,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(parameters = {})
-        parameters.to_json
+        parameters&.to_json
       end
 
       def parse(body)
@@ -295,8 +316,14 @@ module ActiveMerchant #:nodoc:
         message
       end
 
-      def success_from(response)
-        response['status'] == 'approved' || response['status'] == 'pre_approved'
+      def success_from(response, options)
+        status = %w(approved pre_approved)
+
+        if options[:action] == 'inquire'
+          status.include?(response['status']) || response['status'] == 'rejected'
+        else
+          status.include?(response['status'])
+        end
       end
 
       def authorization_from(response)

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['AR']
       self.default_currency = 'ARS'
-      self.supported_cardtypes = %i[visa master american_express discover]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club naranja cabal]
 
       self.homepage_url = 'http://decidir.com.ar/home'
       self.display_name = 'Decidir Plus'
@@ -18,20 +18,44 @@ module ActiveMerchant #:nodoc:
 
       def purchase(money, payment, options = {})
         post = {}
+        build_purchase_authorize_request(post, money, payment, options)
 
-        add_payment(post, payment, options)
-        add_purchase_data(post, money, payment, options)
+        commit(:post, 'payments', post)
+      end
+
+      def authorize(money, payment, options = {})
+        post = {}
+        build_purchase_authorize_request(post, money, payment, options)
 
         commit(:post, 'payments', post)
       end
 
+      def capture(money, authorization, options = {})
+        post = {}
+        post[:amount] = money
+
+        commit(:put, "payments/#{add_reference(authorization)}", post)
+      end
+
       def refund(money, authorization, options = {})
         post = {}
         post[:amount] = money
 
+        commit(:post, "payments/#{add_reference(authorization)}/refunds", post)
+      end
+
+      def void(authorization, options = {})
         commit(:post, "payments/#{add_reference(authorization)}/refunds")
       end
 
+      def verify(credit_card, options = {})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { store(credit_card, options) }
+          r.process { authorize(100, r.authorization, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
       def store(payment, options = {})
         post = {}
         add_payment(post, payment, options)
@@ -39,6 +63,10 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'tokens', post)
       end
 
+      def unstore(customer_token)
+        commit(:delete, "cardtokens/#{customer_token}")
+      end
+
       def supports_scrubbing?
         true
       end
@@ -52,6 +80,13 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def build_purchase_authorize_request(post, money, payment, options)
+        add_customer_data(post, options)
+        add_payment(post, payment, options)
+        add_purchase_data(post, money, payment, options)
+        add_fraud_detection(post, options)
+      end
+
       def add_reference(authorization)
         return unless authorization
 
@@ -65,26 +100,64 @@ module ActiveMerchant #:nodoc:
           post[:bin] = bin
         else
           post[:card_number] = payment.number
-          post[:card_expiration_month] = payment.month.to_s.rjust(2, '0')
-          post[:card_expiration_year] = payment.year.to_s[-2..-1]
+          post[:card_expiration_month] = format(payment.month, :two_digits)
+          post[:card_expiration_year] = format(payment.year, :two_digits)
           post[:security_code] = payment.verification_value.to_s
-          post[:card_holder_name] = payment.name
+          post[:card_holder_name] = payment.name.empty? ? options[:name_override] : payment.name
           post[:card_holder_identification] = {}
-          post[:card_holder_identification][:type] = options[:dni]
-          post[:card_holder_identification][:number] = options[:card_holder_identification_number]
+          post[:card_holder_identification][:type] = options[:card_holder_identification_type] if options[:card_holder_identification_type]
+          post[:card_holder_identification][:number] = options[:card_holder_identification_number] if options[:card_holder_identification_number]
+
+          # additional data used for Visa transactions
+          post[:card_holder_door_number] = options[:card_holder_door_number].to_i if options[:card_holder_door_number]
+          post[:card_holder_birthday] = options[:card_holder_birthday] if options[:card_holder_birthday]
         end
       end
 
+      def add_customer_data(post, options = {})
+        return unless customer = options[:customer]
+
+        post[:customer] = {}
+        post[:customer][:id] = customer[:id] if customer[:id]
+        post[:customer][:email] = customer[:email] if customer[:email]
+      end
+
       def add_purchase_data(post, money, payment, options = {})
         post[:site_transaction_id] = options[:site_transaction_id] || SecureRandom.hex
-        post[:payment_method_id] = 1
+        post[:payment_method_id] = add_payment_method_id(options)
         post[:amount] = money
         post[:currency] = options[:currency] || self.default_currency
         post[:installments] = options[:installments] || 1
         post[:payment_type] = options[:payment_type] || 'single'
+        post[:establishment_name] = options[:establishment_name] if options[:establishment_name]
+
+        add_aggregate_data(post, options) if options[:aggregate_data]
         add_sub_payments(post, options)
       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_sub_payments(post, options)
         # sub_payments field is required for purchase transactions, even if empty
         post[:sub_payments] = []
@@ -94,14 +167,78 @@ module ActiveMerchant #:nodoc:
         sub_payments.each do |sub_payment|
           sub_payment_hash = {
             site_id: sub_payment[:site_id],
-            installments: sub_payment[:installments],
-            amount: sub_payment[:amount]
+            installments: sub_payment[:installments].to_i,
+            amount: sub_payment[:amount].to_i
           }
           post[:sub_payments] << sub_payment_hash
         end
       end
 
+      def add_payment_method_id(options)
+        return options[:payment_method_id].to_i if options[:payment_method_id]
+
+        if options[:debit]
+          case options[:card_brand]
+          when 'visa'
+            31
+          when 'master'
+            105
+          when 'maestro'
+            106
+          when 'cabal'
+            108
+          else
+            31
+          end
+        else
+          case options[:card_brand]
+          when 'visa'
+            1
+          when 'master'
+            104
+          when 'american_express'
+            65
+          when 'american_express_prisma'
+            111
+          when 'cabal'
+            63
+          when 'diners_club'
+            8
+          else
+            1
+          end
+        end
+      end
+
+      def add_fraud_detection(post, options)
+        return unless fraud_detection = options[:fraud_detection]
+
+        {}.tap do |hsh|
+          hsh[:send_to_cs] = fraud_detection[:send_to_cs] == 'true' # true/false
+          hsh[:channel] = fraud_detection[:channel] if fraud_detection[:channel]
+          hsh[:dispatch_method] = fraud_detection[:dispatch_method] if fraud_detection[:dispatch_method]
+          add_csmdds(hsh, fraud_detection)
+
+          post[:fraud_detection] = hsh
+        end
+      end
+
+      def add_csmdds(hsh, fraud_detection)
+        return unless fraud_detection[:csmdds]
+
+        csmdds_arr = []
+        fraud_detection[:csmdds].each do |csmdds|
+          csmdds_hsh = {}
+          csmdds_hsh[:code] = csmdds[:code].to_i
+          csmdds_hsh[:description] = csmdds[:description]
+          csmdds_arr.append(csmdds_hsh)
+        end
+        hsh[:csmdds] = csmdds_arr unless csmdds_arr.empty?
+      end
+
       def parse(body)
+        return {} if body.nil?
+
         JSON.parse(body)
       end
 
@@ -140,11 +277,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(response)
-        response.dig('status') == 'approved' || response.dig('status') == 'active'
+        response.dig('status') == 'approved' || response.dig('status') == 'active' || response.dig('status') == 'pre_approved' || response.empty?
       end
 
       def message_from(response)
-        response.dig('status') || error_message(response) || response.dig('message')
+        return '' if response.empty?
+
+        rejected?(response) ? message_from_status_details(response) : response.dig('status') || error_message(response) || response.dig('message')
       end
 
       def authorization_from(response)
@@ -158,7 +297,24 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(response)
-        response.dig('error_type') unless success_from(response)
+        return if success_from(response)
+
+        error_code = nil
+        if error = response.dig('status_details', 'error')
+          error_code = error.dig('reason', 'id') || error['type']
+        elsif response['error_type']
+          error_code = response['error_type']
+        elsif response.dig('error', 'validation_errors')
+          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']
+        elsif error = response.dig('error')
+          error_code = error.dig('reason', 'id')
+        end
+
+        error_code
       end
 
       def error_message(response)
@@ -168,6 +324,21 @@ module ActiveMerchant #:nodoc:
 
         "#{validation_errors.dig('code')}: #{validation_errors.dig('param')}"
       end
+
+      def rejected?(response)
+        return response.dig('status') == 'rejected'
+      end
+
+      def message_from_status_details(response)
+        return unless error = response.dig('status_details', 'error')
+        return message_from_fraud_detection(response) if error.dig('type') == 'cybersource_error'
+
+        "#{error.dig('type')}: #{error.dig('reason', 'description')}"
+      end
+
+      def message_from_fraud_detection(response)
+        return error_message(response.dig('fraud_detection', 'status', 'details'))
+      end
     end
   end
 end

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

@@ -6,18 +6,12 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(BR MX CO CL AR PE)
       self.default_currency = 'USD'
-      self.supported_cardtypes = %i[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,16 +29,17 @@ module ActiveMerchant #:nodoc:
         capture: :get,
         refund: :post,
         void: :get,
-        store: :post
+        store: :post,
+        inquire: :get
       }
 
       VERIFY_AMOUNT_PER_COUNTRY = {
         'br' => 100,
         'ar' => 100,
-        'co' => 100,
+        'co' => 50000,
         'pe' => 300,
-        'mx' => 300,
-        'cl' => 5000
+        'mx' => 2000,
+        'cl' => 80000
       }
 
       def initialize(options = {})
@@ -57,7 +53,7 @@ module ActiveMerchant #:nodoc:
         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)
@@ -71,7 +67,7 @@ module ActiveMerchant #:nodoc:
         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)
@@ -124,6 +120,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def inquire(authorization, options = {})
+        post = {}
+        add_integration_key(post)
+        add_authorization(post, authorization)
+
+        commit(:inquire, post)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -151,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
@@ -183,16 +187,18 @@ module ActiveMerchant #:nodoc:
         post[:payment][:currency_code] = (options[:currency] || currency(money))
         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)
-        payment, brand = payment.split('|') if payment.is_a?(String)
-        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
 
@@ -215,6 +221,7 @@ module ActiveMerchant #:nodoc:
         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)
@@ -252,13 +259,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(action, response)
+        payment_status = response.try(:[], 'payment').try(:[], 'status')
+
         if %i[purchase capture refund].include?(action)
-          response.try(:[], 'payment').try(:[], 'status') == 'CO'
+          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
@@ -273,7 +282,11 @@ module ActiveMerchant #:nodoc:
 
       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
@@ -293,7 +306,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def requires_http_get(action)
-        return true if %i[capture void].include?(action)
+        return true if %i[capture void inquire].include?(action)
 
         false
       end

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

@@ -17,6 +17,11 @@ module ActiveMerchant #:nodoc:
       SERVICE_TEST_URL = 'https://certservices.elementexpress.com/express.asmx'
       SERVICE_LIVE_URL = 'https://services.elementexpress.com/express.asmx'
 
+      NETWORK_TOKEN_TYPE = {
+        apple_pay: '2',
+        google_pay: '1'
+      }
+
       def initialize(options = {})
         requires!(options, :account_id, :account_token, :application_id, :acceptor_id, :application_name, :application_version)
         super
@@ -171,6 +176,8 @@ module ActiveMerchant #:nodoc:
           add_payment_account_id(xml, payment)
         elsif payment.is_a?(Check)
           add_echeck(xml, payment)
+        elsif payment.is_a?(NetworkTokenizationCreditCard)
+          add_network_tokenization_card(xml, payment)
         else
           add_credit_card(xml, payment)
         end
@@ -200,7 +207,7 @@ module ActiveMerchant #:nodoc:
           xml.TransactionID options[:trans_id] if options[:trans_id]
           xml.TransactionAmount amount(money.to_i) if money
           xml.MarketCode market_code(money, options) if options[:market_code] || money
-          xml.ReferenceNumber options[:order_id] || SecureRandom.hex(20)
+          xml.ReferenceNumber options[:order_id].present? ? options[:order_id][0, 50] : SecureRandom.hex(20)
           xml.TicketNumber options[:ticket_number] if options[:ticket_number]
           xml.MerchantSuppliedTransactionId options[:merchant_supplied_transaction_id] if options[:merchant_supplied_transaction_id]
           xml.PaymentType options[:payment_type] if options[:payment_type]
@@ -246,8 +253,21 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_network_tokenization_card(xml, payment)
+        xml.card do
+          xml.CardNumber payment.number
+          xml.ExpirationMonth format(payment.month, :two_digits)
+          xml.ExpirationYear format(payment.year, :two_digits)
+          xml.CardholderName "#{payment.first_name} #{payment.last_name}"
+          xml.Cryptogram payment.payment_cryptogram
+          xml.ElectronicCommerceIndicator payment.eci if payment.eci.present?
+          xml.WalletType NETWORK_TOKEN_TYPE.fetch(payment.source, '0')
+        end
+      end
+
       def add_address(xml, options)
         if address = options[:billing_address] || options[:address]
+          address[:email] ||= options[:email]
           xml.address do
             xml.BillingAddress1 address[:address1] if address[:address1]
             xml.BillingAddress2 address[:address2] if address[:address2]