helper.rb in activemerchant-1.42.8

- old
+ new

@@ -5,32 +5,38 @@
         attr_reader :fields
         class_attribute :service_url
         class_attribute :mappings
         class_attribute :country_format
         self.country_format = :alpha2
-        
+
         # The application making the calls to the gateway
         # Useful for things like the PayPal build notation (BN) id fields
         class_attribute :application_id
         self.application_id = 'ActiveMerchant'
 
+        def self.inherited(subclass)
+          subclass.mappings ||= {}
+        end
+
         def initialize(order, account, options = {})
-          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :transaction_type, :authcode])
-          @fields          = {}
-          @raw_html_fields = []
-          @test            = options[:test]
-          self.order       = order
-          self.account     = account
-          self.amount      = options[:amount]
-          self.currency    = options[:currency]
-          self.credential2 = options[:credential2]
-          self.credential3 = options[:credential3]
-          self.credential4 = options[:credential4]
+          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :transaction_type, :authcode, :notify_url, :return_url, :redirect_param, :forward_url])
+          @fields             = {}
+          @raw_html_fields    = []
+          @test               = options[:test]
+          self.order          = order
+          self.account        = account
+          self.amount         = options[:amount]
+          self.currency       = options[:currency]
+          self.credential2    = options[:credential2]
+          self.credential3    = options[:credential3]
+          self.credential4    = options[:credential4]
+          self.notify_url     = options[:notify_url]
+          self.return_url     = options[:return_url]
+          self.redirect_param = options[:redirect_param]
         end
 
         def self.mapping(attribute, options = {})
-          self.mappings ||= {}
           self.mappings[attribute] = options
         end
 
         def add_field(name, value)
           return if name.blank? || value.blank?
@@ -48,23 +54,23 @@
         # for multiple fields with the same name (e.g., to support line items).
         def add_raw_html_field(name, value)
           return if name.blank? || value.blank?
           @raw_html_fields << [name, value]
         end
-        
+
         def raw_html_fields
           @raw_html_fields
         end
 
         def billing_address(params = {})
           add_address(:billing_address, params)
         end
-        
+
         def shipping_address(params = {})
           add_address(:shipping_address, params)
         end
-        
+
         def form_fields
           @fields
         end
 
         def test?
@@ -74,28 +80,28 @@
         def form_method
           "POST"
         end
 
         private
-        
+
         def add_address(key, params)
           return if mappings[key].nil?
-          
+
           code = lookup_country_code(params.delete(:country))
-          add_field(mappings[key][:country], code) 
+          add_field(mappings[key][:country], code)
           add_fields(key, params)
         end
-        
+
         def lookup_country_code(name_or_code, format = country_format)
           country = Country.find(name_or_code)
           country.code(format).to_s
         rescue InvalidCountryCodeError
           name_or_code
         end
 
         def method_missing(method_id, *args)
           method_id = method_id.to_s.gsub(/=$/, '').to_sym
-          # Return and do nothing if the mapping was not found. This allows 
+          # Return and do nothing if the mapping was not found. This allows
           # For easy substitution of the different integrations
           return if mappings[method_id].nil?
 
           mapping = mappings[method_id]
 