activemerchant 1.90.0 → 1.91.0

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

@@ -324,15 +324,15 @@ module ActiveMerchant #:nodoc:
           :region => address[:state],
           :postal_code => scrub_zip(address[:zip]),
         }
-        if address[:country] || address[:country_code_alpha2]
-          mapped[:country_code_alpha2] = (address[:country] || address[:country_code_alpha2])
-        elsif address[:country_name]
-          mapped[:country_name] = address[:country_name]
-        elsif address[:country_code_alpha3]
-          mapped[:country_code_alpha3] = address[:country_code_alpha3]
-        elsif address[:country_code_numeric]
-          mapped[:country_code_numeric] = address[:country_code_numeric]
+
+        mapped[:country_code_alpha2] = (address[:country] || address[:country_code_alpha2]) if address[:country] || address[:country_code_alpha2]
+        mapped[:country_name] = address[:country_name] if address[:country_name]
+        mapped[:country_code_alpha3] = address[:country_code_alpha3] if address[:country_code_alpha3]
+        unless address[:country].blank?
+          mapped[:country_code_alpha3] ||= Country.find(address[:country]).code(:alpha3).value
         end
+        mapped[:country_code_numeric] = address[:country_code_numeric] if address[:country_code_numeric]
+
         mapped
       end
 
@@ -585,7 +585,9 @@ module ActiveMerchant #:nodoc:
           parameters[:merchant_account_id] = merchant_account_id
         end
 
-        if options[:recurring]
+        if options[:transaction_source]
+          parameters[:transaction_source] = options[:transaction_source]
+        elsif options[:recurring]
           parameters[:recurring] = true
         end
 

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

@@ -281,6 +281,9 @@ module ActiveMerchant #:nodoc:
           test: test?,
           error_code: error_code_from(response)
         )
+      rescue ResponseError => e
+        return Response.new(false, 'Unable to authenticate.  Please check your credentials.', {}, :test => test?) if e.response.code == '401'
+        raise
       end
 
       def success_from(response)

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

@@ -173,13 +173,24 @@ module ActiveMerchant #:nodoc:
         response = parse(xml)
         Response.new(
           response[:success],
-          response[:message],
+          message_from(response),
           response,
           :test => test?,
-          :authorization => build_authorization(response)
+          :authorization => build_authorization(response),
+          :error_code => response[:error_code]
         )
       end
 
+      def message_from(response)
+        if response[:message] == 'ERROR' && response[:error_message]
+          response[:error_message]
+        elsif response[:error_message]
+          "#{response[:message]} #{response[:error_message]}"
+        else
+          response[:message]
+        end
+      end
+
       def post_data(params)
         return nil unless params
 

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

@@ -46,14 +46,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
+        txn_id, _ = authorization.to_s.split('|')
         post = {}
+
         add_amount(post, money, options)
         add_extra_options(post, options)
 
-        commit(:post, "purchases/#{CGI.escape(authorization)}/capture", post)
+        commit(:post, "purchases/#{CGI.escape(txn_id)}/capture", post)
       end
 
-      def refund(money, txn_id, options={})
+      def refund(money, authorization, options={})
+        txn_id, _ = authorization.to_s.split('|')
         post = {}
 
         add_extra_options(post, options)
@@ -64,8 +67,15 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'refunds', post)
       end
 
+      def void(authorization, options={})
+        txn_id, endpoint = authorization.to_s.split('|')
+
+        commit(:post, "#{endpoint}/void?id=#{txn_id}", {})
+      end
+
       def store(creditcard, options={})
         post = {}
+
         add_creditcard(post, creditcard)
 
         commit(:post, 'credit_cards', post)
@@ -97,7 +107,8 @@ module ActiveMerchant #:nodoc:
           post[:cvv] = creditcard.verification_value if creditcard.verification_value?
           post[:card_holder] = creditcard.name if creditcard.name
         elsif creditcard.is_a?(String)
-          post[:card_token] = creditcard
+          id, _ = creditcard.to_s.split('|')
+          post[:card_token] = id
           post[:cvv] = options[:cvv]
         elsif creditcard.is_a?(Hash)
           ActiveMerchant.deprecated 'Passing the credit card as a Hash is deprecated. Use a String and put the (optional) CVV in the options hash instead.'
@@ -141,7 +152,7 @@ module ActiveMerchant #:nodoc:
           message_from(response),
           response,
           :test => response['test'],
-          :authorization => authorization_from(response, success)
+          :authorization => authorization_from(response, success, uri)
         )
       end
 
@@ -149,13 +160,15 @@ module ActiveMerchant #:nodoc:
         (
           response['successful'] &&
           response['response'] &&
-          (response['response']['successful'] || response['response']['token'])
+          (response['response']['successful'] || response['response']['token'] || response['response']['response_code'] == '00')
         )
       end
 
-      def authorization_from(response, success)
+      def authorization_from(response, success, uri)
+        endpoint = uri.split('/')[0]
         if success
-          (response['response']['id'] || response['response']['token'])
+          id = response['response']['id'] || response['response']['token']
+          "#{id}|#{endpoint}"
         else
           nil
         end

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

@@ -22,6 +22,7 @@ module ActiveMerchant #:nodoc:
       }
 
       def initialize(options={})
+        ActiveMerchant.deprecated('IPP gateway is now named Bambora Asia-Pacific')
         requires!(options, :username, :password)
         super
       end

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

@@ -33,7 +33,6 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login, :password)
         @cvv_enabled = options[:cvv_enabled]
         @avs_enabled = options[:avs_enabled]
-        @cof_enabled = options[:cof_enabled]
         options[:crypt_type] = 7 unless options.has_key?(:crypt_type)
         super
       end
@@ -51,7 +50,7 @@ module ActiveMerchant #:nodoc:
         post[:order_id] = options[:order_id]
         post[:address] = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        add_cof(post, options) if @cof_enabled
+        add_cof(post, options)
         action = if post[:cavv]
                    'cavv_preauth'
                  elsif post[:data_key].blank?
@@ -74,7 +73,7 @@ module ActiveMerchant #:nodoc:
         post[:order_id] = options[:order_id]
         post[:address] = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        add_cof(post, options) if @cof_enabled
+        add_cof(post, options)
         action = if post[:cavv]
                    'cavv_purchase'
                  elsif post[:data_key].blank?
@@ -293,7 +292,7 @@ module ActiveMerchant #:nodoc:
           when :cvd_info
             transaction.add_element(cvd_element(parameters[:cvd_value])) if @cvv_enabled
           when :cof_info
-            transaction.add_element(credential_on_file(parameters)) if @cof_enabled && cof_details_present?(parameters)
+            transaction.add_element(credential_on_file(parameters)) if cof_details_present?(parameters)
           else
             transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
           end

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

@@ -55,6 +55,10 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, money, options)
 
+        # Setting merchantRefNumber to a unique id for each refund
+        # This is to support multiple partial refunds for the same order
+        post[:merchantRefNum] = SecureRandom.uuid
+
         commit(:post, "settlements/#{authorization}/refunds", post)
       end
 

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

@@ -144,7 +144,8 @@ module ActiveMerchant #:nodoc:
 
       def add_payment_method(post, payment_method, options)
         if(payment_method.is_a?(String))
-          post[:customer_vault_id] = payment_method
+          customer_vault_id, _ = split_authorization(payment_method)
+          post[:customer_vault_id] = customer_vault_id
         elsif payment_method.is_a?(NetworkTokenizationCreditCard)
           post[:ccnumber] = payment_method.number
           post[:ccexp] = exp_date(payment_method)
@@ -236,15 +237,16 @@ module ActiveMerchant #:nodoc:
           succeeded,
           message_from(succeeded, response),
           response,
-          authorization: authorization_from(response, params[:payment]),
+          authorization: authorization_from(response, params[:payment], action),
           avs_result: AVSResult.new(code: response[:avsresponse]),
           cvv_result: CVVResult.new(response[:cvvresponse]),
           test: test?
         )
       end
 
-      def authorization_from(response, payment_type)
-        [ response[:transactionid], payment_type ].join('#')
+      def authorization_from(response, payment_type, action)
+        authorization = (action == 'add_customer' ? response[:customer_vault_id] : response[:transactionid])
+        [ authorization, payment_type ].join('#')
       end
 
       def split_authorization(authorization)

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

@@ -205,7 +205,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def error?(response)
-        response.key?('error_code')
+        response['error_code'] && !response['error_code'].blank?
       end
 
       def response_error(raw_response)

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

@@ -30,7 +30,7 @@ module ActiveMerchant #:nodoc:
     class OrbitalGateway < Gateway
       include Empty
 
-      API_VERSION = '7.1'
+      API_VERSION = '7.7'
 
       POST_HEADERS = {
         'MIME-Version' => '1.1',
@@ -506,6 +506,12 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_stored_credentials(xml, parameters)
+        xml.tag! :MITMsgType, parameters[:mit_msg_type] if parameters[:mit_msg_type]
+        xml.tag! :MITStoredCredentialInd, parameters[:mit_stored_credential_ind] if parameters[:mit_stored_credential_ind]
+        xml.tag! :MITSubmittedTransactionID, parameters[:mit_submitted_transaction_id] if parameters[:mit_submitted_transaction_id]
+      end
+
       def parse(body)
         response = {}
         xml = REXML::Document.new(body)
@@ -635,6 +641,7 @@ module ActiveMerchant #:nodoc:
             end
 
             add_level_2_purchase(xml, parameters)
+            add_stored_credentials(xml, parameters)
           end
         end
         xml.target!

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

@@ -241,7 +241,8 @@ module ActiveMerchant #:nodoc:
       #       :client_type => :web, # Possible values are: :web, :ivr, :moto, :unattended, :internet, or :recurring
       #       :txn_data1 => "String up to 255 characters",
       #       :txn_data2 => "String up to 255 characters",
-      #       :txn_data3 => "String up to 255 characters"
+      #       :txn_data3 => "String up to 255 characters",
+      #       :client_info => "String up to 15 characters. The IP address of the user who processed the transaction."
       #     }
       #
       # +:client_type+, while not documented for PxPost, will be sent as
@@ -277,6 +278,8 @@ module ActiveMerchant #:nodoc:
         xml.add_element('TxnData1').text = options[:txn_data1].to_s.slice(0, 255) unless options[:txn_data1].blank?
         xml.add_element('TxnData2').text = options[:txn_data2].to_s.slice(0, 255) unless options[:txn_data2].blank?
         xml.add_element('TxnData3').text = options[:txn_data3].to_s.slice(0, 255) unless options[:txn_data3].blank?
+
+        xml.add_element('ClientInfo').text = options[:client_info] if options[:client_info]
       end
 
       def new_transaction

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

@@ -171,15 +171,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_extra_params(post, options)
-        if options[:extra_params]
-          items = {}
-          options[:extra_params].each do |param|
-            param.each do |key, value|
-              items[key.to_sym] = value
-            end
-          end
-          post[:extra_params] = items
-        end
+        extra_params = {}
+        extra_params.merge!(options[:extra_params]) if options[:extra_params]
+
+        post['extra_params'] = extra_params unless extra_params.empty?
       end
 
       def parse(body)

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

@@ -1,14 +1,14 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PinGateway < Gateway
-      self.test_url = 'https://test-api.pin.net.au/1'
-      self.live_url = 'https://api.pin.net.au/1'
+      self.test_url = 'https://test-api.pinpayments.com/1'
+      self.live_url = 'https://api.pinpayments.com/1'
 
       self.default_currency = 'AUD'
       self.money_format = :cents
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express]
-      self.homepage_url = 'http://www.pin.net.au/'
+      self.homepage_url = 'http://www.pinpayments.com/'
       self.display_name = 'Pin Payments'
 
       def initialize(options = {})
@@ -67,6 +67,7 @@ module ActiveMerchant #:nodoc:
       # Updates the credit card for the customer.
       def update(token, creditcard, options = {})
         post = {}
+        token = get_customer_token(token)
 
         add_creditcard(post, creditcard)
         add_customer_data(post, options)
@@ -137,13 +138,21 @@ module ActiveMerchant #:nodoc:
           )
         elsif creditcard.kind_of?(String)
           if creditcard =~ /^card_/
-            post[:card_token] = creditcard
+            post[:card_token] = get_card_token(creditcard)
           else
             post[:customer_token] = creditcard
           end
         end
       end
 
+      def get_customer_token(token)
+        token.split(/;(?=cus)/).last
+      end
+
+      def get_card_token(token)
+        token.split(/;(?=cus)/).first
+      end
+
       def add_metadata(post, options)
         post[:metadata] = options[:metadata] if options[:metadata]
       end
@@ -200,13 +209,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def unparsable_response(raw_response)
-        message = 'Invalid JSON response received from Pin Payments. Please contact support@pin.net.au if you continue to receive this message.'
+        message = 'Invalid JSON response received from Pin Payments. Please contact support@pinpayments.com if you continue to receive this message.'
         message += " (The raw response returned by the API was #{raw_response.inspect})"
         return Response.new(false, message)
       end
 
       def token(response)
-        response['token']
+        if response['token'].start_with?('cus')
+          "#{response.dig('card', 'token')};#{response['token']}"
+        else
+          response['token']
+        end
       end
 
       def parse(body)

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

@@ -234,7 +234,7 @@ module ActiveMerchant #:nodoc:
           xml.aptNum address[:address2]
           xml.city address[:city]
           xml.state address[:state]
-          xml.zip address[:zip]
+          xml.zip address[:zip].to_s.delete('-')
         end
       end
 

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

@@ -12,6 +12,10 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners]
 
+      CVV_CODE_MAPPING = {
+        'S' => 'D'
+      }
+
       def initialize(options={})
         requires!(options, :username, :password, :merchant, :pem, :pem_password)
         super
@@ -168,11 +172,18 @@ module ActiveMerchant #:nodoc:
           message_from(succeeded, raw),
           raw,
           authorization: raw['response.orderNumber'] || raw['response.customerReferenceNumber'],
+          cvv_result: cvv_result(succeeded, raw),
           error_code: error_code_from(succeeded, raw),
           test: test?
         )
       end
 
+      def cvv_result(succeeded, raw)
+        return unless succeeded
+        code = CVV_CODE_MAPPING[raw['response.cvnResponse']] || raw['response.cvnResponse']
+        CVVResult.new(code)
+      end
+
       def headers
         {
           'Content-Type'  => 'application/x-www-form-urlencoded'

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

@@ -532,7 +532,7 @@ module ActiveMerchant #:nodoc:
 
       def add_contact(doc, fullname, options)
         doc['v1'].contact do
-          doc['v1'].fullName fullname
+          doc['v1'].fullName fullname unless fullname.blank?
           doc['v1'].coName options[:company_name] if options[:company_name]
           doc['v1'].title options[:title] if options[:title]
 
@@ -557,7 +557,7 @@ module ActiveMerchant #:nodoc:
 
           if (shipping_address = options[:shipping_address])
             doc['v1'].ship do
-              doc['v1'].fullName fullname
+              doc['v1'].fullName fullname unless fullname.blank?
               doc['v1'].addrLn1 shipping_address[:address1] if shipping_address[:address1]
               doc['v1'].addrLn2 shipping_address[:address2] if shipping_address[:address2]
               doc['v1'].city shipping_address[:city] if shipping_address[:city]
@@ -572,7 +572,7 @@ module ActiveMerchant #:nodoc:
 
       def add_name(doc, payment_method)
         doc['v1'].contact do
-          doc['v1'].fullName payment_method.name
+          doc['v1'].fullName payment_method.name unless payment_method.name.blank?
         end
       end
 

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

@@ -333,6 +333,7 @@ module ActiveMerchant #:nodoc:
         params[:routing] = check.routing_number
         params[:account] = check.account_number
         params[:savings] = 'y' if check.account_type == 'savings'
+        params[:name] = check.name
       end
 
       def add_creditcard(params, creditcard)