activemerchant 1.38.0 → 1.79.2

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
 
@@ -48,6 +59,17 @@ module ActiveMerchant #:nodoc:
         commit('ccSettlement', money, options)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((%3CstorePwd%3E).*(%3C(%2F|/)storePwd%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3CcardNum%3E)\d*(%3C(%2F|/)cardNum%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3Ccvd%3E)\d*(%3C(%2F|/)cvd%3E))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def parse_card_or_auth(card_or_auth, options)
@@ -85,7 +107,7 @@ module ActiveMerchant #:nodoc:
         else
           raise 'Unknown Action'
         end
-        txnRequest = URI.encode(xml)
+        txnRequest = escape_uri(xml)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, "txnMode=#{action}&txnRequest=#{txnRequest}"))
 
         Response.new(successful?(response), message_from(response), hash_from_xml(response),
@@ -96,6 +118,11 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      # The upstream is picky and so we can't use CGI.escape like we want to
+      def escape_uri(uri)
+        URI::DEFAULT_PARSER.escape(uri)
+      end
+
       def successful?(response)
         REXML::XPath.first(response, '//decision').text == 'ACCEPTED' rescue false
       end
@@ -155,18 +182,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 +202,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 +211,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 +222,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 +239,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 +252,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
 
@@ -242,9 +270,11 @@ module ActiveMerchant #:nodoc:
           if brand = card_type(@credit_card.brand)
             xml.tag! 'cardType'     , brand
           end
-          if @credit_card.verification_value
+          if @credit_card.verification_value?
             xml.tag! 'cvdIndicator' , '1' # Value Provided
             xml.tag! 'cvd'          , @credit_card.verification_value
+          else
+            xml.tag! 'cvdIndicator' , '0'
           end
         end
       end
@@ -252,32 +282,34 @@ module ActiveMerchant #:nodoc:
       def build_billing_details(xml, opts)
         xml.tag! 'billingDetails' do
           xml.tag! 'cardPayMethod', 'WEB'
-          build_address(xml, opts[:billing_address], opts[:email])
+          build_address(xml, opts[:billing_address]) if opts[:billing_address]
+          xml.tag! 'email', opts[:email] if opts[:email]
         end
       end
 
       def build_shipping_details(xml, opts)
         xml.tag! 'shippingDetails' do
-          build_address(xml, opts[:shipping_address], opts[:email])
+          build_address(xml, opts[:shipping_address])
+          xml.tag! 'email', opts[:email] if opts[:email]
         end if opts[:shipping_address].present?
       end
 
-      def build_address(xml, addr, email=nil)
+      def build_address(xml, addr)
         if addr[:name]
-          xml.tag! 'firstName', CGI.escape(addr[:name].split(' ').first) # TODO: parse properly
-          xml.tag! 'lastName' , CGI.escape(addr[:name].split(' ').last )
+          first_name, last_name = split_names(addr[:name])
+          xml.tag! 'firstName', first_name
+          xml.tag! 'lastName' , last_name
         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?
       end
 
       def card_type(key)
@@ -294,4 +326,3 @@ module ActiveMerchant #:nodoc:
     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