activemerchant 1.100.0 → 1.133.0

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
       self.homepage_url = 'http://www.elementps.com'
       self.display_name = 'Element'
@@ -17,12 +17,17 @@ module ActiveMerchant #:nodoc:
       SERVICE_TEST_URL = 'https://certservices.elementexpress.com/express.asmx'
       SERVICE_LIVE_URL = 'https://services.elementexpress.com/express.asmx'
 
-      def initialize(options={})
+      NETWORK_TOKEN_TYPE = {
+        apple_pay: '2',
+        google_pay: '1'
+      }
+
+      def initialize(options = {})
         requires!(options, :account_id, :account_token, :application_id, :acceptor_id, :application_name, :application_version)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         action = payment.is_a?(Check) ? 'CheckSale' : 'CreditCardSale'
 
         request = build_soap_request do |xml|
@@ -38,7 +43,7 @@ module ActiveMerchant #:nodoc:
         commit(action, request, money)
       end
 
-      def authorize(money, payment, options={})
+      def authorize(money, payment, options = {})
         request = build_soap_request do |xml|
           xml.CreditCardAuthorization(xmlns: 'https://transaction.elementexpress.com') do
             add_credentials(xml)
@@ -52,8 +57,8 @@ module ActiveMerchant #:nodoc:
         commit('CreditCardAuthorization', request, money)
       end
 
-      def capture(money, authorization, options={})
-        trans_id, _ = split_authorization(authorization)
+      def capture(money, authorization, options = {})
+        trans_id, = split_authorization(authorization)
         options[:trans_id] = trans_id
 
         request = build_soap_request do |xml|
@@ -67,8 +72,8 @@ module ActiveMerchant #:nodoc:
         commit('CreditCardAuthorizationCompletion', request, money)
       end
 
-      def refund(money, authorization, options={})
-        trans_id, _ = split_authorization(authorization)
+      def refund(money, authorization, options = {})
+        trans_id, = split_authorization(authorization)
         options[:trans_id] = trans_id
 
         request = build_soap_request do |xml|
@@ -82,9 +87,22 @@ module ActiveMerchant #:nodoc:
         commit('CreditCardReturn', request, money)
       end
 
-      def void(authorization, options={})
+      def credit(money, payment, options = {})
+        request = build_soap_request do |xml|
+          xml.CreditCardCredit(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, payment)
+            add_transaction(xml, money, options)
+            add_terminal(xml, options)
+          end
+        end
+
+        commit('CreditCardCredit', request, money)
+      end
+
+      def void(authorization, options = {})
         trans_id, trans_amount = split_authorization(authorization)
-        options.merge!({trans_id: trans_id, trans_amount: trans_amount, reversal_type: 'Full'})
+        options.merge!({ trans_id: trans_id, trans_amount: trans_amount, reversal_type: 'Full' })
 
         request = build_soap_request do |xml|
           xml.CreditCardReversal(xmlns: 'https://transaction.elementexpress.com') do
@@ -110,11 +128,19 @@ module ActiveMerchant #:nodoc:
         commit('PaymentAccountCreate', request, nil)
       end
 
-      def verify(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) }
+      def verify(credit_card, options = {})
+        request = build_soap_request do |xml|
+          xml.CreditCardAVSOnly(xmlns: 'https://transaction.elementexpress.com') do
+            add_credentials(xml)
+            add_payment_method(xml, credit_card)
+            add_transaction(xml, 0, options)
+            add_terminal(xml, options)
+            add_address(xml, options)
+          end
         end
+
+        # send request with the transaction amount set to 0
+        commit('CreditCardAVSOnly', request, 0)
       end
 
       def supports_scrubbing?
@@ -150,6 +176,8 @@ module ActiveMerchant #:nodoc:
           add_payment_account_id(xml, payment)
         elsif payment.is_a?(Check)
           add_echeck(xml, payment)
+        elsif payment.is_a?(NetworkTokenizationCreditCard)
+          add_network_tokenization_card(xml, payment)
         else
           add_credit_card(xml, payment)
         end
@@ -178,15 +206,26 @@ module ActiveMerchant #:nodoc:
           xml.ReversalType options[:reversal_type] if options[:reversal_type]
           xml.TransactionID options[:trans_id] if options[:trans_id]
           xml.TransactionAmount amount(money.to_i) if money
-          xml.MarketCode 'Default' if money
-          xml.ReferenceNumber options[:order_id] || SecureRandom.hex(20)
+          xml.MarketCode market_code(money, options) if options[:market_code] || money
+          xml.ReferenceNumber options[:order_id].present? ? options[:order_id][0, 50] : SecureRandom.hex(20)
+          xml.TicketNumber options[:ticket_number] if options[:ticket_number]
+          xml.MerchantSuppliedTransactionId options[:merchant_supplied_transaction_id] if options[:merchant_supplied_transaction_id]
+          xml.PaymentType options[:payment_type] if options[:payment_type]
+          xml.SubmissionType options[:submission_type] if options[:submission_type]
+          xml.DuplicateCheckDisableFlag options[:duplicate_check_disable_flag].to_s == 'true' ? 'True' : 'False' unless options[:duplicate_check_disable_flag].nil?
+          xml.DuplicateOverrideFlag options[:duplicate_override_flag].to_s == 'true' ? 'True' : 'False' unless options[:duplicate_override_flag].nil?
+          xml.MerchantDescriptor options[:merchant_descriptor] if options[:merchant_descriptor]
         end
       end
 
+      def market_code(money, options)
+        options[:market_code] || 'Default'
+      end
+
       def add_terminal(xml, options)
         xml.terminal do
-          xml.TerminalID '01'
-          xml.CardPresentCode 'UseDefault'
+          xml.TerminalID options[:terminal_id] || '01'
+          xml.CardPresentCode options[:card_present_code] || 'UseDefault'
           xml.CardholderPresentCode 'UseDefault'
           xml.CardInputCode 'UseDefault'
           xml.CVVPresenceCode 'UseDefault'
@@ -214,8 +253,21 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_network_tokenization_card(xml, payment)
+        xml.card do
+          xml.CardNumber payment.number
+          xml.ExpirationMonth format(payment.month, :two_digits)
+          xml.ExpirationYear format(payment.year, :two_digits)
+          xml.CardholderName "#{payment.first_name} #{payment.last_name}"
+          xml.Cryptogram payment.payment_cryptogram
+          xml.ElectronicCommerceIndicator payment.eci if payment.eci.present?
+          xml.WalletType NETWORK_TOKEN_TYPE.fetch(payment.source, '0')
+        end
+      end
+
       def add_address(xml, options)
         if address = options[:billing_address] || options[:address]
+          address[:email] ||= options[:email]
           xml.address do
             xml.BillingAddress1 address[:address1] if address[:address1]
             xml.BillingAddress2 address[:address2] if address[:address2]
@@ -246,9 +298,7 @@ module ActiveMerchant #:nodoc:
         doc.remove_namespaces!
         root = doc.root.xpath('//response/*')
 
-        if root.empty?
-          root = doc.root.xpath('//Response/*')
-        end
+        root = doc.root.xpath('//Response/*') if root.empty?
 
         root.each do |node|
           if node.elements.empty?

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

@@ -5,48 +5,48 @@ 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', 'NO']
+      self.supported_countries = %w[DK SE NO]
+      self.supported_cardtypes = %i[dankort forbrugsforeningen visa master
+                                    american_express diners_club jcb maestro]
       self.homepage_url = 'http://epay.dk/'
       self.display_name = 'ePay'
 
       CURRENCY_CODES = {
-        :ADP => '020', :AED => '784', :AFA => '004', :ALL => '008', :AMD => '051',
-        :ANG => '532', :AOA => '973', :ARS => '032', :AUD => '036', :AWG => '533',
-        :AZM => '031', :BAM => '977', :BBD => '052', :BDT => '050', :BGL => '100',
-        :BGN => '975', :BHD => '048', :BIF => '108', :BMD => '060', :BND => '096',
-        :BOB => '068', :BOV => '984', :BRL => '986', :BSD => '044', :BTN => '064',
-        :BWP => '072', :BYR => '974', :BZD => '084', :CAD => '124', :CDF => '976',
-        :CHF => '756', :CLF => '990', :CLP => '152', :CNY => '156', :COP => '170',
-        :CRC => '188', :CUP => '192', :CVE => '132', :CYP => '196', :CZK => '203',
-        :DJF => '262', :DKK => '208', :DOP => '214', :DZD => '012', :ECS => '218',
-        :ECV => '983', :EEK => '233', :EGP => '818', :ERN => '232', :ETB => '230',
-        :EUR => '978', :FJD => '242', :FKP => '238', :GBP => '826', :GEL => '981',
-        :GHC => '288', :GIP => '292', :GMD => '270', :GNF => '324', :GTQ => '320',
-        :GWP => '624', :GYD => '328', :HKD => '344', :HNL => '340', :HRK => '191',
-        :HTG => '332', :HUF => '348', :IDR => '360', :ILS => '376', :INR => '356',
-        :IQD => '368', :IRR => '364', :ISK => '352', :JMD => '388', :JOD => '400',
-        :JPY => '392', :KES => '404', :KGS => '417', :KHR => '116', :KMF => '174',
-        :KPW => '408', :KRW => '410', :KWD => '414', :KYD => '136', :KZT => '398',
-        :LAK => '418', :LBP => '422', :LKR => '144', :LRD => '430', :LSL => '426',
-        :LTL => '440', :LVL => '428', :LYD => '434', :MAD => '504', :MDL => '498',
-        :MGF => '450', :MKD => '807', :MMK => '104', :MNT => '496', :MOP => '446',
-        :MRO => '478', :MTL => '470', :MUR => '480', :MVR => '462', :MWK => '454',
-        :MXN => '484', :MXV => '979', :MYR => '458', :MZM => '508', :NAD => '516',
-        :NGN => '566', :NIO => '558', :NOK => '578', :NPR => '524', :NZD => '554',
-        :OMR => '512', :PAB => '590', :PEN => '604', :PGK => '598', :PHP => '608',
-        :PKR => '586', :PLN => '985', :PYG => '600', :QAR => '634', :ROL => '642',
-        :RUB => '643', :RUR => '810', :RWF => '646', :SAR => '682', :SBD => '090',
-        :SCR => '690', :SDD => '736', :SEK => '752', :SGD => '702', :SHP => '654',
-        :SIT => '705', :SKK => '703', :SLL => '694', :SOS => '706', :SRG => '740',
-        :STD => '678', :SVC => '222', :SYP => '760', :SZL => '748', :THB => '764',
-        :TJS => '972', :TMM => '795', :TND => '788', :TOP => '776', :TPE => '626',
-        :TRL => '792', :TRY => '949', :TTD => '780', :TWD => '901', :TZS => '834',
-        :UAH => '980', :UGX => '800', :USD => '840', :UYU => '858', :UZS => '860',
-        :VEB => '862', :VND => '704', :VUV => '548', :XAF => '950', :XCD => '951',
-        :XOF => '952', :XPF => '953', :YER => '886', :YUM => '891', :ZAR => '710',
-        :ZMK => '894', :ZWD => '716'
+        ADP: '020', AED: '784', AFA: '004', ALL: '008', AMD: '051',
+        ANG: '532', AOA: '973', ARS: '032', AUD: '036', AWG: '533',
+        AZM: '031', BAM: '977', BBD: '052', BDT: '050', BGL: '100',
+        BGN: '975', BHD: '048', BIF: '108', BMD: '060', BND: '096',
+        BOB: '068', BOV: '984', BRL: '986', BSD: '044', BTN: '064',
+        BWP: '072', BYR: '974', BZD: '084', CAD: '124', CDF: '976',
+        CHF: '756', CLF: '990', CLP: '152', CNY: '156', COP: '170',
+        CRC: '188', CUP: '192', CVE: '132', CYP: '196', CZK: '203',
+        DJF: '262', DKK: '208', DOP: '214', DZD: '012', ECS: '218',
+        ECV: '983', EEK: '233', EGP: '818', ERN: '232', ETB: '230',
+        EUR: '978', FJD: '242', FKP: '238', GBP: '826', GEL: '981',
+        GHC: '288', GIP: '292', GMD: '270', GNF: '324', GTQ: '320',
+        GWP: '624', GYD: '328', HKD: '344', HNL: '340', HRK: '191',
+        HTG: '332', HUF: '348', IDR: '360', ILS: '376', INR: '356',
+        IQD: '368', IRR: '364', ISK: '352', JMD: '388', JOD: '400',
+        JPY: '392', KES: '404', KGS: '417', KHR: '116', KMF: '174',
+        KPW: '408', KRW: '410', KWD: '414', KYD: '136', KZT: '398',
+        LAK: '418', LBP: '422', LKR: '144', LRD: '430', LSL: '426',
+        LTL: '440', LVL: '428', LYD: '434', MAD: '504', MDL: '498',
+        MGF: '450', MKD: '807', MMK: '104', MNT: '496', MOP: '446',
+        MRO: '478', MTL: '470', MUR: '480', MVR: '462', MWK: '454',
+        MXN: '484', MXV: '979', MYR: '458', MZM: '508', NAD: '516',
+        NGN: '566', NIO: '558', NOK: '578', NPR: '524', NZD: '554',
+        OMR: '512', PAB: '590', PEN: '604', PGK: '598', PHP: '608',
+        PKR: '586', PLN: '985', PYG: '600', QAR: '634', ROL: '642',
+        RUB: '643', RUR: '810', RWF: '646', SAR: '682', SBD: '090',
+        SCR: '690', SDD: '736', SEK: '752', SGD: '702', SHP: '654',
+        SIT: '705', SKK: '703', SLL: '694', SOS: '706', SRG: '740',
+        STD: '678', SVC: '222', SYP: '760', SZL: '748', THB: '764',
+        TJS: '972', TMM: '795', TND: '788', TOP: '776', TPE: '626',
+        TRL: '792', TRY: '949', TTD: '780', TWD: '901', TZS: '834',
+        UAH: '980', UGX: '800', USD: '840', UYU: '858', UZS: '860',
+        VEB: '862', VND: '704', VUV: '548', XAF: '950', XCD: '951',
+        XOF: '952', XPF: '953', YER: '886', YUM: '891', ZAR: '710',
+        ZMK: '894', ZWD: '716'
       }
 
       # login: merchant number
@@ -177,14 +177,14 @@ module ActiveMerchant #:nodoc:
           Response.new response['accept'].to_i == 1,
             response['errortext'],
             response,
-            :test => test?,
-            :authorization => response['tid']
+            test: test?,
+            authorization: response['tid']
         else
           Response.new response['result'] == 'true',
             messages(response['epay'], response['pbs']),
             response,
-            :test => test?,
-            :authorization => params[:transaction]
+            test: test?,
+            authorization: params[:transaction]
         end
       end
 
@@ -261,7 +261,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def xml_builder(params, soap_call)
-        xml = Builder::XmlMarkup.new(:indent => 2)
+        xml = Builder::XmlMarkup.new(indent: 2)
         xml.instruct!
         xml.tag! 'soap:Envelope', { 'xmlns:xsi' => 'http://schemas.xmlsoap.org/soap/envelope/',
                                     'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',

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

@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://secure.evoepay.com/api/transact.php'
 
       self.supported_countries  = ['CA']
-      self.supported_cardtypes  = [:visa, :master, :american_express, :jcb, :discover]
+      self.supported_cardtypes  = %i[visa master american_express jcb discover]
       self.money_format         = :dollars
       self.homepage_url         = 'http://www.evocanada.com/'
       self.display_name         = 'EVO Canada'
@@ -139,8 +139,8 @@ module ActiveMerchant #:nodoc:
       # <tt>options</tt>.
       def capture(money, authorization, options = {})
         post = {
-          :amount         => amount(money),
-          :transactionid  => authorization
+          amount: amount(money),
+          transactionid: authorization
         }
         add_order(post, options)
         commit('capture', money, post)
@@ -153,7 +153,7 @@ module ActiveMerchant #:nodoc:
       # The <tt>identification</tt> parameter is the transaction ID, retrieved
       # from {Response#authorization}.
       def refund(money, identification)
-        post = {:transactionid => identification}
+        post = { transactionid: identification }
         commit('refund', money, post)
       end
 
@@ -181,7 +181,7 @@ module ActiveMerchant #:nodoc:
       # The <tt>identification</tt> parameter is the transaction ID, retrieved
       # from {Response#authorization}.
       def void(identification)
-        post = {:transactionid => identification}
+        post = { transactionid: identification }
         commit('void', nil, post)
       end
 
@@ -192,7 +192,7 @@ module ActiveMerchant #:nodoc:
       # The <tt>identification</tt> parameter is the transaction ID, retrieved
       # from {Response#authorization}.
       def update(identification, options)
-        post = {:transactionid => identification}
+        post = { transactionid: identification }
         add_order(post, options)
         commit('update', nil, post)
       end
@@ -245,7 +245,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_paymentmethod(post, payment)
-        if card_brand(payment)=='check'
+        if card_brand(payment) == 'check'
           post[:payment]              = 'check'
           post[:checkname]            = payment.name
           post[:checkaba]             = payment.routing_number
@@ -280,11 +280,10 @@ module ActiveMerchant #:nodoc:
         message = message_from(response)
 
         Response.new(success?(response), message, response,
-          :test          => test?,
-          :authorization => response['transactionid'],
-          :avs_result    => { :code => response['avsresponse'] },
-          :cvv_result    => response['cvvresponse']
-        )
+          test: test?,
+          authorization: response['transactionid'],
+          avs_result: { code: response['avsresponse'] },
+          cvv_result: response['cvvresponse'])
       end
 
       def message_from(response)
@@ -292,7 +291,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(action, parameters = {})
-        post = {:type => action}
+        post = { type: action }
 
         if test?
           post[:username] = 'demo'

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
 
       self.money_format = :cents
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
+      self.supported_cardtypes = %i[visa master american_express diners_club]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY'
 
@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
         commit(purchase_url(post[:CVN]), money, post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
 
         add_customer_id(post)
@@ -66,12 +66,12 @@ module ActiveMerchant #:nodoc:
       private
 
       def requires_address!(options)
-        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless options.has_key?(:address) or options.has_key?(:billing_address)
+        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless options.has_key?(:address) || options.has_key?(:billing_address)
       end
 
       def add_creditcard(post, creditcard)
-        post[:CardNumber]  = creditcard.number
-        post[:CardExpiryMonth]  = sprintf('%.2i', creditcard.month)
+        post[:CardNumber] = creditcard.number
+        post[:CardExpiryMonth] = sprintf('%.2i', creditcard.month)
         post[:CardExpiryYear] = sprintf('%.4i', creditcard.year)[-2..-1]
         post[:CustomerFirstName] = creditcard.first_name
         post[:CustomerLastName]  = creditcard.last_name
@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, options)
         if address = options[:billing_address] || options[:address]
-          post[:CustomerAddress]    = [ address[:address1], address[:address2], address[:city], address[:state], address[:country] ].compact.join(', ')
+          post[:CustomerAddress]    = [address[:address1], address[:address2], address[:city], address[:state], address[:country]].compact.join(', ')
           post[:CustomerPostcode]   = address[:zip]
         end
       end
@@ -114,9 +114,8 @@ module ActiveMerchant #:nodoc:
         Response.new(success?(response),
           message_from(response[:ewaytrxnerror]),
           response,
-          :authorization => response[:ewaytrxnnumber],
-          :test => test?
-        )
+          authorization: response[:ewaytrxnnumber],
+          test: test?)
       end
 
       def success?(response)
@@ -145,6 +144,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(message)
         return '' if message.blank?
+
         MESSAGES[message[0, 2]] || message
       end