activemerchant 1.43.3 → 1.44.0

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

@@ -9,9 +9,9 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'DKK'
       self.money_format = :cents
       self.supported_cardtypes = [:dankort, :forbrugsforeningen, :visa, :master, :american_express, :diners_club, :jcb, :maestro]
-      self.supported_countries = ['DK', 'SE']
-      self.homepage_url = 'http://quickpay.dk/'
-      self.display_name = 'Quickpay'
+      self.supported_countries = ['DE', 'DK', 'ES', 'FI', 'FR', 'FO', 'GB', 'IS', 'NO', 'SE']
+      self.homepage_url = 'http://quickpay.net/'
+      self.display_name = 'QuickPay'
 
       MD5_CHECK_FIELDS = {
         3 => {
@@ -120,11 +120,11 @@ module ActiveMerchant #:nodoc:
 
           :chstatus  => %w(protocol msgtype merchant apikey)
         },
-        
+
         7 => {
           :authorize => %w(protocol msgtype merchant ordernumber amount
                            currency autocapture cardnumber expirationdate cvd
-                           acquirer cardtypelock testmode fraud_remote_addr
+                           acquirers cardtypelock testmode fraud_remote_addr
                            fraud_http_accept fraud_http_accept_language
                            fraud_http_accept_encoding fraud_http_accept_charset
                            fraud_http_referer fraud_http_user_agent apikey),
@@ -136,11 +136,12 @@ module ActiveMerchant #:nodoc:
 
           :refund    => %w(protocol msgtype merchant amount transaction apikey),
 
-          :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
-                           expirationdate cvd acquirer cardtypelock description testmode
-                           fraud_remote_addr fraud_http_accept fraud_http_accept_language
-                           fraud_http_accept_encoding fraud_http_accept_charset
-                           fraud_http_referer fraud_http_user_agent apikey),
+          :subscribe => %w(protocol msgtype merchant ordernumber amount currency
+                           cardnumber expirationdate cvd acquirers cardtypelock
+                           description testmode fraud_remote_addr fraud_http_accept
+                           fraud_http_accept_language fraud_http_accept_encoding
+                           fraud_http_accept_charset fraud_http_referer
+                           fraud_http_user_agent apikey),
 
           :recurring => %w(protocol msgtype merchant ordernumber amount currency
                            autocapture transaction apikey),
@@ -148,7 +149,7 @@ module ActiveMerchant #:nodoc:
           :status    => %w(protocol msgtype merchant transaction apikey),
 
           :chstatus  => %w(protocol msgtype merchant apikey)
-        }        
+        }
       }
 
       APPROVED = '000'
@@ -218,7 +219,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -226,6 +227,7 @@ module ActiveMerchant #:nodoc:
         post = {}
 
         add_creditcard(post, creditcard, options)
+        add_amount(post, 0, options) if @protocol >= 7
         add_invoice(post, options)
         add_description(post, options)
         add_fraud_parameters(post, options)
@@ -254,7 +256,7 @@ module ActiveMerchant #:nodoc:
         post[:cvd]            = credit_card.verification_value
         post[:expirationdate] = expdate(credit_card)
         post[:cardtypelock]   = options[:cardtypelock] unless options[:cardtypelock].blank?
-        post[:acquirer]       = options[:acquirer] unless options[:acquirer].blank?
+        post[:acquirers]      = options[:acquirers] unless options[:acquirers].blank?
       end
 
       def add_reference(post, identification)
@@ -288,7 +290,7 @@ module ActiveMerchant #:nodoc:
 
       def add_fraud_parameters(post, options)
         if @protocol >= 4
-          post[:fraud_remote_addr] = options[:fraud_remote_addr] if options[:fraud_remote_addr]
+          post[:fraud_remote_addr] = options[:ip] if options[:ip]
           post[:fraud_http_accept] = options[:fraud_http_accept] if options[:fraud_http_accept]
           post[:fraud_http_accept_language] = options[:fraud_http_accept_language] if options[:fraud_http_accept_language]
           post[:fraud_http_accept_encoding] = options[:fraud_http_accept_encoding] if options[:fraud_http_accept_encoding]
@@ -357,7 +359,7 @@ module ActiveMerchant #:nodoc:
 
       # Limited to 20 digits max
       def format_order_number(number)
-        number.to_s.gsub(/[^\w_]/, '').rjust(4, "0")[0...20]
+        number.to_s.gsub(/[^\w]/, '').rjust(4, "0")[0...20]
       end
     end
   end

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

@@ -28,7 +28,8 @@ module ActiveMerchant
         'diners_club'       => 'DINERS',
         'switch'            => 'SWITCH',
         'solo'              => 'SWITCH',
-        'laser'             => 'LASER'
+        'laser'             => 'LASER',
+        'maestro'           => 'MC'
       }
 
       self.money_format = :cents
@@ -73,7 +74,7 @@ module ActiveMerchant
       end
 
       def credit(money, authorization, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
@@ -265,16 +266,6 @@ module ActiveMerchant
         "#{format(credit_card.month, :two_digits)}#{format(credit_card.year, :two_digits)}"
       end
 
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
-        end
-      end
-
       def message_from(response)
         message = nil
         case response[:result]

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

@@ -121,7 +121,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, source, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, source, options)
       end
 

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

@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, credit_card, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, credit_card, options)
       end
 
@@ -59,17 +59,11 @@ module ActiveMerchant #:nodoc:
       end
 
       private
-      def exp_date(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
 
       def add_credit_card(post, credit_card)
         post[:C_name]       = credit_card.name
         post[:C_cardnumber] = credit_card.number
-        post[:C_exp]        = exp_date(credit_card)
+        post[:C_exp]        = expdate(credit_card)
         post[:C_cvv]        = credit_card.verification_value if credit_card.verification_value?
       end
 

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

@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, reference)
-        ref, source = reference.to_s.split(";")
+        ref, _ = reference.to_s.split(";")
         post[:T_reference] = ref
       end
 

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

@@ -22,7 +22,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, credit_card, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, source, options)
       end
 

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

@@ -18,7 +18,9 @@ module ActiveMerchant #:nodoc:
         :authorization => 'DEFERRED',
         :capture => 'RELEASE',
         :void => 'VOID',
-        :abort => 'ABORT'
+        :abort => 'ABORT',
+        :store => 'TOKEN',
+        :unstore => 'REMOVETOKEN'
       }
 
       CREDIT_CARDS = {
@@ -55,14 +57,14 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def purchase(money, credit_card, options = {})
+      def purchase(money, payment_method, options = {})
         requires!(options, :order_id)
 
         post = {}
 
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_credit_card(post, credit_card)
+        add_payment_method(post, payment_method, options)
         add_address(post, options)
         add_customer_data(post, options)
         add_optional_data(post, options)
@@ -70,14 +72,14 @@ module ActiveMerchant #:nodoc:
         commit(:purchase, post)
       end
 
-      def authorize(money, credit_card, options = {})
+      def authorize(money, payment_method, options = {})
         requires!(options, :order_id)
 
         post = {}
 
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_credit_card(post, credit_card)
+        add_payment_method(post, payment_method, options)
         add_address(post, options)
         add_customer_data(post, options)
         add_optional_data(post, options)
@@ -118,10 +120,24 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
+      def store(credit_card, options = {})
+        post = {}
+        add_credit_card(post, credit_card)
+        add_currency(post, 0, options)
+
+        commit(:store, post)
+      end
+
+      def unstore(token, options = {})
+        post = {}
+        add_token(post, token)
+        commit(:unstore, post)
+      end
+
       private
       def add_reference(post, identification)
         order_id, transaction_id, authorization, security_key = identification.split(';')
@@ -147,20 +163,29 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :Currency, currency, :required => true)
       end
 
+      def add_currency(post, money, options)
+        currency = options[:currency] || currency(money)
+        add_pair(post, :Currency, currency, :required => true)
+      end
+
       # doesn't actually use the currency -- dodgy!
       def add_release_amount(post, money, options)
         add_pair(post, :ReleaseAmount, amount(money), :required => true)
       end
 
       def add_customer_data(post, options)
-        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, :CustomerEMail, truncate(options[:email], 255)) unless options[:email].blank?
         add_pair(post, :ClientIPAddress, options[:ip])
       end
 
       def add_optional_data(post, options)
         add_pair(post, :GiftAidPayment, options[:gift_aid_payment]) unless options[:gift_aid_payment].blank?
         add_pair(post, :Apply3DSecure, options[:apply_3d_secure]) unless options[:apply_3d_secure].blank?
+        add_pair(post, :CreateToken, 1) unless options[:store].blank?
+        add_pair(post, :FIRecipientAcctNumber, options[:recipient_account_number])
+        add_pair(post, :FIRecipientSurname, options[:recipient_surname])
+        add_pair(post, :FIRecipientPostcode, options[:recipient_postcode])
+        add_pair(post, :FIRecipientDoB, options[:recipient_dob])
       end
 
       def add_address(post, options)
@@ -168,34 +193,44 @@ module ActiveMerchant #:nodoc:
           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])
+          add_pair(post, :BillingAddress1, truncate(billing_address[:address1], 100))
+          add_pair(post, :BillingAddress2, truncate(billing_address[:address2], 100))
+          add_pair(post, :BillingCity, truncate(billing_address[:city], 40))
+          add_pair(post, :BillingState, truncate(billing_address[:state], 2)) if is_usa(billing_address[:country])
+          add_pair(post, :BillingCountry, truncate(billing_address[:country], 2))
+          add_pair(post, :BillingPhone, sanitize_phone(billing_address[:phone]))
+          add_pair(post, :BillingPostCode, truncate(billing_address[:zip], 10))
         end
 
         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])
+          add_pair(post, :DeliveryAddress1, truncate(shipping_address[:address1], 100))
+          add_pair(post, :DeliveryAddress2, truncate(shipping_address[:address2], 100))
+          add_pair(post, :DeliveryCity, truncate(shipping_address[:city], 40))
+          add_pair(post, :DeliveryState, truncate(shipping_address[:state], 2)) if is_usa(shipping_address[:country])
+          add_pair(post, :DeliveryCountry, truncate(shipping_address[:country], 2))
+          add_pair(post, :DeliveryPhone, sanitize_phone(shipping_address[:phone]))
+          add_pair(post, :DeliveryPostCode, truncate(shipping_address[:zip], 10))
         end
       end
 
       def add_invoice(post, options)
         add_pair(post, :VendorTxCode, sanitize_order_id(options[:order_id]), :required => true)
-        add_pair(post, :Description, truncate_description(options[:description] || options[:order_id]))
+        add_pair(post, :Description, truncate(options[:description] || options[:order_id], 100))
+      end
+
+      def add_payment_method(post, payment_method, options)
+        if payment_method.respond_to?(:number)
+          add_credit_card(post, payment_method)
+        else
+          add_token_details(post, payment_method, options)
+        end
       end
 
       def add_credit_card(post, credit_card)
-        add_pair(post, :CardHolder, credit_card.name, :required => true)
+        add_pair(post, :CardHolder, truncate(credit_card.name, 50), :required => true)
         add_pair(post, :CardNumber, credit_card.number, :required => true)
 
         add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), :required => true)
@@ -209,13 +244,33 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :CV2, credit_card.verification_value)
       end
 
+      def add_token_details(post, token, options)
+        add_token(post, token)
+        add_pair(post, :StoreToken, options[:customer])
+      end
+
+      def add_token(post, token)
+        add_pair(post, :Token, token)
+      end
+
       def sanitize_order_id(order_id)
-        order_id.to_s.gsub(/[^-a-zA-Z0-9._]/, '')
+        cleansed = order_id.to_s.gsub(/[^-a-zA-Z0-9._]/, '')
+        truncate(cleansed, 40)
       end
 
-      def truncate_description(description)
-        return nil unless description
-        description[0, 100]
+      def sanitize_phone(phone)
+        return nil unless phone
+        cleansed = phone.to_s.gsub(/[^0-9+]/, '')
+        truncate(cleansed, 20)
+      end
+
+      def truncate(value, max_size)
+        return nil unless value
+        value[0, max_size]
+      end
+
+      def is_usa(country)
+        truncate(country, 2) == 'US'
       end
 
       def map_card_type(credit_card)
@@ -256,11 +311,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response, params, action)
+        case action
+        when :store
+          response['Token']
+        else
          [ params[:VendorTxCode],
            response["VPSTxId"],
            response["TxAuthNo"],
            response["SecurityKey"],
            action ].join(";")
+        end
       end
 
       def abort_or_void_from(identification)
@@ -273,7 +333,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_url(action)
-        endpoint = [ :purchase, :authorization ].include?(action) ? "vspdirect-register" : TRANSACTIONS[action].downcase
+        endpoint = case action
+          when :purchase, :authorization then "vspdirect-register"
+          when :store then 'directtoken'
+          else TRANSACTIONS[action].downcase
+        end
         "#{test? ? self.test_url : self.live_url}/#{endpoint}.vsp"
       end
 
@@ -320,7 +384,7 @@ module ActiveMerchant #:nodoc:
 
         last_name = name.pop || ''
         first_name = name.join(' ')
-        [ first_name[0,20], last_name[0,20] ]
+        [ truncate(first_name, 20), truncate(last_name, 20) ]
       end
 
       def localized_amount(money, currency)
@@ -328,6 +392,7 @@ module ActiveMerchant #:nodoc:
         CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s) ? amount.split('.').first : amount
       end
     end
+
   end
 end
 

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

@@ -57,7 +57,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, authorization, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
@@ -125,13 +125,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def expdate(creditcard)
-        year  = sprintf("%.4i", creditcard.year)
-        month = sprintf("%.2i", creditcard.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
       def add_customer_data(xml, options)
         if options.has_key? :customer
           xml.tag! 'CUSTOMERID', options[:customer]