activemerchant 1.28.0 → 1.29.1

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

@@ -2,24 +2,24 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     #
     # CardStream supports the following credit cards, which are auto-detected by
-    # the gateway based on the card number used: 
-    # * AM American Express 
-    # * Diners Club 
-    # * Electron 
-    # * JCB 
-    # * UK Maestro 
-    # * Maestro International 
-    # * Mastercard 
-    # * Solo 
-    # * Style 
-    # * Switch 
-    # * Visa Credit 
-    # * Visa Debit 
-    # * Visa Purchasing 
+    # the gateway based on the card number used:
+    # * AM American Express
+    # * Diners Club
+    # * Electron
+    # * JCB
+    # * UK Maestro
+    # * Maestro International
+    # * Mastercard
+    # * Solo
+    # * Style
+    # * Switch
+    # * Visa Credit
+    # * Visa Debit
+    # * Visa Purchasing
     #
     class CardStreamGateway < Gateway
       self.live_url = self.test_url = 'https://gateway.cardstream.com/process.ashx'
-      
+
       self.money_format = :cents
       self.default_currency = 'GBP'
       self.supported_countries = ['GB']
@@ -29,7 +29,7 @@ module ActiveMerchant #:nodoc:
 
       APPROVED = '00'
 
-      CURRENCY_CODES = { 
+      CURRENCY_CODES = {
         "AUD"=> '036',
         "CAD"=> '124',
         "CZK"=> '203',
@@ -45,24 +45,24 @@ module ActiveMerchant #:nodoc:
         "USD"=> '840',
         "EUR"=> '978'
       }
-      
+
       TRANSACTIONS = {
         :purchase => 'ESALE_KEYED',
         :refund => 'EREFUND_KEYED',
         :authorization => 'ESALE_KEYED'
       }
-      
+
       CVV_CODE = {
-        '0' => 'U',  
+        '0' => 'U',
         '1' => 'P',
         '2' => 'M',
         '4' => 'N'
       }
-      
-      # 0 - No additional information available.  
-      # 1 - Postcode not checked.  
-      # 2 - Postcode matched.  
-      # 4 - Postcode not matched.  
+
+      # 0 - No additional information available.
+      # 1 - Postcode not checked.
+      # 2 - Postcode matched.
+      # 4 - Postcode not matched.
       # 8 - Postcode partially matched.
       AVS_POSTAL_MATCH = {
         "0" => nil,
@@ -71,11 +71,11 @@ module ActiveMerchant #:nodoc:
         "4" => "N",
         "8" => "N"
       }
-      
-      # 0 - No additional information available.  
-      # 1 - Address numeric not checked.  
-      # 2 - Address numeric matched.  
-      # 4 - Address numeric not matched.  
+
+      # 0 - No additional information available.
+      # 1 - Address numeric not checked.
+      # 2 - Address numeric matched.
+      # 4 - Address numeric not matched.
       # 8 - Address numeric partially matched.
       AVS_STREET_MATCH = {
         "0" => nil,
@@ -84,18 +84,17 @@ module ActiveMerchant #:nodoc:
         "4" => "N",
         "8" => "N"
       }
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
       def purchase(money, credit_card, options = {})
         requires!(options, :order_id)
-        
+
         post = {}
-        
+
         add_amount(post, money, options)
         add_invoice(post, money, credit_card, options)
         add_credit_card(post, credit_card)
@@ -104,9 +103,9 @@ module ActiveMerchant #:nodoc:
 
         commit(:purchase, post)
       end
-  
+
       private
-      
+
       def add_amount(post, money, options)
         add_pair(post, :Amount, amount(money), :required => true)
         add_pair(post, :CurrencyCode, currency_code(options[:currency] || currency(money)), :required => true)
@@ -119,7 +118,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, options)
         address = options[:billing_address] || options[:address]
-        
+
         return if address.nil?
 
         add_pair(post, :BillingStreet, address[:address1])
@@ -132,10 +131,10 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, credit_card, options)
         add_pair(post, :TransactionUnique, options[:order_id], :required => true)
         add_pair(post, :OrderDesc, options[:description] || options[:order_id], :required => true)
-        
+
         if [ 'american_express', 'diners_club' ].include?(card_brand(credit_card).to_s)
-          add_pair(post, :AEIT1Quantity,  1) 
-          add_pair(post, :AEIT1Description,  (options[:description] || options[:order_id]).slice(0, 15)) 
+          add_pair(post, :AEIT1Quantity,  1)
+          add_pair(post, :AEIT1Description,  (options[:description] || options[:order_id]).slice(0, 15))
           add_pair(post, :AEIT1GrossValue, amount(money))
         end
       end
@@ -143,20 +142,20 @@ module ActiveMerchant #:nodoc:
       def add_credit_card(post, credit_card)
         add_pair(post, :CardName, credit_card.name, :required => true)
         add_pair(post, :CardNumber, credit_card.number, :required => true)
-         
+
         add_pair(post, :ExpiryDateMM, format(credit_card.month, :two_digits), :required => true)
         add_pair(post, :ExpiryDateYY, format(credit_card.year, :two_digits), :required => true)
-         
+
         if requires_start_date_or_issue_number?(credit_card)
           add_pair(post, :StartDateMM, format(credit_card.start_month, :two_digits))
           add_pair(post, :StartDateYY, format(credit_card.start_year, :two_digits))
-          
+
           add_pair(post, :IssueNumber, credit_card.issue_number)
         end
-        
+
         add_pair(post, :CV2, credit_card.verification_value)
       end
-      
+
       def commit(action, parameters)
         response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
 
@@ -188,19 +187,19 @@ module ActiveMerchant #:nodoc:
           :ReturnAVSCV2Message => "YES",
           :CountryCode => '826' # 826 for UK based merchant
         )
-        
+
         add_pair(parameters, :Dispatch, action == :authorization ? "LATER" : "NOW")
-    
+
         parameters.collect { |key, value| "VP#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
-      
-      # VPCrossReference 
-      # The value in VPCrossReference on a success transaction will contain 
-      # a unique reference that you may use to run future transactions. 
-      # Please note that cross reference transactions must come a static IP 
-      # addressed that has been pre-registered with Cardstream. To 
-      # register an IP address please send it to support@cardstream.com 
-      # with your Cardstream issued merchant ID and it will be added to 
+
+      # VPCrossReference
+      # The value in VPCrossReference on a success transaction will contain
+      # a unique reference that you may use to run future transactions.
+      # Please note that cross reference transactions must come a static IP
+      # addressed that has been pre-registered with Cardstream. To
+      # register an IP address please send it to support@cardstream.com
+      # with your Cardstream issued merchant ID and it will be added to
       # your account.
       def parse(body)
         result = {}
@@ -209,14 +208,10 @@ module ActiveMerchant #:nodoc:
           a = pair.split("=")
           result[a[0].gsub(/^VP/,'').underscore.to_sym] = a[1]
         end
-        
+
         result
       end
 
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-      
       def currency_code(currency)
         CURRENCY_CODES[currency]
       end

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

@@ -26,7 +26,6 @@ module ActiveMerchant #:nodoc:
       #   Otherwise, perform transactions against the production server.
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 

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

@@ -107,15 +107,9 @@ module ActiveMerchant #:nodoc:
       #                       if CVV would have failed
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
-      # Should run against the test servers or not?
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-
       # Request an authorization for an amount from CyberSource
       #
       # You must supply an :order_id in the options hash
@@ -148,12 +142,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, identification, options = {})
-        commit(build_credit_request(money, identification, options), options)
+        commit(build_refund_request(money, identification, options), options)
       end
 
-      def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, identification, options)
+      # Adds credit to a subscription (stand alone credit).
+      def credit(money, reference, options = {})
+        requires!(options, :order_id)
+        commit(build_credit_request(money, reference, options), options)
       end
 
       # Stores a customer subscription/profile with type "on-demand".
@@ -281,7 +276,7 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_credit_request(money, identification, options)
+      def build_refund_request(money, identification, options)
         order_id, request_id, request_token = identification.split(";")
         options[:order_id] = order_id
 
@@ -292,6 +287,16 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_credit_request(money, reference, options)
+        xml = Builder::XmlMarkup.new :indent => 2
+
+        add_purchase_data(xml, money, true, options)
+        add_subscription(xml, options, reference)
+        add_credit_service(xml)
+
+        xml.target!
+      end
+
       def build_create_subscription_request(creditcard, options)
         options[:subscription] = (options[:subscription] || {}).merge(:frequency => "on-demand", :amount => 0, :automatic_renew => false)
 
@@ -435,10 +440,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_credit_service(xml, request_id, request_token)
+      def add_credit_service(xml, request_id = nil, request_token = nil)
         xml.tag! 'ccCreditService', {'run' => 'true'} do
-          xml.tag! 'captureRequestID', request_id
-          xml.tag! 'captureRequestToken', request_token
+          xml.tag! 'captureRequestID', request_id if request_id
+          xml.tag! 'captureRequestToken', request_token if request_token
         end
       end