activemerchant 1.105.0 → 1.107.4

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

@@ -21,6 +21,8 @@ module ActiveMerchant #:nodoc:
         visa:             'Visa 3DSecure',
         american_express: 'AMEX 3DSecure',
         discover:         'Discover 3DSecure',
+        android_pay:      'GooglePayApp',
+        google_pay:       'GooglePayApp'
       }
 
       def initialize(options={})
@@ -162,7 +164,7 @@ module ActiveMerchant #:nodoc:
         xml.hps :CardData do
           if card_or_token.respond_to?(:number)
             if card_or_token.track_data
-              xml.tag!('hps:TrackData', 'method'=>'swipe') do
+              xml.tag!('hps:TrackData', 'method' => 'swipe') do
                 xml.text! card_or_token.track_data
               end
               if options[:encryption_type]
@@ -199,9 +201,9 @@ module ActiveMerchant #:nodoc:
           xml.hps :RoutingNumber, check.routing_number
           xml.hps :AccountNumber, check.account_number
           xml.hps :CheckNumber, check.number
-          xml.hps :AccountType, check.account_type.upcase
+          xml.hps :AccountType, check.account_type&.upcase
         end
-        xml.hps :CheckType, check.account_holder_type.upcase
+        xml.hps :CheckType, check.account_holder_type&.upcase
       end
 
       def add_details(xml, options)

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

@@ -14,12 +14,13 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'iATS Payments'
 
       ACTIONS = {
-        purchase: 'ProcessCreditCardV1',
-        purchase_check: 'ProcessACHEFTV1',
-        refund: 'ProcessCreditCardRefundWithTransactionIdV1',
-        refund_check: 'ProcessACHEFTRefundWithTransactionIdV1',
-        store: 'CreateCreditCardCustomerCodeV1',
-        unstore: 'DeleteCustomerCodeV1'
+        purchase: 'ProcessCreditCard',
+        purchase_check: 'ProcessACHEFT',
+        purchase_customer_code: 'ProcessCreditCardWithCustomerCode',
+        refund: 'ProcessCreditCardRefundWithTransactionId',
+        refund_check: 'ProcessACHEFTRefundWithTransactionId',
+        store: 'CreateCreditCardCustomerCode',
+        unstore: 'DeleteCustomerCode'
       }
 
       def initialize(options={})
@@ -42,7 +43,7 @@ module ActiveMerchant #:nodoc:
         add_ip(post, options)
         add_description(post, options)
 
-        commit((payment.is_a?(Check) ? :purchase_check : :purchase), post)
+        commit(determine_purchase_type(payment), post)
       end
 
       def refund(money, authorization, options={})
@@ -90,6 +91,16 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def determine_purchase_type(payment)
+        if payment.is_a?(String)
+          :purchase_customer_code
+        elsif payment.is_a?(Check)
+          :purchase_check
+        else
+          :purchase
+        end
+      end
+
       def add_ip(post, options)
         post[:customer_ip_address] = options[:ip] if options.has_key?(:ip)
       end
@@ -101,6 +112,9 @@ module ActiveMerchant #:nodoc:
           post[:city] = billing_address[:city]
           post[:state] = billing_address[:state]
           post[:zip_code] = billing_address[:zip]
+          post[:phone] = billing_address[:phone] if billing_address[:phone]
+          post[:email] = billing_address[:email] if billing_address[:email]
+          post[:country] = billing_address[:country] if billing_address[:country]
         end
       end
 
@@ -114,7 +128,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment(post, payment)
-        if payment.is_a?(Check)
+        if payment.is_a?(String)
+          post[:customer_code] = payment
+        elsif payment.is_a?(Check)
           add_check(post, payment)
         else
           add_credit_card(post, payment)
@@ -178,12 +194,13 @@ module ActiveMerchant #:nodoc:
 
       def endpoints
         {
-          purchase: 'ProcessLink.asmx',
-          purchase_check: 'ProcessLink.asmx',
-          refund: 'ProcessLink.asmx',
-          refund_check: 'ProcessLink.asmx',
-          store: 'CustomerLink.asmx',
-          unstore: 'CustomerLink.asmx'
+          purchase: 'ProcessLinkv3.asmx',
+          purchase_check: 'ProcessLinkv3.asmx',
+          purchase_customer_code: 'ProcessLinkv3.asmx',
+          refund: 'ProcessLinkv3.asmx',
+          refund_check: 'ProcessLinkv3.asmx',
+          store: 'CustomerLinkv3.asmx',
+          unstore: 'CustomerLinkv3.asmx'
         }
       end
 
@@ -266,7 +283,7 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, parameters = {})
         xml = Builder::XmlMarkup.new
-        xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
+        xml.instruct!(:xml, version: '1.0', encoding: 'utf-8')
         xml.tag! 'soap12:Envelope', envelope_namespaces do
           xml.tag! 'soap12:Body' do
             xml.tag! ACTIONS[action], { 'xmlns' => 'https://www.iatspayments.com/NetGate/' } do

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

@@ -51,13 +51,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        post ={}
+        post = {}
         post[:transactionid] = authorization
         commit('capture', money, post)
       end
 
       def void(authorization, options = {})
-        post ={}
+        post = {}
         post[:transactionid] = authorization
         commit('void', nil, post)
       end
@@ -93,7 +93,7 @@ module ActiveMerchant #:nodoc:
       # store and unstore need to be defined
       def store(creditcard, options = {})
         billing_id = options.delete(:billing_id).to_s || true
-        authorize(100, creditcard, options.merge(:store => billing_id))
+        authorize(100, creditcard, options.merge(store: billing_id))
       end
 
       alias_method :unstore, :delete
@@ -173,10 +173,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
         Response.new(response['response'] == '1', message_from(response), response,
-          :authorization => response['transactionid'],
-          :test => test?,
-          :cvv_result => response['cvvresponse'],
-          :avs_result => { :code => response['avsresponse'] }
+          authorization: response['transactionid'],
+          test: test?,
+          cvv_result: response['cvvresponse'],
+          avs_result: { code: response['avsresponse'] }
         )
       end
 

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

@@ -141,9 +141,9 @@ module ActiveMerchant #:nodoc:
         response = parse(data)
 
         Response.new(response[:success], response[:message], response,
-          :authorization => response[:transaction_id],
-          :avs_result => { :code => response[:avs_result] },
-          :cvv_result => response[:cvv_result]
+          authorization: response[:transaction_id],
+          avs_result: { code: response[:avs_result] },
+          cvv_result: response[:cvv_result]
         )
       end
 

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

@@ -98,7 +98,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_credit_card(xml, payment)
-        xml.CreditCard :Registered => 'False' do
+        xml.CreditCard Registered: 'False' do
           xml.CardNumber payment.number
           xml.ExpM format(payment.month, :two_digits)
           xml.ExpY format(payment.year, :four_digits)

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

@@ -291,7 +291,8 @@ module ActiveMerchant #:nodoc:
         order_id, cross_reference, _ = authorization.split(';')
         build_request(options) do |xml|
           if money
-            details = {'CurrencyCode' => currency_code(options[:currency] || default_currency), 'Amount' => amount(money)}
+            currency = options[:currency] || currency(money)
+            details = {'CurrencyCode' => currency_code(currency), 'Amount' => localized_amount(money, currency)}
           else
             details = {'CurrencyCode' => currency_code(default_currency), 'Amount' => '0'}
           end
@@ -304,8 +305,8 @@ module ActiveMerchant #:nodoc:
 
       def build_request(options)
         requires!(options, :action)
-        xml = Builder::XmlMarkup.new :indent => 2
-        xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
+        xml = Builder::XmlMarkup.new indent: 2
+        xml.instruct!(:xml, version: '1.0', encoding: 'utf-8')
         xml.tag! 'soap:Envelope', { 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/',
                                     'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                                     'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema'} do
@@ -327,8 +328,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_purchase_data(xml, type, money, options)
+        currency = options[:currency] || currency(money)
         requires!(options, :order_id)
-        xml.tag! 'TransactionDetails', {'Amount' => amount(money), 'CurrencyCode' => currency_code(options[:currency] || currency(money))} do
+        xml.tag! 'TransactionDetails', {'Amount' => localized_amount(money, currency), 'CurrencyCode' => currency_code(currency)} do
           xml.tag! 'MessageDetails', {'TransactionType' => type}
           xml.tag! 'OrderID', options[:order_id]
           xml.tag! 'TransactionControl' do
@@ -383,13 +385,13 @@ module ActiveMerchant #:nodoc:
         authorization = success ? [options[:order_id], response[:transaction_output_data][:cross_reference], response[:transaction_output_data][:auth_code]].compact.join(';') : nil
 
         Response.new(success, message, response,
-          :test => test?,
-          :authorization => authorization,
-          :avs_result => {
-            :street_match => AVS_CODE[ response[:transaction_output_data][:address_numeric_check_result] ],
-            :postal_match => AVS_CODE[ response[:transaction_output_data][:post_code_check_result] ],
+          test: test?,
+          authorization: authorization,
+          avs_result: {
+            street_match: AVS_CODE[ response[:transaction_output_data][:address_numeric_check_result] ],
+            postal_match: AVS_CODE[ response[:transaction_output_data][:post_code_check_result] ],
           },
-          :cvv_result => CVV_CODE[ response[:transaction_output_data][:cv2_check_result] ]
+          cvv_result: CVV_CODE[ response[:transaction_output_data][:cv2_check_result] ]
         )
       end
 

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

@@ -388,14 +388,14 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(self.live_url, post_data(payload), 'Content-Type' => 'text/xml'))
 
         Response.new(successful?(response), response[:error_message], response,
-          :test => test?,
-          :authorization => response[:xid],
-          :avs_result => { :code => response[:avs_response] },
-          :cvv_result => response[:cvv_response])
+          test: test?,
+          authorization: response[:xid],
+          avs_result: { code: response[:avs_response] },
+          cvv_result: response[:cvv_response])
       end
 
       def post_data(payload)
-        payload_xml = payload.root.to_xml(:indent => 0)
+        payload_xml = payload.root.to_xml(indent: 0)
 
         payload_signature = sign_payload(payload_xml)
 
@@ -410,7 +410,7 @@ module ActiveMerchant #:nodoc:
         end.doc
 
         request.root.children.first.after payload.root
-        request.to_xml(:indent => 0)
+        request.to_xml(indent: 0)
       end
 
       def parse(raw_xml)
@@ -439,7 +439,7 @@ module ActiveMerchant #:nodoc:
 
       def sign_payload(payload)
         key = @options[:password].to_s
-        digest=OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new(key), key, payload)
+        digest = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new(key), key, payload)
         signature = Base64.encode64(digest)
         signature.chomp!
       end

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

@@ -60,7 +60,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def verify(credit_card, options={})
-        authorize(0, credit_card, options)
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
       end
 
       def verify_credentials
@@ -84,7 +87,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def build_xml_envelope(vxml)
-        builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+        builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
           xml[:soap].Envelope 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/' do
             xml[:soap].Body do
               xml.Execute 'xmlns' => 'http://iveri.com/' do
@@ -203,7 +206,7 @@ module ActiveMerchant #:nodoc:
       def parse_element(parsed, node)
         if !node.attributes.empty?
           node.attributes.each do |a|
-            parsed[underscore(node.name)+ '_' + underscore(a[1].name)] = a[1].value
+            parsed[underscore(node.name) + '_' + underscore(a[1].name)] = a[1].value
           end
         end
 

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

@@ -8,6 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(AO AQ AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BQ BR BS BT BV BW BY BZ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG EH ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HM HN HR HT HU ID IE IL IM IN IO IQ IR IS IT JE JM JO JP KE KG KH KI KM KN KP KR KW KY KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NF NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PK PL PM PN PR PS PT PW PY QA RE RO RS RU RW SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ UA UG UM US UY UZ VA VC VE VG VI VN VU WF WS YE YT ZA ZM ZW)
       self.default_currency = 'EUR'
+      self.currencies_with_three_decimal_places = %w(BHD IQD JOD KWD LWD OMR TND)
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro]
 
       self.homepage_url = 'https://www.ixopay.com'
@@ -151,6 +152,7 @@ module ActiveMerchant #:nodoc:
           xml.currency    currency
           xml.description description
           xml.callbackUrl(options[:callback_url])
+          add_stored_credentials(xml, options)
         end
       end
 
@@ -169,6 +171,7 @@ module ActiveMerchant #:nodoc:
           xml.currency    currency
           xml.description description
           xml.callbackUrl callback_url
+          add_stored_credentials(xml, options)
         end
       end
 
@@ -251,6 +254,25 @@ module ActiveMerchant #:nodoc:
         SecureRandom.uuid
       end
 
+      # Ixopay does not pass any parameters for cardholder/merchant initiated.
+      # Ixopay also doesn't support installment transactions, only recurring
+      # ("RECURRING") and unscheduled ("CARDONFILE").
+      #
+      # Furthermore, Ixopay is slightly unusual in its application of stored
+      # credentials in that the gateway does not return a true
+      # network_transaction_id that can be sent on subsequent transactions.
+      def add_stored_credentials(xml, options)
+        return unless stored_credential = options[:stored_credential]
+
+        if stored_credential[:initial_transaction]
+          xml.transactionIndicator 'INITIAL'
+        elsif stored_credential[:reason_type] == 'recurring'
+          xml.transactionIndicator 'RECURRING'
+        elsif stored_credential[:reason_type] == 'unscheduled'
+          xml.transactionIndicator 'CARDONFILE'
+        end
+      end
+
       def add_extra_data(xml, extra_data)
         extra_data.each do |k, v|
           xml.extraData(v, key: k)

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

@@ -287,10 +287,10 @@ module ActiveMerchant #:nodoc:
         Response.new(success,
           success ? 'APPROVED' : message_from(response),
           response,
-          :test => test?,
-          :authorization => authorization_from(response, money, token),
-          :avs_result => { :code => response[:avs] },
-          :cvv_result => response[:cvv2]
+          test: test?,
+          authorization: authorization_from(response, money, token),
+          avs_result: { code: response[:avs] },
+          cvv_result: response[:cvv2]
         )
       end
 

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

@@ -298,11 +298,11 @@ module ActiveMerchant #:nodoc:
         Response.new(success,
           success ? 'APPROVED' : message_from(response),
           response,
-          :test => test?,
-          :authorization => authorization_from(response, money, token),
-          :avs_result => AVSResult.new(:code => response[:avs]),
-          :cvv_result => CVVResult.new(response[:cvv2]),
-          :error_code => success ? nil : error_code_from(response)
+          test: test?,
+          authorization: authorization_from(response, money, token),
+          avs_result: AVSResult.new(code: response[:avs]),
+          cvv_result: CVVResult.new(response[:cvv2]),
+          error_code: success ? nil : error_code_from(response)
         )
       end
 

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

@@ -4,8 +4,8 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Kushki'
       self.homepage_url = 'https://www.kushkipagos.com'
 
-      self.test_url = 'https://api-uat.kushkipagos.com/v1/'
-      self.live_url = 'https://api.kushkipagos.com/v1/'
+      self.test_url = 'https://api-uat.kushkipagos.com/'
+      self.live_url = 'https://api.kushkipagos.com/'
 
       self.supported_countries = ['CL', 'CO', 'EC', 'MX', 'PE']
       self.default_currency = 'USD'
@@ -24,6 +24,23 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def authorize(amount, payment_method, options={})
+        MultiResponse.run() do |r|
+          r.process { tokenize(amount, payment_method, options) }
+          r.process { preauthorize(amount, r.authorization, options) }
+        end
+      end
+
+      def capture(amount, authorization, options={})
+        action = 'capture'
+
+        post = {}
+        post[:ticketNumber] = authorization
+        add_invoice(action, post, amount, options)
+
+        commit(action, post)
+      end
+
       def refund(amount, authorization, options={})
         action = 'refund'
 
@@ -75,6 +92,16 @@ module ActiveMerchant #:nodoc:
         commit(action, post)
       end
 
+      def preauthorize(amount, authorization, options)
+        action = 'preAuthorization'
+
+        post = {}
+        add_reference(post, authorization, options)
+        add_invoice(action, post, amount, options)
+
+        commit(action, post)
+      end
+
       def add_invoice(action, post, money, options)
         if action == 'tokenize'
           post[:totalAmount] = amount(money).to_f
@@ -131,7 +158,9 @@ module ActiveMerchant #:nodoc:
         'tokenize' => 'tokens',
         'charge' => 'charges',
         'void' => 'charges',
-        'refund' => 'refund'
+        'refund' => 'refund',
+        'preAuthorization' => 'preAuthorization',
+        'capture' => 'capture'
       }
 
       def commit(action, params)
@@ -178,9 +207,9 @@ module ActiveMerchant #:nodoc:
         base_url = test? ? test_url : live_url
 
         if ['void', 'refund'].include?(action)
-          base_url + ENDPOINT[action] + '/' + params[:ticketNumber].to_s
+          base_url + 'v1/' + ENDPOINT[action] + '/' + params[:ticketNumber].to_s
         else
-          base_url + ENDPOINT[action]
+          base_url + 'card/v1/' + ENDPOINT[action]
         end
       end