activemerchant 1.133.0 → 1.138.0

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

@@ -1,7 +1,7 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayTraceGateway < Gateway
-      self.test_url = 'https://api.paytrace.com'
+      self.test_url = 'https://api.sandbox.paytrace.com'
       self.live_url = 'https://api.paytrace.com'
 
       self.supported_countries = ['US']
@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :username, :password, :integrator_id)
         super
-        acquire_access_token
+        acquire_access_token unless options[:access_token]
       end
 
       def purchase(money, payment_or_customer_id, options = {})
@@ -95,7 +95,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options = {})
         if visa_or_mastercard?(options)
-          MultiResponse.run do |r|
+          MultiResponse.run(:use_first_response) do |r|
             r.process { commit(ENDPOINTS[:capture], build_capture_request(money, authorization, options)) }
             r.process { commit(ENDPOINTS[:"level_3_#{options[:visa_or_mastercard]}"], send_level_3_data(r, options)) }
           end
@@ -169,28 +169,35 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(%r((Authorization: Bearer )[a-zA-Z0-9:_]+), '\1[FILTERED]').
           gsub(%r(("credit_card\\?":{\\?"number\\?":\\?")\d+), '\1[FILTERED]').
-          gsub(%r(("cvv\\?":\\?")\d+), '\1[FILTERED]').
+          gsub(%r(("csc\\?":\\?")\d+), '\1[FILTERED]').
           gsub(%r(("username\\?":\\?")\w+@+\w+.+\w+), '\1[FILTERED]').
+          gsub(%r(("username\\?":\\?")\w+), '\1[FILTERED]').
           gsub(%r(("password\\?":\\?")\w+), '\1[FILTERED]').
           gsub(%r(("integrator_id\\?":\\?")\w+), '\1[FILTERED]')
       end
 
       def acquire_access_token
         post = {}
+        base_url = (test? ? test_url : live_url)
         post[:grant_type] = 'password'
         post[:username] = @options[:username]
         post[:password] = @options[:password]
         data = post.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
-        url = live_url + '/oauth/token'
+        url = base_url + '/oauth/token'
         oauth_headers = {
           'Accept'            => '*/*',
           'Content-Type'      => 'application/x-www-form-urlencoded'
         }
         response = ssl_post(url, data, oauth_headers)
-        json_response = JSON.parse(response)
+        json_response = parse(response)
 
-        @options[:access_token] = json_response['access_token'] if json_response['access_token']
-        response
+        if json_response.include?('error')
+          oauth_response = Response.new(false, json_response['error_description'])
+          raise OAuthResponseError.new(oauth_response)
+        else
+          @options[:access_token] = json_response['access_token'] if json_response['access_token']
+          response
+        end
       end
 
       private
@@ -237,17 +244,18 @@ module ActiveMerchant #:nodoc:
       end
 
       def customer_id?(payment_or_customer_id)
-        payment_or_customer_id.class == String
+        payment_or_customer_id.instance_of?(String)
       end
 
       def string_literal_to_boolean(value)
-        return value unless value.class == String
+        return value unless value.instance_of?(String)
 
         if value.casecmp('true').zero?
           true
         elsif value.casecmp('false').zero?
           false
-        else return nil
+        else
+          return nil
         end
       end
 
@@ -258,15 +266,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, creditcard, options)
-        return unless options[:billing_address] || options[:address]
-
-        address = options[:billing_address] || options[:address]
         post[:billing_address] = {}
+
+        if (address = options[:billing_address] || options[:address])
+          post[:billing_address][:street_address] = address[:address1]
+          post[:billing_address][:city] = address[:city]
+          post[:billing_address][:state] = address[:state]
+          post[:billing_address][:zip] = address[:zip]
+        end
+
         post[:billing_address][:name] = creditcard.name
-        post[:billing_address][:street_address] = address[:address1]
-        post[:billing_address][:city] = address[:city]
-        post[:billing_address][:state] = address[:state]
-        post[:billing_address][:zip] = address[:zip]
       end
 
       def add_amount(post, money, options)
@@ -283,6 +292,7 @@ module ActiveMerchant #:nodoc:
           post[:credit_card][:number] = payment.number
           post[:credit_card][:expiration_month] = payment.month
           post[:credit_card][:expiration_year] = payment.year
+          post[:csc] = payment.verification_value
         end
       end
 
@@ -373,6 +383,12 @@ module ActiveMerchant #:nodoc:
         url = base_url + '/v1/' + action
         raw_response = ssl_post(url, post_data(parameters), headers)
         response = parse(raw_response)
+        handle_final_response(action, response)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      end
+
+      def handle_final_response(action, response)
         success = success_from(response)
 
         Response.new(
@@ -385,8 +401,6 @@ module ActiveMerchant #:nodoc:
           test: test?,
           error_code: success ? nil : error_code_from(response)
         )
-      rescue JSON::ParserError
-        unparsable_response(raw_response)
       end
 
       def unparsable_response(raw_response)

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

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayboxDirectGateway < Gateway
       class_attribute :live_url_backup
 
@@ -68,20 +68,20 @@ module ActiveMerchant #:nodoc:
         # ECI=02 => MasterCard success
         # ECI=05 => Visa, Amex or JCB success
         if options[:eci] == '02' || options[:eci] == '05'
-          post[:"3DSTATUS"] = 'Y'
-          post[:"3DENROLLED"] = 'Y'
-          post[:"3DSIGNVAL"] = 'Y'
-          post[:"3DERROR"] = '0'
+          post[:'3DSTATUS'] = 'Y'
+          post[:'3DENROLLED'] = 'Y'
+          post[:'3DSIGNVAL'] = 'Y'
+          post[:'3DERROR'] = '0'
         else
-          post[:"3DSTATUS"] = 'N'
-          post[:"3DENROLLED"] = 'N'
-          post[:"3DSIGNVAL"] = 'N'
-          post[:"3DERROR"] = '10000'
+          post[:'3DSTATUS'] = 'N'
+          post[:'3DENROLLED'] = 'N'
+          post[:'3DSIGNVAL'] = 'N'
+          post[:'3DERROR'] = '10000'
         end
-        post[:"3DECI"] = options[:eci]
-        post[:"3DXID"] = options[:xid]
-        post[:"3DCAVV"] = options[:cavv]
-        post[:"3DCAVVALGO"] = options[:cavv_algorithm]
+        post[:'3DECI'] = options[:eci]
+        post[:'3DXID'] = options[:xid]
+        post[:'3DCAVV'] = options[:cavv]
+        post[:'3DCAVVALGO'] = options[:cavv_algorithm]
       end
 
       def authorize(money, creditcard, options = {})

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

@@ -3,9 +3,11 @@ module ActiveMerchant
     class PayeezyGateway < Gateway
       class_attribute :integration_url
 
-      self.test_url = 'https://api-cert.payeezy.com/v1'
-      self.integration_url = 'https://api-cat.payeezy.com/v1'
-      self.live_url = 'https://api.payeezy.com/v1'
+      version 'v1'
+
+      self.test_url = "https://api-cert.payeezy.com/#{fetch_version}"
+      self.integration_url = "https://api-cat.payeezy.com/#{fetch_version}"
+      self.live_url = "https://api.payeezy.com/#{fetch_version}"
 
       self.default_currency = 'USD'
       self.money_format = :cents
@@ -35,6 +37,8 @@ module ActiveMerchant
 
         add_invoice(params, options)
         add_reversal_id(params, options)
+        add_customer_ref(params, options)
+        add_reference_3(params, options)
         add_payment_method(params, payment_method, options)
         add_address(params, options)
         add_amount(params, amount, options)
@@ -51,6 +55,8 @@ module ActiveMerchant
 
         add_invoice(params, options)
         add_reversal_id(params, options)
+        add_customer_ref(params, options)
+        add_reference_3(params, options)
         add_payment_method(params, payment_method, options)
         add_address(params, options)
         add_amount(params, amount, options)
@@ -170,6 +176,14 @@ module ActiveMerchant
         params[:reversal_id] = options[:reversal_id] if options[:reversal_id]
       end
 
+      def add_customer_ref(params, options)
+        params[:customer_ref] = options[:customer_ref] if options[:customer_ref]
+      end
+
+      def add_reference_3(params, options)
+        params[:reference_3] = options[:reference_3] if options[:reference_3]
+      end
+
       def amount_from_authorization(authorization)
         authorization.split('|').last.to_i
       end
@@ -192,7 +206,7 @@ module ActiveMerchant
         params[:apikey] = @options[:apikey]
         params[:ta_token] = options[:ta_token]
         params[:type] = 'FDToken'
-        params[:credit_card] = add_card_data(payment_method)
+        params[:credit_card] = add_card_data(payment_method, options)
         params[:auth] = 'false'
       end
 
@@ -208,7 +222,7 @@ module ActiveMerchant
         elsif payment_method.is_a? NetworkTokenizationCreditCard
           add_network_tokenization(params, payment_method, options)
         else
-          add_creditcard(params, payment_method)
+          add_creditcard(params, payment_method, options)
         end
       end
 
@@ -245,17 +259,17 @@ module ActiveMerchant
         params[:token] = token
       end
 
-      def add_creditcard(params, creditcard)
-        credit_card = add_card_data(creditcard)
+      def add_creditcard(params, creditcard, options)
+        credit_card = add_card_data(creditcard, options)
 
         params[:method] = 'credit_card'
         params[:credit_card] = credit_card
       end
 
-      def add_card_data(payment_method)
+      def add_card_data(payment_method, options = {})
         card = {}
         card[:type] = CREDIT_CARD_BRAND[payment_method.brand]
-        card[:cardholder_name] = payment_method.name
+        card[:cardholder_name] = name_from_payment_method(payment_method) || name_from_address(options)
         card[:card_number] = payment_method.number
         card[:exp_date] = format_exp_date(payment_method.month, payment_method.year)
         card[:cvv] = payment_method.verification_value if payment_method.verification_value?
@@ -354,7 +368,7 @@ module ActiveMerchant
       def commit(params, options)
         url = base_url(options) + endpoint(params)
 
-        if transaction_id = params.delete(:transaction_id)
+        if transaction_id = params.delete(:transaction_id)&.delete(' ')
           url = "#{url}/#{transaction_id}"
         end
 
@@ -412,8 +426,7 @@ module ActiveMerchant
           @options[:token],
           payload
         ].join('')
-        hash = Base64.strict_encode64(OpenSSL::HMAC.hexdigest('sha256', @options[:apisecret], message))
-        hash
+        Base64.strict_encode64(OpenSSL::HMAC.hexdigest('sha256', @options[:apisecret], message))
       end
 
       def headers(payload)
@@ -487,7 +500,7 @@ module ActiveMerchant
           end
         else
           [
-            response['transaction_id'],
+            response['transaction_id']&.delete(' '),
             response['transaction_tag'],
             params[:method],
             response['amount']&.to_i

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

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayexGateway < Gateway
       class_attribute :live_external_url, :test_external_url, :live_confined_url, :test_confined_url
 
@@ -245,7 +245,7 @@ module ActiveMerchant #:nodoc:
         properties = {
           accountNumber: @options[:account],
           transactionNumber: transaction_number,
-          amount: amount,
+          amount:,
           orderId: options[:order_id] || '',
           vatAmount: options[:vat_amount] || 0,
           additionalValues: ''
@@ -262,7 +262,7 @@ module ActiveMerchant #:nodoc:
         properties = {
           accountNumber: @options[:account],
           transactionNumber: transaction_number,
-          amount: amount,
+          amount:,
           orderId: options[:order_id],
           vatAmount: options[:vat_amount] || 0,
           additionalValues: ''
@@ -385,11 +385,13 @@ module ActiveMerchant #:nodoc:
           'Content-Length' => request.size.to_s
         }
         response = parse(ssl_post(url, request, headers))
-        Response.new(success?(response),
+        Response.new(
+          success?(response),
           message_from(response),
           response,
           test: test?,
-          authorization: build_authorization(response))
+          authorization: build_authorization(response)
+        )
       end
 
       def build_authorization(response)

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     module PayflowCommonAPI
       def self.included(base)
         base.default_currency = 'USD'
@@ -99,7 +99,7 @@ module ActiveMerchant #:nodoc:
           end
           xml.tag! 'RequestAuth' do
             xml.tag! 'UserPass' do
-              xml.tag! 'User', !@options[:user].blank? ? @options[:user] : @options[:login]
+              xml.tag! 'User', @options[:user].blank? ? @options[:login] : @options[:user]
               xml.tag! 'Password', @options[:password]
             end
           end

data/lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayflowExpressResponse < Response
       def email
         @params['e_mail']

data/lib/active_merchant/billing/gateways/payflow/payflow_response.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayflowResponse < Response
       def profile_id
         @params['profile_id']

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

@@ -3,8 +3,8 @@ require 'active_merchant/billing/gateways/payflow/payflow_common_api'
 require 'active_merchant/billing/gateways/payflow/payflow_response'
 require 'active_merchant/billing/gateways/payflow_express'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayflowGateway < Gateway
       include PayflowCommonAPI
 
@@ -91,14 +91,14 @@ module ActiveMerchant #:nodoc:
       def cancel_recurring(profile_id)
         ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
 
-        request = build_recurring_request(:cancel, 0, profile_id: profile_id)
+        request = build_recurring_request(:cancel, 0, profile_id:)
         commit(request, options.merge(request_type: :recurring))
       end
 
       def recurring_inquiry(profile_id, options = {})
         ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
 
-        request = build_recurring_request(:inquiry, nil, options.update(profile_id: profile_id))
+        request = build_recurring_request(:inquiry, nil, options.update(profile_id:))
         commit(request, options.merge(request_type: :recurring))
       end
 
@@ -192,9 +192,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
             end
 
-            if %i(authorization purchase).include? action
-              add_mpi_3ds(xml, options[:three_d_secure]) if options[:three_d_secure]
-            end
+            add_mpi_3ds(xml, options[:three_d_secure]) if %i(authorization purchase).include?(action) && (options[:three_d_secure])
 
             xml.tag! 'Tender' do
               add_credit_card(xml, credit_card, options)
@@ -213,11 +211,11 @@ module ActiveMerchant #:nodoc:
 
         eci = three_d_secure_options[:eci]
         cavv = three_d_secure_options[:cavv]
-        xid = three_d_secure_options[:xid]
         version = three_d_secure_options[:version]
 
         # 3DS2 only
         ds_transaction_id = three_d_secure_options[:ds_transaction_id] if version_2_or_newer?(three_d_secure_options)
+        xid = three_d_secure_options[:xid].presence || cavv
 
         xml.tag!('ExtData', 'Name' => 'AUTHENTICATION_ID', 'Value' => authentication_id) unless authentication_id.blank?
         xml.tag!('ExtData', 'Name' => 'AUTHENTICATION_STATUS', 'Value' => authentication_status) unless authentication_status.blank?
@@ -343,6 +341,9 @@ module ActiveMerchant #:nodoc:
       def add_three_d_secure(options, xml)
         if options[:three_d_secure]
           three_d_secure = options[:three_d_secure]
+          ds_transaction_id = three_d_secure[:ds_transaction_id]
+          xid = three_d_secure[:xid].presence || three_d_secure[:cavv]
+
           xml.tag! 'BuyerAuthResult' do
             authentication_status(three_d_secure, xml)
             xml.tag! 'AuthenticationId', three_d_secure[:authentication_id] unless three_d_secure[:authentication_id].blank?
@@ -350,9 +351,9 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'ACSUrl', three_d_secure[:acs_url] unless three_d_secure[:acs_url].blank?
             xml.tag! 'ECI', three_d_secure[:eci] unless three_d_secure[:eci].blank?
             xml.tag! 'CAVV', three_d_secure[:cavv] unless three_d_secure[:cavv].blank?
-            xml.tag! 'XID', three_d_secure[:xid] unless three_d_secure[:xid].blank?
+            xml.tag! 'XID', xid unless xid.blank?
             xml.tag! 'ThreeDSVersion', three_d_secure[:version] unless three_d_secure[:version].blank?
-            xml.tag! 'DSTransactionID', three_d_secure[:ds_transaction_id] unless three_d_secure[:ds_transaction_id].blank?
+            xml.tag! 'DSTransactionID', ds_transaction_id unless ds_transaction_id.blank?
           end
         end
       end
@@ -419,7 +420,7 @@ module ActiveMerchant #:nodoc:
                   end
 
                   if action == :add
-                    xml.tag! 'Start', format_rp_date(options[:starting_at] || Date.today + 1)
+                    xml.tag! 'Start', format_rp_date(options[:starting_at] || (Date.today + 1))
                   else
                     xml.tag! 'Start', format_rp_date(options[:starting_at]) unless options[:starting_at].nil?
                   end

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

@@ -2,8 +2,8 @@ require 'active_merchant/billing/gateways/payflow/payflow_common_api'
 require 'active_merchant/billing/gateways/payflow/payflow_express_response'
 require 'active_merchant/billing/gateways/paypal_express_common'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # ==General Parameters
     # The following parameters are supported for #setup_authorization, #setup_purchase, #authorize and #purchase transactions. I've read
     # in the docs that they recommend you pass the exact same parameters to both setup and authorize/purchase.

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

@@ -1,7 +1,7 @@
 require 'active_merchant/billing/gateways/payflow_express'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayflowExpressUkGateway < PayflowExpressGateway
       self.default_currency = 'GBP'
       self.partner = 'PayPalUk'

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

@@ -1,8 +1,8 @@
 require 'active_merchant/billing/gateways/payflow'
 require 'active_merchant/billing/gateways/payflow_express_uk'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PayflowUkGateway < PayflowGateway
       self.default_currency = 'GBP'
       self.partner = 'PayPalUk'

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

@@ -1,7 +1,7 @@
 require 'rexml/document'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # In NZ DPS supports ANZ, Westpac, National Bank, ASB and BNZ.
     # In Australia DPS supports ANZ, NAB, Westpac, CBA, St George and Bank of South Australia.
     # The Maybank in Malaysia is supported and the Citibank for Singapore.
@@ -20,8 +20,8 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://www.windcave.com/'
       self.display_name = 'Windcave (formerly PaymentExpress)'
 
-      self.live_url = 'https://sec.paymentexpress.com/pxpost.aspx'
-      self.test_url = 'https://uat.paymentexpress.com/pxpost.aspx'
+      self.live_url = 'https://sec.windcave.com/pxpost.aspx'
+      self.test_url = 'https://uat.windcave.com/pxpost.aspx'
 
       APPROVED = '1'
 
@@ -306,9 +306,13 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url, request.to_s))
 
         # Return a response
-        PaymentExpressResponse.new(response[:success] == APPROVED, message_from(response), response,
+        PaymentExpressResponse.new(
+          response[:success] == APPROVED,
+          message_from(response),
+          response,
           test: response[:test_mode] == '1',
-          authorization: authorization_from(action, response))
+          authorization: authorization_from(action, response)
+        )
       end
 
       # Response XML documentation: http://www.paymentexpress.com/technical_resources/ecommerce_nonhosted/pxpost.html#XMLTxnOutput

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

@@ -1,11 +1,13 @@
 require 'base64'
 require 'digest'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class PaymentezGateway < Gateway #:nodoc:
-      self.test_url = 'https://ccapi-stg.paymentez.com/v2/'
-      self.live_url = 'https://ccapi.paymentez.com/v2/'
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
+    class PaymentezGateway < Gateway # :nodoc:
+      version 'v2'
+
+      self.test_url = "https://ccapi-stg.paymentez.com/#{fetch_version}/"
+      self.live_url = "https://ccapi.paymentez.com/#{fetch_version}/"
 
       self.supported_countries = %w[MX EC CO BR CL PE]
       self.default_currency = 'USD'
@@ -34,7 +36,7 @@ module ActiveMerchant #:nodoc:
         28 => :card_declined
       }.freeze
 
-      SUCCESS_STATUS = ['success', 'pending', 1, 0]
+      SUCCESS_STATUS = ['APPROVED', 'PENDING', 'pending', 'success', 1, 0]
 
       CARD_MAPPING = {
         'visa' => 'vi',
@@ -218,7 +220,7 @@ module ActiveMerchant #:nodoc:
           xid: three_d_secure_options[:xid],
           eci: three_d_secure_options[:eci],
           version: three_d_secure_options[:version],
-          reference_id: three_d_secure_options[:three_ds_server_trans_id],
+          reference_id: three_d_secure_options[:ds_transaction_id],
           status: three_d_secure_options[:authentication_response_status] || three_d_secure_options[:directory_response_status]
         }.compact
 
@@ -237,14 +239,14 @@ module ActiveMerchant #:nodoc:
 
       def commit_raw(object, action, parameters)
         if action == 'inquire'
-          url = "#{(test? ? test_url : live_url)}#{object}/#{parameters}"
+          url = "#{test? ? test_url : live_url}#{object}/#{parameters}"
           begin
             raw_response = ssl_get(url, headers)
           rescue ResponseError => e
             raw_response = e.response.body
           end
         else
-          url = "#{(test? ? test_url : live_url)}#{object}/#{action}"
+          url = "#{test? ? test_url : live_url}#{object}/#{action}"
           begin
             raw_response = ssl_post(url, post_data(parameters), headers)
           rescue ResponseError => e
@@ -262,7 +264,7 @@ module ActiveMerchant #:nodoc:
       def commit_transaction(action, parameters)
         response = commit_raw('transaction', action, parameters)
         Response.new(
-          success_from(response),
+          success_from(response, action),
           message_from(response),
           response,
           authorization: authorization_from(response),
@@ -290,10 +292,22 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def success_from(response)
-        return false if response.include?('error')
+      def success_from(response, action = nil)
+        transaction_current_status = response.dig('transaction', 'current_status')
+        request_status = response['status']
+        transaction_status = response.dig('transaction', 'status')
+        default_response = SUCCESS_STATUS.include?(transaction_current_status || request_status || transaction_status)
 
-        SUCCESS_STATUS.include?(response['status'] || response['transaction']['status'])
+        case action
+        when 'refund'
+          if transaction_current_status && request_status
+            transaction_current_status&.upcase == 'CANCELLED' && request_status&.downcase == 'success'
+          else
+            default_response
+          end
+        else
+          default_response
+        end
       end
 
       def card_success_from(response)
@@ -314,10 +328,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def card_message_from(response)
-        if !response.include?('error')
-          response['message'] || response['card']['message']
-        else
+        if response.include?('error')
           response['error']['type']
+        else
+          response['message'] || response['card']['message']
         end
       end
 

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

@@ -1,6 +1,8 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class PaymillGateway < Gateway
+      version 'v2'
+
       self.supported_countries = %w(AD AT BE BG CH CY CZ DE DK EE ES FI FO FR GB
                                     GI GR HR HU IE IL IM IS IT LI LT LU LV MC MT
                                     NL NO PL PT RO SE SI SK TR VA)
@@ -10,7 +12,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'PAYMILL'
       self.money_format = :cents
       self.default_currency = 'EUR'
-      self.live_url = 'https://api.paymill.com/v2/'
+      self.live_url = "https://api.paymill.com/#{fetch_version}/"
 
       def initialize(options = {})
         requires!(options, :public_key, :private_key)
@@ -192,7 +194,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def save_card_url
-        (test? ? 'https://test-token.paymill.com' : 'https://token-v2.paymill.de')
+        (test? ? 'https://test-token.paymill.com' : "https://token-#{fetch_version}.paymill.de")
       end
 
       def post_data(params)