activemerchant 1.56.0 → 1.66.0

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

@@ -13,21 +13,96 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'CardStream'
 
       CURRENCY_CODES = {
-        "AUD" => '036',
-        "BRL" => '986',
-        "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'
+        "AED" => "784",
+        "ALL" => "008",
+        "AMD" => "051",
+        "ANG" => "532",
+        "ARS" => "032",
+        "AUD" => "036",
+        "AWG" => "533",
+        "BAM" => "977",
+        "BBD" => "052",
+        "BGN" => "975",
+        "BMD" => "060",
+        "BOB" => "068",
+        "BRL" => "986",
+        "BSD" => "044",
+        "BWP" => "072",
+        "BZD" => "084",
+        "CAD" => "124",
+        "CHF" => "756",
+        "CLP" => "152",
+        "CNY" => "156",
+        "COP" => "170",
+        "CRC" => "188",
+        "CZK" => "203",
+        "DKK" => "208",
+        "DOP" => "214",
+        "EGP" => "818",
+        "EUR" => "978",
+        "GBP" => "826",
+        "GEL" => "981",
+        "GIP" => "292",
+        "GTQ" => "320",
+        "GYD" => "328",
+        "HKD" => "344",
+        "HNL" => "340",
+        "HRK" => "191",
+        "HUF" => "348",
+        "ISK" => "352",
+        "IDR" => "360",
+        "ILS" => "376",
+        "INR" => "356",
+        "JPY" => "392",
+        "JMD" => "388",
+        "KES" => "404",
+        "KRW" => "410",
+        "KYD" => "136",
+        "LBP" => "422",
+        "LKR" => "144",
+        "MAD" => "504",
+        "MVR" => "462",
+        "MWK" => "454",
+        "MXN" => "484",
+        "MYR" => "458",
+        "NAD" => "516",
+        "NGN" => "566",
+        "NIO" => "558",
+        "NOK" => "578",
+        "NPR" => "524",
+        "NZD" => "554",
+        "PAB" => "590",
+        "PEN" => "604",
+        "PGK" => "598",
+        "PHP" => "608",
+        "PKR" => "586",
+        "PLN" => "985",
+        "PYG" => "600",
+        "QAR" => "634",
+        "RON" => "946",
+        "RSD" => "941",
+        "RUB" => "643",
+        "RWF" => "646",
+        "SAR" => "682",
+        "SEK" => "752",
+        "SGD" => "702",
+        "SRD" => "968",
+        "THB" => "764",
+        "TND" => "788",
+        "TRY" => "949",
+        "TTD" => "780",
+        "TWD" => "901",
+        "TZS" => "834",
+        "UAH" => "980",
+        "UGX" => "800",
+        "USD" => "840",
+        "UYU" => "858",
+        "VND" => "704",
+        "WST" => "882",
+        "XAF" => "950",
+        "XCD" => "951",
+        "XOF" => "952",
+        "ZAR" => "710"
       }
 
       CVV_CODE = {
@@ -73,20 +148,22 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def authorize(money, creditcard, options = {})
+      def authorize(money, credit_card_or_reference, options = {})
         post = {}
+        add_pair(post, :captureDelay, -1)
         add_amount(post, money, options)
-        add_invoice(post, creditcard, money, options)
-        add_creditcard(post, creditcard)
+        add_invoice(post, credit_card_or_reference, money, options)
+        add_credit_card_or_reference(post, credit_card_or_reference)
         add_customer_data(post, options)
-        commit('PREAUTH', post)
+        commit('SALE', post)
       end
 
-      def purchase(money, creditcard, options = {})
+      def purchase(money, credit_card_or_reference, options = {})
         post = {}
+        add_pair(post, :captureDelay, 0)
         add_amount(post, money, options)
-        add_invoice(post, creditcard, money, options)
-        add_creditcard(post, creditcard)
+        add_invoice(post, credit_card_or_reference, money, options)
+        add_credit_card_or_reference(post, credit_card_or_reference)
         add_customer_data(post, options)
         commit('SALE', post)
       end
@@ -94,8 +171,9 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options = {})
         post = {}
         add_pair(post, :xref, authorization)
-        add_amount(post, money, options)
-        commit('SALE', post)
+        add_pair(post, :amount, amount(money), :required => true)
+
+        commit('CAPTURE', post)
       end
 
       def refund(money, authorization, options = {})
@@ -108,7 +186,7 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options = {})
         post = {}
         add_pair(post, :xref, authorization)
-        commit('REFUND', post)
+        commit('CANCEL', post)
       end
 
       def verify(creditcard, options={})
@@ -145,20 +223,36 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_invoice(post, credit_card, money, options)
+      def add_invoice(post, credit_card_or_reference, money, options)
         add_pair(post, :transactionUnique, options[:order_id], :required => true)
         add_pair(post, :orderRef, options[:description] || options[:order_id], :required => true)
-        if ['american_express', 'diners_club'].include?(card_brand(credit_card).to_s)
-          add_pair(post, :item1Quantity, 1)
-          add_pair(post, :item1Description, (options[:description] || options[:order_id]).slice(0, 15))
-          add_pair(post, :item1GrossValue, amount(money))
+        add_pair(post, :statementNarrative1, options[:merchant_name]) if options[:merchant_name]
+        add_pair(post, :statementNarrative2, options[:dynamic_descriptor]) if options[:dynamic_descriptor]
+        if credit_card_or_reference.respond_to?(:number)
+          if ['american_express', 'diners_club'].include?(card_brand(credit_card_or_reference).to_s)
+            add_pair(post, :item1Quantity, 1)
+            add_pair(post, :item1Description, (options[:description] || options[:order_id]).slice(0, 15))
+            add_pair(post, :item1GrossValue, amount(money))
+          end
         end
 
-        add_pair(post, :threeDSRequired, (options[:threeds_required] || @threeds_required) ? 'Y' : 'N')
         add_pair(post, :type, options[:type] || '1')
+        add_threeds_required(post, options)
+      end
+
+      def add_credit_card_or_reference(post, credit_card_or_reference)
+        if credit_card_or_reference.respond_to?(:number)
+          add_credit_card(post, credit_card_or_reference)
+        else
+          add_reference(post, credit_card_or_reference.to_s)
+        end
+      end
+
+      def add_reference(post, reference)
+        add_pair(post, :xref, reference, :required => true)
       end
 
-      def add_creditcard(post, credit_card)
+      def add_credit_card(post, credit_card)
         add_pair(post, :customerName, credit_card.name, :required => true)
         add_pair(post, :cardNumber, credit_card.number, :required => true)
 
@@ -175,8 +269,16 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :cardCVV, credit_card.verification_value)
       end
 
+      def add_threeds_required(post, options)
+        add_pair(post, :threeDSRequired, (options[:threeds_required] || @threeds_required) ? 'Y' : 'N')
+      end
+
+      def normalize_line_endings(str)
+        str.gsub(/%0D%0A|%0A%0D|%0D/, "%0A")
+      end
+
       def add_hmac(post)
-        result = post.sort.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        result = post.sort.collect { |key, value| "#{key}=#{normalize_line_endings(CGI.escape(value.to_s))}" }.join("&")
         result = Digest::SHA512.hexdigest("#{result}#{@options[:shared_secret]}")
 
         add_pair(post, :signature, result)
@@ -194,11 +296,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-
+        parameters.update(:countryCode => self.supported_countries[0]) unless ['CAPTURE', 'CANCEL'].include?(action)
         parameters.update(
           :merchantID => @options[:login],
-          :action => action,
-          :countryCode => self.supported_countries[0],
+          :action => action
         )
         # adds a signature to the post hash/array
         add_hmac(parameters)
@@ -211,13 +312,32 @@ module ActiveMerchant #:nodoc:
                      :test => test?,
                      :authorization => response[:xref],
                      :cvv_result => CVV_CODE[response[:avscv2ResponseCode].to_s[0, 1]],
-                     :avs_result => {
-                       :postal_match => AVS_POSTAL_MATCH[response[:avscv2ResponseCode].to_s[1, 1]],
-                       :street_match => AVS_STREET_MATCH[response[:avscv2ResponseCode].to_s[2, 1]]
-                     }
+                     :avs_result => avs_from(response)
         )
       end
 
+      def avs_from(response)
+        postal_match = AVS_POSTAL_MATCH[response[:avscv2ResponseCode].to_s[1, 1]]
+        street_match = AVS_STREET_MATCH[response[:avscv2ResponseCode].to_s[2, 1]]
+
+        code = if postal_match == "Y" && street_match == "Y"
+          "M"
+        elsif postal_match == "Y"
+          "P"
+        elsif street_match == "Y"
+          "A"
+        else
+          "I"
+        end
+
+        AVSResult.new({
+          :code => code,
+          :postal_match => postal_match,
+          :street_match => street_match
+        })
+      end
+
+
       def currency_code(currency)
         CURRENCY_CODES[currency]
       end
@@ -229,6 +349,7 @@ module ActiveMerchant #:nodoc:
       def add_pair(post, key, value, options = {})
         post[key] = value if !value.blank? || options[:required]
       end
+
     end
   end
 end

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

@@ -10,6 +10,7 @@ module ActiveMerchant #:nodoc:
       self.homepage_url        = "http://www.higherone.com/"
       self.display_name        = "Cashnet"
       self.money_format        = :dollars
+      self.max_retries         = 0
 
       # Creates a new CashnetGateway
       #

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = "Checkout.com V2 Gateway"
       self.homepage_url = "https://www.checkout.com/"
       self.live_url = "https://api2.checkout.com/v2"
-      self.test_url = "http://sandbox.checkout.com/api2/v2"
+      self.test_url = "https://sandbox.checkout.com/api2/v2"
 
       self.supported_countries = ['AD', 'AT', 'BE', 'BG', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FO', 'FI', 'FR', 'GB', 'GI', 'GL', 'GR', 'HR', 'HU', 'IE', 'IS', 'IL', 'IT', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SM', 'SK', 'SJ', 'TR', 'VA']
       self.default_currency = "USD"
@@ -78,6 +78,9 @@ module ActiveMerchant #:nodoc:
         post[:value] = amount(money)
         post[:trackId] = options[:order_id]
         post[:currency] = options[:currency] || currency(money)
+        post[:descriptor] = {}
+        post[:descriptor][:name] = options[:descriptor_name] if options[:descriptor_name]
+        post[:descriptor][:city] = options[:descriptor_city] if options[:descriptor_city]
       end
 
       def add_payment_method(post, payment_method)
@@ -162,7 +165,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(response)
-        response["responseCode"] == ("10000" || "10100")
+        response["responseCode"] == "10000" || response["responseCode"] == "10100"
       end
 
       def message_from(succeeded, response)

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

@@ -0,0 +1,24 @@
+module ActiveMerchant
+  module Billing
+    class CitrusPayGateway < Gateway
+      include MastercardGateway
+
+      class_attribute :live_na_url, :live_ap_url, :test_na_url, :test_ap_url
+
+      self.test_na_url = 'https://test-gateway.mastercard.com/api/rest/version/39/'
+      self.test_ap_url = 'https://test-gateway.mastercard.com/api/rest/version/39/'
+
+      self.live_na_url = 'https://na-gateway.mastercard.com/api/rest/version/39/'
+      self.live_ap_url = 'https://ap-gateway.mastercard.com/api/rest/version/39/'
+
+      self.display_name = 'Citrus Pay'
+      self.homepage_url = 'http://www.citruspay.com/'
+      self.supported_countries = %w(AR AU BR FR DE HK MX NZ SG GB US)
+      self.default_currency = 'USD'
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro, :laser]
+      self.ssl_version = :TLSv1
+
+    end
+  end
+end
+

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

@@ -10,6 +10,7 @@ module ActiveMerchant #:nodoc:
                                   'HU', 'IS', 'IE', 'IT', 'LV', 'LI', 'LT', 'LU', 'MT', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'GB']
 
       self.default_currency    = 'EUR'
+      self.currencies_without_fractions = %w(BIF BYR DJF GNF JPY KMF KRW PYG RWF VND VUV XAF XOF XPF)
       self.supported_cardtypes = [:visa, :master]
 
       self.homepage_url = 'https://www.clearhaus.com'
@@ -37,21 +38,12 @@ module ActiveMerchant #:nodoc:
         50000 => 'Clearhaus error'
       }
 
-      # Create gateway
-      #
-      # options:
-      #       :api_key - merchant's Clearhaus API Key
-      #       :signing_key - merchant's private key for optionally signing request
       def initialize(options={})
         requires!(options, :api_key)
+        options[:private_key] = options[:private_key].strip if options[:private_key]
         super
       end
 
-      # Make a purchase (authorize and capture)
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # payment        - The CreditCard or the Clearhaus card token.
-      # options        - A standard ActiveMerchant options hash
       def purchase(amount, payment, options={})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(amount, payment, options) }
@@ -59,11 +51,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Authorize a transaction.
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # payment        - The CreditCard or the Clearhaus card token.
-      # options        - A standard ActiveMerchant options hash  with optional pares
       def authorize(amount, payment, options={})
         post = {}
         add_invoice(post, amount, options)
@@ -83,23 +70,13 @@ module ActiveMerchant #:nodoc:
         commit(action, post)
       end
 
-      # Capture a pre-authorized transaction.
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # authorization  - The Clearhaus authorization id string.
-      # options        - A standard ActiveMerchant options hash
       def capture(amount, authorization, options={})
         post = {}
-        add_amount(post, amount, options)
+        add_invoice(post, amount, options)
 
         commit("/authorizations/#{authorization}/captures", post)
       end
 
-      # Refund a captured transaction (fully or partial).
-      #
-      # amount         - The monetary amount of the transaction in cents.
-      # authorization  - The Clearhaus authorization id string.
-      # options        - A standard ActiveMerchant options hash
       def refund(amount, authorization, options={})
         post = {}
         add_amount(post, amount, options)
@@ -118,10 +95,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Tokenize credit card with Clearhaus.
-      #
-      # credit_card    - The CreditCard.
-      # options        - A standard ActiveMerchant options hash
       def store(credit_card, options={})
         post = {}
         add_payment(post, credit_card)
@@ -145,11 +118,11 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, options)
         add_amount(post, money, options)
         post[:reference] = options[:order_id] if options[:order_id]
-        post[:text_on_statement] = options[:description] if options[:description]
+        post[:text_on_statement] = options[:text_on_statement] if options[:text_on_statement]
       end
 
       def add_amount(post, amount, options)
-        post[:amount]   = amount(amount)
+        post[:amount]   = localized_amount(amount, options[:currency] || default_currency)
         post[:currency] = (options[:currency] || default_currency)
       end
 
@@ -182,8 +155,12 @@ module ActiveMerchant #:nodoc:
         headers = headers(@options[:api_key])
         body = parameters.to_query
 
-        if signing_key = @options[:signing_key]
-          headers["Signature"] = generate_signature(@options[:api_key], signing_key, body)
+        if @options[:signing_key] && @options[:private_key]
+          begin
+            headers["Signature"] = generate_signature(body)
+          rescue OpenSSL::PKey::RSAError => e
+            return Response.new(false, e.message)
+          end
         end
 
         response = begin
@@ -197,7 +174,7 @@ module ActiveMerchant #:nodoc:
           success_from(response),
           message_from(response),
           response,
-          authorization: authorization_from(response),
+          authorization: authorization_from(action, response),
           test: test?,
           error_code: error_code_from(response)
         )
@@ -217,15 +194,22 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def authorization_from(response)
-        response['id']
+      def authorization_from(action, response)
+        id_of_auth_for_capture(action) || response['id']
+      end
+
+      def id_of_auth_for_capture(action)
+        match = action.match(/authorizations\/(.+)\/captures/)
+        return nil unless match
+
+        match.captures.first
       end
 
-      def generate_signature(api_key, signing_key, body)
-        key = OpenSSL::PKey::RSA.new(signing_key)
+      def generate_signature(body)
+        key = OpenSSL::PKey::RSA.new(@options[:private_key])
         hex = key.sign(OpenSSL::Digest.new('sha256'), body).unpack('H*').first
 
-        "#{api_key} RS256-hex #{hex}"
+        "#{@options[:signing_key]} RS256-hex #{hex}"
       end
 
       def error_code_from(response)

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :key)
-        options[:version] ||= '0.3.0'
+        options[:version] ||= '1.0.0'
         super
       end
 
@@ -55,6 +55,11 @@ module ActiveMerchant #:nodoc:
         commit(:post, "charges/#{identifier}/refund", post)
       end
 
+      def void(identifier, options = {})
+        post = {}
+        commit(:post, "charges/#{identifier}/void", post)
+      end
+
       def supports_scrubbing
         true
       end

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

@@ -120,7 +120,7 @@ module ActiveMerchant #:nodoc:
 
       def add_card_details(xml, payment_method, options={})
         xml.CardDetails do
-          xml.Manual(type: "cnp") do
+          xml.Manual(type: "ecommerce") do
             xml.PAN payment_method.number
             xml.ExpiryDate exp_date(payment_method)
             xml.CSC payment_method.verification_value unless empty?(payment_method.verification_value)