activemerchant 1.14.0 → 1.15.0

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

@@ -272,10 +272,6 @@ module ActiveMerchant #:nodoc:
         end
       end
       
-      def test?
-        @options[:test] || super
-      end
-      
     end
   end
 end

data/lib/active_merchant/billing/gateways/ideal/ideal_base.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
     # - does not support multiple subID per merchant
     # - language is fixed to 'nl'
     class IdealBaseGateway < Gateway
-      class_inheritable_accessor :test_url, :live_url, :server_pem, :pem_password, :default_expiration_period
+      class_attribute :test_url, :live_url, :server_pem, :pem_password, :default_expiration_period
       self.default_expiration_period = 'PT10M'
       self.default_currency = 'EUR'
       self.pem_password = true

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

@@ -45,7 +45,7 @@ module ActiveMerchant #:nodoc:
     # - does not support multiple subID per merchant
     # - language is fixed to 'nl'
     class IdealRabobankGateway < IdealBaseGateway
-      class_inheritable_accessor :test_url, :live_url
+      class_attribute :test_url, :live_url
 
       self.test_url = 'https://idealtest.rabobank.nl/ideal/iDeal'
       self.live_url = 'https://ideal.rabobank.nl/ideal/iDeal'

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

@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
       
       SUCCESS, APPROVED = '0', '00'
       
-      class_inheritable_accessor :primary_test_url, :secondary_test_url, :primary_live_url, :secondary_live_url
+      class_attribute :primary_test_url, :secondary_test_url, :primary_live_url, :secondary_live_url
       
       self.primary_test_url = "https://orbitalvar1.paymentech.net/authorize"
       self.secondary_test_url = "https://orbitalvar2.paymentech.net/authorize"

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

@@ -99,7 +99,7 @@ module ActiveMerchant #:nodoc:
     class PayJunctionGateway < Gateway
       API_VERSION   = '1.2'
 
-      class_inheritable_accessor :test_url, :live_url
+      class_attribute :test_url, :live_url
 
       self.test_url = "https://www.payjunctionlabs.com/quick_link"
       self.live_url = "https://payjunction.com/quick_link"

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

@@ -16,13 +16,13 @@ module ActiveMerchant #:nodoc:
       def authorize(money, credit_card_or_reference, options = {})
         request = build_sale_or_authorization_request(:authorization, money, credit_card_or_reference, options)
       
-        commit(request)
+        commit(request, options)
       end
       
       def purchase(money, credit_card_or_reference, options = {})
         request = build_sale_or_authorization_request(:purchase, money, credit_card_or_reference, options)
 
-        commit(request)
+        commit(request, options)
       end
       
       def credit(money, identification_or_credit_card, options = {})
@@ -33,12 +33,12 @@ module ActiveMerchant #:nodoc:
         else
           # Perform non-referenced credit
           request = build_credit_card_request(:credit, money, identification_or_credit_card, options)
-          commit(request)
+          commit(request, options)
         end
       end
       
       def refund(money, reference, options = {})
-        commit(build_reference_request(:credit, money, reference, options))
+        commit(build_reference_request(:credit, money, reference, options), options)
       end
       # Adds or modifies a recurring Payflow profile.  See the Payflow Pro Recurring Billing Guide for more details:
       # https://www.paypal.com/en_US/pdf/PayflowPro_RecurringBilling_Guide.pdf
@@ -57,17 +57,17 @@ module ActiveMerchant #:nodoc:
         request = build_recurring_request(options[:profile_id] ? :modify : :add, money, options) do |xml|
           add_credit_card(xml, credit_card) if credit_card
         end
-        commit(request, :recurring)
+        commit(request, options.merge(:request_type => :recurring))
       end
       
       def cancel_recurring(profile_id)
         request = build_recurring_request(:cancel, 0, :profile_id => profile_id)
-        commit(request, :recurring)
+        commit(request, options.merge(:request_type => :recurring))
       end
       
       def recurring_inquiry(profile_id, options = {})
         request = build_recurring_request(:inquiry, nil, options.update( :profile_id => profile_id ))
-        commit(request, :recurring)
+        commit(request, options.merge(:request_type => :recurring))
       end   
       
       def express
@@ -84,10 +84,21 @@ module ActiveMerchant #:nodoc:
       end
       
       def build_reference_sale_or_authorization_request(action, money, reference, options)
-        xml = Builder::XmlMarkup.new 
+        xml = Builder::XmlMarkup.new
         xml.tag! TRANSACTIONS[action] do
           xml.tag! 'PayData' do
             xml.tag! 'Invoice' do
+              # Fields accepted by PayFlow and recommended to be provided even for Reference Transaction, per Payflow docs.
+              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! 'Comment', options[:comment] unless options[:comment].blank?
+              xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].blank?
+
+              billing_address = options[:billing_address] || options[:address]
+              add_address(xml, 'BillTo', billing_address, options) if billing_address
+              add_address(xml, 'ShipTo', options[:shipping_address],options) if options[:shipping_address]
+
               xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
             end
             xml.tag! 'Tender' do
@@ -108,6 +119,9 @@ 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?
+              # 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?
 
               billing_address = options[:billing_address] || options[:address]
               add_address(xml, 'BillTo', billing_address, options) if billing_address

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

@@ -4,14 +4,14 @@ module ActiveMerchant #:nodoc:
       def self.included(base)
         base.default_currency = 'USD'
           
-        base.class_inheritable_accessor :partner
+        base.class_attribute :partner
         
         # Set the default partner to PayPal
         base.partner = 'PayPal'
         
         base.supported_countries = ['US', 'CA', 'SG', 'AU']
         
-        base.class_inheritable_accessor :timeout
+        base.class_attribute :timeout
         base.timeout = 60
         
         # Enable safe retry of failed connections
@@ -67,27 +67,27 @@ module ActiveMerchant #:nodoc:
       
       def capture(money, authorization, options = {})
         request = build_reference_request(:capture, money, authorization, options)
-        commit(request)
+        commit(request, options)
       end
       
       def void(authorization, options = {})
         request = build_reference_request(:void, nil, authorization, options)
-        commit(request)
+        commit(request, options)
       end
   
       private      
-      def build_request(body, request_type = nil)
+      def build_request(body, options = {})
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.tag! 'XMLPayRequest', 'Timeout' => timeout.to_s, 'version' => "2.1", "xmlns" => XMLNS do
           xml.tag! 'RequestData' do
             xml.tag! 'Vendor', @options[:login]
             xml.tag! 'Partner', @options[:partner]
-            if request_type == :recurring
+            if options[:request_type] == :recurring
               xml << body
             else
               xml.tag! 'Transactions' do
-                xml.tag! 'Transaction' do
+                xml.tag! 'Transaction', 'CustRef' => options[:customer] do
                   xml.tag! 'Verbosity', 'MEDIUM'
                   xml << body
                 end
@@ -189,8 +189,8 @@ module ActiveMerchant #:nodoc:
     	  }
     	end
     	
-    	def commit(request_body, request_type = nil)
-        request = build_request(request_body, request_type)
+    	def commit(request_body, options  = {})
+        request = build_request(request_body, options)
         headers = build_headers(request.size)
         
     	  response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request, headers))
@@ -204,4 +204,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

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

@@ -4,29 +4,85 @@ require File.dirname(__FILE__) + '/paypal_express_common'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    class PayflowExpressGateway < Gateway 
+      # ==General Parameters
+      # The following parameters are supported for #setup_authorization, #setup_purchase, #authorize and #purchase transactions. I've read
+      # in the docs that they recommend you pass the exact same parameters to both setup and authorize/purchase.
+      #
+      # This information was gleaned from a mix of:
+      # * PayFlow documentation
+      #   * for key value pairs: {Express Checkout for Payflow Pro (PDF)}[https://cms.paypal.com/cms_content/US/en_US/files/developer/PFP_ExpressCheckout_PP.pdf]
+      #   * XMLPay: {Payflow Pro XMLPay Developer's Guide (PDF)}[https://cms.paypal.com/cms_content/US/en_US/files/developer/PP_PayflowPro_XMLPay_Guide.pdf]
+      # * previous ActiveMerchant code
+      # * trial & error
+      #
+      # The following parameters are currently supported.
+      # [<tt>:ip</tt>] (opt) Customer IP Address
+      # [<tt>:order_id</tt>] (opt) An order or invoice number. This will be passed through to the Payflow backend at manager.paypal.com, and show up as "Supplier Reference #"
+      # [<tt>:description</tt>] (opt) Order description, shown to buyer (after redirected to PayPal). If Order Line Items are used (see below), then the description is suppressed. This will not be passed through to the Payflow backend.
+      # [<tt>:billing_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
+      # [<tt>:shipping_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
+      # [<tt>:currency</tt>] (req) Currency of transaction, will be set to USD by default for PayFlow Express if not specified
+      # [<tt>:email</tt>] (opt) Email of buyer; used to pre-fill PayPal login screen
+      # [<tt>:payer_id</tt>] (opt) Unique PayPal buyer account identification number, as returned by details_for request
+      # [<tt>:token</tt>] (req for #authorize & #purchase) Token returned by setup transaction
+      # [<tt>:no_shipping</tt>] (opt) Boolean for whether or not to display shipping address to buyer
+      # [<tt>:address_override</tt>] (opt) Boolean. If true, display shipping address passed by parameters, rather than shipping address on file with PayPal
+      # [<tt>:allow_note</tt>] (opt) Boolean for permitting buyer to add note during checkout. Note contents can be retrieved with details_for transaction
+      # [<tt>:return_url</tt>] (req) URL to which the buyer’s browser is returned after choosing to pay.
+      # [<tt>:cancel_return_url</tt>] (req) URL to which the buyer is returned if the buyer cancels the order.
+      # [<tt>:notify_url</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+      # [<tt>:comment</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment1
+      # [<tt>:comment2</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment2
+      #
+      # ==Line Items
+      # Support for order line items is available, but has to be enabled on the PayFlow backend. This is what I was told by Todd Sieber at Technical Support:
+      #
+      # <em>You will need to call Payflow Support at 1-888-883-9770, choose option #2.  Request that they update your account in "Pandora" under Product Settings >> PayPal Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.</em>
+      #
+      # See here[https://www.x.com/message/206214#206214] for the forum discussion (requires login to {x.com}[https://x.com]
+      #     
+      # [<tt>:items</tt>] (opt) Array of Order Line Items hashes. These are shown to the buyer after redirect to PayPal.
+      #
+      #
+      #
+      #                   The following keys are supported for line items:
+      #                   [<tt>:name</tt>] Name of line item
+      #                   [<tt>:description</tt>] Description of line item
+      #                   [<tt>:amount</tt>] Line Item Amount in Cents (as Integer)
+      #                   [<tt>:quantity</tt>] Line Item Quantity (default to 1 if left blank)
+      #
+      # ====Customization of Payment Page
+      # [<tt>:page_style</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+      # [<tt>:header_image</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+      # [<tt>:background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+      # ====Additional options for old Checkout Experience, being phased out in 2010 and 2011
+      # [<tt>:header_background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+      # [<tt>:header_border_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+
+
+    class PayflowExpressGateway < Gateway
       include PayflowCommonAPI
       include PaypalExpressCommon
       
       self.test_redirect_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr'
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside'
       self.display_name = 'PayPal Express Checkout'
-      
+
       def authorize(money, options = {})
         requires!(options, :token, :payer_id)
         request = build_sale_or_authorization_request('Authorization', money, options)
-        commit(request)
+        commit(request, options)
       end
       
       def purchase(money, options = {})        
         requires!(options, :token, :payer_id)
         request = build_sale_or_authorization_request('Sale', money, options)
-        commit(request)
+        commit(request, options)
       end
       
       def refund(money, identification, options = {})
         request = build_reference_request(:credit, money, identification, options)
-        commit(request)
+        commit(request, options)
       end        
 
       def credit(money, identification, options = {})
@@ -38,19 +94,19 @@ module ActiveMerchant #:nodoc:
         requires!(options, :return_url, :cancel_return_url)
         
         request = build_setup_express_sale_or_authorization_request('Authorization', money, options)
-        commit(request)
+        commit(request, options)
       end
       
       def setup_purchase(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
         
         request = build_setup_express_sale_or_authorization_request('Sale', money, options)
-        commit(request)
+        commit(request, options)
       end
       
       def details_for(token)
         request = build_get_express_details_request(token)
-        commit(request)
+        commit(request, options)
       end
       
       private
@@ -69,28 +125,12 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-      
+
       def build_setup_express_sale_or_authorization_request(action, money, options = {})
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'SetExpressCheckout' do
           xml.tag! action do
-            xml.tag! 'PayData' do
-              xml.tag! 'Invoice' do
-                xml.tag! 'CustIP', options[:ip] unless options[:ip].blank?
-                xml.tag! 'InvNum', options[:order_id] unless options[:order_id].blank?
-                xml.tag! 'Description', options[:description] unless options[:description].blank?
-            
-                billing_address = options[:billing_address] || options[:address]
-                add_address(xml, 'BillTo', billing_address, options) if billing_address
-                add_address(xml, 'ShipTo', options[:shipping_address], options) if options[:shipping_address]
-                
-                xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
-              end
-              
-              xml.tag! 'Tender' do
-                add_paypal_details(xml, options)
-              end
-            end
+            add_pay_data xml, money, options
           end
         end
         xml.target!
@@ -100,19 +140,55 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'DoExpressCheckout' do
           xml.tag! action do
-            xml.tag! 'PayData' do
-              xml.tag! 'Invoice' do 
-                xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
-              end
-              xml.tag! 'Tender' do
-                add_paypal_details xml, options
-              end
-            end
+            add_pay_data xml, money, options
           end
         end
         xml.target!
       end
-      
+
+      def add_pay_data(xml, money, options)
+        xml.tag! 'PayData' do
+          xml.tag! 'Invoice' do
+            xml.tag! 'CustIP', options[:ip] unless options[:ip].blank?
+            xml.tag! 'InvNum', options[:order_id] unless options[:order_id].blank?
+            # Description field will be shown to buyer, unless line items are also being supplied (then only line items are shown).
+            xml.tag! 'Description', options[:description] unless options[:description].blank?
+            # Comment, Comment2 should make it to the backend at manager.paypal.com, as with Payflow credit card transactions
+            # but that doesn't seem to work (yet?). See: https://www.x.com/thread/51908?tstart=0
+            xml.tag! 'Comment', options[:comment] unless options[:comment].nil?
+            xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].nil?
+
+            billing_address = options[:billing_address] || options[:address]
+            add_address(xml, 'BillTo', billing_address, options) if billing_address
+            add_address(xml, 'ShipTo', options[:shipping_address], options) if options[:shipping_address]
+
+            # Note: To get order line-items to show up with Payflow Express, this feature has to be enabled on the backend.
+            # Call Support at 888 883 9770, press 2. Then request that they update your account in "Pandora" under Product Settings >> PayPal
+            # Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.
+            # See here for the forum discussion: https://www.x.com/message/206214#206214
+            items = options[:items] || []
+            items.each_with_index do |item, index|
+              xml.tag! 'ExtData', 'Name' => "L_DESC#{index}", 'Value' => item[:description]
+              xml.tag! 'ExtData', 'Name' => "L_COST#{index}", 'Value' => amount(item[:amount])
+              xml.tag! 'ExtData', 'Name' => "L_QTY#{index}", 'Value' => item[:quantity] || '1'
+              xml.tag! 'ExtData', 'Name' => "L_NAME#{index}", 'Value' => item[:name]
+              # Note: An ItemURL is supported in Paypal Express (different API), but not PayFlow Express, as far as I can tell.
+              # L_URLn nor L_ITEMURLn seem to work
+            end
+            if items.any?
+              xml.tag! 'ExtData', 'Name' => 'CURRENCY', 'Value' => options[:currency] || currency(money)
+              xml.tag! 'ExtData', 'Name' => "ITEMAMT", 'Value' => amount(money)
+            end
+
+            xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
+          end
+
+          xml.tag! 'Tender' do
+            add_paypal_details(xml, options)
+          end
+        end
+      end
+
       def add_paypal_details(xml, options)
          xml.tag! 'PayPal' do
           xml.tag! 'EMail', options[:email] unless options[:email].blank?
@@ -128,9 +204,12 @@ module ActiveMerchant #:nodoc:
           # Customization of the payment page
           xml.tag! 'PageStyle', options[:page_style] unless options[:page_style].blank?
           xml.tag! 'HeaderImage', options[:header_image] unless options[:header_image].blank?
+          xml.tag! 'PayflowColor', options[:background_color] unless options[:background_color].blank?
+          # Note: HeaderImage and PayflowColor apply to both the new (as of 2010) and the old checkout experience
+          # HeaderBackColor and HeaderBorderColor apply only to the old checkout experience which is being phased out.
           xml.tag! 'HeaderBackColor', options[:header_background_color] unless options[:header_background_color].blank?
           xml.tag! 'HeaderBorderColor', options[:header_border_color] unless options[:header_border_color].blank?
-          xml.tag! 'PayflowColor', options[:background_color] unless options[:background_color].blank?
+          xml.tag! 'ExtData', 'Name' => 'ALLOWNOTE', 'Value' => options[:allow_note]
         end
       end
       

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
     class QbmsGateway < Gateway
       API_VERSION = '4.0'
 
-      class_inheritable_accessor :test_url, :live_url
+      class_attribute :test_url, :live_url
 
       self.test_url = "https://webmerchantaccount.ptc.quickbooks.com/j/AppGateway"
       self.live_url = "https://webmerchantaccount.quickbooks.com/j/AppGateway"

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

@@ -131,7 +131,7 @@ module ActiveMerchant
           add_amount(xml, money, options)
           add_card(xml, credit_card)
           xml.tag! 'autosettle', 'flag' => auto_settle_flag(action)
-          add_signed_digest(xml, timestamp, @options[:login], options[:order_id], amount(money), (options[:currency] || currency(money)), credit_card.number)
+          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), amount(money), (options[:currency] || currency(money)), credit_card.number)
           add_comments(xml, options)
           add_address_and_customer_info(xml, options)
         end
@@ -145,7 +145,7 @@ module ActiveMerchant
           add_merchant_details(xml, options)
           add_transaction_identifiers(xml, authorization, options)
           add_comments(xml, options)
-          add_signed_digest(xml, timestamp, @options[:login], options[:order_id])
+          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), nil, nil, nil)
         end
         xml.target!
       end
@@ -160,7 +160,7 @@ module ActiveMerchant
           xml.tag! 'refundhash', @options[:refund_hash] if @options[:refund_hash]
           xml.tag! 'autosettle', 'flag' => 1
           add_comments(xml, options)
-          add_signed_digest(xml, timestamp, @options[:login], options[:order_id], amount(money), (options[:currency] || currency(money)))
+          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), amount(money), (options[:currency] || currency(money)), nil)
         end
         xml.target!
       end
@@ -172,7 +172,7 @@ module ActiveMerchant
           add_merchant_details(xml, options)
           add_transaction_identifiers(xml, authorization, options)
           add_comments(xml, options)
-          add_signed_digest(xml, timestamp, @options[:login], options[:order_id])
+          add_signed_digest(xml, timestamp, @options[:login], sanitize_order_id(options[:order_id]), nil, nil, nil)
         end
         xml.target!
       end
@@ -207,7 +207,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]
+          xml.tag! 'account', (options[:account] || @options[:account])
         end
       end
 
@@ -252,22 +252,13 @@ module ActiveMerchant
         string.gsub(/[\D]/,'')
       end
 
-      def stringify_values(values)
-        string = ""
-        (0..5).each do |i|
-          string << "#{values[i]}"
-          string << "." unless i == 5
-        end
-        string
-      end
-      
       def new_timestamp
         Time.now.strftime('%Y%m%d%H%M%S')
       end
 
       def add_signed_digest(xml, *values)
-        string = stringify_values(values)
-        xml.tag! 'sha1hash', sha1from(string)
+        string = Digest::SHA1.hexdigest(values.join("."))
+        xml.tag! 'sha1hash', Digest::SHA1.hexdigest([string, @options[:password]].join("."))
       end
 
       def auto_settle_flag(action)
@@ -278,10 +269,6 @@ module ActiveMerchant
         "#{format(credit_card.month, :two_digits)}#{format(credit_card.year, :two_digits)}"
       end
 
-      def sha1from(string)
-        Digest::SHA1.hexdigest("#{Digest::SHA1.hexdigest(string)}.#{@options[:password]}")
-      end
-
       def normalize(field)
         case field
         when "true"   then true