activemerchant 1.77.0 → 1.78.0

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

@@ -9,7 +9,6 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = %w(CA PR US)
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
-      self.ssl_version = :TLSv1
 
       self.homepage_url = 'https://www.globalpaymentsinc.com'
       self.display_name = 'Global Transport'

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

@@ -23,23 +23,33 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment_method, options={})
         request = build_xml_request do |doc|
           add_authentication(doc)
-          doc.sale(transaction_attributes(options)) do
-            add_auth_purchase_params(doc, money, payment_method, options)
+          if check?(payment_method)
+            doc.echeckSale(transaction_attributes(options)) do
+              add_echeck_purchase_params(doc, money, payment_method, options)
+            end
+          else
+            doc.sale(transaction_attributes(options)) do
+              add_auth_purchase_params(doc, money, payment_method, options)
+            end
           end
         end
-
-        commit(:sale, request, money)
+       check?(payment_method) ? commit(:echeckSales, request, money) : commit(:sale, request, money)
       end
 
       def authorize(money, payment_method, options={})
         request = build_xml_request do |doc|
           add_authentication(doc)
-          doc.authorization(transaction_attributes(options)) do
-            add_auth_purchase_params(doc, money, payment_method, options)
+          if check?(payment_method)
+            doc.echeckVerification(transaction_attributes(options)) do
+              add_echeck_purchase_params(doc, money, payment_method, options)
+            end
+          else
+            doc.authorization(transaction_attributes(options)) do
+              add_auth_purchase_params(doc, money, payment_method, options)
+            end
           end
         end
-
-        commit(:authorization, request, money)
+        check?(payment_method) ? commit(:echeckVerification, request, money) : commit(:authorization, request, money)
       end
 
       def capture(money, authorization, options={})
@@ -62,19 +72,24 @@ module ActiveMerchant #:nodoc:
         refund(money, authorization, options)
       end
 
-      def refund(money, authorization, options={})
-        transaction_id, _, _ = split_authorization(authorization)
-
+      def refund(money, payment, options={})
         request = build_xml_request do |doc|
           add_authentication(doc)
           add_descriptor(doc, options)
-          doc.credit(transaction_attributes(options)) do
-            doc.litleTxnId(transaction_id)
-            doc.amount(money) if money
+          doc.send(refund_type(payment), transaction_attributes(options)) do
+            if payment.is_a?(String)
+              transaction_id, kind, _ = split_authorization(payment)
+              doc.litleTxnId(transaction_id)
+              doc.amount(money) if money
+            elsif check?(payment)
+              add_echeck_purchase_params(doc, money, payment, options)
+            else
+              add_auth_purchase_params(doc, money, payment, options)
+            end
           end
         end
 
-        commit(:credit, request)
+        commit(refund_type(payment), request)
       end
 
       def verify(creditcard, options = {})
@@ -105,6 +120,11 @@ module ActiveMerchant #:nodoc:
             doc.orderId(truncate(options[:order_id], 24))
             if payment_method.is_a?(String)
               doc.paypageRegistrationId(payment_method)
+            elsif check?(payment_method)
+              doc.echeckForToken do
+                doc.accNum(payment_method.account_number)
+                doc.routingNum(payment_method.routing_number)
+              end
             else
               doc.accountNumber(payment_method.number)
               doc.cardValidationNum(payment_method.verification_value) if payment_method.verification_value
@@ -124,6 +144,8 @@ module ActiveMerchant #:nodoc:
           gsub(%r((<user>).+(</user>)), '\1[FILTERED]\2').
           gsub(%r((<password>).+(</password>)), '\1[FILTERED]\2').
           gsub(%r((<number>).+(</number>)), '\1[FILTERED]\2').
+          gsub(%r((<accNum>).+(</accNum>)), '\1[FILTERED]\2').
+          gsub(%r((<routingNum>).+(</routingNum>)), '\1[FILTERED]\2').
           gsub(%r((<cardValidationNum>).+(</cardValidationNum>)), '\1[FILTERED]\2').
           gsub(%r((<accountNumber>).+(</accountNumber>)), '\1[FILTERED]\2').
           gsub(%r((<paypageRegistrationId>).+(</paypageRegistrationId>)), '\1[FILTERED]\2').
@@ -131,6 +153,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       CARD_TYPE = {
         'visa'             => 'VI',
         'master'           => 'MC',
@@ -159,7 +182,27 @@ module ActiveMerchant #:nodoc:
       }
 
       def void_type(kind)
-        (kind == 'authorization') ? :authReversal : :void
+        if kind == 'authorization'
+          :authReversal
+        elsif kind == 'echeckSales'
+          :echeckVoid
+        else
+          :void
+        end
+      end
+
+      def refund_type(payment)
+        transaction_id, kind, _ = split_authorization(payment)
+        if check?(payment) || kind  == 'echeckSales'
+          :echeckCredit
+        else
+          :credit
+        end
+      end
+
+      def check?(payment_method)
+        return false if payment_method.is_a?(String)
+        card_brand(payment_method) == 'check'
       end
 
       def add_authentication(doc)
@@ -178,9 +221,29 @@ module ActiveMerchant #:nodoc:
         add_payment_method(doc, payment_method, options)
         add_pos(doc, payment_method)
         add_descriptor(doc, options)
+        add_merchant_data(doc, options)
         add_debt_repayment(doc, options)
       end
 
+      def add_merchant_data(doc, options={})
+        if options[:affiliate] || options[:campaign] || options[:merchant_grouping_id]
+          doc.merchantData do
+            doc.affiliate(options[:affiliate]) if options[:affiliate]
+            doc.campaign(options[:campaign]) if options[:campaign]
+            doc.merchantGroupingId(options[:merchant_grouping_id]) if options[:merchant_grouping_id]
+          end
+        end
+      end
+
+      def add_echeck_purchase_params(doc, money, payment_method, options)
+        doc.orderId(truncate(options[:order_id], 24))
+        doc.amount(money)
+        add_order_source(doc, payment_method, options)
+        add_billing_address(doc, payment_method, options)
+        add_payment_method(doc, payment_method, options)
+        add_descriptor(doc, options)
+      end
+
       def add_descriptor(doc, options)
         if options[:descriptor_name] || options[:descriptor_phone]
           doc.customBilling do
@@ -203,6 +266,13 @@ module ActiveMerchant #:nodoc:
           doc.card do
             doc.track(payment_method.track_data)
           end
+        elsif check?(payment_method)
+          doc.echeck do
+            doc.accType(payment_method.account_type)
+            doc.accNum(payment_method.account_number)
+            doc.routingNum(payment_method.routing_number)
+            doc.checkNum(payment_method.number)
+          end
         else
           doc.card do
             doc.type_(CARD_TYPE[payment_method.brand])
@@ -227,7 +297,13 @@ module ActiveMerchant #:nodoc:
         return if payment_method.is_a?(String)
 
         doc.billToAddress do
-          doc.name(payment_method.name)
+          if check?(payment_method)
+            doc.name(payment_method.name)
+            doc.firstName(payment_method.first_name)
+            doc.lastName(payment_method.last_name)
+          else
+            doc.name(payment_method.name)
+          end
           doc.email(options[:email]) if options[:email]
 
           add_address(doc, options[:billing_address])

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

@@ -102,7 +102,7 @@ module ActiveMerchant #:nodoc:
         add_additional_data(post, options)
         add_customer_data(post, payment, options)
         add_address(post, options)
-        post[:binary_mode] = true
+        post[:binary_mode] = (options[:binary_mode].nil? ? true : options[:binary_mode])
         post
       end
 
@@ -210,7 +210,7 @@ module ActiveMerchant #:nodoc:
         if action == "refund"
           response["error"].nil?
         else
-          ["active", "approved", "authorized", "cancelled"].include?(response["status"])
+          ["active", "approved", "authorized", "cancelled", "in_process"].include?(response["status"])
         end
       end
 

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

@@ -79,13 +79,13 @@ module ActiveMerchant #:nodoc:
 
         post['customerName'] = scrub_name(address[:name])
         post['customerCountry'] = address[:country]
-        post['customerState'] = address[:state]
+        post['customerState'] = address[:state] || 'N/A'
         post['customerCity'] = address[:city]
         post['customerAddress'] = address[:address1]
         post['customerPostCode'] = address[:zip]
-		post['customerIP'] = address[:ip]
-		post['customerPhone'] = address[:phone]
-		post['customerEmail'] = address[:email]
+        post['customerIP'] = address[:ip]
+        post['customerPhone'] = address[:phone]
+        post['customerEmail'] = address[:email]
       end
 
       def add_order_id(post, options)

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

@@ -206,6 +206,18 @@ module ActiveMerchant #:nodoc:
         @options[:login].start_with?('TEST')
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((&?CardNum=)\d*(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?CardSecurityCode=)\d*(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?AccessCode=)[^&]*(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?Password=)[^&]*(&?)), '\1[FILTERED]\2')
+      end
+
       private
 
       def add_amount(post, money, options)

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

@@ -31,7 +31,6 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'NETbilling'
       self.homepage_url = 'http://www.netbilling.com'
       self.supported_countries = ['US']
-      self.ssl_version = :TLSv1
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
 
       def initialize(options = {})

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

@@ -141,7 +141,6 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Ogone'
       self.default_currency = 'EUR'
       self.money_format = :cents
-      self.ssl_version = :TLSv1
 
       def initialize(options = {})
         requires!(options, :login, :user, :password)

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

@@ -59,6 +59,17 @@ module ActiveMerchant #:nodoc:
         commit('ccSettlement', money, options)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((%3CstorePwd%3E).*(%3C(%2F|/)storePwd%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3CcardNum%3E)\d*(%3C(%2F|/)cardNum%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3Ccvd%3E)\d*(%3C(%2F|/)cvd%3E))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def parse_card_or_auth(card_or_auth, options)

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

@@ -306,8 +306,10 @@ module ActiveMerchant #:nodoc:
           gsub(%r((<OrbitalConnectionUsername>).+(</OrbitalConnectionUsername>)), '\1[FILTERED]\2').
           gsub(%r((<OrbitalConnectionPassword>).+(</OrbitalConnectionPassword>)), '\1[FILTERED]\2').
           gsub(%r((<AccountNum>).+(</AccountNum>)), '\1[FILTERED]\2').
+          gsub(%r((<CCAccountNum>).+(</CCAccountNum>)), '\1[FILTERED]\2').
           gsub(%r((<CardSecVal>).+(</CardSecVal>)), '\1[FILTERED]\2').
-          gsub(%r((<MerchantID>).+(</MerchantID>)), '\1[FILTERED]\2')
+          gsub(%r((<MerchantID>).+(</MerchantID>)), '\1[FILTERED]\2').
+          gsub(%r((<CustomerMerchantID>).+(</CustomerMerchantID>)), '\1[FILTERED]\2')
       end
 
       private
@@ -356,8 +358,8 @@ module ActiveMerchant #:nodoc:
 
       def add_level_2_tax(xml, options={})
         if (level_2 = options[:level_2_data])
-          xml.tag! :TaxInd, level_2[:tax_indicator] if [TAX_NOT_PROVIDED, TAX_INCLUDED, NON_TAXABLE_TRANSACTION].include?(level_2[:tax_indicator])
-          xml.tag! :Tax, amount(level_2[:tax]) if level_2[:tax]
+          xml.tag! :TaxInd, level_2[:tax_indicator] if [TAX_NOT_PROVIDED, TAX_INCLUDED, NON_TAXABLE_TRANSACTION].include?(level_2[:tax_indicator].to_i)
+          xml.tag! :Tax, level_2[:tax].to_i if level_2[:tax]
         end
       end
 

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

@@ -74,7 +74,7 @@ module ActiveMerchant
       end
 
       def store(payment_method, options = {})
-        params = {}
+        params = {transaction_type: 'store'}
 
         add_creditcard_for_tokenization(params, payment_method, options)
 
@@ -131,25 +131,19 @@ module ActiveMerchant
         transaction_id, transaction_tag, method, _ = authorization.split('|')
         params[:transaction_id] = transaction_id
         params[:transaction_tag] = transaction_tag
-        params[:method] = method
+        params[:method] = (method == 'token') ? 'credit_card' : method
       end
 
       def add_creditcard_for_tokenization(params, payment_method, options)
         params[:apikey] = @options[:apikey]
-        params[:js_security_key] = options[:js_security_key]
         params[:ta_token] = options[:ta_token]
-        params[:callback] = 'Payeezy.callback'
         params[:type] = 'FDToken'
-        card = add_card_data(payment_method)
-        params['credit_card.type'] = card[:type]
-        params['credit_card.cardholder_name'] = card[:cardholder_name]
-        params['credit_card.card_number'] = card[:card_number]
-        params['credit_card.exp_date'] = card[:exp_date]
-        params['credit_card.cvv'] = card[:cvv]
+        params[:credit_card] = add_card_data(payment_method)
+        params[:auth] = 'false'
       end
 
       def is_store_action?(params)
-        params[:ta_token].present?
+        params[:transaction_type] == 'store'
       end
 
       def add_payment_method(params, payment_method, options)
@@ -277,18 +271,12 @@ module ActiveMerchant
       end
 
       def endpoint(params)
-        is_store_action?(params) ? '/securitytokens' : '/transactions'
+        is_store_action?(params) ? '/transactions/tokens' : '/transactions'
       end
 
       def api_request(url, params)
-        if is_store_action?(params)
-          callback = ssl_request(:get, "#{url}?#{post_data(params)}", nil, {})
-          payload = callback[/{(?:\n|.)*}/]
-          parse(payload)
-        else
-          body = params.to_json
-          parse(ssl_post(url, body, headers(body)))
-        end
+        body = params.to_json
+        parse(ssl_post(url, body, headers(body)))
       end
 
       def post_data(params)
@@ -331,6 +319,8 @@ module ActiveMerchant
           response['transaction_status'] == 'approved'
         elsif response['results']
           response['results']['status'] == 'success'
+        elsif response['status']
+          response['status'] == 'success'
         else
           false
         end
@@ -360,10 +350,10 @@ module ActiveMerchant
         if is_store_action?(params)
           if success_from(response)
             [
-              response['results']['token']['type'],
-              response['results']['token']['cardholder_name'],
-              response['results']['token']['exp_date'],
-              response['results']['token']['value']
+              response['token']['type'],
+              response['token']['cardholder_name'],
+              response['token']['exp_date'],
+              response['token']['value']
             ].join('|')
           else
             nil

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

@@ -100,8 +100,20 @@ module ActiveMerchant #:nodoc:
         @express ||= PayflowExpressGateway.new(@options)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<CardNum>)[^<]*(</CardNum>)), '\1[FILTERED]\2').
+          gsub(%r((<CVNum>)[^<]*(</CVNum>)), '\1[FILTERED]\2').
+          gsub(%r((<AcctNum>)[^<]*(</AcctNum>)), '\1[FILTERED]\2').
+          gsub(%r((<Password>)[^<]*(</Password>)), '\1[FILTERED]\2')
+      end
 
       private
+
       def build_sale_or_authorization_request(action, money, funding_source, options)
         if funding_source.is_a?(String)
           build_reference_sale_or_authorization_request(action, money, funding_source, options)
@@ -121,6 +133,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'CustIP', options[:ip] unless options[:ip].blank?
               xml.tag! 'InvNum', options[:order_id].to_s.gsub(/[^\w.]/, '') unless options[:order_id].blank?
               xml.tag! 'Description', options[:description] unless options[:description].blank?
+              xml.tag! 'OrderDesc', options[:order_desc] unless options[:order_desc].blank?
               xml.tag! 'Comment', options[:comment] unless options[:comment].blank?
               xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].blank?
               xml.tag! 'TaxAmt', options[:taxamt] unless options[:taxamt].blank?
@@ -152,6 +165,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'CustIP', options[:ip] unless options[:ip].blank?
               xml.tag! 'InvNum', options[:order_id].to_s.gsub(/[^\w.]/, '') unless options[:order_id].blank?
               xml.tag! 'Description', options[:description] unless options[:description].blank?
+              xml.tag! 'OrderDesc', options[:order_desc] unless options[:order_desc].blank?
               # Comment and Comment2 will show up in manager.paypal.com as Comment1 and Comment2
               xml.tag! 'Comment', options[:comment] unless options[:comment].blank?
               xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].blank?
@@ -184,6 +198,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'CustIP', options[:ip] unless options[:ip].blank?
               xml.tag! 'InvNum', options[:order_id].to_s.gsub(/[^\w.]/, '') unless options[:order_id].blank?
               xml.tag! 'Description', options[:description] unless options[:description].blank?
+              xml.tag! 'OrderDesc', options[:order_desc] unless options[:order_desc].blank?
               xml.tag! 'BillTo' do
                 xml.tag! 'Name', check.name
               end
@@ -332,4 +347,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -52,8 +52,9 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, money, options)
         add_payment(post, payment)
         add_customer_data(post, options)
+        action = payment.is_a?(String) ? 'debit' : 'debit_cc'
 
-        commit_transaction('debit_cc', post)
+        commit_transaction(action, post)
       end
 
       def authorize(money, payment, options = {})
@@ -62,10 +63,15 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, money, options)
         add_customer_data(post, options)
 
-        MultiResponse.run do |r|
-          r.process { store(payment, options) }
-          post[:card] = { token: r.authorization }
-          r.process { commit_transaction('authorize', post) }
+        if payment.is_a?(String)
+          post[:card] = { token: payment }
+          commit_transaction('authorize', post)
+        else
+          MultiResponse.run do |r|
+            r.process { store(payment, options) }
+            post[:card] = { token: r.authorization }
+            r.process { commit_transaction('authorize', post) }
+          end
         end
       end
 
@@ -148,12 +154,16 @@ module ActiveMerchant #:nodoc:
 
       def add_payment(post, payment)
         post[:card] ||= {}
-        post[:card][:number] = payment.number
-        post[:card][:holder_name] = payment.name
-        post[:card][:expiry_month] = payment.month
-        post[:card][:expiry_year] = payment.year
-        post[:card][:cvc] = payment.verification_value
-        post[:card][:type] = CARD_MAPPING[payment.brand]
+        if payment.is_a?(String)
+          post[:card][:token] = payment
+        else
+          post[:card][:number] = payment.number
+          post[:card][:holder_name] = payment.name
+          post[:card][:expiry_month] = payment.month
+          post[:card][:expiry_year] = payment.year
+          post[:card][:cvc] = payment.verification_value
+          post[:card][:type] = CARD_MAPPING[payment.brand]
+        end
       end
 
       def parse(body)