activemerchant 1.28.0 → 1.29.1

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

@@ -5,21 +5,21 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SkipJackGateway < Gateway
       API_VERSION = '?.?'
-      
-      self.live_url = "https://www.skipjackic.com" 
+
+      self.live_url = "https://www.skipjackic.com"
       self.test_url = "https://developer.skipjackic.com"
-      
+
       BASIC_PATH = "/scripts/evolvcc.dll"
       ADVANCED_PATH = "/evolvcc/evolvcc.aspx"
-      
+
       ACTIONS = {
         :authorization => 'AuthorizeAPI',
         :change_status => 'SJAPI_TransactionChangeStatusRequest',
         :get_status => 'SJAPI_TransactionStatusRequest'
       }
-      
+
       SUCCESS_MESSAGE = 'The transaction was successful.'
-      
+
       MONETARY_CHANGE_STATUSES = ['SETTLE', 'AUTHORIZE', 'AUTHORIZE ADDITIONAL', 'CREDIT', 'SPLITSETTLE']
 
       CARD_CODE_ERRORS = %w( N S "" )
@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
         '4' => 'Pending Manual Settlement',
         '5' => 'Pending Recurring'
       }
-      
+
       RETURN_CODE_MESSAGES = {
         '-1' => 'Data was not by received intact by Skipjack Transaction Network.',
         '0' => 'Communication Failure. Error in Request and Response at IP level.',
@@ -161,17 +161,17 @@ module ActiveMerchant #:nodoc:
         '-116' => 'POS Check Invalid Lane Number POS Check lane or cash register number is invalid. Use a valid lane or cash register number that has been configured in the Skipjack Merchant Account.',
         '-117' => 'POS Check Invalid Cashier Number'
       }
-      
+
       self.supported_countries = ['US', 'CA']
       self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :discover, :diners_club]
       self.homepage_url = 'http://www.skipjack.com/'
       self.display_name = 'SkipJack'
 
       # Creates a new SkipJackGateway
-      # 
+      #
       # The gateway requires that a valid login and password be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:login</tt> -- The SkipJack Merchant Serial Number.
@@ -181,14 +181,9 @@ module ActiveMerchant #:nodoc:
       # See the SkipJack Integration Guide for details. (default: +false+)
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
-      
-      def test?
-        @options[:test] || super
-      end
-    
+
       def authorize(money, creditcard, options = {})
         requires!(options, :order_id, :email)
         post = {}
@@ -210,13 +205,13 @@ module ActiveMerchant #:nodoc:
       end
 
       # Captures the funds from an authorized transaction.
-      # 
+      #
       # ==== Parameters
       #
       # * <tt>money</tt> -- The amount to be capture as an Integer in cents.
       # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.
       # * <tt>options</tt> -- A hash of optional parameters.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:force_settlement</tt> -- Force the settlement to occur as soon as possible. This option is not supported by other gateways. See the SkipJack API reference for more details
@@ -252,24 +247,24 @@ module ActiveMerchant #:nodoc:
       def status(order_id)
         commit(:get_status, nil, :szOrderNumber => order_id)
       end
-      
+
       private
-      
+
       def advanced?
         @options[:advanced]
       end
-      
+
       def add_forced_settlement(post, options)
         post[:szForceSettlement] = options[:force_settlment] ? 1 : 0
       end
-      
+
       def add_status_action(post, action)
         post[:szDesiredStatus] = action
       end
-      
+
       def commit(action, money, parameters)
         response = parse( ssl_post( url_for(action), post_data(action, money, parameters) ), action )
-        
+
         # Pass along the original transaction id in the case an update transaction
         Response.new(response[:success], message_from(response, action), response,
           :test => test?,
@@ -278,13 +273,13 @@ module ActiveMerchant #:nodoc:
           :cvv_result => response[:szCVV2ResponseCode]
         )
       end
-      
+
       def url_for(action)
         result = test? ? self.test_url : self.live_url
         result += advanced? && action == :authorization ? ADVANCED_PATH : BASIC_PATH
         result += "?#{ACTIONS[action]}"
       end
-      
+
       def add_credentials(params, action)
         if action == :authorization
           params[:SerialNumber] = @options[:login]
@@ -294,7 +289,7 @@ module ActiveMerchant #:nodoc:
           params[:szDeveloperSerialNumber] = @options[:password]
         end
       end
-      
+
       def add_amount(params, action, money)
         if action == :authorization
           params[:TransactionAmount] = amount(money)
@@ -313,7 +308,7 @@ module ActiveMerchant #:nodoc:
           parse_status_response(body, [ :SerialNumber, :TransactionAmount, :DesiredStatus, :StatusResponse, :StatusResponseMessage, :OrderNumber, :AuditID ])
         end
       end
-      
+
       def split_lines(body)
         body.split(/[\r\n]+/)
       end
@@ -321,13 +316,13 @@ module ActiveMerchant #:nodoc:
       def split_line(line)
         line.split(/","/).collect { |key| key.sub(/"*([^"]*)"*/, '\1').strip; }
       end
-      
+
       def authorize_response_map(body)
         lines = split_lines(body)
         keys, values = split_line(lines[0]), split_line(lines[1])
         Hash[*(keys.zip(values).flatten)].symbolize_keys
       end
-      
+
       def parse_authorization_response(body)
         result = authorize_response_map(body)
         result[:success] = (result[:szIsApproved] == '1')
@@ -374,7 +369,7 @@ module ActiveMerchant #:nodoc:
         post[:CustomerCode] = options[:customer].to_s.slice(0, 17)
         post[:InvoiceNumber] = options[:invoice]
         post[:OrderDescription] = options[:description]
-        
+
         if order_items = options[:items]
           post[:OrderString] = order_items.collect { |item| "#{item[:sku]}~#{item[:description].tr('~','-')}~#{item[:declared_value]}~#{item[:quantity]}~#{item[:taxable]}~~~~~~~~#{item[:tax_rate]}~||"}.join
         else
@@ -405,7 +400,7 @@ module ActiveMerchant #:nodoc:
           post[:Phone]          = address[:phone]
           post[:Fax]            = address[:fax]
         end
-        
+
         if address = options[:shipping_address]
           post[:ShipToName]           = address[:name]
           post[:ShipToStreetAddress]  = address[:address1]
@@ -417,7 +412,7 @@ module ActiveMerchant #:nodoc:
           post[:ShipToPhone]          = address[:phone]
           post[:ShipToFax]            = address[:fax]
         end
-        
+
         # The phone number for the shipping address is required
         # Use the billing address phone number if a shipping address
         # phone number wasn't provided
@@ -449,7 +444,7 @@ module ActiveMerchant #:nodoc:
       def message_from_status(response)
         response[:success] ? SUCCESS_MESSAGE : response[:szErrorMessage]
       end
-      
+
       def sanitize_order_id(value)
         value.to_s.gsub(/[^\w.]/, '')
       end

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

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'check.rb')
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SmartPs < Gateway #:nodoc:
-      
+
       ##
       # This is the base gateway for processors who use the smartPS processing system
 
@@ -11,13 +11,12 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
-      end  
-      
-      # Pass :store => true in the options to store the 
-      # payment info at the gateway and get a generated 
-      # customer_vault_id in the response.  
+      end
+
+      # Pass :store => true in the options to store the
+      # payment info at the gateway and get a generated
+      # customer_vault_id in the response.
       # Pass :store => some_number_or_string to specify the
       # customer_vault_id the gateway should use (make sure it's
       # unique).
@@ -33,7 +32,7 @@ module ActiveMerchant #:nodoc:
         add_processor(post, options)
         commit('auth', money, post)
       end
-      
+
       def purchase(money, payment_source, options = {})
         post = {}
         add_invoice(post, options)
@@ -43,26 +42,26 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_currency(post, money, options)
         add_taxes(post, options)
-        add_processor(post, options)     
+        add_processor(post, options)
         commit('sale', money, post)
-      end                       
-    
+      end
+
       def capture(money, authorization, options = {})
         post ={}
         post[:transactionid] = authorization
         commit('capture', money, post)
       end
-      
+
       def void(authorization, options = {})
         post ={}
         post[:transactionid] = authorization
         commit('void', nil, post)
       end
-      
+
       def credit(money, payment_source, options = {})
         post = {}
         add_invoice(post, options)
-        add_payment_source(post, payment_source, options)        
+        add_payment_source(post, payment_source, options)
         add_address(post, options[:billing_address] || options[:address])
         add_customer_data(post, options)
         add_sku(post,options)
@@ -70,14 +69,14 @@ module ActiveMerchant #:nodoc:
         add_processor(post, options)
         commit('credit', money, post)
       end
-      
+
       def refund(money, auth, options = {})
         post = {}
         add_transaction(post, auth)
         commit('refund', money, post)
       end
-      
-      
+
+
       # Update the values (such as CC expiration) stored at
       # the gateway.  The CC number must be supplied in the
       # CreditCard object.
@@ -85,13 +84,13 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:customer_vault] = "update_customer"
         add_customer_vault_id(post, vault_id)
-        add_creditcard(post, creditcard, options)        
+        add_creditcard(post, creditcard, options)
         add_address(post, options[:billing_address] || options[:address])
         add_customer_data(post, options)
-             
+
         commit(nil, nil, post)
       end
-      
+
       # Amend an existing transaction
       def amend(auth, options = {})
         post = {}
@@ -99,15 +98,15 @@ module ActiveMerchant #:nodoc:
         add_transaction(post, auth)
         commit('update', nil, post)
       end
-      
-    
+
+
       def delete(vault_id)
         post = {}
         post[:customer_vault] = "delete_customer"
-        add_customer_vault_id(post, vault_id)         
+        add_customer_vault_id(post, vault_id)
         commit(nil, nil, post)
       end
-    
+
       # To match the other stored-value gateways, like TrustCommerce,
       # store and unstore need to be defined
       def store(payment_source, options = {})
@@ -118,10 +117,10 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         commit(nil, nil, post)
       end
-      
+
       alias_method :unstore, :delete
 
-      private                             
+      private
       def add_customer_data(post, options)
         if options.has_key? :email
           post[:email] = options[:email]
@@ -129,23 +128,23 @@ module ActiveMerchant #:nodoc:
 
         if options.has_key? :ip
           post[:ipaddress] = options[:ip]
-        end        
+        end
       end
 
-      def add_address(post, address,prefix="")     
-        prefix +="_" unless prefix.blank? 
+      def add_address(post, address,prefix="")
+        prefix +="_" unless prefix.blank?
         unless address.blank? or address.values.blank?
           post[prefix+"address1"]    = address[:address1].to_s
           post[prefix+"address2"]    = address[:address2].to_s unless address[:address2].blank?
           post[prefix+"company"]    = address[:company].to_s
           post[prefix+"phone"]      = address[:phone].to_s
-          post[prefix+"zip"]        = address[:zip].to_s       
+          post[prefix+"zip"]        = address[:zip].to_s
           post[prefix+"city"]       = address[:city].to_s
           post[prefix+"country"]    = address[:country].to_s
           post[prefix+"state"]      = address[:state].blank?  ? 'n/a' : address[:state]
-        end         
+        end
       end
-      
+
       def add_currency(post, money, options)
         post[:currency] = options[:currency] || currency(money)
       end
@@ -157,11 +156,11 @@ module ActiveMerchant #:nodoc:
       def add_processor(post, options)
         post[:processor] = options[:processor] unless options[:processor].nil?
       end
-      
+
       def add_invoice(post, options)
         post[:orderid] = options[:order_id].to_s.gsub(/[^\w.]/, '')
       end
-      
+
       def add_payment_source(params, source, options={})
         case determine_funding_source(source)
         when :vault       then add_customer_vault_id(params, source)
@@ -169,13 +168,13 @@ module ActiveMerchant #:nodoc:
         when :check       then add_check(params, source, options)
         end
       end
-      
+
       def add_customer_vault_id(params, vault_id)
         params[:customer_vault_id] = vault_id
       end
-      
+
       def add_creditcard(post, creditcard, options)
-        if options[:store]  
+        if options[:store]
           post[:customer_vault] = "add_customer"
           post[:customer_vault_id] = options[:store] unless options[:store] == true
         end
@@ -183,15 +182,15 @@ module ActiveMerchant #:nodoc:
         post[:cvv] = creditcard.verification_value if creditcard.verification_value?
         post[:ccexp]  = expdate(creditcard)
         post[:firstname] = creditcard.first_name
-        post[:lastname]  = creditcard.last_name   
+        post[:lastname]  = creditcard.last_name
       end
-      
+
       def add_check(post, check, options)
-        if options[:store]  
+        if options[:store]
           post[:customer_vault] = "add_customer"
           post[:customer_vault_id] = options[:store] unless options[:store] == true
         end
-        
+
         post[:payment] = 'check' # Set transaction to ACH
         post[:checkname] = check.name # The name on the customer's Checking Account
         post[:checkaba] = check.routing_number # The customer's bank routing number
@@ -199,44 +198,44 @@ module ActiveMerchant #:nodoc:
         post[:account_holder_type] = check.account_holder_type # The customer's type of ACH account
         post[:account_type] = check.account_type # The customer's type of ACH account
       end
-      
+
       def add_sku(post,options)
         post["product_sku_#"] = options[:sku] || options["product_sku_#"]
       end
-      
+
       def add_transaction(post, auth)
         post[:transactionid] = auth
       end
-      
+
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
           key,val = pair.split(/=/)
           results[key] = val
         end
-        
+
         results
-      end     
-      
+      end
+
       def commit(action, money, parameters)
         parameters[:amount]  = amount(money) if money
         response = parse( ssl_post(self.live_url, post_data(action,parameters)) )
-        Response.new(response["response"] == "1", message_from(response), response, 
+        Response.new(response["response"] == "1", message_from(response), response,
           :authorization => response["transactionid"],
           :test => test?,
           :cvv_result => response["cvvresponse"],
           :avs_result => { :code => response["avsresponse"] }
         )
-        
+
       end
-      
+
       def expdate(creditcard)
         year  = sprintf("%.04i", creditcard.year.to_i)
         month = sprintf("%.02i", creditcard.month.to_i)
 
         "#{month}#{year[-2..-1]}"
       end
-      
+
 
       def message_from(response)
         case response["responsetext"]
@@ -248,7 +247,7 @@ module ActiveMerchant #:nodoc:
           response["responsetext"]
         end
       end
-      
+
       def post_data(action, parameters = {})
         post = {}
         post[:username]      = @options[:login]
@@ -256,18 +255,18 @@ module ActiveMerchant #:nodoc:
         post[:type]       = action if action
 
         request = post.merge(parameters).map {|key,value| "#{key}=#{CGI.escape(value.to_s)}"}.join("&")
-        request        
+        request
       end
-      
+
       def determine_funding_source(source)
-        case 
+        case
         when source.is_a?(String) then :vault
         when CreditCard.card_companies.keys.include?(card_brand(source)) then :credit_card
         when card_brand(source) == 'check' then :check
         else raise ArgumentError, "Unsupported funding source provided"
         end
       end
-    end    
+    end
   end
 end
 

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
         'unchecked' => 'P'
       }
 
-      self.supported_countries = ['US']
+      self.supported_countries = ['US', 'CA']
       self.default_currency = 'USD'
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
@@ -48,6 +48,7 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         add_creditcard(post, creditcard, options)
         add_customer(post, options)
+        add_customer_data(post,options)
         post[:description] = options[:description] || options[:email]
         add_flags(post, options)
 
@@ -105,8 +106,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        post[:description] = options[:description]
-        post[:email] = options[:email]
+        metadata_options = [:description,:browser_ip,:user_agent,:referrer]
+        post.update(options.slice(*metadata_options))
+
+        post[:external_id] = options[:order_id]
+        post[:payment_user_agent] = "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}"
       end
 
       def add_address(post, options)
@@ -117,6 +121,7 @@ module ActiveMerchant #:nodoc:
           post[:card][:address_country] = address[:country] if address[:country]
           post[:card][:address_zip] = address[:zip] if address[:zip]
           post[:card][:address_state] = address[:state] if address[:state]
+          post[:card][:address_city] = address[:city] if address[:city]
         end
       end
 

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

@@ -7,36 +7,35 @@ module ActiveMerchant #:nodoc:
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://www.transfirst.com/'
       self.display_name = 'TransFirst'
-      
+
       UNUSED_FIELDS = %w(ECIValue UserId CAVVData TrackData POSInd EComInd MerchZIP MerchCustPNum MCC InstallmentNum InstallmentOf POSEntryMode POSConditionCode AuthCharInd CardCertData)
 
       DECLINED = 'The transaction was declined'
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
-      end  
-  
+      end
+
       def purchase(money, credit_card, options = {})
         post = {}
-        
+
         add_amount(post, money)
         add_invoice(post, options)
-        add_credit_card(post, credit_card)        
-        add_address(post, options)   
-             
+        add_credit_card(post, credit_card)
+        add_address(post, options)
+
         commit(post)
-      end                       
-  
-      private                       
+      end
+
+      private
       def add_amount(post, money)
         add_pair(post, :Amount, amount(money), :required => true)
       end
-      
+
       def add_address(post, options)
         address = options[:billing_address] || options[:address]
-        
+
         if address
           add_pair(post, :Address, address[:address1])
           add_pair(post, :ZipCode, address[:zip])
@@ -50,34 +49,34 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :PaymentDesc, options[:description], :required => true)
         add_pair(post, :TaxIndicator, 0)
       end
-      
+
       def add_credit_card(post, credit_card)
         add_pair(post, :CardHolderName, credit_card.name, :required => true)
         add_pair(post, :CardNumber, credit_card.number, :required => true)
-        
+
         add_pair(post, :Expiration, expdate(credit_card), :required => true)
         add_pair(post, :CVV2, credit_card.verification_value)
       end
-      
+
       def add_unused_fields(post)
         UNUSED_FIELDS.each do |f|
           post[f] = ""
         end
       end
-      
+
       def expdate(credit_card)
         year  = format(credit_card.year, :two_digits)
         month = format(credit_card.month, :two_digits)
 
         "#{month}#{year}"
       end
-      
+
       def parse(data)
         response = {}
-        
+
         xml = REXML::Document.new(data)
         root = REXML::XPath.first(xml, "//CCSaleDebitResponse")
-        
+
         if root.nil?
           response[:message] = data.to_s.strip
         else
@@ -85,21 +84,21 @@ module ActiveMerchant #:nodoc:
             response[node.name.underscore.to_sym] = node.text
           end
         end
-      
+
         response
       end
-      
-      def commit(params) 
+
+      def commit(params)
         response = parse( ssl_post(self.live_url, post_data(params)) )
 
-        Response.new(response[:status] == "Authorized", message_from(response), response, 
-          :test => test?, 
+        Response.new(response[:status] == "Authorized", message_from(response), response,
+          :test => test?,
           :authorization => response[:trans_id],
           :avs_result => { :code => response[:avs_code] },
           :cvv_result => response[:cvv2_code]
         )
       end
-      
+
       def message_from(response)
         case response[:message]
         when 'Call Voice Center'
@@ -108,16 +107,16 @@ module ActiveMerchant #:nodoc:
           response[:message]
         end
       end
-      
+
       def post_data(params = {})
         add_unused_fields(params)
         params[:MerchantID] = @options[:login]
         params[:RegKey] = @options[:password]
-        
+
         request = params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
         request
       end
-      
+
       def add_pair(post, key, value, options = {})
         post[key] = value if !value.blank? || options[:required]
       end