activemerchant 1.80.0 → 1.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a370014b9b3f630ef74788e39ed2f70166e825b
-  data.tar.gz: ada89dc3c89779f200933eb9ce9ec03af4e4b68b
+  metadata.gz: 9a3a23a8a15d84e0c61a12458a7198886b2ab517
+  data.tar.gz: 256e0471468a250883d3b57eb8af909c4ae20a94
 SHA512:
-  metadata.gz: 9e98a44739681282c53fd421e39903830656a97bab74dab4c8d7ea34cf103f09b2c091fd6941b97cc72962e43f1aba3f104c89074089b5b2d3c53ae215f26a33
-  data.tar.gz: 255f0dab0c7aaf55f4d111fac977e5cd058fa5e8a86b4d6f424fe87bdb056d730bc5ea50830887fa1f69f72c58c24929ce3c3bf296f05b3c0196803e5a2702b5
+  metadata.gz: 95115d4f69d651b30e3129af8bb20b37af280d4de58c3b4a9fa29954c5bc605b4c0226c3555d08ec2c7f2b41b7cdae16081f634199adf22e5caa69605d733ceb
+  data.tar.gz: b711f96170b72145fa4ef79b79778c26c4396a0d51fdfb4af1aaeb7e05a56a7dd7c8a9bd8f03fe4ac3cf08a3a86944c9925a373206ff34a937526c2f4db305e8

data/CHANGELOG

@@ -1,6 +1,22 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+* GlobalCollect: Don't overwrite contactDetails [curiousepic] #2915
+* Pin Payments: Pass reference for statement desc [curiousepic] #2919
+* FirstData: introduce v27 gateway [shasum] #2912
+* Stripe: Fix contactless magstripe support [abhiin1947] #2917
+* ANET: Expose full response code [curiousepic] #2924
+* Global Collect: Fix customer data field structure [curiousepic] #2929
+* Adyen: Set Default Name for Apple Pay Transactions [nfarve] #2930
+* Beanstream: Update to use api key with login credentials [nfarve] #2934
+* CT Payments: Fix a typo in the live URL scheme [bpollack] #2936
+* CyberSource: Don't throw exceptions on HTML responses [bpollack] #2937
+* CyberSource: Remove extraneous parameter blocking echecks [chriscz] #2861
+* FirstPay: Update Fields For Recurring Payments [nfarve] #2940
+* Remove unused handle_response method [bl] #2309
+* Barclaycard Smartpay: bump API version to v30 [bpollack] #2941
+* Safecharge: Remove duplicate supported country [curiousepic]
+* Payflow Express: Use SHIPTONAME instead of `full_name` for shipping address [filipebarcos] #2945
 
 == Version 1.80.0 (July 4, 2018)
 * Default SSL min_version to TLS 1.1 to comply with June 30 PCI DSS deadline [bdewater] #2909
@@ -34,6 +50,7 @@
 * Redsys: Fix payments with cc token [Leonardo Diez] #2586
 * Redsys: Missing cardnumber params in xml_signed_fields [nerburish] #2628
 * Bogus: allow authorizing with a tokenized card [Azdaroth] #2703
+* CT Payment: Add new gateway [nfarve]  #2911
 
 == Version 1.79.2 (June 2, 2018)
 * Fix Gateway#max_version= overwriting min_version [bdewater]

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

@@ -179,6 +179,7 @@ module ActiveMerchant #:nodoc:
         }
 
         card.delete_if{|k,v| v.blank? }
+        card[:holderName] ||= 'Not Provided' if credit_card.is_a?(NetworkTokenizationCreditCard)
         requires!(card, :expiryMonth, :expiryYear, :holderName, :number)
         post[:card] = card
       end

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

@@ -863,6 +863,10 @@ module ActiveMerchant
           (empty?(element.content) ? nil : element.content)
         end
 
+        response[:full_response_code] = if(element = doc.at_xpath('//messages/message/code'))
+          (empty?(element.content) ? nil : element.content)
+        end
+
         response
       end
 

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

@@ -13,6 +13,8 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://www.barclaycardsmartpay.com/'
       self.display_name = 'Barclaycard Smartpay'
 
+      API_VERSION = 'v30'
+
       def initialize(options = {})
         requires!(options, :company, :merchant, :password)
         super
@@ -222,11 +224,11 @@ module ActiveMerchant #:nodoc:
       def build_url(action)
         case action
         when 'store'
-          "#{test? ? self.test_url : self.live_url}/Recurring/v12/storeToken"
+          "#{test? ? self.test_url : self.live_url}/Recurring/#{API_VERSION}/storeToken"
         when 'finalize3ds'
-          "#{test? ? self.test_url : self.live_url}/Payment/v12/authorise3d"
+          "#{test? ? self.test_url : self.live_url}/Payment/#{API_VERSION}/authorise3d"
         else
-          "#{test? ? self.test_url : self.live_url}/Payment/v12/#{action}"
+          "#{test? ? self.test_url : self.live_url}/Payment/#{API_VERSION}/#{action}"
         end
       end
 

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

@@ -199,6 +199,7 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
           gsub(/(&?password=)[^&\s]*(&?)/, '\1[FILTERED]\2').
+          gsub(/(&?passcode=)[^&\s]*(&?)/, '\1[FILTERED]\2').
           gsub(/(&?trnCardCvd=)\d*(&?)/, '\1[FILTERED]\2').
           gsub(/(&?trnCardNumber=)\d*(&?)/, '\1[FILTERED]\2')
       end

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -156,7 +156,6 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options = {})
         reference, _, _ = split_auth(authorization)
-
         post = {}
         add_amount(post, money)
         add_reference(post, reference)
@@ -313,7 +312,6 @@ module ActiveMerchant #:nodoc:
         post[:serviceVersion] = SP_SERVICE_VERSION
         post[:responseFormat] = 'QS'
         post[:cardValidation] = (options[:cardValidation].to_i == 1) || '0'
-
         post[:operationType] = options[:operationType] || options[:operation] || secure_profile_action(:new)
         post[:customerCode] = options[:billing_id] || options[:vault_id] || false
         post[:status] = options[:status]
@@ -462,6 +460,7 @@ module ActiveMerchant #:nodoc:
           params[:username] = @options[:user] if @options[:user]
           params[:password] = @options[:password] if @options[:password]
           params[:merchant_id] = @options[:login]
+          params[:passcode] = @options[:api_key]
         end
         params[:vbvEnabled] = '0'
         params[:scEnabled] = '0'

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

@@ -0,0 +1,267 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class CtPaymentGateway < Gateway
+      self.test_url = 'https://test.ctpaiement.ca/v1/'
+      self.live_url = 'https://www.ctpaiement.com/v1/'
+
+      self.supported_countries = ['US', 'CA']
+      self.default_currency = 'CAD'
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club]
+
+      self.homepage_url = 'http://www.ct-payment.com/'
+      self.display_name = 'CT Payment'
+
+      STANDARD_ERROR_CODE_MAPPING = {
+        '14' => STANDARD_ERROR_CODE[:invalid_number],
+        '05' => STANDARD_ERROR_CODE[:card_declined],
+        'M6' => STANDARD_ERROR_CODE[:card_declined],
+        '9068' => STANDARD_ERROR_CODE[:incorrect_number],
+        '9067' => STANDARD_ERROR_CODE[:incorrect_number]
+      }
+      CARD_BRAND = {
+        'american_express' => 'A',
+        'master' => 'M',
+        'diners_club' => 'I',
+        'visa' => 'V',
+        'discover' => 'O'
+      }
+
+      def initialize(options={})
+        requires!(options, :api_key, :company_number, :merchant_number)
+        super
+      end
+
+      def purchase(money, payment, options={})
+        requires!(options, :order_id)
+        post = {}
+        add_terminal_number(post, options)
+        add_money(post, money)
+        add_operator_id(post, options)
+        add_invoice(post, money, options)
+        add_payment(post, payment)
+        add_address(post, payment, options)
+        add_customer_data(post, options)
+
+        payment.is_a?(String) ? commit('purchaseWithToken', post) : commit('purchase', post)
+      end
+
+      def authorize(money, payment, options={})
+        requires!(options, :order_id)
+        post = {}
+        add_money(post, money)
+        add_terminal_number(post, options)
+        add_operator_id(post, options)
+        add_invoice(post, money, options)
+        add_payment(post, payment)
+        add_address(post, payment, options)
+        add_customer_data(post, options)
+
+        payment.is_a?(String) ? commit('preAuthorizationWithToken', post) : commit('preAuthorization', post)
+      end
+
+      def capture(money, authorization, options={})
+        requires!(options, :order_id)
+        post = {}
+        add_invoice(post, money, options)
+        add_money(post, money)
+        add_customer_data(post, options)
+        transaction_number, authorization_number, invoice_number = split_authorization(authorization)
+        post[:OriginalTransactionNumber] = transaction_number
+        post[:OriginalAuthorizationNumber] = authorization_number
+        post[:OriginalInvoiceNumber] = invoice_number
+
+        commit('completion', post)
+      end
+
+      def refund(money, authorization, options={})
+        requires!(options, :order_id)
+        post = {}
+        add_invoice(post, money, options)
+        add_money(post, money)
+        add_customer_data(post, options)
+        transaction_number, _, invoice_number = split_authorization(authorization)
+        post[:OriginalTransactionNumber] = transaction_number
+        post[:OriginalInvoiceNumber] = invoice_number
+
+        commit('refundWithoutCard', post)
+      end
+
+      def credit(money, payment, options={})
+        requires!(options, :order_id)
+        post = {}
+        add_terminal_number(post, options)
+        add_money(post, money)
+        add_operator_id(post, options)
+        add_invoice(post, money, options)
+        add_payment(post, payment)
+        add_address(post, payment, options)
+        add_customer_data(post, options)
+
+        payment.is_a?(String) ? commit('refundWithToken', post) : commit('refund', post)
+      end
+
+      def void(authorization, options={})
+        post = {}
+        post[:InputType] = 'I'
+        post[:LanguageCode] = 'E'
+        transaction_number, _, invoice_number = split_authorization(authorization)
+        post[:OriginalTransactionNumber] = transaction_number
+        post[:OriginalInvoiceNumber] = invoice_number
+        add_operator_id(post, options)
+        add_customer_data(post, options)
+
+        commit('void', post)
+      end
+
+      def verify(credit_card, options={})
+        requires!(options, :order_id)
+        post = {}
+        add_terminal_number(post, options)
+        add_operator_id(post, options)
+        add_invoice(post,0, options)
+        add_payment(post, credit_card)
+        add_customer_data(post, options)
+
+        commit('verifyAccount', post)
+      end
+
+      def store(credit_card, options={})
+        requires!(options, :email)
+        post = {
+          LanguageCode: 'E',
+          Name: credit_card.name.rjust(50, ' '),
+          Email: options[:email].rjust(240, ' ')
+        }
+        add_operator_id(post, options)
+        add_payment(post, credit_card)
+        add_customer_data(post, options)
+
+        commit('recur/AddUser', post)
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((&?auth-api-key=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?payload=)[a-zA-Z%0-9=]+)i, '\1[FILTERED]').
+          gsub(%r((&?token:)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?cardNumber:)[^&]*)i, '\1[FILTERED]')
+      end
+
+      private
+
+      def add_terminal_number(post, options)
+        post[:MerchantTerminalNumber] = options[:merchant_terminal_number] || ' ' * 5
+      end
+
+      def add_money(post, money)
+        post[:Amount] = money.to_s.rjust(11,'0')
+      end
+
+      def add_operator_id(post, options)
+        post[:OperatorID] = options[:operator_id] || '0' * 8
+      end
+
+      def add_customer_data(post, options)
+        post[:CustomerNumber] = options[:customer_number] || '0' * 8
+      end
+
+      def add_address(post, creditcard, options)
+        if address = options[:billing_address] || options[:address]
+          post[:CardHolderAddress] = ("#{address[:address1]} #{address[:address2]}").rjust(20, ' ')
+          post[:CardHolderPostalCode] = address[:zip].gsub(/\s+/, '').rjust(9, ' ')
+        end
+      end
+
+      def add_invoice(post, money,  options)
+        post[:CurrencyCode] = options[:currency] || (currency(money) if money)
+        post[:InvoiceNumber] = options[:order_id].rjust(12,'0')
+        post[:InputType] = 'I'
+        post[:LanguageCode] = 'E'
+      end
+
+      def add_payment(post, payment)
+        if payment.is_a?(String)
+          post[:Token] = split_authorization(payment)[3].strip
+        else
+          post[:CardType] = CARD_BRAND[payment.brand] || ' '
+          post[:CardNumber] = payment.number.rjust(40,' ')
+          post[:ExpirationDate] = expdate(payment)
+          post[:Cvv2Cvc2Number] = payment.verification_value
+        end
+      end
+
+      def parse(body)
+        JSON.parse(body)
+      end
+
+      def split_authorization(authorization)
+        authorization.split(';')
+      end
+
+      def commit_raw(action, parameters)
+        url = (test? ? test_url : live_url) + action
+        response = parse(ssl_post(url, post_data(action, parameters)))
+
+        final_response = Response.new(
+          success_from(response),
+          message_from(response),
+          response,
+          authorization: authorization_from(response),
+          avs_result: AVSResult.new(code: response['avsStatus']),
+          cvv_result: CVVResult.new(response['cvv2Cvc2Status']),
+          test: test?,
+          error_code: error_code_from(response)
+        )
+      end
+
+      def commit(action, parameters)
+        if action == 'void'
+          commit_raw(action, parameters)
+        else
+          MultiResponse.run(true) do |r|
+            r.process { commit_raw(action, parameters)}
+            r.process {
+              split_auth = split_authorization(r.authorization)
+              auth =  (action.include?('recur')? split_auth[4] : split_auth[0])
+              action.include?('recur') ? commit_raw('recur/ack', {ID: auth}) : commit_raw('ack', {TransactionNumber: auth})
+            }
+          end
+        end
+      end
+
+      def success_from(response)
+        return true if response['returnCode'] == '  00'
+        return true if response['returnCode'] == 'true'
+        return true if response['recurReturnCode'] == '  00'
+        return false
+      end
+
+      def message_from(response)
+        response['errorDescription'] || (response['terminalDisp'].strip if response['terminalDisp'])
+      end
+
+      def authorization_from(response)
+        "#{response['transactionNumber']};#{response['authorizationNumber']};"\
+        "#{response['invoiceNumber']};#{response['token']};#{response['id']}"
+      end
+
+      def post_data(action, parameters = {})
+        parameters[:CompanyNumber] = @options[:company_number]
+        parameters[:MerchantNumber] = @options[:merchant_number]
+        parameters = parameters.collect do |key, value|
+          "#{key}=#{value}" unless (value.nil? || value.empty?)
+        end.join('&')
+        payload = Base64.strict_encode64(parameters)
+        "auth-api-key=#{@options[:api_key]}&payload=#{payload}".strip
+      end
+
+      def error_code_from(response)
+        STANDARD_ERROR_CODE_MAPPING[response['returnCode'].strip || response['recurReturnCode'.strip]] unless success_from(response)
+      end
+    end
+  end
+end

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

@@ -356,7 +356,7 @@ module ActiveMerchant #:nodoc:
         add_subscription(xml, options)
         if options[:setup_fee]
           if card_brand(payment_method) == 'check'
-            add_check_service(xml, options)
+            add_check_service(xml)
           else
             add_purchase_service(xml, payment_method, options)
             add_payment_network_token(xml) if network_tokenization?(payment_method)
@@ -708,9 +708,13 @@ module ActiveMerchant #:nodoc:
       # Response object
       def commit(request, action, amount, options)
         begin
-          response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(request, options)))
+          raw_response = ssl_post(test? ? self.test_url : self.live_url, build_request(request, options))
         rescue ResponseError => e
-          response = parse(e.response.body)
+          raw_response = e.response.body
+        end
+
+        begin
+          response = parse(raw_response)
         rescue REXML::ParseException => e
           response = { message: e.to_s }
         end

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

@@ -93,8 +93,9 @@ module ActiveMerchant #:nodoc:
         post[:card_exp] = expdate(payment)
         post[:cvv2] = payment.verification_value
         post[:recurring] = options[:recurring] if options[:recurring]
-        post[:recurringStartDate] = options[:recurring_start_date] if options[:recurring_start_date]
-        post[:recurringEndDate] = options[:recurring_end_date] if options[:recurring_end_date]
+        post[:recurring_start_date] = options[:recurring_start_date] if options[:recurring_start_date]
+        post[:recurring_end_date] = options[:recurring_end_date] if options[:recurring_end_date]
+        post[:recurring_type] = options[:recurring_type] if options[:recurring_type]
       end
 
       def add_reference(post, action, money, authorization)

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

@@ -0,0 +1,444 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class FirstdataE4V27Gateway < Gateway
+      self.test_url = 'https://api.demo.globalgatewaye4.firstdata.com/transaction/v27'
+      self.live_url = 'https://api.globalgatewaye4.firstdata.com/transaction/v27'
+
+      TRANSACTIONS = {
+        sale:          '00',
+        authorization: '01',
+        verify:        '05',
+        capture:       '32',
+        void:          '33',
+        credit:        '34',
+        store:         '05'
+      }
+
+      SUCCESS = 'true'
+
+      SENSITIVE_FIELDS = [:cvdcode, :expiry_date, :card_number]
+
+      BRANDS = {
+        :visa => 'Visa',
+        :master => 'Mastercard',
+        :american_express => 'American Express',
+        :jcb => 'JCB',
+        :discover => 'Discover'
+      }
+
+      DEFAULT_ECI = '07'
+
+      self.supported_cardtypes = BRANDS.keys
+      self.supported_countries = ['CA', 'US']
+      self.default_currency = 'USD'
+      self.homepage_url = 'http://www.firstdata.com'
+      self.display_name = 'FirstData Global Gateway e4 v27'
+
+      STANDARD_ERROR_CODE_MAPPING = {
+        # Bank error codes: https://support.payeezy.com/hc/en-us/articles/203730509-First-Data-Global-Gateway-e4-Bank-Response-Codes
+        '201' => STANDARD_ERROR_CODE[:incorrect_number],
+        '531' => STANDARD_ERROR_CODE[:invalid_cvc],
+        '503' => STANDARD_ERROR_CODE[:invalid_cvc],
+        '811' => STANDARD_ERROR_CODE[:invalid_cvc],
+        '605' => STANDARD_ERROR_CODE[:invalid_expiry_date],
+        '522' => STANDARD_ERROR_CODE[:expired_card],
+        '303' => STANDARD_ERROR_CODE[:card_declined],
+        '530' => STANDARD_ERROR_CODE[:card_declined],
+        '401' => STANDARD_ERROR_CODE[:call_issuer],
+        '402' => STANDARD_ERROR_CODE[:call_issuer],
+        '501' => STANDARD_ERROR_CODE[:pickup_card],
+        # Ecommerce error codes: https://support.payeezy.com/hc/en-us/articles/203730499-eCommerce-Response-Codes-ETG-e4-Transaction-Gateway-Codes
+        '22' => STANDARD_ERROR_CODE[:invalid_number],
+        '25' => STANDARD_ERROR_CODE[:invalid_expiry_date],
+        '31' => STANDARD_ERROR_CODE[:incorrect_cvc],
+        '44' => STANDARD_ERROR_CODE[:incorrect_zip],
+        '42' => STANDARD_ERROR_CODE[:processing_error]
+      }
+
+      def initialize(options = {})
+        requires!(options, :login, :password, :key_id, :hmac_key)
+        @options = options
+
+        super
+      end
+
+      def authorize(money, credit_card_or_store_authorization, options = {})
+        commit(:authorization, build_sale_or_authorization_request(money, credit_card_or_store_authorization, options))
+      end
+
+      def purchase(money, credit_card_or_store_authorization, options = {})
+        commit(:sale, build_sale_or_authorization_request(money, credit_card_or_store_authorization, options))
+      end
+
+      def capture(money, authorization, options = {})
+        commit(:capture, build_capture_or_credit_request(money, authorization, options))
+      end
+
+      def void(authorization, options = {})
+        commit(:void, build_capture_or_credit_request(money_from_authorization(authorization), authorization, options))
+      end
+
+      def refund(money, authorization, options = {})
+        commit(:credit, build_capture_or_credit_request(money, authorization, options))
+      end
+
+      def verify(credit_card, options = {})
+        commit(:verify, build_sale_or_authorization_request(0, credit_card, options))
+      end
+
+      # Tokenize a credit card with TransArmor
+      #
+      # The TransArmor token and other card data necessary for subsequent
+      # transactions is stored in the response's +authorization+ attribute.
+      # The authorization string may be passed to +authorize+ and +purchase+
+      # instead of a +ActiveMerchant::Billing::CreditCard+ instance.
+      #
+      # TransArmor support must be explicitly activated on your gateway
+      # account by FirstData. If your authorization string is empty, contact
+      # FirstData support for account setup assistance.
+      #
+      # https://support.payeezy.com/hc/en-us/articles/203731189-TransArmor-Tokenization
+      def store(credit_card, options = {})
+        commit(:store, build_store_request(credit_card, options), credit_card)
+      end
+
+      def verify_credentials
+        response = void('0')
+        response.message != 'Unauthorized Request. Bad or missing credentials.'
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript
+          .gsub(%r((<Card_Number>).+(</Card_Number>)), '\1[FILTERED]\2')
+          .gsub(%r((<CVDCode>).+(</CVDCode>)), '\1[FILTERED]\2')
+          .gsub(%r((<Password>).+(</Password>))i, '\1[FILTERED]\2')
+          .gsub(%r((<CAVV>).+(</CAVV>)), '\1[FILTERED]\2')
+          .gsub(%r((CARD NUMBER\s+: )#+\d+), '\1[FILTERED]')
+      end
+
+      def supports_network_tokenization?
+        true
+      end
+
+      private
+
+      def build_request(action, body)
+        xml = Builder::XmlMarkup.new
+
+        xml.instruct!
+        xml.tag! 'Transaction', xmlns: 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes' do
+          add_credentials(xml)
+          add_transaction_type(xml, action)
+          xml << body
+        end
+
+        xml.target!
+      end
+
+      def build_sale_or_authorization_request(money, credit_card_or_store_authorization, options)
+        xml = Builder::XmlMarkup.new
+
+        add_amount(xml, money, options)
+
+        if credit_card_or_store_authorization.is_a? String
+          add_credit_card_token(xml, credit_card_or_store_authorization, options)
+        else
+          add_credit_card(xml, credit_card_or_store_authorization, options)
+        end
+
+        add_address(xml, options)
+        add_customer_data(xml, options)
+        add_invoice(xml, options)
+        add_tax_fields(xml, options)
+        add_level_3(xml, options)
+
+        xml.target!
+      end
+
+      def build_capture_or_credit_request(money, identification, options)
+        xml = Builder::XmlMarkup.new
+
+        add_identification(xml, identification)
+        add_amount(xml, money, options)
+        add_customer_data(xml, options)
+        add_card_authentication_data(xml, options)
+
+        xml.target!
+      end
+
+      def build_store_request(credit_card, options)
+        xml = Builder::XmlMarkup.new
+
+        add_credit_card(xml, credit_card, options)
+        add_address(xml, options)
+        add_customer_data(xml, options)
+
+        xml.target!
+      end
+
+      def add_credentials(xml)
+        xml.tag! 'ExactID', @options[:login]
+        xml.tag! 'Password', @options[:password]
+      end
+
+      def add_transaction_type(xml, action)
+        xml.tag! 'Transaction_Type', TRANSACTIONS[action]
+      end
+
+      def add_identification(xml, identification)
+        authorization_num, transaction_tag, _ = identification.split(';')
+
+        xml.tag! 'Authorization_Num', authorization_num
+        xml.tag! 'Transaction_Tag', transaction_tag
+      end
+
+      def add_amount(xml, money, options)
+        currency_code = options[:currency] || default_currency
+        xml.tag! 'DollarAmount', localized_amount(money, currency_code)
+        xml.tag! 'Currency', currency_code
+      end
+
+      def add_credit_card(xml, credit_card, options)
+        if credit_card.respond_to?(:track_data) && credit_card.track_data.present?
+          xml.tag! 'Track1', credit_card.track_data
+          xml.tag! 'Ecommerce_Flag', 'R'
+        else
+          xml.tag! 'Card_Number', credit_card.number
+          xml.tag! 'Expiry_Date', expdate(credit_card)
+          xml.tag! 'CardHoldersName', credit_card.name
+          xml.tag! 'CardType', card_type(credit_card.brand)
+
+          add_credit_card_eci(xml, credit_card, options)
+          add_credit_card_verification_strings(xml, credit_card, options)
+        end
+      end
+
+      def add_credit_card_eci(xml, credit_card, options)
+        eci = if credit_card.is_a?(NetworkTokenizationCreditCard) && credit_card.source == :apple_pay && card_brand(credit_card) == 'discover'
+                # Discover requires any Apple Pay transaction, regardless of in-app
+                # or web, and regardless of the ECI contained in the PKPaymentToken,
+                # to have an ECI value explicitly of 04.
+                '04'
+              else
+                (credit_card.respond_to?(:eci) ? credit_card.eci : nil) || options[:eci] || DEFAULT_ECI
+              end
+
+        xml.tag! 'Ecommerce_Flag', eci.to_s =~ /^[0-9]+$/ ? eci.to_s.rjust(2, '0') : eci
+      end
+
+      def add_credit_card_verification_strings(xml, credit_card, options)
+        if credit_card.is_a?(NetworkTokenizationCreditCard)
+          add_network_tokenization_credit_card(xml, credit_card)
+        else
+          if credit_card.verification_value?
+            xml.tag! 'CVD_Presence_Ind', '1'
+            xml.tag! 'CVDCode', credit_card.verification_value
+          end
+
+          add_card_authentication_data(xml, options)
+        end
+      end
+
+      def add_network_tokenization_credit_card(xml, credit_card)
+        case card_brand(credit_card).to_sym
+        when :american_express
+          cryptogram = Base64.decode64(credit_card.payment_cryptogram)
+          xml.tag!('XID', Base64.encode64(cryptogram[20...40]))
+          xml.tag!('CAVV', Base64.encode64(cryptogram[0...20]))
+        else
+          xml.tag!('XID', credit_card.transaction_id) if credit_card.transaction_id
+          xml.tag!('CAVV', credit_card.payment_cryptogram)
+        end
+      end
+
+      def add_card_authentication_data(xml, options)
+        xml.tag! 'CAVV', options[:cavv]
+        xml.tag! 'XID', options[:xid]
+      end
+
+      def add_credit_card_token(xml, store_authorization, options)
+        params = store_authorization.split(';')
+        credit_card = CreditCard.new(
+          :brand      => params[1],
+          :first_name => params[2],
+          :last_name  => params[3],
+          :month      => params[4],
+          :year       => params[5])
+
+        xml.tag! 'TransarmorToken', params[0]
+        xml.tag! 'Expiry_Date', expdate(credit_card)
+        xml.tag! 'CardHoldersName', credit_card.name
+        xml.tag! 'CardType', card_type(credit_card.brand)
+        add_card_authentication_data(xml, options)
+      end
+
+      def add_customer_data(xml, options)
+        xml.tag! 'Customer_Ref', options[:customer] if options[:customer]
+        xml.tag! 'Client_IP', options[:ip] if options[:ip]
+        xml.tag! 'Client_Email', options[:email] if options[:email]
+      end
+
+      def add_address(xml, options)
+        if (address = options[:billing_address] || options[:address])
+          xml.tag! 'Address' do
+            xml.tag! 'Address1', address[:address1]
+            xml.tag! 'Address2', address[:address2] if address[:address2]
+            xml.tag! 'City', address[:city]
+            xml.tag! 'State', address[:state]
+            xml.tag! 'Zip', address[:zip]
+            xml.tag! 'CountryCode', address[:country]
+          end
+          xml.tag! 'ZipCode', address[:zip]
+        end
+      end
+
+      def add_invoice(xml, options)
+        xml.tag! 'Reference_No', options[:order_id]
+        xml.tag! 'Reference_3',  options[:description] if options[:description]
+      end
+
+      def add_tax_fields(xml, options)
+        xml.tag! 'Tax1Amount',  options[:tax1_amount] if options[:tax1_amount]
+        xml.tag! 'Tax1Number',  options[:tax1_number] if options[:tax1_number]
+      end
+
+      def add_level_3(xml, options)
+        xml.tag!('Level3') { |x| x << options[:level_3] } if options[:level_3]
+      end
+
+      def expdate(credit_card)
+        "#{format(credit_card.month, :two_digits)}#{format(credit_card.year, :two_digits)}"
+      end
+
+      def card_type(credit_card_brand)
+        BRANDS[credit_card_brand.to_sym] if credit_card_brand
+      end
+
+      def commit(action, data, credit_card = nil)
+        url = (test? ? self.test_url : self.live_url)
+        request = build_request(action, data)
+        begin
+          response = parse(ssl_post(url, request, headers('POST', url, request)))
+        rescue ResponseError => e
+          response = parse_error(e.response)
+        end
+
+        Response.new(successful?(response), message_from(response), response,
+          :test => test?,
+          :authorization => successful?(response) ? response_authorization(action, response, credit_card) : '',
+          :avs_result => {:code => response[:avs]},
+          :cvv_result => response[:cvv2],
+          :error_code => standard_error_code(response)
+        )
+      end
+
+      def headers(method, url, request)
+        content_type = 'application/xml'
+        content_digest = Digest::SHA1.hexdigest(request)
+        sending_time = Time.now.utc.iso8601
+        payload = [method, content_type, content_digest, sending_time, url.split('.com')[1]].join("\n")
+        hmac = OpenSSL::HMAC.digest('sha1', @options[:hmac_key], payload)
+        encoded = Base64.strict_encode64(hmac)
+
+        {
+          'x-gge4-date' => sending_time,
+          'x-gge4-content-sha1' => content_digest,
+          'Authorization' => 'GGE4_API ' + @options[:key_id].to_s + ':' + encoded,
+          'Accepts' => content_type,
+          'Content-Type' => content_type
+        }
+      end
+
+      def successful?(response)
+        response[:transaction_approved] == SUCCESS
+      end
+
+      def response_authorization(action, response, credit_card)
+        if action == :store
+          store_authorization_from(response, credit_card)
+        else
+          authorization_from(response)
+        end
+      end
+
+      def authorization_from(response)
+        if response[:authorization_num] && response[:transaction_tag]
+          [
+            response[:authorization_num],
+            response[:transaction_tag],
+            (response[:dollar_amount].to_f * 100).round
+          ].join(';')
+        else
+          ''
+        end
+      end
+
+      def store_authorization_from(response, credit_card)
+        if response[:transarmor_token].present?
+          [
+            response[:transarmor_token],
+            credit_card.brand,
+            credit_card.first_name,
+            credit_card.last_name,
+            credit_card.month,
+            credit_card.year
+          ].map { |value| value.to_s.tr(';', '') }.join(';')
+        else
+          raise StandardError, "TransArmor support is not enabled on your #{display_name} account"
+        end
+      end
+
+      def money_from_authorization(auth)
+        _, _, amount = auth.split(/;/, 3)
+        amount.to_i
+      end
+
+      def message_from(response)
+        if(response[:faultcode] && response[:faultstring])
+          response[:faultstring]
+        elsif(response[:error_number] && response[:error_number] != '0')
+          response[:error_description]
+        else
+          result = (response[:exact_message] || '')
+          result << " - #{response[:bank_message]}" if response[:bank_message].present?
+          result
+        end
+      end
+
+      def parse_error(error)
+        {
+          :transaction_approved => 'false',
+          :error_number => error.code,
+          :error_description => error.body,
+          :ecommerce_error_code => error.body.gsub(/[^\d]/, '')
+        }
+      end
+
+      def standard_error_code(response)
+        STANDARD_ERROR_CODE_MAPPING[response[:bank_resp_code] || response[:ecommerce_error_code]]
+      end
+
+      def parse(xml)
+        response = {}
+        xml = REXML::Document.new(xml)
+
+        if (root = REXML::XPath.first(xml, '//TransactionResult'))
+          parse_elements(response, root)
+        end
+
+        SENSITIVE_FIELDS.each { |key| response.delete(key) }
+        response
+      end
+
+      def parse_elements(response, root)
+        root.elements.to_a.each do |node|
+          response[node.name.gsub(/EXact/, 'Exact').underscore.to_sym] = (node.text || '').strip
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'GlobalCollect'
       self.homepage_url = 'http://www.globalcollect.com/'
 
-      self.test_url = 'https://api-sandbox.globalcollect.com/'
+      self.test_url = 'https://eu.sandbox.api-ingenico.com/'
       self.live_url = 'https://api.globalcollect.com/'
 
       self.supported_countries = ['AD', 'AE', 'AG', 'AI', 'AL', 'AM', 'AO', 'AR', 'AS', 'AT', 'AU', 'AW', 'AX', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BL', 'BM', 'BN', 'BO', 'BQ', 'BR', 'BS', 'BT', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN', 'CO', 'CR', 'CU', 'CV', 'CW', 'CX', 'CY', 'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'GA', 'GB', 'GD', 'GE', 'GF', 'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HN', 'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IM', 'IN', 'IS', 'IT', 'JM', 'JO', 'JP', 'KE', 'KG', 'KH', 'KI', 'KM', 'KN', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR', 'LS', 'LT', 'LU', 'LV', 'MA', 'MC', 'MD', 'ME', 'MF', 'MG', 'MH', 'MK', 'MM', 'MN', 'MO', 'MP', 'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NG', 'NI', 'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PL', 'PN', 'PS', 'PT', 'PW', 'QA', 'RE', 'RO', 'RS', 'RU', 'RW', 'SA', 'SB', 'SC', 'SE', 'SG', 'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SR', 'ST', 'SV', 'SZ', 'TC', 'TD', 'TG', 'TH', 'TJ', 'TL', 'TM', 'TN', 'TO', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'US', 'UY', 'UZ', 'VC', 'VE', 'VG', 'VI', 'VN', 'WF', 'WS', 'ZA', 'ZM', 'ZW']
@@ -140,9 +140,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options, payment = nil)
-        post['order']['customer'] = {
-          'merchantCustomerId' => options[:customer]
-        }
         if payment
           post['order']['customer']['personalInformation'] = {
             'name' => {
@@ -151,16 +148,11 @@ module ActiveMerchant #:nodoc:
             }
           }
         end
-        post['order']['companyInformation'] = {
-          'name' => options[:company]
-        }
-        post['order']['contactDetails'] = {
-          'emailAddress' => options[:email]
-        }
+        post['order']['customer']['merchantCustomerId'] = options[:customer] if options[:customer]
+        post['order']['customer']['companyInformation']['name'] = options[:company] if options[:company]
+        post['order']['customer']['contactDetails']['emailAddress'] = options[:email] if options[:email]
         if address = options[:billing_address] || options[:address]
-          post['order']['contactDetails'] = {
-            'phoneNumber' => address[:phone]
-          }
+          post['order']['customer']['contactDetails']['phoneNumber'] = address[:phone] if address[:phone]
         end
       end
 
@@ -169,10 +161,10 @@ module ActiveMerchant #:nodoc:
           post['customer']['address'] = {
             'countryCode' => address[:country]
           }
-          post['customer']['contactDetails'] = {
-            'emailAddress' => options[:email],
-            'phoneNumber' => address[:phone]
-          }
+          post['customer']['contactDetails']['emailAddress'] = options[:email] if options[:email]
+          if address = options[:billing_address] || options[:address]
+            post['customer']['contactDetails']['phoneNumber'] = address[:phone] if address[:phone]
+          end
         end
       end
 

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

@@ -103,7 +103,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'Credit'
             xml.tag! 'TranCode', action
-            if options[:allow_partial_auth] && (action == 'PreAuth' || action == 'Sale')
+            if options[:allow_partial_auth] && ['PreAuth', 'Sale'].include?(action)
               xml.tag! 'PartialAuth', 'Allow'
             end
             add_invoice(xml, options[:order_id], nil, options)

data/lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb

@@ -4,26 +4,26 @@ module ActiveMerchant #:nodoc:
       def email
         @params['e_mail']
       end
-      
+
       def full_name
         "#{@params['name']} #{@params['lastname']}"
       end
-      
+
       def token
         @params['token']
       end
-      
+
       def payer_id
         @params['payer_id']
       end
-      
+
       # Really the shipping country, but it is all the information provided
       def payer_country
         address['country']
       end
-      
+
       def address
-        {  'name'       => full_name,
+        {  'name'       => @params['shiptoname'] || full_name,
            'company'    => nil,
            'address1'   => @params['street'],
            'address2'   => @params['shiptostreet2'] || @params['street2'],

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

@@ -114,6 +114,7 @@ module ActiveMerchant #:nodoc:
 
       def add_invoice(post, options)
         post[:description] = options[:description] || 'Active Merchant Purchase'
+        post[:reference] = options[:reference] if options[:reference]
       end
 
       def add_capture(post, options)

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://process.sandbox.safecharge.com/service.asmx/Process'
       self.live_url = 'https://process.safecharge.com/service.asmx/Process'
 
-      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'GR', 'ES', 'FI', 'FR', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SE', 'SI', 'SK', 'GB', 'US']
+      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'GR', 'ES', 'FI', 'FR', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'GB', 'US']
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master]
 

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

@@ -397,6 +397,7 @@ module ActiveMerchant #:nodoc:
         if emv_payment?(creditcard)
           add_emv_creditcard(post, creditcard.icc_data)
           post[:card][:read_method] = 'contactless' if creditcard.read_method == 'contactless'
+          post[:card][:read_method] = 'contactless_magstripe_mode' if creditcard.read_method == 'contactless_magstripe'
           if creditcard.encrypted_pin_cryptogram.present? && creditcard.encrypted_pin_ksn.present?
             post[:card][:encrypted_pin] = creditcard.encrypted_pin_cryptogram
             post[:card][:encrypted_pin_key_id] = creditcard.encrypted_pin_ksn

data/lib/active_merchant/connection.rb

@@ -177,19 +177,6 @@ module ActiveMerchant
       end
     end
 
-    def handle_response(response)
-      if @ignore_http_status then
-        return response.body
-      else
-        case response.code.to_i
-        when 200...300
-          response.body
-        else
-          raise ResponseError.new(response)
-        end
-      end
-    end
-
     def debug(message, tag = nil)
       log(:debug, message, tag)
     end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.80.0'
+  VERSION = '1.81.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.80.0
+  version: 1.81.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -204,6 +204,7 @@ files:
 - lib/active_merchant/billing/gateways/conekta.rb
 - lib/active_merchant/billing/gateways/creditcall.rb
 - lib/active_merchant/billing/gateways/credorax.rb
+- lib/active_merchant/billing/gateways/ct_payment.rb
 - lib/active_merchant/billing/gateways/culqi.rb
 - lib/active_merchant/billing/gateways/cyber_source.rb
 - lib/active_merchant/billing/gateways/data_cash.rb
@@ -226,6 +227,7 @@ files:
 - lib/active_merchant/billing/gateways/first_giving.rb
 - lib/active_merchant/billing/gateways/first_pay.rb
 - lib/active_merchant/billing/gateways/firstdata_e4.rb
+- lib/active_merchant/billing/gateways/firstdata_e4_v27.rb
 - lib/active_merchant/billing/gateways/flo2cash.rb
 - lib/active_merchant/billing/gateways/flo2cash_simple.rb
 - lib/active_merchant/billing/gateways/forte.rb