activemerchant 1.60.0 → 1.61.0

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

@@ -1,17 +1,8 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    # See the remote and mocked unit test files for example usage.  Pay special
-    # attention to the contents of the options hash.
-    #
     # Initial setup instructions can be found in
     # http://cybersource.com/support_center/implementation/downloads/soap_api/SOAP_toolkits.pdf
     #
-    # Debugging
-    # If you experience an issue with this gateway be sure to examine the
-    # transaction information from a general transaction search inside the
-    # CyberSource Business Center for the full error messages including field
-    # names.
-    #
     # Important Notes
     # * For checks you can purchase and store.
     # * AVS and CVV only work against the production server.  You will always
@@ -35,14 +26,15 @@ module ActiveMerchant #:nodoc:
 
       XSD_VERSION = "1.121"
 
-      # visa, master, american_express, discover
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = %w(US BR CA CN DK FI FR DE JP MX NO SE GB SG)
+
       self.default_currency = 'USD'
+      self.currencies_without_fractions = %w(JPY)
+
       self.homepage_url = 'http://www.cybersource.com'
       self.display_name = 'CyberSource'
 
-      # map credit card to the CyberSource expected representation
       @@credit_card_codes = {
         :visa  => '001',
         :master => '002',
@@ -50,7 +42,6 @@ module ActiveMerchant #:nodoc:
         :discover => '004'
       }
 
-      # map response codes to something humans can read
       @@response_codes = {
         :r100 => "Successful transaction",
         :r101 => "Request is missing one or more required fields" ,
@@ -116,38 +107,28 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      # Request an authorization for an amount from CyberSource
-      #
-      # You must supply an :order_id in the options hash
       def authorize(money, creditcard_or_reference, options = {})
         setup_address_hash(options)
-        commit(build_auth_request(money, creditcard_or_reference, options), options )
+        commit(build_auth_request(money, creditcard_or_reference, options), :authorize, money, options )
       end
 
-      def auth_reversal(money, identification, options = {})
-        commit(build_auth_reversal_request(money, identification, options), options)
-      end
-
-      # Capture an authorization that has previously been requested
       def capture(money, authorization, options = {})
         setup_address_hash(options)
-        commit(build_capture_request(money, authorization, options), options)
+        commit(build_capture_request(money, authorization, options), :capture, money, options)
       end
 
-      # Purchase is an auth followed by a capture
-      # You must supply an order_id in the options hash
       # options[:pinless_debit_card] => true # attempts to process as pinless debit card
       def purchase(money, payment_method_or_reference, options = {})
         setup_address_hash(options)
-        commit(build_purchase_request(money, payment_method_or_reference, options), options)
+        commit(build_purchase_request(money, payment_method_or_reference, options), :purchase, money, options)
       end
 
       def void(identification, options = {})
-        commit(build_void_request(identification, options), options)
+        commit(build_void_request(identification, options), :void, nil, options)
       end
 
       def refund(money, identification, options = {})
-        commit(build_refund_request(money, identification, options), options)
+        commit(build_refund_request(money, identification, options), :refund, money, options)
       end
 
       def verify(payment, options = {})
@@ -159,7 +140,7 @@ module ActiveMerchant #:nodoc:
 
       # Adds credit to a subscription (stand alone credit).
       def credit(money, reference, options = {})
-        commit(build_credit_request(money, reference, options), options)
+        commit(build_credit_request(money, reference, options), :credit, money, options)
       end
 
       # Stores a customer subscription/profile with type "on-demand".
@@ -167,26 +148,26 @@ module ActiveMerchant #:nodoc:
       # options[:setup_fee] => money
       def store(payment_method, options = {})
         setup_address_hash(options)
-        commit(build_create_subscription_request(payment_method, options), options)
+        commit(build_create_subscription_request(payment_method, options), :store, nil, options)
       end
 
       # Updates a customer subscription/profile
       def update(reference, creditcard, options = {})
         requires!(options, :order_id)
         setup_address_hash(options)
-        commit(build_update_subscription_request(reference, creditcard, options), options)
+        commit(build_update_subscription_request(reference, creditcard, options), :update, nil, options)
       end
 
       # Removes a customer subscription/profile
       def unstore(reference, options = {})
         requires!(options, :order_id)
-        commit(build_delete_subscription_request(reference, options), options)
+        commit(build_delete_subscription_request(reference, options), :unstore, nil, options)
       end
 
       # Retrieves a customer subscription/profile
       def retrieve(reference, options = {})
         requires!(options, :order_id)
-        commit(build_retrieve_subscription_request(reference, options), options)
+        commit(build_retrieve_subscription_request(reference, options), :retrieve, nil, options)
       end
 
       # CyberSource requires that you provide line item information for tax
@@ -218,13 +199,13 @@ module ActiveMerchant #:nodoc:
       def calculate_tax(creditcard, options)
         requires!(options,  :line_items)
         setup_address_hash(options)
-        commit(build_tax_calculation_request(creditcard, options), options)
+        commit(build_tax_calculation_request(creditcard, options), :calculate_tax, nil, options)
       end
 
       # Determines if a card can be used for Pinless Debit Card transactions
       def validate_pinless_debit_card(creditcard, options = {})
         requires!(options, :order_id)
-        commit(build_validate_pinless_debit_request(creditcard,options), options)
+        commit(build_validate_pinless_debit_request(creditcard,options), :validate_pinless_debit_card, nil, options)
       end
 
       def supports_scrubbing?
@@ -245,6 +226,11 @@ module ActiveMerchant #:nodoc:
         true
       end
 
+      def verify_credentials
+        response = void("0")
+        response.params["reasonCode"] == "102"
+      end
+
       private
 
       # Create all address hash key value pairs so that we still function if we
@@ -308,20 +294,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_void_request(identification, options)
-        order_id, request_id, request_token = identification.split(";")
+        order_id, request_id, request_token, action, money, currency  = identification.split(";")
         options[:order_id] = order_id
 
         xml = Builder::XmlMarkup.new :indent => 2
-        add_void_service(xml, request_id, request_token)
-        xml.target!
-      end
-
-      def build_auth_reversal_request(money, identification, options)
-        order_id, request_id, request_token = identification.split(";")
-        options[:order_id] = order_id
-        xml = Builder::XmlMarkup.new :indent => 2
-        add_purchase_data(xml, money, true, options)
-        add_auth_reversal_service(xml, request_id, request_token)
+        if action == "capture"
+          add_void_service(xml, request_id, request_token)
+        else
+          add_purchase_data(xml, money, true, options.merge(:currency => currency || default_currency))
+          add_auth_reversal_service(xml, request_id, request_token)
+        end
         xml.target!
       end
 
@@ -429,7 +411,7 @@ module ActiveMerchant #:nodoc:
       def add_line_item_data(xml, options)
         options[:line_items].each_with_index do |value, index|
           xml.tag! 'item', {'id' => index} do
-            xml.tag! 'unitPrice', amount(value[:declared_value])
+            xml.tag! 'unitPrice', localized_amount(value[:declared_value].to_i, options[:currency] || default_currency)
             xml.tag! 'quantity', value[:quantity]
             xml.tag! 'productCode', value[:code] || 'shipping_only'
             xml.tag! 'productName', value[:description]
@@ -449,7 +431,7 @@ module ActiveMerchant #:nodoc:
       def add_purchase_data(xml, money = 0, include_grand_total = false, options={})
         xml.tag! 'purchaseTotals' do
           xml.tag! 'currency', options[:currency] || currency(money)
-          xml.tag!('grandTotalAmount', amount(money))  if include_grand_total
+          xml.tag!('grandTotalAmount', localized_amount(money.to_i, options[:currency] || default_currency))  if include_grand_total
         end
       end
 
@@ -462,7 +444,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'city',                  address[:city]
           xml.tag! 'state',                 address[:state]
           xml.tag! 'postalCode',            address[:zip]
-          xml.tag! 'country',               address[:country]
+          xml.tag! 'country',               lookup_country_code(address[:country]) unless address[:country].blank?
           xml.tag! 'company',               address[:company]                 unless address[:company].blank?
           xml.tag! 'companyTaxID',          address[:companyTaxID]            unless address[:company_tax_id].blank?
           xml.tag! 'phoneNumber',           address[:phone]                   unless address[:phone].blank?
@@ -492,7 +474,7 @@ module ActiveMerchant #:nodoc:
 
       def add_mdd_fields(xml, options)
         xml.tag! 'merchantDefinedData' do
-          (1..20).each do |each|
+          (1..100).each do |each|
             key = "mdd_field_#{each}".to_sym
             xml.tag!("field#{each}", options[key]) if options[key]
           end
@@ -625,7 +607,7 @@ module ActiveMerchant #:nodoc:
           end
 
           xml.tag! 'status',            options[:subscription][:status]                         if options[:subscription][:status]
-          xml.tag! 'amount',            amount(options[:subscription][:amount])                 if options[:subscription][:amount]
+          xml.tag! 'amount',            localized_amount(options[:subscription][:amount].to_i, options[:currency] || default_currency) if options[:subscription][:amount]
           xml.tag! 'numberOfPayments',  options[:subscription][:occurrences]                    if options[:subscription][:occurrences]
           xml.tag! 'automaticRenew',    options[:subscription][:automatic_renew]                if options[:subscription][:automatic_renew]
           xml.tag! 'frequency',         options[:subscription][:frequency]                      if options[:subscription][:frequency]
@@ -669,6 +651,11 @@ module ActiveMerchant #:nodoc:
         xml.tag!'pinlessDebitValidateService', {'run' => 'true'}
       end
 
+      def lookup_country_code(country_field)
+        country_code = Country.find(country_field) rescue nil
+        country_code.code(:alpha2)
+      end
+
       # Where we actually build the full SOAP request using builder
       def build_request(body, options)
         xml = Builder::XmlMarkup.new :indent => 2
@@ -694,7 +681,7 @@ module ActiveMerchant #:nodoc:
 
       # Contact CyberSource, make the SOAP request, and parse the reply into a
       # Response object
-      def commit(request, options)
+      def commit(request, action, amount, options)
         begin
           response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(request, options)))
         rescue ResponseError => e
@@ -703,7 +690,7 @@ module ActiveMerchant #:nodoc:
 
         success = response[:decision] == "ACCEPT"
         message = @@response_codes[('r' + response[:reasonCode]).to_sym] rescue response[:message]
-        authorization = success ? [ options[:order_id], response[:requestID], response[:requestToken] ].compact.join(";") : nil
+        authorization = success ? [ options[:order_id], response[:requestID], response[:requestToken], action, amount, options[:currency]].compact.join(";") : nil
 
         Response.new(success, message, response,
           :test => test?,

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

@@ -29,7 +29,7 @@ module ActiveMerchant #:nodoc:
           xml.send(action, xmlns: "https://transaction.elementexpress.com") do
             add_credentials(xml)
             add_payment_method(xml, payment)
-            add_transaction(xml, money)
+            add_transaction(xml, money, options)
             add_terminal(xml, options)
             add_address(xml, options)
           end
@@ -43,7 +43,7 @@ module ActiveMerchant #:nodoc:
           xml.CreditCardAuthorization(xmlns: "https://transaction.elementexpress.com") do
             add_credentials(xml)
             add_payment_method(xml, payment)
-            add_transaction(xml, money)
+            add_transaction(xml, money, options)
             add_terminal(xml, options)
             add_address(xml, options)
           end
@@ -226,6 +226,17 @@ module ActiveMerchant #:nodoc:
             xml.BillingPhone address[:phone_number] if address[:phone_number]
           end
         end
+        if shipping_address = options[:shipping_address]
+          xml.address do
+            xml.ShippingAddress1 shipping_address[:address1] if shipping_address[:address1]
+            xml.ShippingAddress2 shipping_address[:address2] if shipping_address[:address2]
+            xml.ShippingCity shipping_address[:city] if shipping_address[:city]
+            xml.ShippingState shipping_address[:state] if shipping_address[:state]
+            xml.ShippingZipcode shipping_address[:zip] if shipping_address[:zip]
+            xml.ShippingEmail shipping_address[:email] if shipping_address[:email]
+            xml.ShippingPhone shipping_address[:phone_number] if shipping_address[:phone_number]
+          end
+        end
       end
 
       def parse(xml)

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

@@ -3,7 +3,7 @@ require 'json'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class FatZebraGateway < Gateway
-      self.live_url    = "https://gateway.fatzebra.com.au/v1.0"
+      self.live_url = "https://gateway.fatzebra.com.au/v1.0"
       self.test_url = "https://gateway.sandbox.fatzebra.com.au/v1.0"
 
       self.supported_countries = ['AU']
@@ -121,12 +121,21 @@ module ActiveMerchant #:nodoc:
 
       def add_extra_options(post, options)
         extra = {}
-        extra[:name] = options[:merchant] if options[:merchant]
-        extra[:location] = options[:merchant_location] if options[:merchant_location]
         extra[:ecm] = "32" if options[:recurring]
+        extra[:cavv] = options[:cavv] if options[:cavv]
+        extra[:xid] = options[:cavv] if options[:xid]
+        extra[:sli] = options[:sli] if options[:sli]
+        add_descriptor(extra, options)
         post[:extra] = extra if extra.any?
       end
 
+      def add_descriptor(extra, options)
+        descriptor = {}
+        descriptor[:name] = options[:merchant] if options[:merchant]
+        descriptor[:location] = options[:merchant_location] if options[:merchant_location]
+        extra[:descriptor] = descriptor if descriptor.any?
+      end
+
       def add_order_id(post, options)
         post[:reference] = options[:order_id] || SecureRandom.hex(15)
       end

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

@@ -129,6 +129,11 @@ module ActiveMerchant #:nodoc:
         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

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

@@ -80,7 +80,9 @@ module ActiveMerchant #:nodoc:
         "visa" => "1",
         "american_express" => "2",
         "master" => "3",
-        "discover" => "128"
+        "discover" => "128",
+        "jcb" => "125",
+        "diners_club" => "132"
       }
 
       def add_order(post, money, options)

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

@@ -1,11 +1,14 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class JetpayGateway < Gateway
+      class_attribute :live_us_url, :live_ca_url
+
       self.test_url = 'https://test1.jetpay.com/jetpay'
-      self.live_url = 'https://gateway17.jetpay.com/jetpay'
+      self.live_us_url = 'https://gateway17.jetpay.com/jetpay'
+      self.live_ca_url = 'https://gateway17.jetpay.com/canada-bb'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['US']
+      self.supported_countries = ['US', 'CA']
 
       # The card types supported by the payment gateway
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -277,7 +280,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(money, request)
-        response = parse(ssl_post(test? ? self.test_url : self.live_url, request))
+        response = parse(ssl_post(url, request))
 
         success = success?(response)
         Response.new(success,
@@ -290,6 +293,11 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def url
+        live_url = @options[:region] == 'CA' ? live_ca_url : live_us_url
+        test? ? test_url : live_url
+      end
+
       def parse(body)
         return {} if body.blank?
 

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

@@ -143,6 +143,8 @@ module ActiveMerchant #:nodoc:
           :pem => LinkpointGateway.pem_file
         }.update(options)
 
+        @options[:pem].strip!
+
         raise ArgumentError, "You need to pass in your pem file using the :pem parameter or set it globally using ActiveMerchant::Billing::LinkpointGateway.pem_file = File.read( File.dirname(__FILE__) + '/../mycert.pem' ) or similar" if @options[:pem].blank?
       end
 

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

@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        commit(:sale, request)
+        commit(:sale, request, money)
       end
 
       def authorize(money, payment_method, options={})
@@ -45,11 +45,11 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        commit(:authorization, request)
+        commit(:authorization, request, money)
       end
 
       def capture(money, authorization, options={})
-        transaction_id, _ = split_authorization(authorization)
+        transaction_id, _, _ = split_authorization(authorization)
 
         request = build_xml_request do |doc|
           add_authentication(doc)
@@ -60,7 +60,7 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        commit(:capture, request)
+        commit(:capture, request, money)
       end
 
       def credit(money, authorization, options = {})
@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options={})
-        transaction_id, _ = split_authorization(authorization)
+        transaction_id, _, _ = split_authorization(authorization)
 
         request = build_xml_request do |doc|
           add_authentication(doc)
@@ -91,12 +91,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def void(authorization, options={})
-        transaction_id, kind = split_authorization(authorization)
+        transaction_id, kind, money = split_authorization(authorization)
 
         request = build_xml_request do |doc|
           add_authentication(doc)
           doc.send(void_type(kind), transaction_attributes(options)) do
             doc.litleTxnId(transaction_id)
+            doc.amount(money) if void_type(kind) == :authReversal
           end
         end
 
@@ -120,6 +121,21 @@ module ActiveMerchant #:nodoc:
         commit(:registerToken, request)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<user>).+(</user>)), '\1[FILTERED]\2').
+          gsub(%r((<password>).+(</password>)), '\1[FILTERED]\2').
+          gsub(%r((<number>).+(</number>)), '\1[FILTERED]\2').
+          gsub(%r((<cardValidationNum>).+(</cardValidationNum>)), '\1[FILTERED]\2').
+          gsub(%r((<accountNumber>).+(</accountNumber>)), '\1[FILTERED]\2').
+          gsub(%r((<paypageRegistrationId>).+(</paypageRegistrationId>)), '\1[FILTERED]\2').
+          gsub(%r((<authenticationValue>).+(</authenticationValue>)), '\1[FILTERED]\2')
+      end
+
       private
       CARD_TYPE = {
         'visa'             => 'VI',
@@ -290,11 +306,11 @@ module ActiveMerchant #:nodoc:
         parsed
       end
 
-      def commit(kind, request)
+      def commit(kind, request, money=nil)
         parsed = parse(kind, ssl_post(url, request, headers))
 
         options = {
-          authorization: authorization_from(kind, parsed),
+          authorization: authorization_from(kind, parsed, money),
           test: test?,
           :avs_result => { :code => AVS_RESPONSE_CODE[parsed[:fraudResult_avsResult]] },
           :cvv_result => parsed[:fraudResult_cardValidationResult]
@@ -308,13 +324,13 @@ module ActiveMerchant #:nodoc:
         %w(000 801 802).include?(parsed[:response])
       end
 
-      def authorization_from(kind, parsed)
-        (kind == :registerToken) ? parsed[:litleToken] : "#{parsed[:litleTxnId]};#{kind}"
+      def authorization_from(kind, parsed, money)
+        (kind == :registerToken) ? parsed[:litleToken] : "#{parsed[:litleTxnId]};#{kind};#{money}"
       end
 
       def split_authorization(authorization)
-        transaction_id, kind = authorization.to_s.split(';')
-        [transaction_id, kind]
+        transaction_id, kind, money = authorization.to_s.split(';')
+        [transaction_id, kind, money]
       end
 
       def transaction_attributes(options)