smulube-activemerchant 1.7.1.4 → 1.7.1.5

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

@@ -61,6 +61,16 @@ module ActiveMerchant #:nodoc:
         :inquiry => "I"
       }
 
+      AUTO_BILLING = {
+        :no_auto => "NoAutoBill",
+        :add_to_next => "AddToNextBilling"
+      }
+
+      INITAMT_ACTIONS = {
+        :cancel => "CancelOnFailure",
+        :continue => "ContinueOnFailure"
+      }
+
       # Creates a new PayflowNvpUkGateway
       #
       # The gateway requires that a valid login and password be passed
@@ -235,7 +245,7 @@ module ActiveMerchant #:nodoc:
       #   * <tt>:currency</tt> - The currency of the transaction. If present must be one of { AUD, CAD, EUR, JPY, GBP or USD }. If omitted the default currency is used.
       #   * <tt>:description</tt> - The description of the profile. Required for the profile to be created successfully.
       #   * <tt>:optionaltrxamt</tt> - Optional initial transaction amount in cents.
-      #   * <tt>:failedinitamtaction</tt> - What to action to perform if the initial transaction fails. Can be either :continue or :cancel. Defaults to :cancel.ContinueOnFailure or CancelOnFailure
+      #   * <tt>:failedinitamtaction</tt> - What to action to perform if the initial transaction fails. Can be either :continue or :cancel. Defaults to :cancel.
       #   * <tt>:autobilloutstanding</tt> - Controls whether to automatically bill the outstanding balance amount in the next payment. Can be either :no_auto or :add_to_next. Defaults to :no_auto
       def recurring(money, creditcard, options = {})
         post = {}
@@ -355,16 +365,8 @@ module ActiveMerchant #:nodoc:
         post[:profilename] = (options[:name] || creditcard.name).to_s.slice(0,128) unless options[:name].nil? && creditcard.nil?
         post[:desc] = options[:description] unless options[:description].nil?
         post[:optionaltrxamt] = amount(options[:optionaltrxamt]) unless options[:optionaltrxamt].nil?
-        if options[:failedinitamtaction].nil? || options[:failedinitamtaction] == :cancel
-          post[:failedinitamtaction] = "CancelOnFailure"
-        elsif options[:failedinitamtaction] == :continue
-          post[:failedinitamtaction] = "ContinueOnFailure"
-        end
-        if options[:autobilloutstanding].nil? || options[:autobilloutstanding] == :no_auto
-          post[:autobilloutamt] = "NoAutoBill"
-        elsif options[:autobilloutstanding] == :add_to_next
-          post[:autobilloutamt] = "AddToNextBilling"
-        end
+        post[:failedinitamtaction] = INITAMT_ACTIONS[options[:failedinitamtaction]] if INITAMT_ACTIONS.has_key?(options[:failedinitamtaction])
+        post[:autobilloutamt] = AUTO_BILLING[options[:autobilloutstanding]] if AUTO_BILLING.has_key?(options[:autobilloutstanding])
       end
 
       def format_date(time)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.7.1.4"
+  VERSION = "1.7.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: smulube-activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: false
   segments: 
   - 1
   - 7
   - 1
-  - 4
-  version: 1.7.1.4
+  - 5
+  version: 1.7.1.5
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -37,7 +37,7 @@ cert_chain:
   RGv1VYD5jSaHiQ==
   -----END CERTIFICATE-----
 
-date: 2010-09-23 00:00:00 +01:00
+date: 2010-09-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency