activemerchant 1.100.0 → 1.101.0

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v10.rb

@@ -187,13 +187,9 @@ module ActiveMerchant
       def add_invoice(post, options)
         add_order_id(post, options)
 
-        if options[:billing_address]
-          post[:invoice_address]  = map_address(options[:billing_address])
-        end
+        post[:invoice_address]  = map_address(options[:billing_address]) if options[:billing_address]
 
-        if options[:shipping_address]
-          post[:shipping_address] = map_address(options[:shipping_address])
-        end
+        post[:shipping_address] = map_address(options[:shipping_address]) if options[:shipping_address]
 
         [:metadata, :branding_id, :variables].each do |field|
           post[field] = options[field] if options[field]

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

@@ -256,9 +256,7 @@ module ActiveMerchant
 
       def add_merchant_details(xml, options)
         xml.tag! 'merchantid', @options[:login]
-        if options[:account] || @options[:account]
-          xml.tag! 'account', (options[:account] || @options[:account])
-        end
+        xml.tag! 'account', (options[:account] || @options[:account]) if options[:account] || @options[:account]
       end
 
       def add_transaction_identifiers(xml, authorization, options)

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

@@ -320,9 +320,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_threeds(data, options)
-        if options[:execute_threed] == true
-          data[:threeds] = {threeDSInfo: 'CardData'}
-        end
+        data[:threeds] = {threeDSInfo: 'CardData'} if options[:execute_threed] == true
       end
 
       def determine_3ds_action(threeds_hash)
@@ -446,13 +444,9 @@ module ActiveMerchant #:nodoc:
 
           # Set moto flag only if explicitly requested via moto field
           # Requires account configuration to be able to use
-          if options.dig(:moto) && options.dig(:metadata, :manual_entry)
-            xml.DS_MERCHANT_DIRECTPAYMENT 'moto'
-          end
+          xml.DS_MERCHANT_DIRECTPAYMENT 'moto' if options.dig(:moto) && options.dig(:metadata, :manual_entry)
 
-          if data[:threeds]
-            xml.DS_MERCHANT_EMV3DS data[:threeds].to_json
-          end
+          xml.DS_MERCHANT_EMV3DS data[:threeds].to_json if data[:threeds]
         end
       end
 
@@ -464,18 +458,7 @@ module ActiveMerchant #:nodoc:
         xml     = Nokogiri::XML(data)
         code    = xml.xpath('//RETORNOXML/CODIGO').text
 
-        if ['iniciaPeticion', 'trataPeticion'].include?(action)
-          vxml = Nokogiri::XML(data).remove_namespaces!.xpath("//Envelope/Body/#{action}Response/#{action}Return").inner_text
-          xml = Nokogiri::XML(vxml)
-          node = (action == 'iniciaPeticion' ? 'INFOTARJETA' : 'OPERACION')
-          op = xml.xpath("//RETORNOXML/#{node}")
-          op.children.each do |element|
-            params[element.name.downcase.to_sym] = element.text
-          end
-          message = response_text_3ds(xml, params)
-          options[:authorization] = build_authorization(params)
-          success = params.size > 0 && is_success_response?(params[:ds_response])
-        elsif code == '0'
+        if code == '0' && xml.xpath('//RETORNOXML/OPERACION').present?
           op = xml.xpath('//RETORNOXML/OPERACION')
           op.children.each do |element|
             params[element.name.downcase.to_sym] = element.text
@@ -487,6 +470,17 @@ module ActiveMerchant #:nodoc:
           else
             message = 'Response failed validation check'
           end
+        elsif ['iniciaPeticion', 'trataPeticion'].include?(action)
+          vxml = Nokogiri::XML(data).remove_namespaces!.xpath("//Envelope/Body/#{action}Response/#{action}Return").inner_text
+          xml = Nokogiri::XML(vxml)
+          node = (action == 'iniciaPeticion' ? 'INFOTARJETA' : 'OPERACION')
+          op = xml.xpath("//RETORNOXML/#{node}")
+          op.children.each do |element|
+            params[element.name.downcase.to_sym] = element.text
+          end
+          message = response_text_3ds(xml, params)
+          options[:authorization] = build_authorization(params)
+          success = params.size > 0 && is_success_response?(params[:ds_response])
         else
           # Some kind of programmer error with the request!
           message = "#{code} ERROR"
@@ -599,13 +593,9 @@ module ActiveMerchant #:nodoc:
         xml_signed_fields = data[:ds_amount] + data[:ds_order] + data[:ds_merchantcode] +
           data[:ds_currency] + data[:ds_response]
 
-        if data[:ds_cardnumber]
-          xml_signed_fields += data[:ds_cardnumber]
-        end
+        xml_signed_fields += data[:ds_cardnumber] if data[:ds_cardnumber]
 
-        if data[:ds_emv3ds]
-          xml_signed_fields += data[:ds_emv3ds]
-        end
+        xml_signed_fields += data[:ds_emv3ds] if data[:ds_emv3ds]
 
         xml_signed_fields + data[:ds_transactiontype] + data[:ds_securepayment]
       end

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

@@ -245,9 +245,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(response)
-        unless success_from(response)
-          response[:ex_err_code] || response[:err_code]
-        end
+        response[:ex_err_code] || response[:err_code] unless success_from(response)
       end
 
       def underscore(camel_cased_word)

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

@@ -403,9 +403,7 @@ module ActiveMerchant #:nodoc:
           :VPSProtocol => @options.fetch(:protocol_version, '3.00')
         )
 
-        if(application_id && (application_id != Gateway.application_id))
-          parameters.update(:ReferrerID => application_id)
-        end
+        parameters.update(:ReferrerID => application_id) if application_id && (application_id != Gateway.application_id)
 
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end

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

@@ -136,13 +136,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(xml, options)
-        if options.has_key? :customer
-          xml.tag! 'CUSTOMERID', options[:customer]
-        end
+        xml.tag! 'CUSTOMERID', options[:customer] if options.has_key? :customer
 
-        if options.has_key? :ip
-          xml.tag! 'CUSTOMERIP', options[:ip]
-        end
+        xml.tag! 'CUSTOMERIP', options[:ip] if options.has_key? :ip
       end
 
       def add_address(xml, creditcard, options)

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

@@ -137,17 +137,11 @@ module ActiveMerchant #:nodoc:
           post[:cust_id] = options[:customer] if Float(options[:customer]) rescue nil
         end
 
-        if options.has_key? :ip
-          post[:customer_ip] = options[:ip]
-        end
+        post[:customer_ip] = options[:ip] if options.has_key? :ip
 
-        if options.has_key? :cardholder_authentication_value
-          post[:cardholder_authentication_value] = options[:cardholder_authentication_value]
-        end
+        post[:cardholder_authentication_value] = options[:cardholder_authentication_value] if options.has_key? :cardholder_authentication_value
 
-        if options.has_key? :authentication_indicator
-          post[:authentication_indicator] = options[:authentication_indicator]
-        end
+        post[:authentication_indicator] = options[:authentication_indicator] if options.has_key? :authentication_indicator
       end
 
       # x_duplicate_window won't be sent by default, because sending it changes the response.
@@ -184,9 +178,7 @@ module ActiveMerchant #:nodoc:
       def message_from(results)
         if results[:response_code] == DECLINED
           return CVVResult.messages[results[:card_code]] if CARD_CODE_ERRORS.include?(results[:card_code])
-          if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
-            return AVSResult.messages[results[:avs_result_code]]
-          end
+          return AVSResult.messages[results[:avs_result_code]] if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
         end
 
         (results[:response_reason_text] ? results[:response_reason_text].chomp('.') : '')

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

@@ -129,13 +129,9 @@ module ActiveMerchant #:nodoc:
       private
 
       def add_customer_data(post, options)
-        if options.has_key? :email
-          post[:email] = options[:email]
-        end
+        post[:email] = options[:email] if options.has_key? :email
 
-        if options.has_key? :ip
-          post[:ipaddress] = options[:ip]
-        end
+        post[:ipaddress] = options[:ip] if options.has_key? :ip
       end
 
       def add_address(post, address, prefix='')

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

@@ -173,12 +173,8 @@ module ActiveMerchant #:nodoc:
         doc.ip(options[:ip]) if options[:ip]
         doc.description(options[:description]) if options[:description]
 
-        if options[:merchant_name_descriptor]
-          doc.merchant_name_descriptor(options[:merchant_name_descriptor])
-        end
-        if options[:merchant_location_descriptor]
-          doc.merchant_location_descriptor(options[:merchant_location_descriptor])
-        end
+        doc.merchant_name_descriptor(options[:merchant_name_descriptor]) if options[:merchant_name_descriptor]
+        doc.merchant_location_descriptor(options[:merchant_location_descriptor]) if options[:merchant_location_descriptor]
       end
 
       def add_payment_method(doc, payment_method, options)

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

@@ -215,13 +215,9 @@ module ActiveMerchant #:nodoc:
             # The /cards endpoint does not update other customer parameters.
             r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", params, options) }
 
-            if options[:set_default] and r.success? and !r.params['id'].blank?
-              post[:default_card] = r.params['id']
-            end
+            post[:default_card] = r.params['id'] if options[:set_default] and r.success? and !r.params['id'].blank?
 
-            if post.count > 0
-              r.process { update_customer(options[:customer], post) }
-            end
+            r.process { update_customer(options[:customer], post) } if post.count > 0
           end
         else
           commit(:post, 'customers', post.merge(params), options)
@@ -410,9 +406,7 @@ module ActiveMerchant #:nodoc:
         copy_when_present(level_three, [:shipping_amount], options)
         copy_when_present(level_three, [:line_items], options)
 
-        unless level_three.empty?
-          post[:level3] = level_three
-        end
+        post[:level3] = level_three unless level_three.empty?
       end
 
       def add_expand_parameters(post, options)

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

@@ -146,9 +146,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_ref(doc, action, payment_method)
-        if ['capture', 'refund', 'void'].include?(action) || payment_method.is_a?(String)
-          doc.ref(split_authorization(payment_method)[0])
-        end
+        doc.ref(split_authorization(payment_method)[0]) if ['capture', 'refund', 'void'].include?(action) || payment_method.is_a?(String)
       end
 
       def add_authentication(doc)
@@ -251,9 +249,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(succeeded, response)
-        unless succeeded
-          response[:code]
-        end
+        response[:code] unless succeeded
       end
 
       def cvv_result(parsed)

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

@@ -333,11 +333,12 @@ module ActiveMerchant #:nodoc:
       def commit(action, request)
         request = add_transaction_code_to_request(request, action)
 
-        raw_response = begin
-          ssl_post(url, request, headers)
-        rescue ActiveMerchant::ResponseError => e
-          e.response.body
-        end
+        raw_response =
+          begin
+            ssl_post(url, request, headers)
+          rescue ActiveMerchant::ResponseError => e
+            e.response.body
+          end
 
         response = parse(raw_response)
 

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

@@ -68,9 +68,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(amount, authorization, options={})
         identifier, original_amount = split_authorization(authorization)
-        if amount && (amount != original_amount)
-          raise ArgumentError.new("Partial capture is not supported, and #{amount.inspect} != #{original_amount.inspect}")
-        end
+        raise ArgumentError.new("Partial capture is not supported, and #{amount.inspect} != #{original_amount.inspect}") if amount && (amount != original_amount)
 
         post = PostData.new
         add_credentials(post)

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

@@ -416,9 +416,7 @@ module ActiveMerchant #:nodoc:
         # symbol keys. Before sending our input to TCLink, we convert all our keys to strings and dump the symbol keys.
         # We also remove any pairs with nil values, as these confuse TCLink.
         parameters.keys.reverse_each do |key|
-          if parameters[key]
-            parameters[key.to_s] = parameters[key]
-          end
+          parameters[key.to_s] = parameters[key] if parameters[key]
           parameters.delete(key)
         end
       end

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

@@ -1345,9 +1345,7 @@ module ActiveMerchant #:nodoc:
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::Check)
           build_tag soap, :string, 'Account', payment_method[:method].account_number
           build_tag soap, :string, 'Routing', payment_method[:method].routing_number
-          unless payment_method[:method].account_type.nil?
-            build_tag soap, :string, 'AccountType', payment_method[:method].account_type.capitalize
-          end
+          build_tag soap, :string, 'AccountType', payment_method[:method].account_type.capitalize unless payment_method[:method].account_type.nil?
           build_tag soap, :string, 'DriversLicense', options[:drivers_license]
           build_tag soap, :string, 'DriversLicenseState', options[:drivers_license_state]
           build_tag soap, :string, 'RecordType', options[:record_type]
@@ -1434,9 +1432,7 @@ module ActiveMerchant #:nodoc:
       def build_card_expiration(options)
         month = options[:payment_method].month
         year  = options[:payment_method].year
-        unless month.nil? || year.nil?
-          "#{"%02d" % month}#{year.to_s[-2..-1]}"
-        end
+        "#{"%02d" % month}#{year.to_s[-2..-1]}" unless month.nil? || year.nil?
       end
 
       def build_check_data(soap, options)
@@ -1476,9 +1472,7 @@ module ActiveMerchant #:nodoc:
 
       def build_billing_address(soap, options)
         if options[:billing_address]
-          if options[:billing_address][:name]
-            options[:billing_address][:first_name], options[:billing_address][:last_name] = split_names(options[:billing_address][:name])
-          end
+          options[:billing_address][:first_name], options[:billing_address][:last_name] = split_names(options[:billing_address][:name]) if options[:billing_address][:name]
           soap.BillingAddress 'xsi:type' => 'ns1:Address' do
             ADDRESS_OPTIONS.each do |k, v|
               build_tag soap, v[0], v[1], options[:billing_address][k]
@@ -1489,9 +1483,7 @@ module ActiveMerchant #:nodoc:
 
       def build_shipping_address(soap, options)
         if options[:shipping_address]
-          if options[:shipping_address][:name]
-            options[:shipping_address][:first_name], options[:shipping_address][:last_name] = split_names(options[:shipping_address][:name])
-          end
+          options[:shipping_address][:first_name], options[:shipping_address][:last_name] = split_names(options[:shipping_address][:name]) if options[:shipping_address][:name]
           soap.ShippingAddress 'xsi:type' => 'ns1:Address' do
             ADDRESS_OPTIONS.each do |k, v|
               build_tag soap, v[0], v[1], options[:shipping_address][k]

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

@@ -153,13 +153,9 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        if options.has_key? :customer
-          post[:custid] = options[:customer]
-        end
+        post[:custid] = options[:customer] if options.has_key? :customer
 
-        if options.has_key? :ip
-          post[:ip] = options[:ip]
-        end
+        post[:ip] = options[:ip] if options.has_key? :ip
       end
 
       def add_address(post, payment, options)
@@ -252,9 +248,7 @@ module ActiveMerchant #:nodoc:
             next
           end
 
-          if key == :bill_amount
-            value = amount(value)
-          end
+          value = amount(value) if key == :bill_amount
 
           post[key.to_s.delete('_')] = value
         end

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

@@ -49,9 +49,7 @@ module ActiveMerchant #:nodoc:
       # Make a credit to a card (Void can only be done from the virtual terminal)
       # Viaklix does not support credits by reference. You must pass in the credit card
       def credit(money, creditcard, options = {})
-        if creditcard.is_a?(String)
-          raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card'
-        end
+        raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card' if creditcard.is_a?(String)
 
         form = {}
         add_invoice(form, options)
@@ -109,9 +107,7 @@ module ActiveMerchant #:nodoc:
         form[:card_number] = creditcard.number
         form[:exp_date] = expdate(creditcard)
 
-        if creditcard.verification_value?
-          add_verification_value(form, creditcard)
-        end
+        add_verification_value(form, creditcard) if creditcard.verification_value?
 
         form[:first_name] = creditcard.first_name.to_s.slice(0, 20)
         form[:last_name] = creditcard.last_name.to_s.slice(0, 30)

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

@@ -48,9 +48,7 @@ module ActiveMerchant #:nodoc:
 
         post = {}
         post[:checkout_id] = checkout_id
-        if(money && (original_amount != amount(money)))
-          post[:amount] = amount(money)
-        end
+        post[:amount] = amount(money) if money && (original_amount != amount(money))
         commit('/checkout/capture', post, options)
       end
 
@@ -66,9 +64,7 @@ module ActiveMerchant #:nodoc:
 
         post = {}
         post[:checkout_id] = checkout_id
-        if(money && (original_amount != amount(money)))
-          post[:amount] = amount(money)
-        end
+        post[:amount] = amount(money) if money && (original_amount != amount(money))
         post[:refund_reason] = (options[:description] || 'Refund')
         post[:payer_email_message] = options[:payer_email_message] if options[:payer_email_message]
         post[:payee_email_message] = options[:payee_email_message] if options[:payee_email_message]

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

@@ -290,9 +290,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'City', address[:city]
             xml.tag! 'ZipCode', address[:zip]
 
-            if address[:state] =~ /[A-Za-z]{2}/ && address[:country] =~ /^(us|ca)$/i
-              xml.tag! 'State', address[:state].upcase
-            end
+            xml.tag! 'State', address[:state].upcase if address[:state] =~ /[A-Za-z]{2}/ && address[:country] =~ /^(us|ca)$/i
 
             xml.tag! 'Country', address[:country]
             xml.tag! 'Phone', address[:phone] if address[:phone] =~ VALID_PHONE_FORMAT
@@ -331,9 +329,7 @@ module ActiveMerchant #:nodoc:
         status = nil
 
         root.elements.to_a.each do |node|
-          if node.name =~ /FNC_CC_/
-            status = REXML::XPath.first(node, 'CC_TRANSACTION/PROCESSING_STATUS')
-          end
+          status = REXML::XPath.first(node, 'CC_TRANSACTION/PROCESSING_STATUS') if node.name =~ /FNC_CC_/
         end
 
         message = ''

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

@@ -203,12 +203,8 @@ module ActiveMerchant #:nodoc:
               end
               add_payment_method(xml, money, payment_method, options)
               add_shopper(xml, options)
-              if options[:hcg_additional_data]
-                add_hcg_additional_data(xml, options)
-              end
-              if options[:instalments]
-                add_instalments_data(xml, options)
-              end
+              add_hcg_additional_data(xml, options) if options[:hcg_additional_data]
+              add_instalments_data(xml, options) if options[:instalments]
               add_moto_flag(xml, options) if options.dig(:metadata, :manual_entry)
               add_additional_3ds_data(xml, options) if options[:execute_threed] && options[:three_ds_version] && options[:three_ds_version] =~ /^2/
               add_3ds_exemption(xml, options) if options[:exemption_type]
@@ -278,9 +274,7 @@ module ActiveMerchant #:nodoc:
           'exponent' => currency_exponent(currency)
         }
 
-        if options[:debit_credit_indicator]
-          amount_hash['debitCreditIndicator'] = options[:debit_credit_indicator]
-        end
+        amount_hash['debitCreditIndicator'] = options[:debit_credit_indicator] if options[:debit_credit_indicator]
 
         xml.tag! 'amount', amount_hash
       end
@@ -572,15 +566,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(success, raw)
-        unless success == 'SUCCESS'
-          raw[:iso8583_return_code_code] || raw[:error_code] || nil
-        end
+        raw[:iso8583_return_code_code] || raw[:error_code] || nil unless success == 'SUCCESS'
       end
 
       def required_status_message(raw, success_criteria)
-        if(!success_criteria.include?(raw[:last_event]))
-          "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(" or ")} is required."
-        end
+        "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(" or ")} is required." if !success_criteria.include?(raw[:last_event])
       end
 
       def authorization_from(action, raw, options)