activemerchant 1.4.2 → 1.5.0

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
         base.cattr_accessor :signature
       end
       
-      API_VERSION = '52.0'
+      API_VERSION = '59.0'
       
       URLS = {
         :test => { :certificate => 'https://api.sandbox.paypal.com/2.0/',
@@ -133,6 +133,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'AuthorizationID', authorization
             xml.tag! 'Amount', amount(money), 'currencyID' => options[:currency] || currency(money)
             xml.tag! 'CompleteType', 'Complete'
+            xml.tag! 'InvoiceID', options[:order_id] unless options[:order_id].blank?
             xml.tag! 'Note', options[:description]
           end
         end

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # The PayPal gateway for PayPal Website Payments Pro Canada only supports Visa and MasterCard
     class PaypalCaGateway < PaypalGateway
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = [:visa, :master, :american_express]
       self.supported_countries = ['CA']
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside'
       self.display_name = 'PayPal Website Payments Pro (CA)'

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

@@ -1,5 +1,3 @@
-# Author::    MoneySpyder, http://moneyspyder.co.uk
-
 module ActiveMerchant
   module Billing
     #
@@ -99,7 +97,7 @@ module ActiveMerchant
       # Purchase the item straight away
       # 
       # Parameters:
-      #   -money: Money object for the total to be charged
+      #   -money: Amount to be charged as an Integer value in cents
       #   -authorization: the PSL cross reference from the previous authorization
       #   -options:
       #
@@ -127,7 +125,7 @@ module ActiveMerchant
       # is available and only 'reserves' the nominal amount (currently a pound and a penny)
       # 
       # Parameters:
-      #   -money: Money object for the total to be charged
+      #   -money: Amount to be charged as an Integer value in cents
       #   -authorization: the PSL cross reference from the previous authorization
       #   -options:
       #
@@ -151,7 +149,7 @@ module ActiveMerchant
       # Captures the funds from an authorized transaction. 
       # 
       # Parameters:
-      #   -money: Money object for the total to be charged
+      #   -money: Amount to be charged as an Integer value in cents
       #   -authorization: The PSL Cross Reference
       #   -options:
       #
@@ -230,7 +228,7 @@ module ActiveMerchant
       # however PSL requires the ISO 4217:2001 Numeric code.
       # 
       # Parameters:
-      #   -money: Money object with the amount and currency
+      #   -money: Integer value in cents
       #   
       # Returns:
       #   -the ISO 4217:2001 Numberic currency code

data/lib/active_merchant/billing/gateways/sage/sage_core.rb

@@ -55,7 +55,13 @@ module ActiveMerchant #:nodoc:
         
         post[:C_address]    = billing_address[:address1]
         post[:C_city]       = billing_address[:city]
-        post[:C_state]      = billing_address[:state]
+        
+        if ['US', 'CA'].include?(billing_address[:country])
+          post[:C_state]    = billing_address[:state]
+        else
+          post[:C_state]    = "Outside of United States"
+        end
+        
         post[:C_zip]        = billing_address[:zip]
         post[:C_country]    = billing_address[:country] 
         post[:C_telephone]  = billing_address[:phone]

data/lib/active_merchant/billing/gateways/{protx.rb → sage_pay.rb}

@@ -1,13 +1,13 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    class ProtxGateway < Gateway  
+    class SagePayGateway < Gateway  
       cattr_accessor :simulate
       self.simulate = false
       
-      TEST_URL = 'https://ukvpstest.protx.com/vspgateway/service'
-      LIVE_URL = 'https://ukvps.protx.com/vspgateway/service'
-      SIMULATOR_URL = 'https://ukvpstest.protx.com/VSPSimulator'
-    
+      TEST_URL = 'https://test.sagepay.com/gateway/service'
+      LIVE_URL = 'https://live.sagepay.com/gateway/service'
+      SIMULATOR_URL = 'https://test.sagepay.com/Simulator'
+      
       APPROVED = 'OK'
     
       TRANSACTIONS = {
@@ -15,7 +15,8 @@ module ActiveMerchant #:nodoc:
         :credit => 'REFUND',
         :authorization => 'DEFERRED',
         :capture => 'RELEASE',
-        :void => 'VOID'
+        :void => 'VOID',
+        :abort => 'ABORT'
       }
       
       CREDIT_CARDS = {
@@ -44,8 +45,8 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['GB']
       self.default_currency = 'GBP'
       
-      self.homepage_url = 'http://www.protx.com'
-      self.display_name = 'Protx'
+      self.homepage_url = 'http://www.sagepay.com'
+      self.display_name = 'SagePay'
 
       def initialize(options = {})
         requires!(options, :login)
@@ -99,9 +100,11 @@ module ActiveMerchant #:nodoc:
         post = {}
         
         add_reference(post, identification)
-        commit(:void, post)
+        action = abort_or_void_from(identification)
+
+        commit(action, post)
       end
-      
+
       # Crediting requires a new order_id to passed in, as well as a description
       def credit(money, identification, options = {})
         requires!(options, :order_id, :description)
@@ -145,29 +148,35 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        add_pair(post, :BillingEmail, options[:email][0,255]) unless options[:email].blank?
-        add_pair(post, :ContactNumber, options[:phone].gsub(/[^0-9+]/, '')[0,20]) unless options[:phone].blank?
-        add_pair(post, :ContactFax, options[:fax].gsub(/[^0-9+]/, '')[0,20]) unless options[:fax].blank?
+        add_pair(post, :CustomerEMail, options[:email][0,255]) unless options[:email].blank?
+        add_pair(post, :BillingPhone, options[:phone].gsub(/[^0-9+]/, '')[0,20]) unless options[:phone].blank?
         add_pair(post, :ClientIPAddress, options[:ip])
       end
 
       def add_address(post, options)
-        address = options[:billing_address] || options[:address]
-        shipping_address = options[:shipping_address] || ''
+        if billing_address = options[:billing_address] || options[:address]
+          first_name, last_name = parse_first_and_last_name(billing_address[:name])
+          add_pair(post, :BillingSurname, last_name)
+          add_pair(post, :BillingFirstnames, first_name)
+          add_pair(post, :BillingAddress1, billing_address[:address1])
+          add_pair(post, :BillingAddress2, billing_address[:address2])
+          add_pair(post, :BillingCity, billing_address[:city])
+          add_pair(post, :BillingState, billing_address[:state]) if billing_address[:country] == 'US'
+          add_pair(post, :BillingCountry, billing_address[:country])
+          add_pair(post, :BillingPostCode, billing_address[:zip])
+        end
         
-        return if address.blank?
-
-        billing = "#{address[:address1]}\n#{address[:address2]}\n#{address[:city]}\n#{address[:state]}"
-
-        add_pair(post, :BillingAddress, billing)
-        add_pair(post, :BillingPostcode, address[:zip])
-
-        return if shipping_address.blank?
-
-        shipping = "#{shipping_address[:address1]}\n#{shipping_address[:address2]}\n#{shipping_address[:city]}\n#{shipping_address[:state]}"
-
-        add_pair(post, :DeliveryAddress, shipping)
-        add_pair(post, :DeliveryPostcode, shipping_address[:zip])
+        if shipping_address = options[:shipping_address] || billing_address
+          first_name, last_name = parse_first_and_last_name(shipping_address[:name])
+          add_pair(post, :DeliverySurname, last_name)
+          add_pair(post, :DeliveryFirstnames, first_name)
+          add_pair(post, :DeliveryAddress1, shipping_address[:address1])
+          add_pair(post, :DeliveryAddress2, shipping_address[:address2])
+          add_pair(post, :DeliveryCity, shipping_address[:city])
+          add_pair(post, :DeliveryState, shipping_address[:state]) if shipping_address[:country] == 'US'
+          add_pair(post, :DeliveryCountry, shipping_address[:country])
+          add_pair(post, :DeliveryPostCode, shipping_address[:zip])
+        end
       end
 
       def add_invoice(post, options)
@@ -222,7 +231,7 @@ module ActiveMerchant #:nodoc:
           
         Response.new(response["Status"] == APPROVED, message_from(response), response,
           :test => test?,
-          :authorization => authorization_from(response, parameters),
+          :authorization => authorization_from(response, parameters, action),
           :avs_result => { 
             :street_match => AVS_CVV_CODE[ response["AddressResult"] ],
             :postal_match => AVS_CVV_CODE[ response["PostCodeResult"] ],
@@ -231,13 +240,19 @@ module ActiveMerchant #:nodoc:
         )
       end
       
-      def authorization_from(response, params)
+      def authorization_from(response, params, action)
          [ params[:VendorTxCode],
            response["VPSTxId"],
            response["TxAuthNo"],
-           response["SecurityKey"] ].join(";")
+           response["SecurityKey"],
+           action ].join(";")
       end
-      
+
+      def abort_or_void_from(identification)
+        original_transaction = identification.split(';').last
+        original_transaction == 'authorization' ? :abort : :void
+      end
+
       def url_for(action)
         simulate ? build_simulator_url(action) : build_url(action)
       end
@@ -260,24 +275,34 @@ module ActiveMerchant #:nodoc:
         parameters.update(
           :Vendor => @options[:login],
           :TxType => TRANSACTIONS[action],
-          :VPSProtocol => "2.22"
+          :VPSProtocol => "2.23"
         )
         
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
       
-      # Protx returns data in the following format
+      # SagePay returns data in the following format
       # Key1=value1
       # Key2=value2
       def parse(body)
         result = {}
-        body.to_a.each { |pair| result[$1] = $2 if pair.strip =~ /\A([^=]+)=(.+)\Z/im }
+        body.to_s.each_line do |pair|
+          result[$1] = $2 if pair.strip =~ /\A([^=]+)=(.+)\Z/im
+        end
         result
       end
 
       def add_pair(post, key, value, options = {})
         post[key] = value if !value.blank? || options[:required]
       end
+
+      def parse_first_and_last_name(value)
+        name = value.to_s.split(' ')
+        
+        last_name = name.pop || ''
+        first_name = name.join(' ')
+        [ first_name[0,20], last_name[0,20] ]
+      end
     end
   end
 end

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

@@ -0,0 +1,144 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class SallieMaeGateway < Gateway
+      URL = 'https://trans.salliemae.com/cgi-bin/process.cgi'
+
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['US']
+
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+
+      # The homepage URL of the gateway
+      self.homepage_url = 'http://www.salliemae.com/'
+
+      # The name of the gateway
+      self.display_name = 'Sallie Mae'
+
+      def initialize(options = {})
+        requires!(options, :login)
+        @options = options
+        super
+      end
+      
+      def test?
+        @options[:login] == "TEST0"
+      end
+
+      def authorize(money, creditcard, options = {})
+        post = PostData.new
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, creditcard, options)
+        add_customer_data(post, options)
+
+        commit(:authonly, money, post)
+      end
+
+      def purchase(money, creditcard, options = {})
+        post = PostData.new
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, creditcard, options)
+        add_customer_data(post, options)
+
+        commit(:sale, money, post)
+      end
+
+      def capture(money, authorization, options = {})
+        post = PostData.new
+        post[:postonly] = authorization
+        commit(:capture, money, post)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        if address = options[:billing_address] || options[:shipping_address] || options[:address]
+          post[:ci_phone] = address[:phone].to_s
+        end
+
+        post[:ci_email] = options[:email].to_s unless options[:email].blank?
+        post[:ci_IP]    = options[:ip].to_s unless options[:ip].blank?
+      end
+
+      def add_address(post, creditcard, options)
+        if address = options[:billing_address] || options[:address]
+          post[:ci_billaddr1] = address[:address1].to_s
+          post[:ci_billaddr2] = address[:address2].to_s unless address[:address2].blank?
+          post[:ci_billcity]  = address[:city].to_s
+          post[:ci_billstate] = address[:state].to_s
+          post[:ci_billzip]   = address[:zip].to_s
+        end
+
+        if shipping_address = options[:shipping_address] || options[:address]
+          post[:ci_shipaddr1] = shipping_address[:address1].to_s
+          post[:ci_shipaddr2] = shipping_address[:address2].to_s unless shipping_address[:address2].blank?
+          post[:ci_shipcity]  = shipping_address[:city].to_s
+          post[:ci_shipstate] = shipping_address[:state].to_s
+          post[:ci_shipzip]   = shipping_address[:zip].to_s
+        end
+      end
+
+      def add_invoice(post, options)
+        memo = "OrderID: #{options[:order_id]}\nDescription: #{options[:description]}"
+        post[:ci_memo] = memo
+      end
+
+      def add_creditcard(post, creditcard)
+        post[:ccnum]   = creditcard.number.to_s
+        post[:ccname]  = creditcard.name.to_s
+        post[:cvv2]    = creditcard.verification_value.to_s if creditcard.verification_value?
+        post[:expmon]  = creditcard.month.to_s
+        post[:expyear] = creditcard.year.to_s
+      end
+
+      def parse(body)
+        h = {}
+        body.gsub!("<html><body><plaintext>", "")
+        body.
+          split("\r\n").
+          map do |i|
+            a = i.split("=")
+            h[a.first] = a.last unless a.first.nil?
+          end
+        h
+      end
+
+      def commit(action, money, parameters)
+        parameters[:acctid] = @options[:login].to_s
+        parameters[:subid]  = @options[:sub_id].to_s unless @options[:sub_id].blank?
+        parameters[:amount] = amount(money)
+
+        case action
+        when :sale
+          parameters[:action] = "ns_quicksale_cc"
+        when :authonly
+          parameters[:action] = "ns_quicksale_cc"
+          parameters[:authonly] = 1
+        when :capture
+          parameters[:action] = "ns_quicksale_cc"
+        end
+
+        response = parse(ssl_post(URL, parameters.to_post_data) || "")
+        Response.new(successful?(response), message_from(response), response,
+          :test => test?,
+          :authorization => response["refcode"]
+        )
+      end
+
+      def successful?(response)
+        response["Status"] == "Accepted"
+      end
+
+      def message_from(response)
+        if successful?(response)
+          "Accepted"
+        else
+          response["Reason"].split(":")[2].capitalize unless response["Reason"].nil?
+        end
+      end
+    end
+  end
+end
+

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

@@ -23,7 +23,7 @@ module ActiveMerchant #:nodoc:
       
       private
       def split(response)
-        response.split('%')
+        response.split(',')
       end
     end
   end

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

@@ -1,10 +1,17 @@
+#!ruby19
+# encoding: utf-8
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SkipJackGateway < Gateway
       API_VERSION = '?.?'
-      LIVE_URL = "https://www.skipjackic.com/scripts/evolvcc.dll"
-      TEST_URL = "https://developer.skipjackic.com/scripts/evolvcc.dll"
-
+      
+      LIVE_HOST = "https://www.skipjackic.com" 
+      TEST_HOST = "https://developer.skipjackic.com"
+      
+      BASIC_PATH = "/scripts/evolvcc.dll"
+      ADVANCED_PATH = "/evolvcc/evolvcc.aspx"
+      
       ACTIONS = {
         :authorization => 'AuthorizeAPI',
         :change_status => 'SJAPI_TransactionChangeStatusRequest',
@@ -127,9 +134,9 @@ module ActiveMerchant #:nodoc:
         '-88' => 'Point of Sale check account number missing or invalid Point of Sale check account number is invalid or empty.',
         '-89' => 'Point of Sale check MICR missing or invalid Point of Sale check MICR invalid or empty.',
         '-90' => 'Point of Sale check number missing or invalid Point of Sale check number invalid or empty.',
-        '-91' => 'CVV2 Invalid or empty “Make CVV a required field feature” enabled (New feature 01 April 2006) in the Merchant Account Setup interface but no CVV code was sent in the transaction data.',
+        '-91' => 'CVV2 Invalid or empty "Make CVV a required field feature" enabled (New feature 01 April 2006) in the Merchant Account Setup interface but no CVV code was sent in the transaction data.',
         '-92' => 'Approval Code Invalid Approval Code Invalid. Approval Code is a 6 digit code.',
-        '-93' => 'Blind Credits Request Refused “Allow Blind Credits” option must be enabled on the Skipjack Merchant Account.',
+        '-93' => 'Blind Credits Request Refused "Allow Blind Credits" option must be enabled on the Skipjack Merchant Account.',
         '-94' => 'Blind Credits Failed',
         '-95' => 'Voice Authorization Request Refused Voice Authorization option must be enabled on the Skipjack Merchant Account.',
         '-96' => 'Voice Authorizations Failed',
@@ -170,6 +177,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:login</tt> -- The SkipJack Merchant Serial Number.
       # * <tt>:password</tt> -- The SkipJack Developer Serial Number.
       # * <tt>:test => +true+ or +false+</tt> -- Use the test or live SkipJack url.
+      # * <tt>:advanced => +true+ or +false+</tt> -- Set to true if you're using an advanced processor
+      # See the SkipJack Integration Guide for details. (default: +false+)
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options
@@ -236,12 +245,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def status(order_id)
-        post = { }
-        post[:szOrderNumber] = :order_id
-        commit(:get_status, nil, post)
+        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
@@ -263,7 +275,8 @@ module ActiveMerchant #:nodoc:
       end
       
       def url_for(action)
-        result = test? ? TEST_URL : LIVE_URL
+        result = test? ? TEST_HOST : LIVE_HOST
+        result += advanced? && action == :authorization ? ADVANCED_PATH : BASIC_PATH
         result += "?#{ACTIONS[action]}"
       end