activemerchant 1.105.0 → 1.106.0

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

@@ -449,8 +449,8 @@ module ActiveMerchant #:nodoc:
         options = {
           authorization: authorization_from(kind, parsed, money),
           test: test?,
-          :avs_result => { :code => AVS_RESPONSE_CODE[parsed[:fraudResult_avsResult]] },
-          :cvv_result => parsed[:fraudResult_cardValidationResult]
+          avs_result: { code: AVS_RESPONSE_CODE[parsed[:fraudResult_avsResult]] },
+          cvv_result: parsed[:fraudResult_cardValidationResult]
         }
 
         Response.new(success_from(kind, parsed), parsed[:message], parsed, options)

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

@@ -207,8 +207,8 @@ module ActiveMerchant
           succeeded,
           message_from(succeeded, raw),
           raw,
-          :authorization => authorization_from(post, raw),
-          :test => test?
+          authorization: authorization_from(post, raw),
+          test: test?
         )
       end
 

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, transaction_id, options = {})
-        post ={}
+        post = {}
         post[:transaction_id] = transaction_id
         post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
         add_invoice(post, options)
@@ -166,10 +166,10 @@ module ActiveMerchant #:nodoc:
           end
 
         Response.new(response['error_code'] == '000', message_from(response), response,
-          :authorization => response['transaction_id'],
-          :test => test?,
-          :cvv_result => response['cvv2_result'],
-          :avs_result => { :code => response['avs_result'] }
+          authorization: response['transaction_id'],
+          test: test?,
+          cvv_result: response['cvv2_result'],
+          avs_result: { code: response['avs_result'] }
         )
       end
 

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

@@ -101,8 +101,8 @@ module ActiveMerchant #:nodoc:
           (responses['response'].to_i == 1),
           responses['responsetext'],
           responses,
-          :test => test?,
-          :authorization => responses['transactionid']
+          test: test?,
+          authorization: responses['transactionid']
         )
       end
     end

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

@@ -172,20 +172,20 @@ module ActiveMerchant #:nodoc:
           message_from(succeeded, response_data),
           response_data,
           authorization: authorization_from(post, response_data),
-          :avs_result => AVSResult.new(code: response_data['avs_response']),
-          :cvv_result => CVVResult.new(response_data['cvv2_response']),
+          avs_result: AVSResult.new(code: response_data['avs_response']),
+          cvv_result: CVVResult.new(response_data['cvv2_response']),
           test: test?
         )
       end
 
       def headers
         {
-          'Content-Type'  => 'application/xml'
+          'Content-Type' => 'application/xml'
         }
       end
 
       def build_request(post)
-        Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
           xml.interface_driver {
             xml.trans_catalog {
               xml.transaction(name: 'creditcard') {

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

@@ -22,12 +22,12 @@ module ActiveMerchant #:nodoc:
       TX_NAMESPACE_V4 = 'http://schemas.merchantwarehouse.com/merchantware/40/Credit/'
 
       ACTIONS = {
-        :purchase  => 'IssueKeyedSale',
-        :authorize => 'IssueKeyedPreAuth',
-        :capture   => 'IssuePostAuth',
-        :void      => 'VoidPreAuthorization',
-        :credit    => 'IssueKeyedRefund',
-        :reference_credit => 'IssueRefundByReference'
+        purchase: 'IssueKeyedSale',
+        authorize: 'IssueKeyedPreAuth',
+        capture: 'IssuePostAuth',
+        void: 'VoidPreAuthorization',
+        credit: 'IssueKeyedRefund',
+        reference_credit: 'IssueRefundByReference'
       }
 
       # Creates a new MerchantWareGateway
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def soap_request(action)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'env:Envelope', ENV_NAMESPACES do
           xml.tag! 'env:Body' do
@@ -131,7 +131,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def v4_soap_request(action)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'soap:Envelope', ENV_NAMESPACES_V4 do
           xml.tag! 'soap:Body' do
@@ -300,10 +300,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(response[:success], response[:message], response,
-          :test => test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => response['AVSResponse'] },
-          :cvv_result => response['CVResponse']
+          test: test?,
+          authorization: authorization_from(response),
+          avs_result: { code: response['AVSResponse'] },
+          cvv_result: response['CVResponse']
         )
       end
 

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

@@ -16,12 +16,12 @@ module ActiveMerchant #:nodoc:
       TX_NAMESPACE = 'http://schemas.merchantwarehouse.com/merchantware/40/Credit/'
 
       ACTIONS = {
-        :purchase  => 'SaleKeyed',
-        :reference_purchase => 'RepeatSale',
-        :authorize => 'PreAuthorizationKeyed',
-        :capture   => 'PostAuthorization',
-        :void      => 'Void',
-        :refund    => 'Refund'
+        purchase: 'SaleKeyed',
+        reference_purchase: 'RepeatSale',
+        authorize: 'PreAuthorizationKeyed',
+        capture: 'PostAuthorization',
+        void: 'Void',
+        refund: 'Refund'
       }
 
       # Creates a new MerchantWareVersionFourGateway
@@ -129,7 +129,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def soap_request(action)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'soap:Envelope', ENV_NAMESPACES do
           xml.tag! 'soap:Body' do
@@ -271,10 +271,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(response[:success], response[:message], response,
-          :test => test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => response['AvsResponse'] },
-          :cvv_result => response['CvResponse']
+          test: test?,
+          authorization: authorization_from(response),
+          avs_result: { code: response['AvsResponse'] },
+          cvv_result: response['CvResponse']
         )
       end
 

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

@@ -31,6 +31,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_payment_method(post, payment_method)
         add_recurring_flag(post, options)
+        add_soft_descriptors(post, options)
         commit('processAuth', post)
       end
 
@@ -41,6 +42,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_payment_method(post, payment_method)
         add_recurring_flag(post, options)
+        add_soft_descriptors(post, options)
         commit('processCard', post)
       end
 
@@ -48,6 +50,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
+        add_soft_descriptors(post, options)
         post['captureAmount'] = amount(money)
         commit('processCapture', post)
       end
@@ -56,6 +59,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
+        add_soft_descriptors(post, options)
         post['refundAmount'] = amount(money)
         commit('refundCard', post)
       end
@@ -153,6 +157,12 @@ module ActiveMerchant #:nodoc:
         post['recurringFlag'] = options[:recurring_flag]
       end
 
+      def add_soft_descriptors(post, options)
+        post['descriptorName'] = options[:descriptor_name] if options[:descriptor_name]
+        post['descriptorCity'] = options[:descriptor_city] if options[:descriptor_city]
+        post['descriptorState'] = options[:descriptor_state] if options[:descriptor_state]
+      end
+
       def verification_hash(money, currency)
         Digest::MD5.hexdigest(
           (
@@ -201,8 +211,8 @@ module ActiveMerchant #:nodoc:
           success?(response),
           response[:response_message],
           response,
-          :test => test?,
-          :authorization => (response[:card_id] || response[:transaction_id])
+          test: test?,
+          authorization: (response[:card_id] || response[:transaction_id])
         )
       end
 

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

@@ -12,8 +12,8 @@ module ActiveMerchant #:nodoc:
     # and +refund+ will become mandatory.
     class MercuryGateway < Gateway
       URLS = {
-        :test => 'https://w1.mercurycert.net/ws/ws.asmx',
-        :live => 'https://w1.mercurypay.com/ws/ws.asmx'
+        test: 'https://w1.mercurycert.net/ws/ws.asmx',
+        live: 'https://w1.mercurypay.com/ws/ws.asmx'
       }
 
       self.homepage_url = 'http://www.mercurypay.com'
@@ -51,14 +51,14 @@ module ActiveMerchant #:nodoc:
       def authorize(money, credit_card, options = {})
         requires!(options, :order_id)
 
-        request = build_non_authorized_request('PreAuth', money, credit_card, options.merge(:authorized => money))
+        request = build_non_authorized_request('PreAuth', money, credit_card, options.merge(authorized: money))
         commit('PreAuth', request)
       end
 
       def capture(money, authorization, options = {})
         requires!(options, :credit_card) unless @use_tokenization
 
-        request = build_authorized_request('PreAuthCapture', money, authorization, options[:credit_card], options.merge(:authorized => money))
+        request = build_authorized_request('PreAuthCapture', money, authorization, options[:credit_card], options.merge(authorized: money))
         commit('PreAuthCapture', request)
       end
 
@@ -303,11 +303,11 @@ module ActiveMerchant #:nodoc:
         message = success ? 'Success' : message_from(response)
 
         Response.new(success, message, response,
-          :test => test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => response[:avs_result] },
-          :cvv_result => response[:cvv_result],
-          :error_code => success ? nil : STANDARD_ERROR_CODE_MAPPING[response[:dsix_return_code]])
+          test: test?,
+          authorization: authorization_from(response),
+          avs_result: { code: response[:avs_result] },
+          cvv_result: response[:cvv_result],
+          error_code: success ? nil : STANDARD_ERROR_CODE_MAPPING[response[:dsix_return_code]])
       end
 
       def message_from(response)

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

@@ -99,7 +99,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>money</tt> -- The amount to be captured as an Integer value in cents.
       # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.
       def capture(money, authorization, options = {})
-        post = {:trans_id => authorization}
+        post = {trans_id: authorization}
         add_customer_data(post, options)
         commit('PRIOR_AUTH_CAPTURE', money, post)
       end
@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>authorization</tt> - The authorization returned from the previous authorize request.
       def void(authorization, options = {})
-        post = {:trans_id => authorization}
+        post = {trans_id: authorization}
         add_duplicate_window(post)
         commit('VOID', nil, post)
       end
@@ -135,8 +135,8 @@ module ActiveMerchant #:nodoc:
       def refund(money, identification, options = {})
         requires!(options, :card_number)
 
-        post = { :trans_id => identification,
-                 :card_num => options[:card_number]}
+        post = { trans_id: identification,
+                 card_num: options[:card_number]}
 
         post[:first_name] = options[:first_name] if options[:first_name]
         post[:last_name] = options[:last_name] if options[:last_name]
@@ -176,11 +176,11 @@ module ActiveMerchant #:nodoc:
         test_mode = test? || message =~ /TESTMODE/
 
         Response.new(success?(response), message, response,
-          :test => test_mode,
-          :authorization => response[:transaction_id],
-          :fraud_review => fraud_review?(response),
-          :avs_result => { :code => response[:avs_result_code] },
-          :cvv_result => response[:card_code]
+          test: test_mode,
+          authorization: response[:transaction_id],
+          fraud_review: fraud_review?(response),
+          avs_result: { code: response[:avs_result_code] },
+          cvv_result: response[:card_code]
         )
       end
 
@@ -196,12 +196,12 @@ module ActiveMerchant #:nodoc:
         fields = split(body)
 
         results = {
-          :response_code => fields[RESPONSE_CODE].to_i,
-          :response_reason_code => fields[RESPONSE_REASON_CODE],
-          :response_reason_text => fields[RESPONSE_REASON_TEXT],
-          :avs_result_code => fields[AVS_RESULT_CODE],
-          :transaction_id => fields[TRANSACTION_ID],
-          :card_code => fields[CARD_CODE_RESPONSE_CODE]
+          response_code: fields[RESPONSE_CODE].to_i,
+          response_reason_code: fields[RESPONSE_REASON_CODE],
+          response_reason_text: fields[RESPONSE_REASON_TEXT],
+          avs_result_code: fields[AVS_RESULT_CODE],
+          transaction_id: fields[TRANSACTION_ID],
+          card_code: fields[CARD_CODE_RESPONSE_CODE]
         }
         results
       end

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

@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options = {})
         requires!(@options, :advanced_login, :advanced_password)
 
-        post = options.merge(:TransNo => authorization)
+        post = options.merge(TransNo: authorization)
 
         add_amount(post, money, options)
         add_advanced_user(post)
@@ -96,7 +96,7 @@ module ActiveMerchant #:nodoc:
       def refund(money, authorization, options = {})
         requires!(@options, :advanced_login, :advanced_password)
 
-        post = options.merge(:TransNo => authorization)
+        post = options.merge(TransNo: authorization)
 
         add_amount(post, money, options)
         add_advanced_user(post)
@@ -109,7 +109,7 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options = {})
         requires!(@options, :advanced_login, :advanced_password)
 
-        post = options.merge(:TransNo => authorization)
+        post = options.merge(TransNo: authorization)
 
         add_advanced_user(post)
         add_standard_parameters('voidAuthorisation', post, options[:unique_id])
@@ -282,11 +282,11 @@ module ActiveMerchant #:nodoc:
         cvv_result_code = 'P' if cvv_result_code == 'Unsupported'
 
         Response.new(success?(response), response[:Message], response,
-          :test => test?,
-          :authorization => response[:TransactionNo],
-          :fraud_review => fraud_review?(response),
-          :avs_result => { :code => avs_response_code },
-          :cvv_result => cvv_result_code
+          test: test?,
+          authorization: response[:TransactionNo],
+          fraud_review: fraud_review?(response),
+          avs_result: { code: avs_response_code },
+          cvv_result: cvv_result_code
         )
       end
 
@@ -300,11 +300,11 @@ module ActiveMerchant #:nodoc:
 
       def add_standard_parameters(action, post, unique_id = nil)
         post.merge!(
-          :Version     => API_VERSION,
-          :Merchant    => @options[:login],
-          :AccessCode  => @options[:password],
-          :Command     => action,
-          :MerchTxnRef => unique_id || generate_unique_id.slice(0, 40)
+          Version: API_VERSION,
+          Merchant: @options[:login],
+          AccessCode: @options[:password],
+          Command: action,
+          MerchTxnRef: unique_id || generate_unique_id.slice(0, 40)
         )
       end
 

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

@@ -17,8 +17,8 @@ module ActiveMerchant #:nodoc:
       ERROR_MESSAGE   = 'Transaction error'
 
       PAYMENT_METHOD = {
-        :check => 1,
-        :credit_card => 2
+        check: 1,
+        credit_card: 2
       }
 
       def initialize(options = {})
@@ -111,7 +111,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(action, params)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'env:Envelope',
           { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
@@ -147,15 +147,15 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, params)
         data = ssl_post(url(action), build_request(action, params),
-          { 'Content-Type' =>'text/xml; charset=utf-8',
+          { 'Content-Type' => 'text/xml; charset=utf-8',
             'SOAPAction' => "#{xmlns(action)}#{action}" }
         )
 
         response = parse(action, data)
         Response.new(successful?(action, response), message_from(action, response), response,
-          :test => test?,
-          :authorization => authorization_from(action, response),
-          :avs_result => { :code => response[:avs_code] }
+          test: test?,
+          authorization: authorization_from(action, response),
+          avs_result: { code: response[:avs_code] }
         )
       end
 

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

@@ -151,11 +151,11 @@ module ActiveMerchant #:nodoc:
 
       # Private: Build XML wrapping code yielding to code to fill the transaction information
       def build_request
-        builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-          xml.Request(:version => '1.0') do
-            xml.Header { xml.Security(:sender => @options[:sender_id]) }
-            xml.Transaction(:mode => test? ? 'CONNECTOR_TEST' : 'LIVE', :response => 'SYNC', :channel => @options[:channel_id]) do
-              xml.User(:login => @options[:login], :pwd => @options[:pwd])
+        builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+          xml.Request(version: '1.0') do
+            xml.Header { xml.Security(sender: @options[:sender_id]) }
+            xml.Transaction(mode: test? ? 'CONNECTOR_TEST' : 'LIVE', response: 'SYNC', channel: @options[:channel_id]) do
+              xml.User(login: @options[:login], pwd: @options[:pwd])
               yield xml
             end
           end
@@ -183,7 +183,7 @@ module ActiveMerchant #:nodoc:
       def add_payment(xml, action, money, options)
         code = tanslate_payment_code(action)
 
-        xml.Payment(:code => code) do
+        xml.Payment(code: code) do
           xml.Presentation do
             xml.Amount amount(money)
             xml.Currency options[:currency] || currency(money)
@@ -198,7 +198,7 @@ module ActiveMerchant #:nodoc:
           xml.Holder credit_card.name
           xml.Number credit_card.number
           xml.Brand credit_card.brand.upcase
-          xml.Expiry(:month => credit_card.month, :year => credit_card.year)
+          xml.Expiry(month: credit_card.month, year: credit_card.year)
           xml.Verification credit_card.verification_value
         end
       end
@@ -248,10 +248,10 @@ module ActiveMerchant #:nodoc:
       # Private : Add the 3DSecure infos to XML
       def add_three_d_secure(xml, options)
         if options[:three_d_secure]
-          xml.Authentication(:type => '3DSecure') do
+          xml.Authentication(type: '3DSecure') do
             xml.ResultIndicator eci_to_result_indicator options[:three_d_secure][:eci]
-            xml.Parameter(:name => 'VERIFICATION_ID') { xml.text options[:three_d_secure][:cavv] }
-            xml.Parameter(:name => 'XID') { xml.text options[:three_d_secure][:xid] }
+            xml.Parameter(name: 'VERIFICATION_ID') { xml.text options[:three_d_secure][:cavv] }
+            xml.Parameter(name: 'XID') { xml.text options[:three_d_secure][:xid] }
           end
         end
       end
@@ -260,10 +260,10 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         xml = Nokogiri::XML(body)
         {
-          :unique_id => xml.xpath('//Response/Transaction/Identification/UniqueID').text,
-          :status => translate_status_code(xml.xpath('//Response/Transaction/Processing/Status/@code').text),
-          :reason => translate_status_code(xml.xpath('//Response/Transaction/Processing/Reason/@code').text),
-          :message => xml.xpath('//Response/Transaction/Processing/Return').text
+          unique_id: xml.xpath('//Response/Transaction/Identification/UniqueID').text,
+          status: translate_status_code(xml.xpath('//Response/Transaction/Processing/Status/@code').text),
+          reason: translate_status_code(xml.xpath('//Response/Transaction/Processing/Reason/@code').text),
+          message: xml.xpath('//Response/Transaction/Processing/Return').text
         }
       end
 
@@ -326,11 +326,11 @@ module ActiveMerchant #:nodoc:
       # Private: Translate AM operations to Monei operations codes
       def tanslate_payment_code(action)
         {
-          :purchase => 'CC.DB',
-          :authorize => 'CC.PA',
-          :capture => 'CC.CP',
-          :refund => 'CC.RF',
-          :void => 'CC.RV'
+          purchase: 'CC.DB',
+          authorize: 'CC.PA',
+          capture: 'CC.CP',
+          refund: 'CC.RF',
+          void: 'CC.RV'
         }[action]
       end
     end