activemerchant 1.105.0 → 1.107.4

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

@@ -216,10 +216,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(success, message, response,
-          :test => test?,
-          :authorization => authorization,
-          :avs_result => { :code => response[:AVSResponseCode] },
-          :cvv_result => response[:CVV2ResponseCode]
+          test: test?,
+          authorization: authorization,
+          avs_result: { code: response[:AVSResponseCode] },
+          cvv_result: response[:CVV2ResponseCode]
         )
       end
 

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

@@ -1,151 +1,151 @@
 module QuickpayCommon
   MD5_CHECK_FIELDS = {
     3 => {
-      :authorize => %w(protocol msgtype merchant ordernumber amount
-                       currency autocapture cardnumber expirationdate
-                       cvd cardtypelock testmode),
+      authorize: %w(protocol msgtype merchant ordernumber amount
+                    currency autocapture cardnumber expirationdate
+                    cvd cardtypelock testmode),
 
-      :capture   => %w(protocol msgtype merchant amount finalize transaction),
+      capture: %w(protocol msgtype merchant amount finalize transaction),
 
-      :cancel    => %w(protocol msgtype merchant transaction),
+      cancel: %w(protocol msgtype merchant transaction),
 
-      :refund    => %w(protocol msgtype merchant amount transaction),
+      refund: %w(protocol msgtype merchant amount transaction),
 
-      :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
-                       expirationdate cvd cardtypelock description testmode),
+      subscribe: %w(protocol msgtype merchant ordernumber cardnumber
+                    expirationdate cvd cardtypelock description testmode),
 
-      :recurring => %w(protocol msgtype merchant ordernumber amount
-                       currency autocapture transaction),
+      recurring: %w(protocol msgtype merchant ordernumber amount
+                    currency autocapture transaction),
 
-      :status    => %w(protocol msgtype merchant transaction),
+      status: %w(protocol msgtype merchant transaction),
 
-      :chstatus  => %w(protocol msgtype merchant)
+      chstatus: %w(protocol msgtype merchant)
     },
 
     4 => {
-      :authorize => %w(protocol msgtype merchant ordernumber amount
-                       currency autocapture cardnumber expirationdate cvd
-                       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),
+      authorize: %w(protocol msgtype merchant ordernumber amount
+                    currency autocapture cardnumber expirationdate cvd
+                    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),
 
-      :capture   => %w(protocol msgtype merchant amount finalize transaction apikey),
+      capture: %w(protocol msgtype merchant amount finalize transaction apikey),
 
-      :cancel    => %w(protocol msgtype merchant transaction apikey),
+      cancel: %w(protocol msgtype merchant transaction apikey),
 
-      :refund    => %w(protocol msgtype merchant amount transaction apikey),
+      refund: %w(protocol msgtype merchant amount transaction apikey),
 
-      :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
-                       expirationdate cvd 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 cardnumber
+                    expirationdate cvd 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),
+      recurring: %w(protocol msgtype merchant ordernumber amount currency
+                    autocapture transaction apikey),
 
-      :status    => %w(protocol msgtype merchant transaction apikey),
+      status: %w(protocol msgtype merchant transaction apikey),
 
-      :chstatus  => %w(protocol msgtype merchant apikey)
+      chstatus: %w(protocol msgtype merchant apikey)
     },
 
     5 => {
-      :authorize => %w(protocol msgtype merchant ordernumber amount
-                       currency autocapture cardnumber expirationdate cvd
-                       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),
+      authorize: %w(protocol msgtype merchant ordernumber amount
+                    currency autocapture cardnumber expirationdate cvd
+                    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),
 
-      :capture   => %w(protocol msgtype merchant amount finalize transaction apikey),
+      capture: %w(protocol msgtype merchant amount finalize transaction apikey),
 
-      :cancel    => %w(protocol msgtype merchant transaction apikey),
+      cancel: %w(protocol msgtype merchant transaction apikey),
 
-      :refund    => %w(protocol msgtype merchant amount transaction apikey),
+      refund: %w(protocol msgtype merchant amount transaction apikey),
 
-      :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
-                       expirationdate cvd 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 cardnumber
+                    expirationdate cvd 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),
+      recurring: %w(protocol msgtype merchant ordernumber amount currency
+                    autocapture transaction apikey),
 
-      :status    => %w(protocol msgtype merchant transaction apikey),
+      status: %w(protocol msgtype merchant transaction apikey),
 
-      :chstatus  => %w(protocol msgtype merchant apikey)
+      chstatus: %w(protocol msgtype merchant apikey)
     },
 
     6 => {
-      :authorize => %w(protocol msgtype merchant ordernumber amount
-                       currency autocapture cardnumber expirationdate cvd
-                       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),
+      authorize: %w(protocol msgtype merchant ordernumber amount
+                    currency autocapture cardnumber expirationdate cvd
+                    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),
 
-      :capture   => %w(protocol msgtype merchant amount finalize transaction
-                       apikey),
+      capture: %w(protocol msgtype merchant amount finalize transaction
+                  apikey),
 
-      :cancel    => %w(protocol msgtype merchant transaction apikey),
+      cancel: %w(protocol msgtype merchant transaction apikey),
 
-      :refund    => %w(protocol msgtype merchant amount transaction apikey),
+      refund: %w(protocol msgtype merchant amount transaction apikey),
 
-      :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
-                       expirationdate cvd 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 cardnumber
+                    expirationdate cvd 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),
+      recurring: %w(protocol msgtype merchant ordernumber amount currency
+                    autocapture transaction apikey),
 
-      :status    => %w(protocol msgtype merchant transaction apikey),
+      status: %w(protocol msgtype merchant transaction apikey),
 
-      :chstatus  => %w(protocol msgtype merchant apikey)
+      chstatus: %w(protocol msgtype merchant apikey)
     },
 
     7 => {
-      :authorize => %w(protocol msgtype merchant ordernumber amount
-                       currency autocapture cardnumber expirationdate cvd
-                       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),
+      authorize: %w(protocol msgtype merchant ordernumber amount
+                    currency autocapture cardnumber expirationdate cvd
+                    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),
 
-      :capture   => %w(protocol msgtype merchant amount finalize transaction
-                       apikey),
+      capture: %w(protocol msgtype merchant amount finalize transaction
+                  apikey),
 
-      :cancel    => %w(protocol msgtype merchant transaction apikey),
+      cancel: %w(protocol msgtype merchant transaction apikey),
 
-      :refund    => %w(protocol msgtype merchant amount transaction apikey),
+      refund: %w(protocol msgtype merchant amount transaction 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),
+      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),
+      recurring: %w(protocol msgtype merchant ordernumber amount currency
+                    autocapture transaction apikey),
 
-      :status    => %w(protocol msgtype merchant transaction apikey),
+      status: %w(protocol msgtype merchant transaction apikey),
 
-      :chstatus  => %w(protocol msgtype merchant apikey)
+      chstatus: %w(protocol msgtype merchant apikey)
     },
 
     10 => {
-      :authorize => %w(mobile_number acquirer autofee customer_id extras
-                       zero_auth customer_ip),
-      :capture   => %w(extras),
-      :cancel    => %w(extras),
-      :refund    => %w(extras),
-      :subscribe => %w(variables branding_id),
-      :authorize_subscription => %w(mobile_number acquirer customer_ip),
-      :recurring => %w(auto_capture autofee zero_auth)
+      authorize: %w(mobile_number acquirer autofee customer_id extras
+                    zero_auth customer_ip),
+      capture: %w(extras),
+      cancel: %w(extras),
+      refund: %w(extras),
+      subscribe: %w(variables branding_id),
+      authorize_subscription: %w(mobile_number acquirer customer_ip),
+      recurring: %w(auto_capture autofee zero_auth)
     }
   }
 

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

@@ -154,8 +154,8 @@ module ActiveMerchant
         end
 
         Response.new(success, message_from(success, response), response,
-          :test => test?,
-          :authorization => authorization_from(response)
+          test: test?,
+          authorization: authorization_from(response)
         )
       end
 
@@ -215,7 +215,7 @@ module ActiveMerchant
         end
 
         if options[:three_d_secure]
-          post[:card][:cavv]= options.dig(:three_d_secure, :cavv)
+          post[:card][:cavv] = options.dig(:three_d_secure, :cavv)
           post[:card][:eci] = options.dig(:three_d_secure, :eci)
           post[:card][:xav] = options.dig(:three_d_secure, :xid)
         end
@@ -253,12 +253,12 @@ module ActiveMerchant
         requires!(address, :name, :address1, :city, :zip, :country)
         country = Country.find(address[:country])
         mapped = {
-          :name         => address[:name],
-          :street       => address[:address1],
-          :city         => address[:city],
-          :region       => address[:address2],
-          :zip_code     => address[:zip],
-          :country_code => country.code(:alpha3).value
+          name: address[:name],
+          street: address[:address1],
+          city: address[:city],
+          region: address[:address2],
+          zip_code: address[:zip],
+          country_code: country.code(:alpha3).value
         }
         mapped
       end

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

@@ -165,8 +165,8 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(self.live_url, post_data(action, params)))
 
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => response[:transaction]
+          test: test?,
+          authorization: response[:transaction]
         )
       end
 

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

@@ -230,7 +230,7 @@ module ActiveMerchant #:nodoc:
 
       def headers
         {
-          'Content-Type'  => 'application/x-www-form-urlencoded'
+          'Content-Type' => 'application/x-www-form-urlencoded'
         }
       end
 

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

@@ -107,8 +107,8 @@ module ActiveMerchant
           (response[:result] == '00'),
           message_from(response),
           response,
-          :test => (response[:message] =~ %r{\[ test system \]}),
-          :authorization => authorization_from(response),
+          test: (response[:message] =~ %r{\[ test system \]}),
+          authorization: authorization_from(response),
           avs_result: AVSResult.new(code: response[:avspostcoderesponse]),
           cvv_result: CVVResult.new(response[:cvnresult])
         )
@@ -138,7 +138,7 @@ module ActiveMerchant
 
       def build_purchase_or_authorization_request(action, money, credit_card, options)
         timestamp = new_timestamp
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'auth' do
           add_merchant_details(xml, options)
           xml.tag! 'orderid', sanitize_order_id(options[:order_id])
@@ -159,7 +159,7 @@ module ActiveMerchant
 
       def build_capture_request(money, authorization, options)
         timestamp = new_timestamp
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'settle' do
           add_merchant_details(xml, options)
           add_amount(xml, money, options)
@@ -172,7 +172,7 @@ module ActiveMerchant
 
       def build_refund_request(money, authorization, options)
         timestamp = new_timestamp
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'rebate' do
           add_merchant_details(xml, options)
           add_transaction_identifiers(xml, authorization, options)
@@ -187,7 +187,7 @@ module ActiveMerchant
 
       def build_credit_request(money, credit_card, options)
         timestamp = new_timestamp
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'credit' do
           add_merchant_details(xml, options)
           xml.tag! 'orderid', sanitize_order_id(options[:order_id])
@@ -203,7 +203,7 @@ module ActiveMerchant
 
       def build_void_request(authorization, options)
         timestamp = new_timestamp
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'void' do
           add_merchant_details(xml, options)
           add_transaction_identifiers(xml, authorization, options)
@@ -216,7 +216,7 @@ module ActiveMerchant
       # Verify initiates an OTB (Open To Buy) request
       def build_verify_request(credit_card, options)
         timestamp = new_timestamp
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'request', 'timestamp' => timestamp, 'type' => 'otb' do
           add_merchant_details(xml, options)
           xml.tag! 'orderid', sanitize_order_id(options[:order_id])
@@ -230,13 +230,14 @@ module ActiveMerchant
       def add_address_and_customer_info(xml, options)
         billing_address = options[:billing_address] || options[:address]
         shipping_address = options[:shipping_address]
+        ipv4_address = ipv4?(options[:ip]) ? options[:ip] : nil
 
-        return unless billing_address || shipping_address || options[:customer] || options[:invoice] || options[:ip]
+        return unless billing_address || shipping_address || options[:customer] || options[:invoice] || ipv4_address
 
         xml.tag! 'tssinfo' do
           xml.tag! 'custnum', options[:customer] if options[:customer]
           xml.tag! 'prodid', options[:invoice] if options[:invoice]
-          xml.tag! 'custipaddress', options[:ip] if options[:ip]
+          xml.tag! 'custipaddress', options[:ip] if ipv4_address
 
           if billing_address
             xml.tag! 'address', 'type' => 'billing' do
@@ -369,6 +370,12 @@ module ActiveMerchant
       def sanitize_order_id(order_id)
         order_id.to_s.gsub(/[^a-zA-Z0-9\-_]/, '')
       end
+
+      def ipv4?(ip_address)
+        return false if ip_address.nil?
+
+        !ip_address.match(/\A\d+\.\d+\.\d+\.\d+\z/).nil?
+      end
     end
   end
 end

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

@@ -91,11 +91,11 @@ module ActiveMerchant #:nodoc:
       # More operations are supported by the gateway itself, but
       # are not supported in this library.
       SUPPORTED_TRANSACTIONS = {
-        :purchase   => 'A',
-        :authorize  => '1',
-        :capture    => '2',
-        :refund     => '3',
-        :cancel     => '9'
+        purchase:   'A',
+        authorize:  '1',
+        capture:    '2',
+        refund:     '3',
+        cancel:     '9'
       }
 
       # These are the text meanings sent back by the acquirer when
@@ -236,7 +236,7 @@ module ActiveMerchant #:nodoc:
         data = {}
         add_action(data, :cancel)
         order_id, amount, currency = split_authorization(authorization)
-        add_amount(data, amount, :currency => currency)
+        add_amount(data, amount, currency: currency)
         add_order(data, order_id)
         data[:description] = options[:description]
 
@@ -302,7 +302,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def threeds_url
-        test? ? 'https://sis-t.redsys.es:25443/sis/services/SerClsWSEntradaV2': 'https://sis.redsys.es/sis/services/SerClsWSEntradaV2'
+        test? ? 'https://sis-t.redsys.es:25443/sis/services/SerClsWSEntradaV2' : 'https://sis.redsys.es/sis/services/SerClsWSEntradaV2'
       end
 
       def add_payment(data, card)
@@ -313,10 +313,10 @@ module ActiveMerchant #:nodoc:
           year  = sprintf('%.4i', card.year)
           month = sprintf('%.2i', card.month)
           data[:card] = {
-            :name => name,
-            :pan  => card.number,
-            :date => "#{year[2..3]}#{month}",
-            :cvv  => card.verification_value
+            name: name,
+            pan: card.number,
+            date: "#{year[2..3]}#{month}",
+            cvv: card.verification_value
           }
         end
       end
@@ -356,7 +356,7 @@ module ActiveMerchant #:nodoc:
         if action
           {
             'Content-Type' => 'text/xml',
-            'SOAPAction'    => action
+            'SOAPAction' => action
           }
         else
           {
@@ -407,7 +407,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_sha1_xml_request(data, options = {})
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         build_merchant_data(xml, data, options)
         xml.target!
       end
@@ -426,7 +426,11 @@ module ActiveMerchant #:nodoc:
           xml.DS_MERCHANT_AMOUNT             data[:amount]
           xml.DS_MERCHANT_ORDER              data[:order_id]
           xml.DS_MERCHANT_TRANSACTIONTYPE    data[:action]
-          xml.DS_MERCHANT_PRODUCTDESCRIPTION data[:description]
+          if data[:description] && data[:threeds]
+            xml.DS_MERCHANT_PRODUCTDESCRIPTION CGI.escape(data[:description])
+          else
+            xml.DS_MERCHANT_PRODUCTDESCRIPTION data[:description]
+          end
           xml.DS_MERCHANT_TERMINAL           options[:terminal] || @options[:terminal]
           xml.DS_MERCHANT_MERCHANTCODE       @options[:login]
           xml.DS_MERCHANT_MERCHANTSIGNATURE  build_signature(data) unless sha256_authentication?
@@ -434,7 +438,11 @@ module ActiveMerchant #:nodoc:
 
           # Only when card is present
           if data[:card]
-            xml.DS_MERCHANT_TITULAR    data[:card][:name]
+            if data[:card][:name] && data[:threeds]
+              xml.DS_MERCHANT_TITULAR    CGI.escape(data[:card][:name])
+            else
+              xml.DS_MERCHANT_TITULAR    data[:card][:name]
+            end
             xml.DS_MERCHANT_PAN        data[:card][:pan]
             xml.DS_MERCHANT_EXPIRYDATE data[:card][:date]
             xml.DS_MERCHANT_CVV2       data[:card][:cvv]
@@ -456,7 +464,7 @@ module ActiveMerchant #:nodoc:
         params  = {}
         success = false
         message = ''
-        options = @options.merge(:test => test?)
+        options = @options.merge(test: test?)
         xml     = Nokogiri::XML(data)
         code    = xml.xpath('//RETORNOXML/CODIGO').text