activemerchant 1.110.0 → 1.116.0

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

@@ -17,12 +17,12 @@ module ActiveMerchant #:nodoc:
       SERVICE_TEST_URL = 'https://certservices.elementexpress.com/express.asmx'
       SERVICE_LIVE_URL = 'https://services.elementexpress.com/express.asmx'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :account_id, :account_token, :application_id, :acceptor_id, :application_name, :application_version)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         action = payment.is_a?(Check) ? 'CheckSale' : 'CreditCardSale'
 
         request = build_soap_request do |xml|
@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
         commit(action, request, money)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         request = build_soap_request do |xml|
           xml.CreditCardAuthorization(xmlns: 'https://transaction.elementexpress.com') do
             add_credentials(xml)
@@ -52,7 +52,7 @@ module ActiveMerchant #:nodoc:
         commit('CreditCardAuthorization', request, money)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         trans_id, = split_authorization(authorization)
         options[:trans_id] = trans_id
 
@@ -67,7 +67,7 @@ module ActiveMerchant #:nodoc:
         commit('CreditCardAuthorizationCompletion', request, money)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         trans_id, = split_authorization(authorization)
         options[:trans_id] = trans_id
 
@@ -82,9 +82,9 @@ module ActiveMerchant #:nodoc:
         commit('CreditCardReturn', request, money)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         trans_id, trans_amount = split_authorization(authorization)
-        options.merge!({trans_id: trans_id, trans_amount: trans_amount, reversal_type: 'Full'})
+        options.merge!({ trans_id: trans_id, trans_amount: trans_amount, reversal_type: 'Full' })
 
         request = build_soap_request do |xml|
           xml.CreditCardReversal(xmlns: 'https://transaction.elementexpress.com') do
@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
         commit('PaymentAccountCreate', request, nil)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         request = build_soap_request do |xml|
           xml.CreditCardAVSOnly(xmlns: 'https://transaction.elementexpress.com') do
             add_credentials(xml)
@@ -188,6 +188,10 @@ module ActiveMerchant #:nodoc:
           xml.TransactionAmount amount(money.to_i) if money
           xml.MarketCode 'Default' if money
           xml.ReferenceNumber options[:order_id] || SecureRandom.hex(20)
+
+          xml.PaymentType options[:payment_type] if options[:payment_type]
+          xml.SubmissionType options[:submission_type] if options[:submission_type]
+          xml.DuplicateCheckDisableFlag options[:duplicate_check_disable_flag].to_s == 'true' ? 'True' : 'False' unless options[:duplicate_check_disable_flag].nil?
         end
       end
 

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

@@ -153,7 +153,7 @@ module ActiveMerchant #:nodoc:
       # The <tt>identification</tt> parameter is the transaction ID, retrieved
       # from {Response#authorization}.
       def refund(money, identification)
-        post = {transactionid: identification}
+        post = { transactionid: identification }
         commit('refund', money, post)
       end
 
@@ -181,7 +181,7 @@ module ActiveMerchant #:nodoc:
       # The <tt>identification</tt> parameter is the transaction ID, retrieved
       # from {Response#authorization}.
       def void(identification)
-        post = {transactionid: identification}
+        post = { transactionid: identification }
         commit('void', nil, post)
       end
 
@@ -192,7 +192,7 @@ module ActiveMerchant #:nodoc:
       # The <tt>identification</tt> parameter is the transaction ID, retrieved
       # from {Response#authorization}.
       def update(identification, options)
-        post = {transactionid: identification}
+        post = { transactionid: identification }
         add_order(post, options)
         commit('update', nil, post)
       end
@@ -283,8 +283,7 @@ module ActiveMerchant #:nodoc:
           test: test?,
           authorization: response['transactionid'],
           avs_result: { code: response['avsresponse'] },
-          cvv_result: response['cvvresponse']
-        )
+          cvv_result: response['cvvresponse'])
       end
 
       def message_from(response)
@@ -292,7 +291,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(action, parameters = {})
-        post = {type: action}
+        post = { type: action }
 
         if test?
           post[:username] = 'demo'

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

@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
         commit(purchase_url(post[:CVN]), money, post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
 
         add_customer_id(post)
@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def requires_address!(options)
-        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless options.has_key?(:address) or options.has_key?(:billing_address)
+        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless options.has_key?(:address) || options.has_key?(:billing_address)
       end
 
       def add_creditcard(post, creditcard)
@@ -115,8 +115,7 @@ module ActiveMerchant #:nodoc:
           message_from(response[:ewaytrxnerror]),
           response,
           authorization: response[:ewaytrxnnumber],
-          test: test?
-        )
+          test: test?)
       end
 
       def success?(response)

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

@@ -49,7 +49,7 @@ module ActiveMerchant #:nodoc:
         commit('CreateCustomer', post)
       end
 
-      def update(billing_id, creditcard, options={})
+      def update(billing_id, creditcard, options = {})
         post = {}
 
         # Handle our required fields
@@ -80,7 +80,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>:order_id</tt> -- The order number, passed to eWay as the "Invoice Reference"
       # * <tt>:invoice</tt> -- The invoice number, passed to eWay as the "Invoice Reference" unless :order_id is also given
       # * <tt>:description</tt> -- A description of the payment, passed to eWay as the "Invoice Description"
-      def purchase(money, billing_id, options={})
+      def purchase(money, billing_id, options = {})
         post = {}
         post[:managedCustomerID] = billing_id.to_s
         post[:amount] = money
@@ -224,8 +224,7 @@ module ActiveMerchant #:nodoc:
 
         EwayResponse.new(response[:success], response[:message], response,
           test: test?,
-          authorization: response[:auth_code]
-        )
+          authorization: response[:auth_code])
       end
 
       # Where we build the full SOAP 1.2 request using builder
@@ -244,16 +243,16 @@ module ActiveMerchant #:nodoc:
 
         xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! 'soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'} do
+        xml.tag! 'soap12:Envelope', { 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope' } do
           xml.tag! 'soap12:Header' do
-            xml.tag! 'eWAYHeader', {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do
+            xml.tag! 'eWAYHeader', { 'xmlns' => 'https://www.eway.com.au/gateway/managedpayment' } do
               xml.tag! 'eWAYCustomerID', @options[:login]
               xml.tag! 'Username', @options[:username]
               xml.tag! 'Password', @options[:password]
             end
           end
           xml.tag! 'soap12:Body' do |x|
-            x.tag! action, {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
+            x.tag! action, { 'xmlns' => 'https://www.eway.com.au/gateway/managedpayment' } do |y|
               post.each do |key, value|
                 y.tag! key, value
               end

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

@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
       #                                      (default: "https://github.com/activemerchant/active_merchant")
       #
       # Returns an ActiveMerchant::Billing::Response object where authorization is the Transaction ID on success
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         params = {}
         add_metadata(params, options)
         add_invoice(params, amount, options)
@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         commit(url_for('Transaction'), params)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         params = {}
         add_metadata(params, options)
         add_invoice(params, amount, options)
@@ -204,7 +204,7 @@ module ActiveMerchant #:nodoc:
           'InvoiceReference' => truncate(options[:order_id], 50),
           'InvoiceNumber' => truncate(options[:invoice] || options[:order_id], 12),
           'InvoiceDescription' => truncate(options[:description], 64),
-          'CurrencyCode' => currency_code,
+          'CurrencyCode' => currency_code
         }
       end
 
@@ -232,7 +232,7 @@ module ActiveMerchant #:nodoc:
         params[key] = {}
 
         add_name_and_email(params[key], options[:shipping_address], options[:email])
-        add_address(params[key], options[:shipping_address], {skip_company: true})
+        add_address(params[key], options[:shipping_address], { skip_company: true })
       end
 
       def add_name_and_email(params, address, email, payment_method = nil)
@@ -251,7 +251,7 @@ module ActiveMerchant #:nodoc:
           payment_method.first_name.present? && payment_method.last_name.present?
       end
 
-      def add_address(params, address, options={})
+      def add_address(params, address, options = {})
         return unless address
 
         params['Title'] = address[:title]
@@ -310,7 +310,7 @@ module ActiveMerchant #:nodoc:
           cvv_result: cvv_result_from(raw)
         )
       rescue ActiveMerchant::ResponseError => e
-        return ActiveMerchant::Billing::Response.new(false, e.response.message, {status_code: e.response.code}, test: test?)
+        return ActiveMerchant::Billing::Response.new(false, e.response.message, { status_code: e.response.code }, test: test?)
       end
 
       def parse(data)
@@ -365,7 +365,7 @@ module ActiveMerchant #:nodoc:
           else
             'I'
           end
-        {code: code}
+        { code: code }
       end
 
       def cvv_result_from(response)
@@ -558,7 +558,7 @@ module ActiveMerchant #:nodoc:
         'V6150' => 'Invalid Refund Amount',
         'V6151' => 'Refund amount greater than original transaction',
         'V6152' => 'Original transaction already refunded for total amount',
-        'V6153' => 'Card type not support by merchant',
+        'V6153' => 'Card type not support by merchant'
       }
     end
   end

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

@@ -5,8 +5,8 @@ module ActiveMerchant #:nodoc:
 
       API_VERSION = '8.5'
 
-      TEST_LOGINS = [{login: 'A00049-01', password: 'test1'},
-                     {login: 'A00427-01', password: 'testus'}]
+      TEST_LOGINS = [{ login: 'A00049-01', password: 'test1' },
+                     { login: 'A00427-01', password: 'testus' }]
 
       TRANSACTIONS = { sale: '00',
                        authorization: '01',
@@ -15,16 +15,16 @@ module ActiveMerchant #:nodoc:
 
       ENVELOPE_NAMESPACES = { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
                               'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
-                              'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'}
+                              'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' }
 
       SEND_AND_COMMIT_ATTRIBUTES = { 'xmlns:n1' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Request',
-                                     'env:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'}
+                                     'env:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/' }
 
       SEND_AND_COMMIT_SOURCE_ATTRIBUTES = { 'xmlns:n2' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes',
-                                            'xsi:type' => 'n2:Transaction'}
+                                            'xsi:type' => 'n2:Transaction' }
 
       POST_HEADERS = { 'soapAction' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/SendAndCommit',
-                       'Content-Type' => 'text/xml'}
+                       'Content-Type' => 'text/xml' }
 
       SUCCESS = 'true'
 
@@ -162,8 +162,7 @@ module ActiveMerchant #:nodoc:
           test: test?,
           authorization: authorization_from(response),
           avs_result: { code: response[:avs] },
-          cvv_result: response[:cvv2]
-        )
+          cvv_result: response[:cvv2])
       rescue ResponseError => e
         case e.response.code
         when '401'
@@ -207,7 +206,7 @@ module ActiveMerchant #:nodoc:
           parse_elements(response, root)
         end
 
-        response.delete_if { |k, v| SENSITIVE_FIELDS.include?(k) }
+        response.delete_if { |k, _v| SENSITIVE_FIELDS.include?(k) }
       end
 
       def parse_elements(response, root)

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

@@ -10,12 +10,12 @@ module ActiveMerchant
       self.homepage_url = 'http://www.ezic.com/'
       self.display_name = 'Ezic'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :account_id)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         post = {}
 
         add_account_id(post)
@@ -26,7 +26,7 @@ module ActiveMerchant
         commit('S', post)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         post = {}
 
         add_account_id(post)
@@ -37,7 +37,7 @@ module ActiveMerchant
         commit('A', post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
 
         add_account_id(post)
@@ -48,7 +48,7 @@ module ActiveMerchant
         commit('D', post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
 
         add_account_id(post)
@@ -59,7 +59,7 @@ module ActiveMerchant
         commit('R', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
 
         add_account_id(post)
@@ -69,7 +69,7 @@ module ActiveMerchant
         commit('U', 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) }
@@ -187,7 +187,7 @@ module ActiveMerchant
 
       def headers
         {
-          'User-Agent' => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          'User-Agent' => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}"
         }
       end
     end

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

@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         commit(:post, "purchases/#{CGI.escape(txn_id)}/capture", post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         txn_id, = authorization.to_s.split('|')
         post = {}
 
@@ -69,13 +69,13 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'refunds', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         txn_id, endpoint = authorization.to_s.split('|')
 
         commit(:post, "#{endpoint}/void?id=#{txn_id}", {})
       end
 
-      def store(creditcard, options={})
+      def store(creditcard, options = {})
         post = {}
 
         add_creditcard(post, creditcard)
@@ -125,11 +125,13 @@ module ActiveMerchant #:nodoc:
       def add_extra_options(post, options)
         extra = {}
         extra[:ecm] = '32' if options[:recurring]
-        extra[:cavv] = options[:cavv] if options[:cavv]
-        extra[:xid] = options[:xid] if options[:xid]
-        extra[:sli] = options[:sli] if options[:sli]
+        extra[:cavv] = options[:cavv] || options.dig(:three_d_secure, :cavv) if options[:cavv] || options.dig(:three_d_secure, :cavv)
+        extra[:xid] = options[:xid] || options.dig(:three_d_secure, :xid) if options[:xid] || options.dig(:three_d_secure, :xid)
+        extra[:sli] = options[:sli] || options.dig(:three_d_secure, :eci) if options[:sli] || options.dig(:three_d_secure, :eci)
         extra[:name] = options[:merchant] if options[:merchant]
         extra[:location] = options[:merchant_location] if options[:merchant_location]
+        extra[:card_on_file] = options.dig(:extra, :card_on_file) if options.dig(:extra, :card_on_file)
+        extra[:auth_reason]  = options.dig(:extra, :auth_reason) if options.dig(:extra, :auth_reason)
         post[:extra] = extra if extra.any?
       end
 
@@ -145,7 +147,7 @@ module ActiveMerchant #:nodoc:
         post[:metadata] = options.fetch(:metadata, {})
       end
 
-      def commit(method, uri, parameters=nil)
+      def commit(method, uri, parameters = nil)
         response =
           begin
             parse(ssl_request(method, get_url(uri), parameters.to_json, headers))

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

@@ -124,9 +124,8 @@ module ActiveMerchant #:nodoc:
         Response.new(success?(response), message, response,
           test: test?,
           authorization: response['transactionid'],
-          avs_result: {code: response['avsresponse']},
-          cvv_result: response['cvvresponse']
-        )
+          avs_result: { code: response['avsresponse'] },
+          cvv_result: response['cvvresponse'])
       end
 
       def success?(response)

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

@@ -90,7 +90,7 @@ module ActiveMerchant #:nodoc:
         response
       end
 
-      def commit(action, post=nil)
+      def commit(action, post = nil)
         url = (test? ? self.test_url : self.live_url) + action
 
         begin