activemerchant 1.110.0 → 1.116.0

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

@@ -28,48 +28,50 @@ module ActiveMerchant #:nodoc:
         '500' => 'An internal error occurred;'
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :api_key)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         post = {}
         add_invoice(post, money, options)
         add_customer_data(post, options) unless payment.is_a?(String)
         add_shipping_address(post, options)
         add_payment(post, payment, options)
+        add_submerchant(post, options)
 
         commit('sale', post)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         post = {}
         add_invoice(post, money, options)
         add_customer_data(post, options) unless payment.is_a?(String)
         add_shipping_address(post, options)
         add_payment(post, payment, options)
         add_capture_flag(post, payment)
+        add_submerchant(post, options)
         commit('authonly', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         post[:code] = authorization
         add_invoice(post, money, options)
         commit('capture', post, authorization)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         add_invoice(post = {}, money, options)
         commit('refund', post, authorization)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         commit('void', nil, authorization)
       end
 
-      def store(payment, options={})
+      def store(payment, options = {})
         post = {}
         options.update(name: payment.name)
         options = add_customer(options) unless options[:customer_id]
@@ -77,7 +79,7 @@ module ActiveMerchant #:nodoc:
         commit('store', post, options[:customer_id])
       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) }
@@ -202,6 +204,31 @@ module ActiveMerchant #:nodoc:
         %w[sodexo vr].include? card_brand(payment)
       end
 
+      def add_submerchant(post, options)
+        if submerchant = options[:submerchant]
+          post[:SubMerchant] = {}
+          post[:SubMerchant][:Merchant_Category_Code] = submerchant[:merchant_category_code] if submerchant[:merchant_category_code]
+          post[:SubMerchant][:Payment_Facilitator_Code] = submerchant[:payment_facilitator_code] if submerchant[:payment_facilitator_code]
+          post[:SubMerchant][:Code] = submerchant[:code] if submerchant[:code]
+          post[:SubMerchant][:Name] = submerchant[:name] if submerchant[:name]
+          post[:SubMerchant][:Document] = submerchant[:document] if submerchant[:document]
+          post[:SubMerchant][:Type] = submerchant[:type] if submerchant[:type]
+          post[:SubMerchant][:Phone] = {}
+          post[:SubMerchant][:Phone][:Country_Code] = submerchant[:phone][:country_code] if submerchant.dig(:phone, :country_code)
+          post[:SubMerchant][:Phone][:Number] = submerchant[:phone][:number] if submerchant.dig(:phone, :number)
+          post[:SubMerchant][:Phone][:Area_Code] = submerchant[:phone][:area_code] if submerchant.dig(:phone, :area_code)
+          post[:SubMerchant][:Address] = {}
+          post[:SubMerchant][:Address][:Street] = submerchant[:address][:street] if submerchant.dig(:address, :street)
+          post[:SubMerchant][:Address][:Number] = submerchant[:address][:number] if submerchant.dig(:address, :number)
+          post[:SubMerchant][:Address][:Complement] = submerchant[:address][:complement] if submerchant.dig(:address, :complement)
+          post[:SubMerchant][:Address][:Neighborhood] = submerchant[:address][:neighborhood] if submerchant.dig(:address, :neighborhood)
+          post[:SubMerchant][:Address][:City] = submerchant[:address][:city] if submerchant.dig(:address, :city)
+          post[:SubMerchant][:Address][:State] = submerchant[:address][:state] if submerchant.dig(:address, :state)
+          post[:SubMerchant][:Address][:Country] = submerchant[:address][:country] if submerchant.dig(:address, :country)
+          post[:SubMerchant][:Address][:Zip_Code] = submerchant[:address][:zip_code] if submerchant.dig(:address, :zip_code)
+        end
+      end
+
       def headers
         {
           'Authorization' => 'Basic ' + Base64.strict_encode64("#{@options[:api_key]}:"),
@@ -275,7 +302,7 @@ module ActiveMerchant #:nodoc:
         parsed_response_body = parse(error.response.body)
         message = parsed_response_body['message']
 
-        parsed_response_body['errors']&.each do |type, descriptions|
+        parsed_response_body['errors']&.each do |_type, descriptions|
           message += ' | '
           message += descriptions.join(', ')
         end
@@ -291,7 +318,7 @@ module ActiveMerchant #:nodoc:
         error_string = ''
 
         response['last_transaction']['gateway_response']['errors']&.each do |error|
-          error.each do |key, value|
+          error.each do |_key, value|
             error_string += ' | ' unless error_string.blank?
             error_string += value
           end

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

@@ -235,16 +235,14 @@ module ActiveMerchant #:nodoc:
 
         Response.new(success?(response), message_from(response), response,
           test: test?,
-          authorization: authorization_from(action, response)
-        )
+          authorization: authorization_from(action, response))
       end
 
       def commit_periodic(action, request)
         response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, build_periodic_request(action, request)))
         Response.new(success?(response), message_from(response), response,
           test: test?,
-          authorization: authorization_from(action, response)
-        )
+          authorization: authorization_from(action, response))
       end
 
       def success?(response)

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

@@ -13,12 +13,12 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.ncrretailonline.com'
       self.display_name = 'NCR Secure Pay'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :username, :password)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         post = {}
         add_invoice(post, money, options)
         add_payment(post, payment)
@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
         commit('sale', post)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         post = {}
         add_invoice(post, money, options)
         add_payment(post, payment)
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
         commit('preauth', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         add_reference(post, authorization)
         add_invoice(post, money, options)
@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
         commit('preauthcomplete', post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
         add_reference(post, authorization)
         add_invoice(post, money, options)
@@ -52,13 +52,13 @@ module ActiveMerchant #:nodoc:
         commit('credit', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_reference(post, authorization)
         commit('void', 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) }

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

@@ -145,8 +145,7 @@ module ActiveMerchant
         response = parse(ssl_post(self.live_url, post_data(action, params)))
 
         Response.new(response['status'] == 'approved', message_from(response), response,
-          authorization: authorization_from(response, action)
-        )
+          authorization: authorization_from(response, action))
       end
 
       def post_data(action, params)

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

@@ -94,12 +94,12 @@ module ActiveMerchant #:nodoc:
         commit('Netaxept/query.aspx', post)
       end
 
-      def add_credentials(post, options, secure=true)
+      def add_credentials(post, options, secure = true)
         post[:merchantId] = @options[:login]
         post[:token] = @options[:password] if secure
       end
 
-      def add_authorization(post, authorization, money=nil)
+      def add_authorization(post, authorization, money = nil)
         post[:transactionId] = authorization
         post[:transactionAmount] = amount(money) if money
       end
@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
         post[:securityCode] = options.verification_value
       end
 
-      def commit(path, parameters, xml=true)
+      def commit(path, parameters, xml = true)
         raw = parse(ssl_get(build_url(path, parameters)), xml)
 
         success = false
@@ -141,12 +141,12 @@ module ActiveMerchant #:nodoc:
         )
       end
 
-      def parse(result, expects_xml=true)
+      def parse(result, expects_xml = true)
         if expects_xml
           doc = REXML::Document.new(result)
           extract_xml(doc.root).merge(container: doc.root.name)
         else
-          {result: result}
+          { result: result }
         end
       end
 
@@ -162,7 +162,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def build_url(base, parameters=nil)
+      def build_url(base, parameters = nil)
         url = (test? ? self.test_url : self.live_url).dup
         url << base
         if parameters

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

@@ -22,12 +22,12 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://processing.paysafe.com/'
       self.display_name = 'Netbanx by PaySafe'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :account_number, :api_key)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         # Do a Verification with AVS prior to purchase
         verification_response = verify(payment, options)
         return verification_response if verification_response.message != 'OK'
@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'auths', post)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         # Do a Verification with AVS prior to Auth + Settle
         verification_response = verify(payment, options)
         return verification_response if verification_response.message != 'OK'
@@ -52,22 +52,24 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'auths', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         add_invoice(post, money, options)
 
         commit(:post, "auths/#{authorization}/settlements", post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         # If the transactions that are pending, API call needs to be Cancellation
         settlement_data = get_settlement(authorization)
         return settlement_data if settlement_data.message != 'OK'
 
         post = {}
-        if settlement_data.params['status'] == 'PENDING'
+        if settlement_data.params['status'] == 'PENDING' && money == settlement_data.params['amount']
           post[:status] = 'CANCELLED'
           commit(:put, "settlements/#{authorization}", post)
+        elsif settlement_data.params['status'] == 'PENDING' && (money < settlement_data.params['amount'] || money > settlement_data.params['amount'])
+          return Response.new(false, 'Transaction not settled. Either do a full refund or try partial refund after settlement.')
         else
           add_invoice(post, money, options)
 
@@ -84,14 +86,14 @@ module ActiveMerchant #:nodoc:
         commit(:get, "settlements/#{authorization}", post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_order_id(post, options)
 
         commit(:post, "auths/#{authorization}/voidauths", post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         post = {}
         add_payment(post, credit_card, options)
         add_order_id(post, options)
@@ -101,7 +103,7 @@ module ActiveMerchant #:nodoc:
 
       # note: when passing options[:customer] we only attempt to add the
       #       card to the profile_id passed as the options[:customer]
-      def store(credit_card, options={})
+      def store(credit_card, options = {})
         # locale can only be one of en_US, fr_CA, en_GB
         requires!(options, :locale)
         post = {}
@@ -196,7 +198,7 @@ module ActiveMerchant #:nodoc:
           street: address[:address1],
           city: address[:city],
           zip: address[:zip],
-          state: address[:state],
+          state: address[:state]
         }
         mapped[:country] = country.code(:alpha2).value unless country.blank?
 

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

@@ -196,13 +196,12 @@ module ActiveMerchant #:nodoc:
         Response.new(success?(response), message_from(response), response,
           test: test_response?(response),
           authorization: response[:trans_id],
-          avs_result: { code: response[:avs_code]},
-          cvv_result: response[:cvv2_code]
-        )
+          avs_result: { code: response[:avs_code] },
+          cvv_result: response[:cvv2_code])
       rescue ActiveMerchant::ResponseError => e
         raise unless e.response.code =~ /^[67]\d\d$/
 
-        return Response.new(false, e.response.message, {status_code: e.response.code}, test: test?)
+        return Response.new(false, e.response.message, { status_code: e.response.code }, test: test?)
       end
 
       def test_response?(response)
@@ -223,7 +222,7 @@ module ActiveMerchant #:nodoc:
         parameters[:pay_type] = 'C'
         parameters[:tran_type] = TRANSACTIONS[action]
 
-        parameters.reject { |k, v| v.blank? }.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
+        parameters.reject { |_k, v| v.blank? }.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -203,9 +203,8 @@ module ActiveMerchant #:nodoc:
         Response.new(success, raw['responsetext'], raw,
           test: test?,
           authorization: authorization,
-          avs_result: { code: raw['avsresponse']},
-          cvv_result: raw['cvvresponse']
-        )
+          avs_result: { code: raw['avsresponse'] },
+          cvv_result: raw['cvvresponse'])
       end
 
       def build_request(action, parameters)

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

@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_payment_method(post, payment_method, options)
@@ -36,11 +36,12 @@ module ActiveMerchant #:nodoc:
         add_vendor_data(post, options)
         add_merchant_defined_fields(post, options)
         add_level3_fields(post, options)
+        add_three_d_secure(post, options)
 
         commit('sale', post)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_payment_method(post, payment_method, options)
@@ -49,11 +50,12 @@ module ActiveMerchant #:nodoc:
         add_vendor_data(post, options)
         add_merchant_defined_fields(post, options)
         add_level3_fields(post, options)
+        add_three_d_secure(post, options)
 
         commit('auth', post)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_reference(post, authorization)
@@ -62,7 +64,7 @@ module ActiveMerchant #:nodoc:
         commit('capture', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         add_reference(post, authorization)
         add_payment_type(post, authorization)
@@ -70,7 +72,7 @@ module ActiveMerchant #:nodoc:
         commit('void', post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_reference(post, authorization)
@@ -79,7 +81,7 @@ module ActiveMerchant #:nodoc:
         commit('refund', post)
       end
 
-      def credit(amount, payment_method, options={})
+      def credit(amount, payment_method, options = {})
         post = {}
         add_invoice(post, amount, options)
         add_payment_method(post, payment_method, options)
@@ -90,7 +92,7 @@ module ActiveMerchant #:nodoc:
         commit('credit', post)
       end
 
-      def verify(payment_method, options={})
+      def verify(payment_method, options = {})
         post = {}
         add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
@@ -248,6 +250,18 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_three_d_secure(post, options)
+        return unless options[:three_d_secure]
+
+        if (three_d_secure = options[:three_d_secure])
+          post[:eci] = three_d_secure[:eci]
+          post[:cavv] = three_d_secure[:cavv]
+          post[:xid] = three_d_secure[:xid]
+          post[:three_ds_version] = three_d_secure[:version]
+          post[:directory_server_id] = three_d_secure[:ds_transaction_id]
+        end
+      end
+
       def add_reference(post, authorization)
         transaction_id, = split_authorization(authorization)
         post[:transactionid] = transaction_id