activemerchant 1.42.6 → 1.90.0

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

@@ -1,4 +1,4 @@
-require "digest/sha2"
+require 'digest/sha2'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -72,7 +72,7 @@ module ActiveMerchant #:nodoc:
       def add_creditcard(post, creditcard)
         post[:CARDFULLNAME]     = creditcard ? creditcard.name : ''
         post[:CARDCODE]         = creditcard ? creditcard.number : ''
-        post[:CARDVALIDITYDATE] = creditcard ? "%02d-%02s" % [creditcard.month, creditcard.year.to_s[-2..-1]] : ''
+        post[:CARDVALIDITYDATE] = creditcard ? '%02d-%02s' % [creditcard.month, creditcard.year.to_s[-2..-1]] : ''
         post[:CARDCVV]          = creditcard ? creditcard.verification_value : ''
       end
 

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -1,6 +1,8 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module BeanstreamCore
+      include Empty
+
       RECURRING_URL = 'https://www.beanstream.com/scripts/recurring_billing.asp'
       SECURE_PROFILE_URL = 'https://www.beanstream.com/scripts/payment_profile.asp'
 
@@ -59,6 +61,72 @@ module ActiveMerchant #:nodoc:
         :cancel => 'C'
       }
 
+      STATES = {
+        'ALBERTA' => 'AB',
+        'BRITISH COLUMBIA' => 'BC',
+        'MANITOBA' => 'MB',
+        'NEW BRUNSWICK' => 'NB',
+        'NEWFOUNDLAND AND LABRADOR' => 'NL',
+        'NOVA SCOTIA' => 'NS',
+        'ONTARIO' => 'ON',
+        'PRINCE EDWARD ISLAND' => 'PE',
+        'QUEBEC' => 'QC',
+        'SASKATCHEWAN' => 'SK',
+        'NORTHWEST TERRITORIES' => 'NT',
+        'NUNAVUT' => 'NU',
+        'YUKON' => 'YT',
+        'ALABAMA' => 'AL',
+        'ALASKA' => 'AK',
+        'ARIZONA' => 'AZ',
+        'ARKANSAS' => 'AR',
+        'CALIFORNIA' => 'CA',
+        'COLORADO' => 'CO',
+        'CONNECTICUT' => 'CT',
+        'DELAWARE' => 'DE',
+        'FLORIDA' => 'FL',
+        'GEORGIA' => 'GA',
+        'HAWAII' => 'HI',
+        'IDAHO' => 'ID',
+        'ILLINOIS' => 'IL',
+        'INDIANA' => 'IN',
+        'IOWA' => 'IA',
+        'KANSAS' => 'KS',
+        'KENTUCKY' => 'KY',
+        'LOUISIANA' => 'LA',
+        'MAINE' => 'ME',
+        'MARYLAND' => 'MD',
+        'MASSACHUSETTS' => 'MA',
+        'MICHIGAN' => 'MI',
+        'MINNESOTA' => 'MN',
+        'MISSISSIPPI' => 'MS',
+        'MISSOURI' => 'MO',
+        'MONTANA' => 'MT',
+        'NEBRASKA' => 'NE',
+        'NEVADA' => 'NV',
+        'NEW HAMPSHIRE' => 'NH',
+        'NEW JERSEY' => 'NJ',
+        'NEW MEXICO' => 'NM',
+        'NEW YORK' => 'NY',
+        'NORTH CAROLINA' => 'NC',
+        'NORTH DAKOTA' => 'ND',
+        'OHIO' => 'OH',
+        'OKLAHOMA' => 'OK',
+        'OREGON' => 'OR',
+        'PENNSYLVANIA' => 'PA',
+        'RHODE ISLAND' => 'RI',
+        'SOUTH CAROLINA' => 'SC',
+        'SOUTH DAKOTA' => 'SD',
+        'TENNESSEE' => 'TN',
+        'TEXAS' => 'TX',
+        'UTAH' => 'UT',
+        'VERMONT' => 'VT',
+        'VIRGINIA' => 'VA',
+        'WASHINGTON' => 'WA',
+        'WEST VIRGINIA' => 'WV',
+        'WISCONSIN' => 'WI',
+        'WYOMING' => 'WY'
+      }
+
       def self.included(base)
         base.default_currency = 'CAD'
 
@@ -70,7 +138,7 @@ module ActiveMerchant #:nodoc:
 
         # The homepage URL of the gateway
         base.homepage_url = 'http://www.beanstream.com/'
-        base.live_url = 'https://www.beanstream.com/scripts/process_transaction.asp'
+        base.live_url = 'https://api.na.bambora.com/scripts/process_transaction.asp'
 
         # The name of the gateway
         base.display_name = 'Beanstream.com'
@@ -87,18 +155,18 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        reference, amount, type = split_auth(authorization)
-
+        reference, _, _ = split_auth(authorization)
         post = {}
         add_amount(post, money)
         add_reference(post, reference)
         add_transaction_type(post, :capture)
+        add_recurring_payment(post, options)
         commit(post)
       end
 
       def refund(money, source, options = {})
         post = {}
-        reference, amount, type = split_auth(source)
+        reference, _, type = split_auth(source)
         add_reference(post, reference)
         add_transaction_type(post, refund_action(type))
         add_amount(post, money)
@@ -106,11 +174,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, source, options = {})
-        deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, source, options)
       end
 
       private
+
       def purchase_action(source)
         if source.is_a?(Check)
           :check_purchase
@@ -120,15 +189,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_ip(post, options)
-        post[:customerIP] = options[:ip] if options[:ip]
+        post[:customerIp] = options[:ip] if options[:ip]
       end
 
       def void_action(original_transaction_type)
-        (original_transaction_type == TRANSACTIONS[:refund]) ? :void_refund : :void_purchase
+        original_transaction_type == TRANSACTIONS[:refund] ? :void_refund : :void_purchase
       end
 
       def refund_action(type)
-        (type == TRANSACTIONS[:check_purchase]) ? :check_refund : :refund
+        type == TRANSACTIONS[:check_purchase] ? :check_refund : :refund
       end
 
       def secure_profile_action(type)
@@ -136,7 +205,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def split_auth(string)
-        string.split(";")
+        string.split(';')
       end
 
       def add_amount(post, money)
@@ -152,27 +221,29 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
+        post[:ordEmailAddress]  = options[:email] if options[:email]
+        post[:shipEmailAddress] = options[:shipping_email] || options[:email] if options[:email]
+
         prepare_address_for_non_american_countries(options)
 
         if billing_address = options[:billing_address] || options[:address]
           post[:ordName]          = billing_address[:name]
-          post[:ordEmailAddress]  = options[:email]
           post[:ordPhoneNumber]   = billing_address[:phone]
           post[:ordAddress1]      = billing_address[:address1]
           post[:ordAddress2]      = billing_address[:address2]
           post[:ordCity]          = billing_address[:city]
-          post[:ordProvince]      = billing_address[:state]
+          post[:ordProvince]      = state_for(billing_address)
           post[:ordPostalCode]    = billing_address[:zip]
           post[:ordCountry]       = billing_address[:country]
         end
+
         if shipping_address = options[:shipping_address]
           post[:shipName]         = shipping_address[:name]
-          post[:shipEmailAddress] = options[:email]
           post[:shipPhoneNumber]  = shipping_address[:phone]
           post[:shipAddress1]     = shipping_address[:address1]
           post[:shipAddress2]     = shipping_address[:address2]
           post[:shipCity]         = shipping_address[:city]
-          post[:shipProvince]     = shipping_address[:state]
+          post[:shipProvince]     = state_for(shipping_address)
           post[:shipPostalCode]   = shipping_address[:zip]
           post[:shipCountry]      = shipping_address[:country]
           post[:shippingMethod]   = shipping_address[:shipping_method]
@@ -180,8 +251,13 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def state_for(address)
+        STATES[address[:state].upcase] || address[:state] if address[:state]
+      end
+
       def prepare_address_for_non_american_countries(options)
         [ options[:billing_address], options[:shipping_address] ].compact.each do |address|
+          next if empty?(address[:country])
           unless ['US', 'CA'].include?(address[:country])
             address[:state] = '--'
             address[:zip]   = '000000' unless address[:zip]
@@ -189,6 +265,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_recurring_payment(post, options)
+        post[:recurringPayment] = 1 if options[:recurring].to_s == 'true'
+      end
+
       def add_invoice(post, options)
         post[:trnOrderNumber]   = options[:order_id]
         post[:trnComments]      = options[:description]
@@ -206,6 +286,11 @@ module ActiveMerchant #:nodoc:
           post[:trnExpMonth] = format(credit_card.month, :two_digits)
           post[:trnExpYear] = format(credit_card.year, :two_digits)
           post[:trnCardCvd] = credit_card.verification_value
+          if credit_card.is_a?(NetworkTokenizationCreditCard)
+            post[:"3DSecureXID"] = credit_card.transaction_id
+            post[:"3DSecureECI"] = credit_card.eci
+            post[:"3DSecureCAVV"] = credit_card.payment_cryptogram
+          end
         end
       end
 
@@ -227,7 +312,6 @@ module ActiveMerchant #:nodoc:
         post[:serviceVersion] = SP_SERVICE_VERSION
         post[:responseFormat] = 'QS'
         post[:cardValidation] = (options[:cardValidation].to_i == 1) || '0'
-
         post[:operationType] = options[:operationType] || options[:operation] || secure_profile_action(:new)
         post[:customerCode] = options[:billing_id] || options[:vault_id] || false
         post[:status] = options[:status]
@@ -291,17 +375,15 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         results = {}
-        if !body.nil?
-          body.split(/&/).each do |pair|
-            key, val = pair.split(/\=/)
-            results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
-          end
+        body&.split(/&/)&.each do |pair|
+          key, val = pair.split(/\=/)
+          results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
         end
 
         # Clean up the message text if there is any
         if results[:messageText]
-          results[:messageText].gsub!(/<LI>/, "")
-          results[:messageText].gsub!(/(\.)?<br>/, ". ")
+          results[:messageText].gsub!(/<LI>/, '')
+          results[:messageText].gsub!(/(\.)?<br>/, '. ')
           results[:messageText].strip!
         end
 
@@ -316,7 +398,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(params, use_profile_api = false)
-        post(post_data(params,use_profile_api),use_profile_api)
+        post(post_data(params, use_profile_api), use_profile_api)
       end
 
       def recurring_commit(params)
@@ -327,10 +409,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post((use_profile_api ? SECURE_PROFILE_URL : self.live_url), data))
         response[:customer_vault_id] = response[:customerCode] if response[:customerCode]
         build_response(success?(response), message_from(response), response,
-          :test => test? || response[:authCode] == "TEST",
+          :test => test? || response[:authCode] == 'TEST',
           :authorization => authorization_from(response),
           :cvv_result => CVD_CODES[response[:cvdId]],
-          :avs_result => { :code => (AVS_CODES.include? response[:avsId]) ? AVS_CODES[response[:avsId]] : response[:avsId] }
+          :avs_result => { :code => AVS_CODES.include?(response[:avsId]) ? AVS_CODES[response[:avsId]] : response[:avsId] }
         )
       end
 
@@ -351,10 +433,6 @@ module ActiveMerchant #:nodoc:
         response[:message]
       end
 
-      def success?(response)
-        response[:responseType] == 'R' || response[:trnApproved] == '1' || response[:responseCode] == '1'
-      end
-
       def recurring_success?(response)
         response[:code] == '1'
       end
@@ -363,7 +441,7 @@ module ActiveMerchant #:nodoc:
         if source.is_a?(String) or source.is_a?(Integer)
           post[:customerCode] = source
         else
-          card_brand(source) == "check" ? add_check(post, source) : add_credit_card(post, source)
+          card_brand(source) == 'check' ? add_check(post, source) : add_credit_card(post, source)
         end
       end
 
@@ -380,14 +458,13 @@ module ActiveMerchant #:nodoc:
           params[:username] = @options[:user] if @options[:user]
           params[:password] = @options[:password] if @options[:password]
           params[:merchant_id] = @options[:login]
+          params[:passcode] = @options[:api_key]
         end
         params[:vbvEnabled] = '0'
         params[:scEnabled] = '0'
 
-        params.reject{|k, v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        params.reject { |k, v| v.blank? }.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
-
     end
   end
 end
-

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/beanstream/beanstream_core'
+require 'active_merchant/billing/gateways/beanstream/beanstream_core'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -16,7 +16,10 @@ module ActiveMerchant #:nodoc:
     # BeanStream supports payment profiles (vaults). This allows you to store cc information with BeanStream and process subsequent transactions with a customer id.
     # Secure Payment Profiles must be enabled on your account (must be done over the phone).
     # Your API Access Passcode must be set in Administration => account settings => order settings.
-    # To learn more about storing credit cards with the Beanstream gateway, please read the BEAN_Payment_Profiles.pdf (I had to phone BeanStream to request it.)
+    # To learn more about storing credit cards with the Beanstream gateway, documentation can be found at http://developer.beanstream.com/documentation/classic-apis
+    #
+    # To store a credit card using Beanstream's Legato Javascript Library (http://developer.beanstream.com/documentation/legato) you must pass the singleUseToken in
+    # the store method's option parameter. Example: @gateway.store("gt6-0c78c25b-3637-4ba0-90e2-26105287f198")
     #
     # == Notes
     # * Adding of order products information is not implemented.
@@ -72,6 +75,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_transaction_type(post, :authorization)
         add_customer_ip(post, options)
+        add_recurring_payment(post, options)
         commit(post)
       end
 
@@ -83,6 +87,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_transaction_type(post, purchase_action(source))
         add_customer_ip(post, options)
+        add_recurring_payment(post, options)
         commit(post)
       end
 
@@ -96,7 +101,20 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
+      def verify(source, options={})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, source, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
+      def success?(response)
+        response[:trnApproved] == '1' || response[:responseCode] == '1'
+      end
+
       def recurring(money, source, options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         post = {}
         add_amount(post, money)
         add_invoice(post, options)
@@ -108,6 +126,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def update_recurring(amount, source, options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         post = {}
         add_recurring_amount(post, amount)
         add_recurring_invoice(post, options)
@@ -119,6 +139,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def cancel_recurring(options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         post = {}
         add_recurring_operation_type(post, :cancel)
         add_recurring_service(post, options)
@@ -131,18 +153,24 @@ module ActiveMerchant #:nodoc:
 
       # To match the other stored-value gateways, like TrustCommerce,
       # store and unstore need to be defined
-      def store(credit_card, options = {})
+      def store(payment_method, options = {})
         post = {}
         add_address(post, options)
-        add_credit_card(post, credit_card)
-        add_secure_profile_variables(post,options)
+
+        if payment_method.respond_to?(:number)
+          add_credit_card(post, payment_method)
+        else
+          post[:singleUseToken] = payment_method
+        end
+        add_secure_profile_variables(post, options)
+
         commit(post, true)
       end
 
-      #can't actually delete a secure profile with the supplicated API. This function sets the status of the profile to closed (C).
-      #Closed profiles will have to removed manually.
+      # can't actually delete a secure profile with the supplicated API. This function sets the status of the profile to closed (C).
+      # Closed profiles will have to removed manually.
       def delete(vault_id)
-        update(vault_id, false, {:status => "C"})
+        update(vault_id, false, {:status => 'C'})
       end
 
       alias_method :unstore, :delete
@@ -150,20 +178,38 @@ module ActiveMerchant #:nodoc:
       # Update the values (such as CC expiration) stored at
       # the gateway.  The CC number must be supplied in the
       # CreditCard object.
-      def update(vault_id, credit_card, options = {})
+      def update(vault_id, payment_method, options = {})
         post = {}
         add_address(post, options)
-        add_credit_card(post, credit_card)
-        options.merge!({:vault_id => vault_id, :operation => secure_profile_action(:modify)})
-        add_secure_profile_variables(post,options)
+        if payment_method.respond_to?(:number)
+          add_credit_card(post, payment_method)
+        else
+          post[:singleUseToken] = payment_method
+        end
+        options[:vault_id] = vault_id
+        options[:operation] = secure_profile_action(:modify)
+        add_secure_profile_variables(post, options)
         commit(post, true)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(/(&?password=)[^&\s]*(&?)/, '\1[FILTERED]\2').
+          gsub(/(&?passcode=)[^&\s]*(&?)/, '\1[FILTERED]\2').
+          gsub(/(&?trnCardCvd=)\d*(&?)/, '\1[FILTERED]\2').
+          gsub(/(&?trnCardNumber=)\d*(&?)/, '\1[FILTERED]\2')
+      end
+
       private
+
       def build_response(*args)
         Response.new(*args)
       end
     end
   end
 end
-

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/beanstream/beanstream_core'
+require 'active_merchant/billing/gateways/beanstream/beanstream_core'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -7,21 +7,21 @@ module ActiveMerchant #:nodoc:
         params['pageContents']
       end
     end
-    
+
     class BeanstreamInteracGateway < Gateway
       include BeanstreamCore
 
       # Confirm a transaction posted back from the bank to Beanstream.
       # Confirming a transaction does not require any credentials,
       # and in an application with many merchants sharing a funded
-      # URL the application may not yet know which merchant the 
+      # URL the application may not yet know which merchant the
       # post back is for until the response of the confirmation is
       # received, which contains the order number.
       def self.confirm(transaction)
         gateway = new(:login => '')
         gateway.confirm(transaction)
       end
-      
+
       def purchase(money, options = {})
         post = {}
         add_amount(post, money)
@@ -31,24 +31,27 @@ module ActiveMerchant #:nodoc:
         add_transaction_type(post, :purchase)
         commit(post)
       end
-      
+
+      def success?(response)
+        response[:responseType] == 'R' || response[:trnApproved] == '1' || response[:responseCode] == '1'
+      end
+
       # Confirm a transaction posted back from the bank to Beanstream.
       def confirm(transaction)
         post(transaction)
       end
-      
+
       private
-      
+
       def add_interac_details(post, options)
         address = options[:billing_address] || options[:address] || {}
         post[:trnCardOwner] = address[:name]
         post[:paymentMethod] = 'IO'
       end
-      
+
       def build_response(*args)
         BeanstreamInteracResponse.new(*args)
       end
     end
   end
 end
-