activemerchant 1.42.6 → 1.90.0

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

@@ -101,19 +101,19 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :test_url, :live_url
 
-      self.test_url = "https://www.payjunctionlabs.com/quick_link"
-      self.live_url = "https://payjunction.com/quick_link"
+      self.test_url = 'https://www.payjunctionlabs.com/quick_link'
+      self.live_url = 'https://payjunction.com/quick_link'
 
       TEST_LOGIN = 'pj-ql-01'
       TEST_PASSWORD = 'pj-ql-01p'
 
-      SUCCESS_CODES = ["00", "85"]
+      SUCCESS_CODES = ['00', '85']
       SUCCESS_MESSAGE = 'The transaction was approved.'
 
       FAILURE_MESSAGE = 'The transaction was declined.'
 
       DECLINE_CODES = {
-        "AE"  => 'Address verification failed because address did not match.',
+        'AE'  => 'Address verification failed because address did not match.',
         'ZE'  => 'Address verification failed because zip did not match.',
         'XE'  => 'Address verification failed because zip and address did not match.',
         'YE'  => 'Address verification failed because zip and address did not match.',
@@ -144,8 +144,8 @@ module ActiveMerchant #:nodoc:
         '96'  => 'Declined because of a system error.',
         'N7'  => 'Declined because of a CVV2/CVC2 mismatch.',
         'M4'  => 'Declined.',
-        "FE"  => "There was a format error with your Trinity Gateway Service (API) request.",
-        "LE"  => "Could not log you in (problem with dc_logon and/or dc_password).",
+        'FE'  => 'There was a format error with your Trinity Gateway Service (API) request.',
+        'LE'  => 'Could not log you in (problem with dc_logon and/or dc_password).',
         'NL'  => 'Aborted because of a system error, please try again later. ',
         'AB'  => 'Aborted because of an upstream system error, please try again later.'
       }
@@ -211,7 +211,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, authorization, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
@@ -239,6 +239,8 @@ module ActiveMerchant #:nodoc:
       # YYYYMMDD format and can be used to specify when the first charge will be made.
       # If omitted the first charge will be immediate.
       def recurring(money, payment_source, options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         requires!(options, [:periodicity, :monthly, :weekly, :daily], :payments)
 
         periodic_type = case options[:periodicity]
@@ -295,11 +297,15 @@ module ActiveMerchant #:nodoc:
 
       # add fields for credit card
       def add_creditcard(params, creditcard)
-        params[:name]                 = creditcard.name
-        params[:number]               = creditcard.number
-        params[:expiration_month]     = creditcard.month
-        params[:expiration_year]      = creditcard.year
-        params[:verification_number]  = creditcard.verification_value if creditcard.verification_value?
+        if creditcard.respond_to?(:track_data) && creditcard.track_data.present?
+          params[:track] = creditcard.track_data
+        else
+          params[:name]                 = creditcard.name
+          params[:number]               = creditcard.number
+          params[:expiration_month]     = creditcard.month
+          params[:expiration_year]      = creditcard.year
+          params[:verification_number]  = creditcard.verification_value if creditcard.verification_value?
+        end
       end
 
       # add field for "instant" transaction, using previous transaction id
@@ -328,7 +334,7 @@ module ActiveMerchant #:nodoc:
       def commit(action, parameters)
         url = test? ? self.test_url : self.live_url
 
-        response = parse( ssl_post(url, post_data(action, parameters)) )
+        response = parse(ssl_post(url, post_data(action, parameters)))
 
         Response.new(successful?(response), message_from(response), response,
           :test => test?,
@@ -360,7 +366,7 @@ module ActiveMerchant #:nodoc:
         params[:version] = API_VERSION
         params[:transaction_type] = action
 
-        params.reject{|k,v| v.blank?}.collect{ |k, v| "dc_#{k.to_s}=#{CGI.escape(v.to_s)}" }.join("&")
+        params.reject { |k, v| v.blank? }.collect { |k, v| "dc_#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def parse(body)
@@ -379,18 +385,6 @@ module ActiveMerchant #:nodoc:
         end
         response
       end
-
-      # Make a ruby type out of the response string
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
-        end
-      end
-
     end
   end
 end

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

@@ -0,0 +1,188 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class PayJunctionV2Gateway < Gateway
+      self.display_name = 'PayJunction'
+      self.homepage_url = 'https://www.payjunction.com/'
+
+      self.test_url = 'https://api.payjunctionlabs.com/transactions'
+      self.live_url = 'https://api.payjunction.com/transactions'
+
+      self.supported_countries = ['US']
+      self.default_currency = 'USD'
+      self.money_format = :dollars
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+
+      def initialize(options={})
+        requires!(options, :api_login, :api_password, :api_key)
+        super
+      end
+
+      def purchase(amount, payment_method, options={})
+        post = {}
+        add_invoice(post, amount, options)
+        add_payment_method(post, payment_method)
+
+        commit('purchase', post)
+      end
+
+      def authorize(amount, payment_method, options={})
+        post = {}
+        post[:status] = 'HOLD'
+        add_invoice(post, amount, options)
+        add_payment_method(post, payment_method)
+
+        commit('authorize', post)
+      end
+
+      def capture(amount, authorization, options={})
+        post = {}
+        post[:status] = 'CAPTURE'
+        post[:transactionId] = authorization
+        add_invoice(post, amount, options)
+
+        commit('capture', post)
+      end
+
+      def void(authorization, options={})
+        post = {}
+        post[:status] = 'VOID'
+        post[:transactionId] = authorization
+
+        commit('void', post)
+      end
+
+      def refund(amount, authorization, options={})
+        post = {}
+        post[:action] = 'REFUND'
+        post[:transactionId] = authorization
+        add_invoice(post, amount, options)
+
+        commit('refund', post)
+      end
+
+      def credit(amount, payment_method, options={})
+        post = {}
+        post[:action] = 'REFUND'
+        add_invoice(post, amount, options)
+        add_payment_method(post, payment_method)
+
+        commit('credit', post)
+      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) }
+        end
+      end
+
+      def store(payment_method, options = {})
+        verify(payment_method, options)
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((X-Pj-Application-Key: )[\w-]+), '\1[FILTERED]').
+          gsub(%r((cardNumber=)\d+), '\1[FILTERED]').
+          gsub(%r((cardCvv=)\d+), '\1[FILTERED]')
+      end
+
+      private
+
+      def add_invoice(post, money, options)
+        post[:amountBase] = amount(money) if money
+        post[:invoiceNumber] = options[:order_id] if options[:order_id]
+      end
+
+      def add_payment_method(post, payment_method)
+        if payment_method.is_a? Integer
+          post[:transactionId] = payment_method
+        else
+          post[:cardNumber] = payment_method.number
+          post[:cardExpMonth] = format(payment_method.month, :two_digits)
+          post[:cardExpYear] = format(payment_method.year, :four_digits)
+          post[:cardCvv] = payment_method.verification_value
+        end
+      end
+
+      def commit(action, params)
+        response = begin
+          parse(ssl_invoke(action, params))
+        rescue ResponseError => e
+          parse(e.response.body)
+        end
+
+        success = success_from(response)
+        Response.new(
+          success,
+          message_from(response),
+          response,
+          authorization: success ? authorization_from(response) : nil,
+          error_code: success ? nil : error_from(response),
+          test: test?
+        )
+      end
+
+      def ssl_invoke(action, params)
+        if ['purchase', 'authorize', 'refund', 'credit'].include?(action)
+          ssl_post(url(), post_data(params), headers)
+        else
+          ssl_request(:put, url(params), post_data(params), headers)
+        end
+      end
+
+      def headers
+        {
+          'Authorization' => 'Basic ' + Base64.encode64("#{@options[:api_login]}:#{@options[:api_password]}").strip,
+          'Content-Type'  => 'application/x-www-form-urlencoded;charset=UTF-8',
+          'Accept'  => 'application/json',
+          'X-PJ-Application-Key'  => @options[:api_key].to_s
+        }
+      end
+
+      def post_data(params)
+        params.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
+      end
+
+      def url(params={})
+        test? ? "#{test_url}/#{params[:transactionId]}" : "#{live_url}/#{params[:transactionId]}"
+      end
+
+      def parse(body)
+        JSON.parse(body)
+      rescue JSON::ParserError
+        message = 'Invalid JSON response received from PayJunctionV2Gateway. Please contact PayJunctionV2Gateway if you continue to receive this message.'
+        message += " (The raw response returned by the API was #{body.inspect})"
+        {
+          'errors' => [{
+            'message' => message
+          }]
+        }
+      end
+
+      def success_from(response)
+        return response['response']['approved'] if response['response']
+        false
+      end
+
+      def message_from(response)
+        return response['response']['message'] if response['response']
+
+        response['errors']&.inject('') { |message, error| error['message'] + '|' + message }
+      end
+
+      def authorization_from(response)
+        response['transactionId']
+      end
+
+      def error_from(response)
+        response['response']['code'] if response['response']
+      end
+    end
+  end
+end

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

@@ -39,9 +39,10 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       # Used for capturing, which is currently not supported.
       def add_reference(post, identification)
-        auth, trans_id = identification.split(";")
+        auth, trans_id = identification.split(';')
         post[:authnum]    = auth
         post[:transid] = trans_id
       end
@@ -51,7 +52,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, options)
-        post[:merchant_transid] = options[:order_id].to_s.slice(0,21)
+        post[:merchant_transid] = options[:order_id].to_s.slice(0, 21)
         post[:memnum]           = options[:invoice]
         post[:custnum]          = options[:customer]
         post[:clientdata]       = options[:description]
@@ -64,21 +65,13 @@ module ActiveMerchant #:nodoc:
         post[:cvv2]     = credit_card.verification_value
       end
 
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
       def commit(action, money, parameters)
-        response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
+        response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
         Response.new(successful?(response), message_from(response), response,
           :test => test_response?(response),
           :authorization => authorization_from(response)
         )
-
       end
 
       def successful?(response)
@@ -86,7 +79,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
-        [ response[:authnum], response[:transid] ].compact.join(";")
+        [ response[:authnum], response[:transid] ].compact.join(';')
       end
 
       def test_response?(response)
@@ -100,7 +93,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         response = {}
         body.to_s.each_line do |l|
-          key, value = l.split(":", 2)
+          key, value = l.split(':', 2)
           response[key.to_s.downcase.to_sym] = value.strip
         end
         response
@@ -111,9 +104,8 @@ module ActiveMerchant #:nodoc:
         parameters[:merchant_id]      = @options[:login]
         parameters[:password]         = @options[:password]
 
-        parameters.reject{|k,v| v.blank?}.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join("&")
+        parameters.reject { |k, v| v.blank? }.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end
 end
-

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

@@ -21,20 +21,21 @@ module ActiveMerchant #:nodoc:
       }
 
       CURRENCY_CODES = {
-        "AUD"=> '036',
-        "CAD"=> '124',
-        "CZK"=> '203',
-        "DKK"=> '208',
-        "HKD"=> '344',
-        "ICK"=> '352',
-        "JPY"=> '392',
-        "NOK"=> '578',
-        "SGD"=> '702',
-        "SEK"=> '752',
-        "CHF"=> '756',
-        "GBP"=> '826',
-        "USD"=> '840',
-        "EUR"=> '978'
+        'AUD'=> '036',
+        'CAD'=> '124',
+        'CZK'=> '203',
+        'DKK'=> '208',
+        'HKD'=> '344',
+        'ICK'=> '352',
+        'JPY'=> '392',
+        'NOK'=> '578',
+        'SGD'=> '702',
+        'SEK'=> '752',
+        'CHF'=> '756',
+        'GBP'=> '826',
+        'USD'=> '840',
+        'EUR'=> '978',
+        'XPF'=> '953'
       }
 
       SUCCESS_CODES = ['00000']
@@ -67,6 +68,8 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, options)
         add_creditcard(post, creditcard)
+        add_amount(post, money, options)
+
         commit('authorization', money, post)
       end
 
@@ -74,6 +77,8 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, options)
         add_creditcard(post, creditcard)
+        add_amount(post, money, options)
+
         commit('purchase', money, post)
       end
 
@@ -81,8 +86,10 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
         post = {}
         add_invoice(post, options)
-        post[:numappel] = authorization[0,10]
-        post[:numtrans] = authorization[10,10]
+        add_amount(post, money, options)
+        post[:numappel] = authorization[0, 10]
+        post[:numtrans] = authorization[10, 10]
+
         commit('capture', money, post)
       end
 
@@ -91,13 +98,15 @@ module ActiveMerchant #:nodoc:
         post ={}
         add_invoice(post, options)
         add_reference(post, identification)
+        add_amount(post, options[:amount], options)
         post[:porteur] = '000000000000000'
         post[:dateval] = '0000'
+
         commit('void', options[:amount], post)
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -105,6 +114,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, options)
         add_reference(post, identification)
+        add_amount(post, money, options)
         commit('refund', money, post)
       end
 
@@ -121,23 +131,26 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, identification)
-        post[:numappel] = identification[0,10]
-        post[:numtrans] = identification[10,10]
+        post[:numappel] = identification[0, 10]
+        post[:numtrans] = identification[10, 10]
+      end
+
+      def add_amount(post, money, options)
+        post[:montant] = ('0000000000' + (money ? amount(money) : ''))[-10..-1]
+        post[:devise] = CURRENCY_CODES[options[:currency] || currency(money)]
       end
 
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
-          key,val = pair.split(/\=/)
+          key, val = pair.split(/\=/)
           results[key.downcase.to_sym] = CGI.unescape(val) if val
         end
         results
       end
 
       def commit(action, money = nil, parameters = nil)
-        parameters[:montant] = ('0000000000' + (money ? amount(money) : ''))[-10..-1]
-        parameters[:devise] = CURRENCY_CODES[options[:currency] || currency(money)]
-        request_data = post_data(action,parameters)
+        request_data = post_data(action, parameters)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, request_data))
         response = parse(ssl_post(self.live_url_backup, request_data)) if service_unavailable?(response) && !test?
         Response.new(success?(response), message_from(response), response.merge(
@@ -145,7 +158,7 @@ module ActiveMerchant #:nodoc:
           :test => test?,
           :authorization => response[:numappel].to_s + response[:numtrans].to_s,
           :fraud_review => false,
-          :sent_params => parameters.delete_if{|key,value| ['porteur','dateval','cvv'].include?(key.to_s)}
+          :sent_params => parameters.delete_if { |key, value| ['porteur', 'dateval', 'cvv'].include?(key.to_s) }
         )
       end
 
@@ -162,20 +175,19 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(action, parameters = {})
-
         parameters.update(
           :version => API_VERSION,
           :type => TRANSACTIONS[action.to_sym],
           :dateq => Time.now.strftime('%d%m%Y%H%M%S'),
           :numquestion => unique_id(parameters[:order_id]),
-          :site => @options[:login].to_s[0,7],
-          :rang => @options[:login].to_s[7..-1],
+          :site => @options[:login].to_s[0, 7],
+          :rang => @options[:rang] || @options[:login].to_s[7..-1],
           :cle => @options[:password],
           :pays => '',
           :archivage => parameters[:order_id]
         )
 
-        parameters.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join("&")
+        parameters.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def unique_id(seed = 0)
@@ -183,14 +195,6 @@ module ActiveMerchant #:nodoc:
 
         "0000000000#{randkey}"[-10..-1]
       end
-
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
     end
   end
 end