activemerchant 1.105.0 → 1.107.4

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

@@ -10,13 +10,13 @@ module ActiveMerchant #:nodoc:
       self.display_name         = 'USA ePay'
 
       TRANSACTIONS = {
-        :authorization  => 'cc:authonly',
-        :purchase       => 'cc:sale',
-        :capture        => 'cc:capture',
-        :refund         => 'cc:refund',
-        :void           => 'cc:void',
-        :void_release   => 'cc:void:release',
-        :check_purchase => 'check:sale'
+        authorization: 'cc:authonly',
+        purchase: 'cc:sale',
+        capture: 'cc:capture',
+        refund: 'cc:refund',
+        void: 'cc:void',
+        void_release: 'cc:void:release',
+        check_purchase: 'check:sale'
       }
 
       STANDARD_ERROR_CODE_MAPPING = {
@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        post = { :refNum => authorization }
+        post = { refNum: authorization }
 
         add_amount(post, money)
         add_test_mode(post, options)
@@ -90,7 +90,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options = {})
-        post = { :refNum => authorization }
+        post = { refNum: authorization }
 
         add_amount(post, money)
         add_test_mode(post, options)
@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
       # Pass `no_release: true` to keep the void from immediately settling
       def void(authorization, options = {})
         command = (options[:no_release] ? :void : :void_release)
-        post = { :refNum => authorization }
+        post = { refNum: authorization }
         add_test_mode(post, options)
         commit(command, post)
       end
@@ -296,20 +296,20 @@ module ActiveMerchant #:nodoc:
         end
 
         {
-          :status           => fields['UMstatus'],
-          :auth_code        => fields['UMauthCode'],
-          :ref_num          => fields['UMrefNum'],
-          :batch            => fields['UMbatch'],
-          :avs_result       => fields['UMavsResult'],
-          :avs_result_code  => fields['UMavsResultCode'],
-          :cvv2_result      => fields['UMcvv2Result'],
-          :cvv2_result_code => fields['UMcvv2ResultCode'],
-          :vpas_result_code => fields['UMvpasResultCode'],
-          :result           => fields['UMresult'],
-          :error            => fields['UMerror'],
-          :error_code       => fields['UMerrorcode'],
-          :acs_url          => fields['UMacsurl'],
-          :payload          => fields['UMpayload']
+          status: fields['UMstatus'],
+          auth_code: fields['UMauthCode'],
+          ref_num: fields['UMrefNum'],
+          batch: fields['UMbatch'],
+          avs_result: fields['UMavsResult'],
+          avs_result_code: fields['UMavsResultCode'],
+          cvv2_result: fields['UMcvv2Result'],
+          cvv2_result_code: fields['UMcvv2ResultCode'],
+          vpas_result_code: fields['UMvpasResultCode'],
+          result: fields['UMresult'],
+          error: fields['UMerror'],
+          error_code: fields['UMerrorcode'],
+          acs_url: fields['UMacsurl'],
+          payload: fields['UMpayload']
         }.delete_if { |k, v| v.nil? }
       end
 
@@ -320,11 +320,11 @@ module ActiveMerchant #:nodoc:
         error_code = nil
         error_code = (STANDARD_ERROR_CODE_MAPPING[response[:error_code]] || STANDARD_ERROR_CODE[:processing_error]) unless approved
         Response.new(approved, message_from(response), response,
-          :test           => test?,
-          :authorization  => response[:ref_num],
-          :cvv_result     => response[:cvv2_result_code],
-          :avs_result     => { :code => response[:avs_result_code] },
-          :error_code     => error_code
+          test: test?,
+          authorization: response[:ref_num],
+          cvv_result: response[:cvv2_result_code],
+          avs_result: { code: response[:avs_result_code] },
+          error_code: error_code
         )
       end
 

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

@@ -50,12 +50,12 @@ module ActiveMerchant #:nodoc:
       SUCCESS = 1
 
       TRANSACTIONS = {
-        :authorization => 'auth',
-        :purchase => 'sale',
-        :capture => 'capture',
-        :void => 'void',
-        :credit => 'credit',
-        :refund => 'refund'
+        authorization: 'auth',
+        purchase: 'sale',
+        capture: 'capture',
+        void: 'void',
+        credit: 'credit',
+        refund: 'refund'
       }
 
       self.supported_countries = ['US']
@@ -195,10 +195,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(self.live_url, post_data(trx_type, post)))
 
         Response.new(response[:response].to_i == SUCCESS, message_from(response), response,
-          :test => test?,
-          :authorization => response[:transactionid],
-          :avs_result => { :code => response[:avsresponse] },
-          :cvv_result => response[:cvvresponse]
+          test: test?,
+          authorization: response[:transactionid],
+          avs_result: { code: response[:avsresponse] },
+          cvv_result: response[:cvvresponse]
         )
       end
 

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

@@ -8,8 +8,8 @@ module ActiveMerchant #:nodoc:
       self.delimiter = "\r\n"
 
       self.actions = {
-        :purchase => 'SALE',
-        :credit => 'CREDIT'
+        purchase: 'SALE',
+        credit: 'CREDIT'
       }
 
       APPROVED = '0'
@@ -137,10 +137,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(parameters)))
 
         Response.new(response['result'] == APPROVED, 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
 

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

@@ -155,9 +155,9 @@ module ActiveMerchant #:nodoc:
           success_from(response),
           message_from(response, options, action),
           response,
-          :test => test?,
-          :authorization => authorization_from(params, response, options),
-          :error_code => response['errorCode']
+          test: test?,
+          authorization: authorization_from(params, response, options),
+          error_code: response['errorCode']
         )
       end
 
@@ -230,9 +230,9 @@ module ActiveMerchant #:nodoc:
           false,
           message_from(response, options, action),
           response,
-          :test => test?,
-          :authorization => response['transactionUUID'],
-          :error_code => response['errorCode']
+          test: test?,
+          authorization: response['transactionUUID'],
+          error_code: response['errorCode']
         )
       end
 

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

@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
 
             return r unless options[:set_default] and r.success? and !r.params['id'].blank?
 
-            r.process { update_customer(options[:customer], :default_card => r.params['id']) }
+            r.process { update_customer(options[:customer], default_card: r.params['id']) }
           end
         else
           commit(:post, 'customers', post, options)
@@ -89,7 +89,7 @@ module ActiveMerchant #:nodoc:
           'Authorization' => 'Basic ' + Base64.encode64(@api_key.to_s + ':').strip,
           'User-Agent' => "Webpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           'X-Webpay-Client-User-Agent' => user_agent,
-          'X-Webpay-Client-User-Metadata' => {:ip => options[:ip]}.to_json
+          'X-Webpay-Client-User-Metadata' => {ip: options[:ip]}.to_json
         }
       end
     end

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

@@ -180,10 +180,10 @@ module ActiveMerchant #:nodoc:
         authorization = response[:GuWID]
 
         Response.new(success, message, response,
-          :test => test?,
-          :authorization => authorization,
-          :avs_result => { :code => avs_code(response, options) },
-          :cvv_result => response[:CVCResponseCode]
+          test: test?,
+          authorization: authorization,
+          avs_result: { code: avs_code(response, options) },
+          cvv_result: response[:CVCResponseCode]
         )
       rescue ResponseError => e
         if e.response.code == '401'
@@ -197,7 +197,7 @@ module ActiveMerchant #:nodoc:
       def build_request(action, money, options)
         options = prepare_options_hash(options)
         options[:action] = action
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'WIRECARD_BXML' do
           xml.tag! 'W_REQUEST' do
@@ -391,7 +391,7 @@ module ActiveMerchant #:nodoc:
           string << error[:Message] if error[:Message]
           error[:Advice].each_with_index do |advice, index|
             string << ' (' if index == 0
-            string << "#{index+1}. #{advice}"
+            string << "#{index + 1}. #{advice}"
             string << ' and ' if index < error[:Advice].size - 1
             string << ')' if index == error[:Advice].size - 1
           end

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

@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment_method, options = {})
         MultiResponse.run do |r|
           r.process { authorize(money, payment_method, options) }
-          r.process { capture(money, r.authorization, options.merge(:authorization_validated => true)) }
+          r.process { capture(money, r.authorization, options.merge(authorization_validated: true)) }
         end
       end
 
@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
           r.process { inquire_request(authorization, options, 'AUTHORISED') } unless options[:authorization_validated]
           if r.params
             authorization_currency = r.params['amount_currency_code']
-            options = options.merge(:currency => authorization_currency) if authorization_currency.present?
+            options = options.merge(currency: authorization_currency) if authorization_currency.present?
           end
           r.process { capture_request(money, authorization, options) }
         end
@@ -94,10 +94,12 @@ module ActiveMerchant #:nodoc:
           r.process { refund_request(money, authorization, options) }
         end
 
-        return response if response.success?
-        return response unless options[:force_full_refund_if_unsettled]
-
-        void(authorization, options) if response.params['last_event'] == 'AUTHORISED'
+        if !response.success? && options[:force_full_refund_if_unsettled] &&
+           response.params['last_event'] == 'AUTHORISED'
+          void(authorization, options)
+        else
+          response
+        end
       end
 
       # Credits only function on a Merchant ID/login/profile flagged for Payouts
@@ -106,13 +108,13 @@ module ActiveMerchant #:nodoc:
       #   merchant ID.
       def credit(money, payment_method, options = {})
         payment_details = payment_details_from(payment_method)
-        credit_request(money, payment_method, payment_details.merge(:credit => true, **options))
+        credit_request(money, payment_method, payment_details.merge(credit: true, **options))
       end
 
       def verify(payment_method, options={})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, payment_method, options) }
-          r.process(:ignore_result) { void(r.authorization, options.merge(:authorization_validated => true)) }
+          r.process(:ignore_result) { void(r.authorization, options.merge(authorization_validated: true)) }
         end
       end
 
@@ -163,8 +165,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request
-        xml = Builder::XmlMarkup.new :indent => 2
-        xml.instruct! :xml, :encoding => 'UTF-8'
+        xml = Builder::XmlMarkup.new indent: 2
+        xml.instruct! :xml, encoding: 'UTF-8'
         xml.declare! :DOCTYPE, :paymentService, :PUBLIC, '-//WorldPay//DTD WorldPay PaymentService v1//EN', 'http://dtd.worldpay.com/paymentService_v1.dtd'
         xml.paymentService 'version' => '1.4', 'merchantCode' => @options[:login] do
           yield xml
@@ -222,7 +224,7 @@ module ActiveMerchant #:nodoc:
         build_order_modify_request(authorization) do |xml|
           xml.capture do
             time = Time.now
-            xml.date 'dayOfMonth' => time.day, 'month' => time.month, 'year'=> time.year
+            xml.date 'dayOfMonth' => time.day, 'month' => time.month, 'year' => time.year
             add_amount(xml, money, options)
           end
         end
@@ -235,7 +237,7 @@ module ActiveMerchant #:nodoc:
       def build_refund_request(money, authorization, options)
         build_order_modify_request(authorization) do |xml|
           xml.refund do
-            add_amount(xml, money, options.merge(:debit_credit_indicator => 'credit'))
+            add_amount(xml, money, options.merge(debit_credit_indicator: 'credit'))
           end
         end
       end
@@ -544,7 +546,7 @@ module ActiveMerchant #:nodoc:
         xml = xml.strip.gsub(/\&/, '&')
         doc = Nokogiri::XML(xml, &:strict)
         doc.remove_namespaces!
-        resp_params = {:action => action}
+        resp_params = {action: action}
 
         parse_elements(doc.root, resp_params)
         resp_params
@@ -580,7 +582,7 @@ module ActiveMerchant #:nodoc:
         xml = ssl_post(url, request, headers(options))
         raw = parse(action, xml)
         if options[:execute_threed]
-          raw[:cookie] = @cookie
+          raw[:cookie] = @cookie if defined?(@cookie)
           raw[:session_id] = options[:session_id]
           raw[:is3DSOrder] = true
         end
@@ -591,17 +593,17 @@ module ActiveMerchant #:nodoc:
           success,
           message,
           raw,
-          :authorization => authorization_from(action, raw, options),
-          :error_code => error_code_from(success, raw),
-          :test => test?,
-          :avs_result => AVSResult.new(code: AVS_CODE_MAP[raw[:avs_result_code_description]]),
-          :cvv_result => CVVResult.new(CVC_CODE_MAP[raw[:cvc_result_code_description]])
+          authorization: authorization_from(action, raw, options),
+          error_code: error_code_from(success, raw),
+          test: test?,
+          avs_result: AVSResult.new(code: AVS_CODE_MAP[raw[:avs_result_code_description]]),
+          cvv_result: CVVResult.new(CVC_CODE_MAP[raw[:cvc_result_code_description]])
         )
       rescue Nokogiri::SyntaxError
         unparsable_response(xml)
       rescue ActiveMerchant::ResponseError => e
         if e.response.code.to_s == '401'
-          return Response.new(false, 'Invalid credentials', {}, :test => test?)
+          return Response.new(false, 'Invalid credentials', {}, test: test?)
         else
           raise e
         end

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorize(money, credit_card, options={})
-        response = create_token(true, credit_card.first_name+' '+credit_card.last_name, credit_card.month, credit_card.year, credit_card.number, credit_card.verification_value)
+        response = create_token(true, credit_card.first_name + ' ' + credit_card.last_name, credit_card.month, credit_card.year, credit_card.number, credit_card.verification_value)
         if response.success?
           options[:authorizeOnly] = true
           post = create_post_for_auth_or_purchase(response.authorization, money, options)
@@ -32,22 +32,22 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options={})
         if authorization
-          commit(:post, "orders/#{CGI.escape(authorization)}/capture", {'captureAmount'=>money}, options, 'capture')
+          commit(:post, "orders/#{CGI.escape(authorization)}/capture", {'captureAmount' => money}, options, 'capture')
         else
           Response.new(false,
             'FAILED',
             'FAILED',
-            :test => test?,
-            :authorization => false,
-            :avs_result => {},
-            :cvv_result => {},
-            :error_code => false
+            test: test?,
+            authorization: false,
+            avs_result: {},
+            cvv_result: {},
+            error_code: false
           )
         end
       end
 
       def purchase(money, credit_card, options={})
-        response = create_token(true, credit_card.first_name+' '+credit_card.last_name, credit_card.month, credit_card.year, credit_card.number, credit_card.verification_value)
+        response = create_token(true, credit_card.first_name + ' ' + credit_card.last_name, credit_card.month, credit_card.year, credit_card.number, credit_card.verification_value)
         if response.success?
           post = create_post_for_auth_or_purchase(response.authorization, money, options)
           response = commit(:post, 'orders', post, options, 'purchase')
@@ -74,16 +74,16 @@ module ActiveMerchant #:nodoc:
 
       def create_token(reusable, name, exp_month, exp_year, number, cvc)
         obj = {
-          'reusable'=> reusable,
-          'paymentMethod'=> {
-            'type'=> 'Card',
-            'name'=> name,
-            'expiryMonth'=> exp_month,
-            'expiryYear'=> exp_year,
-            'cardNumber'=> number,
-            'cvc'=> cvc
+          'reusable' => reusable,
+          'paymentMethod' => {
+            'type' => 'Card',
+            'name' => name,
+            'expiryMonth' => exp_month,
+            'expiryYear' => exp_year,
+            'cardNumber' => number,
+            'cvc' => cvc
           },
-          'clientKey'=> @client_key
+          'clientKey' => @client_key
         }
         token_response = commit(:post, 'tokens', obj, {'Authorization' => @service_key}, 'token')
         token_response
@@ -95,15 +95,15 @@ module ActiveMerchant #:nodoc:
           'orderDescription' => options[:description] || 'Worldpay Order',
           'amount' => money,
           'currencyCode' => options[:currency] || default_currency,
-          'name' => options[:billing_address]&&options[:billing_address][:name] ? options[:billing_address][:name] : '',
+          'name' => options[:billing_address] && options[:billing_address][:name] ? options[:billing_address][:name] : '',
           'billingAddress' => {
-            'address1'=>options[:billing_address]&&options[:billing_address][:address1] ? options[:billing_address][:address1] : '',
-            'address2'=>options[:billing_address]&&options[:billing_address][:address2] ? options[:billing_address][:address2] : '',
-            'address3'=>'',
-            'postalCode'=>options[:billing_address]&&options[:billing_address][:zip] ? options[:billing_address][:zip] : '',
-            'city'=>options[:billing_address]&&options[:billing_address][:city] ? options[:billing_address][:city] : '',
-            'state'=>options[:billing_address]&&options[:billing_address][:state] ? options[:billing_address][:state] : '',
-            'countryCode'=>options[:billing_address]&&options[:billing_address][:country] ? options[:billing_address][:country] : ''
+            'address1' => options[:billing_address] && options[:billing_address][:address1] ? options[:billing_address][:address1] : '',
+            'address2' => options[:billing_address] && options[:billing_address][:address2] ? options[:billing_address][:address2] : '',
+            'address3' => '',
+            'postalCode' => options[:billing_address] && options[:billing_address][:zip] ? options[:billing_address][:zip] : '',
+            'city' => options[:billing_address] && options[:billing_address][:city] ? options[:billing_address][:city] : '',
+            'state' => options[:billing_address] && options[:billing_address][:state] ? options[:billing_address][:state] : '',
+            'countryCode' => options[:billing_address] && options[:billing_address][:country] ? options[:billing_address][:country] : ''
           },
           'customerOrderCode' => options[:order_id],
           'orderType' => 'ECOM',
@@ -121,7 +121,7 @@ module ActiveMerchant #:nodoc:
           'Content-Type' => 'application/json',
           'User-Agent' => "Worldpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           'X-Worldpay-Client-User-Agent' => user_agent,
-          'X-Worldpay-Client-User-Metadata' => {:ip => options[:ip]}.to_json
+          'X-Worldpay-Client-User-Metadata' => {ip: options[:ip]}.to_json
         }
         headers['Authorization'] = options['Authorization'] if options['Authorization']
         headers
@@ -147,7 +147,7 @@ module ActiveMerchant #:nodoc:
                   success = true
                 elsif type == 'purchase' && response['paymentStatus'] == 'SUCCESS'
                   success = true
-                elsif type == 'capture' || type=='refund' || type=='void'
+                elsif type == 'capture' || type == 'refund' || type == 'void'
                   success = true
                 end
               end
@@ -174,11 +174,11 @@ module ActiveMerchant #:nodoc:
         Response.new(success,
           success ? 'SUCCESS' : response['message'],
           response,
-          :test => test?,
-          :authorization => authorization,
-          :avs_result => {},
-          :cvv_result => {},
-          :error_code => success ? nil : response['customCode']
+          test: test?,
+          authorization: authorization,
+          avs_result: {},
+          cvv_result: {},
+          error_code: success ? nil : response['customCode']
         )
       end