tomriley-active_merchant 1.4.2.6 → 1.4.2.7

data/active_merchant.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "active_merchant"
-  s.version  = "1.4.2.6"
+  s.version  = "1.4.2.7"
   s.date     = "2009-01-12"
   s.summary  = "Active Merchant is a simple payment abstraction library used in and sponsored by Shopify."
   s.homepage = "http://www.activemerchant.org/"

data/lib/active_merchant/billing/credit_card.rb

@@ -112,8 +112,17 @@ module ActiveMerchant #:nodoc:
       def before_validate #:nodoc: 
         self.month = month.to_i
         self.year  = year.to_i
-        self.start_month = start_month.to_i unless start_month.nil?
-        self.start_year = start_year.to_i unless start_year.nil?
+        # Set start date to nil unless user provided one
+        if !start_month.nil? && !start_month.blank?
+          self.start_month = start_month.to_i
+        else
+          self.start_month = nil
+        end
+        if !start_year.nil? && !start_year.blank?
+          self.start_year = start_year.to_i
+        else
+          self.start_year = nil
+        end
         self.number = number.to_s.gsub(/[^\d]/, "")
         self.type.downcase! if type.respond_to?(:downcase)
         self.type = self.class.type?(number) if type.blank?
@@ -140,12 +149,9 @@ module ActiveMerchant #:nodoc:
       end
       
       def validate_switch_or_solo_attributes #:nodoc:
-        if %w[switch solo].include?(type)
-          unless valid_month?(@start_month) && valid_start_year?(@start_year) || valid_issue_number?(@issue_number)
-            errors.add :start_month,  "is invalid"      unless valid_month?(@start_month)
-            errors.add :start_year,   "is invalid"      unless valid_start_year?(@start_year)
-            errors.add :issue_number, "cannot be empty" unless valid_issue_number?(@issue_number)
-          end
+        if @start_month && @start_year
+          errors.add :start_month,  "is invalid"      unless valid_month?(@start_month)
+          errors.add :start_year,   "is invalid"      unless valid_start_year?(@start_year)
         end
       end
       

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

@@ -245,19 +245,17 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), :required => true)
         
         start_date = format_date(credit_card.start_month, credit_card.start_year)
-        add_pair(post, :StartDate, start_date) if start_date
+        if start_date
+          print "Adding StartDate #{start_date}\n"
+          add_pair(post, :StartDate, start_date)
+        end
         
         unless credit_card.issue_number.blank?
           issue_number = sprintf("%02d", credit_card.issue_number.to_i)
+          print "Adding IssueNumber #{issue_number}\n"
           add_pair(post, :IssueNumber, issue_number)
         end
         
-        #if requires_start_date_or_issue_number?(credit_card)
-        if credit_card.start_month && credit_card.start_year
-          add_pair(post, :StartDate, format_date(credit_card.start_month, credit_card.start_year))
-        end
-        add_pair(post, :IssueNumber, credit_card.issue_number) if credit_card.issue_number
-        #end
         add_pair(post, :CardType, map_card_type(credit_card))
         
         add_pair(post, :CV2, credit_card.verification_value)
@@ -282,7 +280,7 @@ module ActiveMerchant #:nodoc:
       
       # MMYY format
       def format_date(month, year)
-        return nil if year.blank? || month.blank?
+        return nil if year.nil? || month.nil? || year.blank? || month.blank?
         
         year  = sprintf("%.4i", year)
         month = sprintf("%.2i", month)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tomriley-active_merchant
 version: !ruby/object:Gem::Version 
-  version: 1.4.2.6
+  version: 1.4.2.7
 platform: ruby
 authors: 
 - Tobias Luetke