activemerchant 1.105.0 → 1.107.4

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

@@ -79,6 +79,7 @@ module ActiveMerchant #:nodoc:
         post = {}
 
         add_creditcard(post, creditcard)
+        post[:is_billing] = true if options[:recurring]
 
         commit(:post, 'credit_cards', post)
       end
@@ -159,8 +160,8 @@ module ActiveMerchant #:nodoc:
           success,
           message_from(response),
           response,
-          :test => response['test'],
-          :authorization => authorization_from(response, success, uri)
+          test: response['test'],
+          authorization: authorization_from(response, success, uri)
         )
       end
 

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

@@ -54,7 +54,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options = {})
-        commit('refund', money, options.merge(:transactionid => authorization))
+        commit('refund', money, options.merge(transactionid: authorization))
       end
 
       def credit(money, authorization, options = {})
@@ -122,10 +122,10 @@ module ActiveMerchant #:nodoc:
         message = message_from(response)
 
         Response.new(success?(response), message, 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/firstdata_e4.rb

@@ -25,14 +25,14 @@ module ActiveMerchant #:nodoc:
       SENSITIVE_FIELDS = [:verification_str2, :expiry_date, :card_number]
 
       BRANDS = {
-        :visa => 'Visa',
-        :master => 'Mastercard',
-        :american_express => 'American Express',
-        :jcb => 'JCB',
-        :discover => 'Discover'
+        visa: 'Visa',
+        master: 'Mastercard',
+        american_express: 'American Express',
+        jcb: 'JCB',
+        discover: 'Discover'
       }
 
-      E4_BRANDS = BRANDS.merge({:mastercard => 'Mastercard'})
+      E4_BRANDS = BRANDS.merge({mastercard: 'Mastercard'})
 
       DEFAULT_ECI = '07'
 
@@ -262,7 +262,7 @@ module ActiveMerchant #:nodoc:
         address = options[:billing_address] || options[:address]
         if address
           address_values = []
-          [:address1, :zip, :city, :state, :country].each { |part| address_values << address[part].to_s }
+          [:address1, :zip, :city, :state, :country].each { |part| address_values << address[part].to_s.tr("\r\n", ' ').strip }
           xml.tag! 'VerificationStr1', address_values.join('|')
         end
 
@@ -298,11 +298,11 @@ module ActiveMerchant #:nodoc:
       def add_credit_card_token(xml, store_authorization, options)
         params = store_authorization.split(';')
         credit_card = CreditCard.new(
-          :brand      => params[1],
-          :first_name => params[2],
-          :last_name  => params[3],
-          :month      => params[4],
-          :year       => params[5])
+          brand: params[1],
+          first_name: params[2],
+          last_name: params[3],
+          month: params[4],
+          year: params[5])
 
         xml.tag! 'TransarmorToken', params[0]
         xml.tag! 'Expiry_Date', expdate(credit_card)
@@ -354,11 +354,11 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => successful?(response) ? response_authorization(action, response, credit_card) : '',
-          :avs_result => {:code => response[:avs]},
-          :cvv_result => response[:cvv2],
-          :error_code => standard_error_code(response)
+          test: test?,
+          authorization: successful?(response) ? response_authorization(action, response, credit_card) : '',
+          avs_result: {code: response[:avs]},
+          cvv_result: response[:cvv2],
+          error_code: standard_error_code(response)
         )
       end
 
@@ -420,10 +420,10 @@ module ActiveMerchant #:nodoc:
 
       def parse_error(error)
         {
-          :transaction_approved => 'false',
-          :error_number => error.code,
-          :error_description => error.body,
-          :ecommerce_error_code => error.body.gsub(/[^\d]/, '')
+          transaction_approved: 'false',
+          error_number: error.code,
+          error_description: error.body,
+          ecommerce_error_code: error.body.gsub(/[^\d]/, '')
         }
       end
 

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

@@ -19,11 +19,11 @@ module ActiveMerchant #:nodoc:
       SENSITIVE_FIELDS = [:cvdcode, :expiry_date, :card_number]
 
       BRANDS = {
-        :visa => 'Visa',
-        :master => 'Mastercard',
-        :american_express => 'American Express',
-        :jcb => 'JCB',
-        :discover => 'Discover'
+        visa: 'Visa',
+        master: 'Mastercard',
+        american_express: 'American Express',
+        jcb: 'JCB',
+        discover: 'Discover'
       }
 
       DEFAULT_ECI = '07'
@@ -265,11 +265,11 @@ module ActiveMerchant #:nodoc:
       def add_credit_card_token(xml, store_authorization, options)
         params = store_authorization.split(';')
         credit_card = CreditCard.new(
-          :brand      => params[1],
-          :first_name => params[2],
-          :last_name  => params[3],
-          :month      => params[4],
-          :year       => params[5])
+          brand: params[1],
+          first_name: params[2],
+          last_name: params[3],
+          month: params[4],
+          year: params[5])
 
         xml.tag! 'TransarmorToken', params[0]
         xml.tag! 'Expiry_Date', expdate(credit_card)
@@ -319,7 +319,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'StoredCredentials' do
           xml.tag! 'Indicator', stored_credential_indicator(xml, card, options)
           if initiator = options.dig(:stored_credential, :initiator)
-            xml.tag! initiator == 'merchant' ? 'M' : 'C'
+            xml.tag! 'Initiation', initiator == 'merchant' ? 'M' : 'C'
           end
           if reason_type = options.dig(:stored_credential, :reason_type)
             xml.tag! 'Schedule', reason_type == 'unscheduled' ? 'U' : 'S'
@@ -361,11 +361,11 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => successful?(response) ? response_authorization(action, response, credit_card) : '',
-          :avs_result => {:code => response[:avs]},
-          :cvv_result => response[:cvv2],
-          :error_code => standard_error_code(response)
+          test: test?,
+          authorization: successful?(response) ? response_authorization(action, response, credit_card) : '',
+          avs_result: {code: response[:avs]},
+          cvv_result: response[:cvv2],
+          error_code: standard_error_code(response)
         )
       end
 
@@ -444,10 +444,10 @@ module ActiveMerchant #:nodoc:
 
       def parse_error(error)
         {
-          :transaction_approved => 'false',
-          :error_number => error.code,
-          :error_description => error.body,
-          :ecommerce_error_code => error.body.gsub(/[^\d]/, '')
+          transaction_approved: 'false',
+          error_number: error.code,
+          error_description: error.body,
+          ecommerce_error_code: error.body.gsub(/[^\d]/, '')
         }
       end
 

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

@@ -119,9 +119,9 @@ module ActiveMerchant #:nodoc:
           succeeded,
           message_from(succeeded, raw),
           raw,
-          :authorization => authorization_from(action, raw[:transaction_id], post[:OriginalTransactionId]),
-          :error_code => error_code_from(succeeded, raw),
-          :test => test?
+          authorization: authorization_from(action, raw[:transaction_id], post[:OriginalTransactionId]),
+          error_code: error_code_from(succeeded, raw),
+          test: test?
         )
       end
 
@@ -133,7 +133,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(action, post)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         post.each do |field, value|
           xml.tag!(field, value)
         end

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

@@ -24,7 +24,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         add_shipping_address(post, options)
         post[:action] = 'sale'
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         add_shipping_address(post, options)
         post[:action] = 'authorize'
@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         post[:action] = 'disburse'
 
@@ -151,21 +151,22 @@ module ActiveMerchant #:nodoc:
         post[:shipping_address][:physical_address][:locality] = address[:city] if address[:city]
       end
 
-      def add_payment_method(post, payment_method)
+      def add_payment_method(post, payment_method, options)
         if payment_method.respond_to?(:brand)
           add_credit_card(post, payment_method)
         else
-          add_echeck(post, payment_method)
+          add_echeck(post, payment_method, options)
         end
       end
 
-      def add_echeck(post, payment)
+      def add_echeck(post, payment, options)
         post[:echeck] = {}
         post[:echeck][:account_holder] = payment.name
         post[:echeck][:account_number] = payment.account_number
         post[:echeck][:routing_number] = payment.routing_number
         post[:echeck][:account_type] = payment.account_type
         post[:echeck][:check_number] = payment.number
+        post[:echeck][:sec_code] = options[:sec_code] || "WEB"
       end
 
       def add_credit_card(post, payment)
@@ -259,7 +260,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def transaction_id_from(authorization)
-        transaction_id, _, original_auth_transaction_id, _= split_authorization(authorization)
+        transaction_id, _, original_auth_transaction_id, _ = split_authorization(authorization)
         original_auth_transaction_id.present? ? original_auth_transaction_id : transaction_id
       end
     end

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

@@ -36,17 +36,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def purchase(money, credit_card, options = {})
-        options = options.merge(:gvp_order_type => 'sales')
+        options = options.merge(gvp_order_type: 'sales')
         commit(money, build_sale_request(money, credit_card, options))
       end
 
       def authorize(money, credit_card, options = {})
-        options = options.merge(:gvp_order_type => 'preauth')
+        options = options.merge(gvp_order_type: 'preauth')
         commit(money, build_authorize_request(money, credit_card, options))
       end
 
       def capture(money, ref_id, options = {})
-        options = options.merge(:gvp_order_type => 'postauth')
+        options = options.merge(gvp_order_type: 'postauth')
         commit(money, build_capture_request(money, ref_id, options))
       end
 
@@ -66,8 +66,8 @@ module ActiveMerchant #:nodoc:
         card_number = credit_card.respond_to?(:number) ? credit_card.number : ''
         hash_data   = generate_hash_data(format_order_id(options[:order_id]), @options[:terminal_id], card_number, amount(money), security_data)
 
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
+        xml = Builder::XmlMarkup.new(indent: 2)
+        xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
 
         xml.tag! 'GVPSRequest' do
           xml.tag! 'Mode', test? ? 'TEST' : 'PROD'
@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_capture_request(money, ref_id, options)
-        options = options.merge(:order_id => ref_id)
+        options = options.merge(order_id: ref_id)
         build_xml_request(money, ref_id, options) do |xml|
           add_customer_data(xml, options)
           add_order_data(xml, options)
@@ -222,8 +222,8 @@ module ActiveMerchant #:nodoc:
         Response.new(success,
           success ? 'Approved' : "Declined (Reason: #{response[:reason_code]} - #{response[:error_msg]} - #{response[:sys_err_msg]})",
           response,
-          :test => test?,
-          :authorization => response[:order_id])
+          test: test?,
+          authorization: response[:order_id])
       end
 
       def parse(body)

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

@@ -7,10 +7,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://eu.sandbox.api-ingenico.com'
       self.live_url = 'https://api.globalcollect.com'
 
-      self.supported_countries = ['AD', 'AE', 'AG', 'AI', 'AL', 'AM', 'AO', 'AR', 'AS', 'AT', 'AU', 'AW', 'AX', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BL', 'BM', 'BN', 'BO', 'BQ', 'BR', 'BS', 'BT', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN', 'CO', 'CR', 'CU', 'CV', 'CW', 'CX', 'CY', 'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'GA', 'GB', 'GD', 'GE', 'GF', 'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HN', 'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IM', 'IN', 'IS', 'IT', 'JM', 'JO', 'JP', 'KE', 'KG', 'KH', 'KI', 'KM', 'KN', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR', 'LS', 'LT', 'LU', 'LV', 'MA', 'MC', 'MD', 'ME', 'MF', 'MG', 'MH', 'MK', 'MM', 'MN', 'MO', 'MP', 'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NG', 'NI', 'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PL', 'PN', 'PS', 'PT', 'PW', 'QA', 'RE', 'RO', 'RS', 'RU', 'RW', 'SA', 'SB', 'SC', 'SE', 'SG', 'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SR', 'ST', 'SV', 'SZ', 'TC', 'TD', 'TG', 'TH', 'TJ', 'TL', 'TM', 'TN', 'TO', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'US', 'UY', 'UZ', 'VC', 'VE', 'VG', 'VI', 'VN', 'WF', 'WS', 'ZA', 'ZM', 'ZW']
+      self.supported_countries = %w[AD AE AG AI AL AM AO AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ CA CC CD CF CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HN HR HT HU ID IE IL IM IN IS IT JM JO JP KE KG KH KI KM KN KR KW KY KZ LA LB LC LI LK LR LS LT LU LV MA MC MD ME MF MG MH MK MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PL PN PS PT PW QA RE RO RS RU RW SA SB SC SE SG SH SI SJ SK SL SM SN SR ST SV SZ TC TD TG TH TJ TL TM TN TO TR TT TV TW TZ UA UG US UY UZ VC VE VG VI VN WF WS ZA ZM ZW]
       self.default_currency = 'USD'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :naranja, :cabal]
+      self.supported_cardtypes = %i[visa master american_express discover naranja cabal]
 
       def initialize(options={})
         requires!(options, :merchant_id, :api_key_id, :secret_api_key)
@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment, options={})
         MultiResponse.run do |r|
           r.process { authorize(money, payment, options) }
-          r.process { capture(money, r.authorization, options) } unless capture_requested?(r)
+          r.process { capture(money, r.authorization, options) } if should_request_capture?(r, options[:requires_approval])
         end
       end
 
@@ -32,7 +32,6 @@ module ActiveMerchant #:nodoc:
         add_address(post, payment, options)
         add_creator_info(post, options)
         add_fraud_fields(post, options)
-
         commit(:authorize, post)
       end
 
@@ -161,6 +160,8 @@ module ActiveMerchant #:nodoc:
           'skipFraudService' => 'true',
           'authorizationMode' => pre_authorization
         }
+        post['cardPaymentMethodSpecificInput']['requiresApproval'] = options[:requires_approval] unless options[:requires_approval].nil?
+
         post['cardPaymentMethodSpecificInput']['card'] = {
           'cvv' => payment.verification_value,
           'cardNumber' => payment.number,
@@ -283,7 +284,7 @@ module ActiveMerchant #:nodoc:
 
       def headers(action, post, authorization = nil)
         {
-          'Content-Type'  => content_type,
+          'Content-Type' => content_type,
           'Authorization' => auth_digest(action, post, authorization),
           'Date' => date
         }
@@ -314,18 +315,16 @@ POST
       end
 
       def message_from(succeeded, response)
-        if succeeded
-          'Succeeded'
+        return 'Succeeded' if succeeded
+
+        if errors = response['errors']
+          errors.first.try(:[], 'message')
+        elsif response['error_message']
+          response['error_message']
+        elsif response['status']
+          'Status: ' + response['status']
         else
-          if errors = response['errors']
-            errors.first.try(:[], 'message')
-          elsif response['error_message']
-            response['error_message']
-          elsif response['status']
-            'Status: ' + response['status']
-          else
-            'No message available'
-          end
+          'No message available'
         end
       end
 
@@ -340,14 +339,14 @@ POST
       end
 
       def error_code_from(succeeded, response)
-        unless succeeded
-          if errors = response['errors']
-            errors.first.try(:[], 'code')
-          elsif status = response.try(:[], 'statusOutput').try(:[], 'statusCode')
-            status.to_s
-          else
-            'No error code available'
-          end
+        return if succeeded
+
+        if errors = response['errors']
+          errors.first.try(:[], 'code')
+        elsif status = response.try(:[], 'statusOutput').try(:[], 'statusCode')
+          status.to_s
+        else
+          'No error code available'
         end
       end
 
@@ -355,6 +354,13 @@ POST
         Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
       end
 
+      # Capture hasn't already been requested,
+      # and
+      # `requires_approval` is not false
+      def should_request_capture?(response, requires_approval)
+        !capture_requested?(response) && requires_approval != false
+      end
+
       def capture_requested?(response)
         response.params.try(:[], 'payment').try(:[], 'status') == 'CAPTURE_REQUESTED'
       end

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

@@ -149,13 +149,13 @@ EOA
           succeeded,
           message_from(succeeded, raw),
           raw,
-          :authorization => authorization_from(post, raw),
-          :test => test?
+          authorization: authorization_from(post, raw),
+          test: test?
         )
       end
 
       def build_request(post)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         post.each do |field, value|
           xml.tag!(field, value)