activemerchant 1.43.3 → 1.44.0

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

@@ -104,7 +104,7 @@ module ActiveMerchant
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 

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

@@ -168,13 +168,6 @@ module ActiveMerchant #:nodoc:
         success?(response) ? SUCCESS_MESSAGE : (response[:auth_msg] || FAILURE_MESSAGE)
       end
 
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
       def post_data(action, parameters = {})
         parameters[:account_id] = @options[:login]
         parameters[:site_tag] = @options[:site_tag] if @options[:site_tag].present?

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

@@ -131,11 +131,15 @@ module ActiveMerchant #:nodoc:
         post[:shipping_country] = shipping_address[:country]
       end
 
-      def add_swipe_data(post, options)
+      def add_swipe_data(post, creditcard, options)
         # unencrypted tracks
-        post[:track_1] = options[:track_1]
-        post[:track_2] = options[:track_2]
-        post[:track_3] = options[:track_3]
+        if creditcard.respond_to?(:track_data) && creditcard.track_data.present?
+          post[:track_1] = creditcard.track_data
+        else
+          post[:track_1] = options[:track_1]
+          post[:track_2] = options[:track_2]
+          post[:track_3] = options[:track_3]
+        end
 
         # encrypted tracks
         post[:magnesafe_track_1] = options[:magnesafe_track_1]
@@ -146,23 +150,14 @@ module ActiveMerchant #:nodoc:
         post[:magnesafe_magneprint_status] = options[:magnesafe_magneprint_status]
       end
 
-      def add_payment_method(post, creditcard_or_check_or_vault_id, options)
+      def add_payment_method(post, payment_source, options)
         post[:processor_id] = options[:processor_id]
         post[:customer_vault] = 'add_customer' if options[:store]
 
-        add_swipe_data(post, options)
+        add_swipe_data(post, payment_source, options)
 
-        # creditcard_or_check can be blank if using swipe data
-        if creditcard_or_check_or_vault_id.is_a?(CreditCard) # creditcard or check
-          creditcard = creditcard_or_check_or_vault_id
-          post[:firstname] = creditcard.first_name
-          post[:lastname] = creditcard.last_name
-          post[:ccnumber] = creditcard.number
-          post[:ccexp] = format(creditcard.month, :two_digits) + format(creditcard.year, :two_digits)
-          post[:cvv] = creditcard.verification_value
-          post[:payment] = 'creditcard'
-        elsif creditcard_or_check_or_vault_id.is_a?(Check)
-          check = creditcard_or_check_or_vault_id
+        if payment_source.is_a?(Check)
+          check = payment_source
           post[:firstname] = check.first_name
           post[:lastname] = check.last_name
           post[:checkname] = check.name
@@ -171,8 +166,16 @@ module ActiveMerchant #:nodoc:
           post[:account_type] = check.account_type
           post[:account_holder_type] = check.account_holder_type
           post[:payment] = 'check'
+        elsif payment_source.respond_to?(:number)
+          creditcard = payment_source
+          post[:firstname] = creditcard.first_name
+          post[:lastname] = creditcard.last_name
+          post[:ccnumber] = creditcard.number
+          post[:ccexp] = format(creditcard.month, :two_digits) + format(creditcard.year, :two_digits)
+          post[:cvv] = creditcard.verification_value
+          post[:payment] = 'creditcard'
         else
-          post[:customer_vault_id] = creditcard_or_check_or_vault_id
+          post[:customer_vault_id] = payment_source
         end
       end
 

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

@@ -192,7 +192,7 @@ module ActiveMerchant #:nodoc:
       # Credit the specified account by a specific amount.
       def credit(money, identification_or_credit_card, options = {})
         if reference_transaction?(identification_or_credit_card)
-          deprecated CREDIT_DEPRECATION_MESSAGE
+          ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
           # Referenced credit: refund of a settled transaction
           refund(money, identification_or_credit_card, options)
         else # must be a credit card or card reference
@@ -251,7 +251,7 @@ module ActiveMerchant #:nodoc:
           add_eci(post, options[:eci] || '9')
         else
           if options.has_key?(:store)
-            deprecated OGONE_STORE_OPTION_DEPRECATION_MESSAGE
+            ActiveMerchant.deprecated OGONE_STORE_OPTION_DEPRECATION_MESSAGE
             options[:billing_id] ||= options[:store]
           end
           add_alias(post, options[:billing_id], options[:alias_operation])
@@ -386,7 +386,7 @@ module ActiveMerchant #:nodoc:
 
       def add_signature(parameters)
         if @options[:signature].blank?
-           deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == "none")
+           ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == "none")
            return
         end
 

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

@@ -127,18 +127,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def headers(options = {})
-        @@ua ||= JSON.dump(
-          :bindings_version => ActiveMerchant::VERSION,
-          :lang => 'ruby',
-          :lang_version => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
-          :platform => RUBY_PLATFORM,
-          :publisher => 'active_merchant'
-        )
         {
           "Content-Type" => "application/json",
           "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
           "User-Agent" => "Openpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-          "X-Openpay-Client-User-Agent" => @@ua
+          "X-Openpay-Client-User-Agent" => user_agent
         }
       end
 

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

@@ -17,7 +17,18 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Optimal Payments'
 
       def initialize(options = {})
-        #requires!(options, :login, :password)
+
+        if(options[:login])
+          ActiveMerchant.deprecated("The 'login' option is deprecated in favor of 'store_id' and will be removed in a future version.")
+          options[:store_id] = options[:login]
+        end
+
+        if(options[:account])
+          ActiveMerchant.deprecated("The 'account' option is deprecated in favor of 'account_number' and will be removed in a future version.")
+          options[:account_number] = options[:account]
+        end
+
+        requires!(options, :account_number, :store_id, :password)
         super
       end
 
@@ -155,18 +166,19 @@ module ActiveMerchant #:nodoc:
 
       def cc_auth_request(money, opts)
         xml_document('ccAuthRequestV1') do |xml|
-          build_merchant_account(xml, @options)
+          build_merchant_account(xml)
           xml.merchantRefNum opts[:order_id]
           xml.amount(money/100.0)
           build_card(xml, opts)
           build_billing_details(xml, opts)
           build_shipping_details(xml, opts)
+          xml.customerIP opts[:ip] if opts[:ip]
         end
       end
 
       def cc_auth_reversal_request(opts)
         xml_document('ccAuthReversalRequestV1') do |xml|
-          build_merchant_account(xml, @options)
+          build_merchant_account(xml)
           xml.confirmationNumber opts[:confirmationNumber]
           xml.merchantRefNum opts[:order_id]
         end
@@ -174,7 +186,7 @@ module ActiveMerchant #:nodoc:
 
       def cc_post_auth_request(money, opts)
         xml_document('ccPostAuthRequestV1') do |xml|
-          build_merchant_account(xml, @options)
+          build_merchant_account(xml)
           xml.confirmationNumber opts[:confirmationNumber]
           xml.merchantRefNum opts[:order_id]
           xml.amount(money/100.0)
@@ -183,7 +195,7 @@ module ActiveMerchant #:nodoc:
 
       def cc_stored_data_request(money, opts)
         xml_document('ccStoredDataRequestV1') do |xml|
-          build_merchant_account(xml, @options)
+          build_merchant_account(xml)
           xml.merchantRefNum opts[:order_id]
           xml.confirmationNumber opts[:confirmationNumber]
           xml.amount(money/100.0)
@@ -194,14 +206,14 @@ module ActiveMerchant #:nodoc:
       #
       # def cc_cancel_request(opts)
       #   xml_document('ccCancelRequestV1') do |xml|
-      #     build_merchant_account(xml, @options)
+      #     build_merchant_account(xml)
       #     xml.confirmationNumber opts[:confirmationNumber]
       #   end
       # end
       #
       # def cc_payment_request(money, opts)
       #   xml_document('ccPaymentRequestV1') do |xml|
-      #     build_merchant_account(xml, @options)
+      #     build_merchant_account(xml)
       #     xml.merchantRefNum opts[:order_id]
       #     xml.amount(money/100.0)
       #     build_card(xml, opts)
@@ -211,7 +223,7 @@ module ActiveMerchant #:nodoc:
       #
       # def cc_authenticate_request(opts)
       #   xml_document('ccAuthenticateRequestV1') do |xml|
-      #     build_merchant_account(xml, @options)
+      #     build_merchant_account(xml)
       #     xml.confirmationNumber opts[:confirmationNumber]
       #     xml.paymentResponse 'myPaymentResponse'
       #   end
@@ -224,11 +236,11 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def build_merchant_account(xml, opts)
+      def build_merchant_account(xml)
         xml.tag! 'merchantAccount' do
-          xml.tag! 'accountNum' , opts[:account]
-          xml.tag! 'storeID'    , opts[:login]
-          xml.tag! 'storePwd'   , opts[:password]
+          xml.tag! 'accountNum' , @options[:account_number]
+          xml.tag! 'storeID'    , @options[:store_id]
+          xml.tag! 'storePwd'   , @options[:password]
         end
       end
 
@@ -264,20 +276,20 @@ module ActiveMerchant #:nodoc:
 
       def build_address(xml, addr, email=nil)
         if addr[:name]
-          xml.tag! 'firstName', CGI.escape(addr[:name].split(' ').first) # TODO: parse properly
-          xml.tag! 'lastName' , CGI.escape(addr[:name].split(' ').last )
+          xml.tag! 'firstName', addr[:name].split(' ').first
+          xml.tag! 'lastName' , addr[:name].split(' ').last
         end
-        xml.tag! 'street' , CGI.escape(addr[:address1]) if addr[:address1].present?
-        xml.tag! 'street2', CGI.escape(addr[:address2]) if addr[:address2].present?
-        xml.tag! 'city'   , CGI.escape(addr[:city]    ) if addr[:city].present?
+        xml.tag! 'street' , addr[:address1] if addr[:address1].present?
+        xml.tag! 'street2', addr[:address2] if addr[:address2].present?
+        xml.tag! 'city'   , addr[:city]     if addr[:city].present?
         if addr[:state].present?
           state_tag = %w(US CA).include?(addr[:country]) ? 'state' : 'region'
-          xml.tag! state_tag, CGI.escape(addr[:state])
+          xml.tag! state_tag, addr[:state]
         end
-        xml.tag! 'country', CGI.escape(addr[:country] ) if addr[:country].present?
-        xml.tag! 'zip'    , CGI.escape(addr[:zip]     ) if addr[:zip].present?
-        xml.tag! 'phone'  , CGI.escape(addr[:phone]   ) if addr[:phone].present?
-        xml.tag! 'email', CGI.escape(email) if email
+        xml.tag! 'country', addr[:country]  if addr[:country].present?
+        xml.tag! 'zip'    , addr[:zip]      if addr[:zip].present?
+        xml.tag! 'phone'  , addr[:phone]    if addr[:phone].present?
+        xml.tag! 'email', email if email
       end
 
       def card_type(key)
@@ -294,4 +306,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/orbital/orbital_soft_descriptors'
-require File.dirname(__FILE__) + '/orbital/avs_result'
-require File.dirname(__FILE__) + '/orbital/cvv_result'
 require "rexml/document"
 
 module ActiveMerchant #:nodoc:
@@ -226,13 +224,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, authorization, options= {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
       def void(authorization, options = {}, deprecated = {})
         if(!options.kind_of?(Hash))
-          deprecated("Calling the void method with an amount parameter is deprecated and will be removed in a future version.")
+          ActiveMerchant.deprecated("Calling the void method with an amount parameter is deprecated and will be removed in a future version.")
           return void(options, deprecated.merge(:amount => authorization))
         end
 
@@ -403,6 +401,8 @@ module ActiveMerchant #:nodoc:
 
       def add_managed_billing(xml, options)
         if mb = options[:managed_billing]
+          ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
           # default to recurring (R).  Other option is deferred (D).
           xml.tag! :MBType, mb[:type] || RECURRING
           # default to Customer Reference Number
@@ -679,6 +679,123 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
+
+      # Unfortunately, Orbital uses their own special codes for AVS responses
+      # that are different than the standard codes defined in
+      # <tt>ActiveMerchant::Billing::AVSResult</tt>.
+      #
+      # This class encapsulates the response codes shown on page 240 of their spec:
+      # http://download.chasepaymentech.com/docs/orbital/orbital_gateway_xml_specification.pdf
+      #
+      class AVSResult < ActiveMerchant::Billing::AVSResult
+        CODES = {
+            '1'  => 'No address supplied',
+            '2'  => 'Bill-to address did not pass Auth Host edit checks',
+            '3'  => 'AVS not performed',
+            '4'  => 'Issuer does not participate in AVS',
+            '5'  => 'Edit-error - AVS data is invalid',
+            '6'  => 'System unavailable or time-out',
+            '7'  => 'Address information unavailable',
+            '8'  => 'Transaction Ineligible for AVS',
+            '9'  => 'Zip Match/Zip 4 Match/Locale match',
+            'A'  => 'Zip Match/Zip 4 Match/Locale no match',
+            'B'  => 'Zip Match/Zip 4 no Match/Locale match',
+            'C'  => 'Zip Match/Zip 4 no Match/Locale no match',
+            'D'  => 'Zip No Match/Zip 4 Match/Locale match',
+            'E'  => 'Zip No Match/Zip 4 Match/Locale no match',
+            'F'  => 'Zip No Match/Zip 4 No Match/Locale match',
+            'G'  => 'No match at all',
+            'H'  => 'Zip Match/Locale match',
+            'J'  => 'Issuer does not participate in Global AVS',
+            'JA' => 'International street address and postal match',
+            'JB' => 'International street address match. Postal code not verified',
+            'JC' => 'International street address and postal code not verified',
+            'JD' => 'International postal code match. Street address not verified',
+            'M1' => 'Cardholder name matches',
+            'M2' => 'Cardholder name, billing address, and postal code matches',
+            'M3' => 'Cardholder name and billing code matches',
+            'M4' => 'Cardholder name and billing address match',
+            'M5' => 'Cardholder name incorrect, billing address and postal code match',
+            'M6' => 'Cardholder name incorrect, billing postal code matches',
+            'M7' => 'Cardholder name incorrect, billing address matches',
+            'M8' => 'Cardholder name, billing address and postal code are all incorrect',
+            'N3' => 'Address matches, ZIP not verified',
+            'N4' => 'Address and ZIP code not verified due to incompatible formats',
+            'N5' => 'Address and ZIP code match (International only)',
+            'N6' => 'Address not verified (International only)',
+            'N7' => 'ZIP matches, address not verified',
+            'N8' => 'Address and ZIP code match (International only)',
+            'N9' => 'Address and ZIP code match (UK only)',
+            'R'  => 'Issuer does not participate in AVS',
+            'UK' => 'Unknown',
+            'X'  => 'Zip Match/Zip 4 Match/Address Match',
+            'Z'  => 'Zip Match/Locale no match',
+        }
+
+        # Map vendor's AVS result code to a postal match code
+        ORBITAL_POSTAL_MATCH_CODE = {
+            'Y' => %w( 9 A B C H JA JD M2 M3 M5 N5 N8 N9 X Z ),
+            'N' => %w( D E F G M8 ),
+            'X' => %w( 4 J R ),
+            nil => %w( 1 2 3 5 6 7 8 JB JC M1 M4 M6 M7 N3 N4 N6 N7 UK )
+        }.inject({}) do |map, (type, codes)|
+          codes.each { |code| map[code] = type }
+          map
+        end
+
+        # Map vendor's AVS result code to a street match code
+        ORBITAL_STREET_MATCH_CODE = {
+            'Y' => %w( 9 B D F H JA JB M2 M4 M5 M6 M7 N3 N5 N7 N8 N9 X ),
+            'N' => %w( A C E G M8 Z ),
+            'X' => %w( 4 J R ),
+            nil => %w( 1 2 3 5 6 7 8 JC JD M1 M3 N4 N6 UK )
+        }.inject({}) do |map, (type, codes)|
+          codes.each { |code| map[code] = type }
+          map
+        end
+
+        def self.messages
+          CODES
+        end
+
+        def initialize(code)
+          @code = (code.blank? ? nil : code.to_s.strip.upcase)
+          if @code
+            @message      = CODES[@code]
+            @postal_match = ORBITAL_POSTAL_MATCH_CODE[@code]
+            @street_match = ORBITAL_STREET_MATCH_CODE[@code]
+          end
+        end
+      end
+
+      # Unfortunately, Orbital uses their own special codes for CVV responses
+      # that are different than the standard codes defined in
+      # <tt>ActiveMerchant::Billing::CVVResult</tt>.
+      #
+      # This class encapsulates the response codes shown on page 255 of their spec:
+      # http://download.chasepaymentech.com/docs/orbital/orbital_gateway_xml_specification.pdf
+      #
+      class CVVResult < ActiveMerchant::Billing::CVVResult
+        MESSAGES = {
+          'M' => 'Match',
+          'N' => 'No match',
+          'P' => 'Not processed',
+          'S' => 'Should have been present',
+          'U' => 'Unsupported by issuer/Issuer unable to process request',
+          'I' => 'Invalid',
+          'Y' => 'Invalid',
+          ''  => 'Not applicable'
+        }
+
+        def self.messages
+          MESSAGES
+        end
+
+        def initialize(code)
+          @code = code.blank? ? '' : code.upcase
+          @message = MESSAGES[@code]
+        end
+      end
     end
   end
 end

data/lib/active_merchant/billing/gateways/orbital/orbital_soft_descriptors.rb

@@ -1,23 +1,21 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    class OrbitalSoftDescriptors
-      include Validateable
-      
+    class OrbitalSoftDescriptors < Model
       PHONE_FORMAT_1 = /\A\d{3}-\d{3}-\d{4}\z/
       PHONE_FORMAT_2 = /\A\d{3}-\w{7}\z/
-      
+
       # ==== Tampa PNS Soft Descriptors
-      # The support for Soft Descriptors via the PNS Host is only for customers processing through Chase 
-      # Paymentech Canada. 
+      # The support for Soft Descriptors via the PNS Host is only for customers processing through Chase
+      # Paymentech Canada.
 
-      # Unlike Salem, the only value that gets passed on the cardholder statement is the Merchant Name field.  
-      # And for these customers, it is a maximum of 25 bytes of data. 
-      # 
-      # All other Soft Descriptor fields can optionally be sent, but will not be submitted to the settlement host 
+      # Unlike Salem, the only value that gets passed on the cardholder statement is the Merchant Name field.
+      # And for these customers, it is a maximum of 25 bytes of data.
+      #
+      # All other Soft Descriptor fields can optionally be sent, but will not be submitted to the settlement host
       # and will not display on the cardholder statement.
-      
+
       attr_accessor :merchant_name, :product_description, :merchant_city, :merchant_phone, :merchant_url, :merchant_email
-      
+
       def initialize(options = {})
         self.merchant_name = options[:merchant_name]
         self.merchant_city = options[:merchant_city]
@@ -25,22 +23,25 @@ module ActiveMerchant #:nodoc:
         self.merchant_url = options[:merchant_url]
         self.merchant_email = options[:merchant_email]
       end
-      
+
       def validate
-        errors.add(:merchant_name, "is required") if self.merchant_name.blank?
-        errors.add(:merchant_name, "is required to be 25 bytes or less") if self.merchant_name.bytesize > 25
-        
-        unless self.merchant_phone.blank? || self.merchant_phone.match(PHONE_FORMAT_1) || self.merchant_phone.match(PHONE_FORMAT_2)
-          errors.add(:merchant_phone, "is required to follow \"NNN-NNN-NNNN\" or \"NNN-AAAAAAA\" format")
+        errors = []
+
+        errors << [:merchant_name, "is required"] if self.merchant_name.blank?
+        errors << [:merchant_name, "is required to be 25 bytes or less"] if self.merchant_name.bytesize > 25
+
+        if(!empty?(self.merchant_phone) && !self.merchant_phone.match(PHONE_FORMAT_1) && !self.merchant_phone.match(PHONE_FORMAT_2))
+          errors << [:merchant_phone, "is required to follow \"NNN-NNN-NNNN\" or \"NNN-AAAAAAA\" format"]
         end
-        
+
         [:merchant_email, :merchant_url].each do |attr|
           unless self.send(attr).blank?
-            errors.add(attr, "is required to be 13 bytes or less") if self.send(attr).bytesize > 13
+            errors << [attr, "is required to be 13 bytes or less"] if(self.send(attr).bytesize > 13)
           end
         end
+
+        errors_hash(errors)
       end
-      
     end
   end
 end