activemerchant 1.53.0 → 1.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a66a1463e2d11b64b17b7690b2fe48e97279a6b6
-  data.tar.gz: 99be80349b8f54a9a07761c8b4b983c9353bf955
+  metadata.gz: 9fc6f0d2cdaee90794c21b2a864c1f388e137b7a
+  data.tar.gz: b8d2bdfb76e707aecd003b60ba388bd4e4c35b16
 SHA512:
-  metadata.gz: ca1cae5f0c4cb904135e2464e36419f95383222408a45bd8e1fb02f91354701191a5c9ae34c95169e809effe08f093583c48b62477065d89860951e7921883f9
-  data.tar.gz: 1b159f4b9bd19e5b80c20c7db233bbe10a54b92811e02c9f6cb4ea885e983b8fbb800c288bf919a20df3793a2e285b892483838ecc190be3214e336dc4d80bfd
+  metadata.gz: 7f022f77e95737535d03582cf5d79c3b93ef2ff44215e1343b73c574fe78269447c36bc8400ff1b4bacbdcf98a453a1dbffc3dce1b1452046fca6f4bb8230426
+  data.tar.gz: c4e19a130993eb296dddc128109873204078c2cf480d48c2cc47f57310ef79f1cd2b62a88cdc02af00791a7d1be08c78957bbc172df728ec18d6236369144a90

data/CHANGELOG

@@ -1,6 +1,23 @@
 = ActiveMerchant CHANGELOG
 
 
+== Version 1.54.0 (October 2, 2015)
+* Beanstream: Add Network Tokenization support [girasquid]
+* CenPOS: Allow order_id on void [duff]
+* Provide better insight to CVV usage in requests [davidsantoso]
+* Ogone: Add verify [duff]
+* Beanstream: Add verify [mrezentes]
+* PayPal: Map standard error codes [JakeCataford]
+* Checkout.com: Fix an issue with empty phone numbers. [anotherjosmith]
+* Quickpay: Edit store and add ability to purchase with stored card [anellis]
+* Stripe: Set `receipt_email` to Stripe request if receipt delivery is requested [miccheng]
+* Worldpay US: Add eCheck support [mrezentes]
+* FirstData_e4: add level_3 data [mrezentes]
+* Vanco: Support passing ip address [duff]
+* Paybox Direct: Currency parsing fix [ivanfer]
+* QuickpayV10: Remove currency requirement from store. [anellis]
+* Raven: Use TLS 1.2 endpoint [bslobodin]
+
 == Version 1.53.0 (September 1, 2015)
 
 * Redsys: Add a number of currencies [agseco]

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

@@ -76,7 +76,10 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(%r((Authorization: Bearer )[a-zA-Z0-9._-]+)i, '\1[FILTERED]').
           gsub(%r(("cardNumber\\?":\\?")[^"]*)i, '\1[FILTERED]').
-          gsub(%r(("cVVCode\\?":\\?")[^"]*)i, '\1[FILTERED]')
+          gsub(%r(("cVVCode\\?":\\?")\d+[^"]*)i, '\1[FILTERED]').
+          gsub(%r(("cVVCode\\?":)null), '\1[BLANK]').
+          gsub(%r(("cVVCode\\?":\\?")\\?"), '\1[BLANK]"').
+          gsub(%r(("cVVCode\\?":\\?")\s+), '\1[BLANK]"')
       end
 
       private

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

@@ -99,6 +99,13 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
+      def verify(source, options={})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, source, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
       def success?(response)
         response[:trnApproved] == '1' || response[:responseCode] == '1'
       end

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

@@ -206,6 +206,11 @@ module ActiveMerchant #:nodoc:
           post[:trnExpMonth] = format(credit_card.month, :two_digits)
           post[:trnExpYear] = format(credit_card.year, :two_digits)
           post[:trnCardCvd] = credit_card.verification_value
+          if credit_card.is_a?(NetworkTokenizationCreditCard)
+            post[:"3DSecureXID"] = credit_card.transaction_id
+            post[:"3DSecureECI"] = credit_card.eci
+            post[:"3DSecureCAVV"] = credit_card.payment_cryptogram
+          end
         end
       end
 

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

@@ -51,6 +51,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_remembered_amount(post, authorization)
         add_tax(post, options)
+        add_order_id(post, options)
 
         commit("Void", post)
       end
@@ -95,9 +96,9 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, options)
         post[:Amount] = amount(money)
         post[:CurrencyCode] = options[:currency] || currency(money)
-        post[:InvoiceNumber] = options[:order_id]
         post[:InvoiceDetail] = options[:invoice_detail] if options[:invoice_detail]
         post[:CustomerCode] = options[:customer_code] if options[:customer_code]
+        add_order_id(post, options)
         add_tax(post, options)
       end
 
@@ -126,6 +127,10 @@ module ActiveMerchant #:nodoc:
         post[:IMEI] = nil
       end
 
+      def add_order_id(post, options)
+        post[:InvoiceNumber] = options[:order_id]
+      end
+
       def add_tax(post, options)
         post[:TaxAmount] = amount(options[:tax] || 0)
       end

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

@@ -100,7 +100,7 @@ module ActiveMerchant #:nodoc:
           post[:card][:billingDetails][:state] = address[:state]
           post[:card][:billingDetails][:country] = address[:country]
           post[:card][:billingDetails][:postcode] = address[:zip]
-          post[:card][:billingDetails][:phone] = { number: address[:phone] }
+          post[:card][:billingDetails][:phone] = { number: address[:phone] } unless address[:phone].blank?
         end
       end
 

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

@@ -172,6 +172,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(xml, options)
         add_invoice(xml, options)
         add_card_authentication_data(xml, options)
+        add_level_3(xml, options)
 
         xml.target!
       end
@@ -301,6 +302,12 @@ module ActiveMerchant #:nodoc:
         xml.tag! "Reference_3",  options[:description] if options[:description]
       end
 
+      def add_level_3(xml, options)
+        if options[:level_3]
+          xml.level3 { |x| x << options[:level_3] }
+        end
+      end
+
       def expdate(credit_card)
         "#{format(credit_card.month, :two_digits)}#{format(credit_card.year, :two_digits)}"
       end

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

@@ -26,6 +26,7 @@ module ActiveMerchant #:nodoc:
           add_allow_dup(xml)
           add_customer_data(xml, card_or_token, options)
           add_details(xml, options)
+          add_descriptor_name(xml, options)
           add_payment(xml, card_or_token, options)
         end
       end
@@ -43,6 +44,7 @@ module ActiveMerchant #:nodoc:
           add_allow_dup(xml)
           add_customer_data(xml, card_or_token,options)
           add_details(xml, options)
+          add_descriptor_name(xml, options)
           add_payment(xml, card_or_token, options)
         end
       end
@@ -60,6 +62,7 @@ module ActiveMerchant #:nodoc:
       def verify(card_or_token, options={})
         commit('CreditAccountVerify') do |xml|
           add_customer_data(xml, card_or_token, options)
+          add_descriptor_name(xml, options)
           add_payment(xml, card_or_token, options)
         end
       end
@@ -146,6 +149,10 @@ module ActiveMerchant #:nodoc:
         xml.hps :AllowDup, 'Y'
       end
 
+      def add_descriptor_name(xml, options)
+        xml.hps :TxnDescriptor, options[:descriptor_name] if options[:descriptor_name]
+      end
+
       def build_request(action)
         xml = Builder::XmlMarkup.new(encoding: 'UTF-8')
         xml.instruct!(:xml, encoding: 'UTF-8')

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

@@ -1,6 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class NmiGateway < Gateway
+      include Empty
 
       DUP_WINDOW_DEPRECATION_MESSAGE = "The class-level duplicate_window variable is deprecated. Please use the :dup_seconds transaction option instead."
 
@@ -140,7 +141,7 @@ module ActiveMerchant #:nodoc:
           post[:firstname] = payment_method.first_name
           post[:lastname] = payment_method.last_name
           post[:ccnumber] = payment_method.number
-          post[:cvv] = payment_method.verification_value
+          post[:cvv] = payment_method.verification_value unless empty?(payment_method.verification_value)
           post[:ccexp] = exp_date(payment_method)
         end
       end

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

@@ -206,6 +206,13 @@ module ActiveMerchant #:nodoc:
         perform_reference_credit(money, reference, options)
       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
+
       # Store a credit card by creating an Ogone Alias
       def store(payment_source, options = {})
         options.merge!(:alias_operation => 'BYPSP') unless(options.has_key?(:billing_id) || options.has_key?(:store))
@@ -423,8 +430,9 @@ module ActiveMerchant #:nodoc:
           raise "Unknown signature algorithm #{algorithm}"
         end
 
+        filtered_params = signed_parameters.select{|k,v| !v.blank?}
         sha_encryptor.hexdigest(
-          signed_parameters.sort_by{|k,v| k.upcase}.map{|k, v| "#{k.upcase}=#{v}#{secret}"}.join("")
+          filtered_params.sort_by{|k,v| k.upcase}.map{|k, v| "#{k.upcase}=#{v}#{secret}"}.join("")
         ).upcase
       end
 

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

@@ -91,7 +91,10 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
           gsub(%r((card_number\\?":\\?")[^"\\]*)i, '\1[FILTERED]').
-          gsub(%r((cvv2\\?":\\?")[^"\\]*)i, '\1[FILTERED]')
+          gsub(%r((cvv2\\?":\\?")\d+[^"\\]*)i, '\1[FILTERED]').
+          gsub(%r((cvv2\\?":)null), '\1[BLANK]').
+          gsub(%r((cvv2\\?":\\?")\\?"), '\1[BLANK]"').
+          gsub(%r((cvv2\\?":\\?")\s+), '\1[BLANK]')
       end
       private
 

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

@@ -25,14 +25,14 @@ module ActiveMerchant #:nodoc:
         'cvv2_not_checked' => 'X'
       }
 
-      self.test_url = 'https://raven.deepcovelabs.com/realtime/'
-      self.live_url = 'https://raven.deepcovelabs.com/realtime/'
+      self.live_url = 'https://raven.deepcovelabs.net/realtime/'
+      self.test_url = self.live_url
 
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master]
       self.money_format = :cents
       self.default_currency = 'USD'
-      self.homepage_url = 'http://www.deepcovelabs.com/raven'
+      self.homepage_url = 'https://www.deepcovelabs.com/raven'
       self.display_name = 'Raven'
 
       def initialize(options = {})

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

@@ -67,6 +67,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 +76,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 +85,10 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
         post = {}
         add_invoice(post, options)
+        add_amount(post, money, options)
         post[:numappel] = authorization[0,10]
         post[:numtrans] = authorization[10,10]
+
         commit('capture', money, post)
       end
 
@@ -91,8 +97,10 @@ 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
 
@@ -125,6 +133,11 @@ module ActiveMerchant #:nodoc:
         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|
@@ -135,8 +148,6 @@ module ActiveMerchant #:nodoc:
       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)
         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?

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

@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
           gsub(%r((<n1:Password>).+(</n1:Password>)), '\1[FILTERED]\2').
           gsub(%r((<n1:Username>).+(</n1:Username>)), '\1[FILTERED]\2').
           gsub(%r((<n2:CreditCardNumber>).+(</n2:CreditCardNumber)), '\1[FILTERED]\2').
-          gsub(%r((<n2:CVV2>).+(</n2:CVV2)), '\1[FILTERED]\2')
+          gsub(%r((<n2:CVV2>)\d+(</n2:CVV2)), '\1[FILTERED]\2')
       end
 
       private
@@ -91,7 +91,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:CreditCardNumber', credit_card.number
           xml.tag! 'n2:ExpMonth', format(credit_card.month, :two_digits)
           xml.tag! 'n2:ExpYear', format(credit_card.year, :four_digits)
-          xml.tag! 'n2:CVV2', credit_card.verification_value
+          xml.tag! 'n2:CVV2', credit_card.verification_value unless credit_card.verification_value.blank?
 
           if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
             xml.tag! 'n2:StartMonth', format(credit_card.start_month, :two_digits) unless credit_card.start_month.blank?

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -40,6 +40,20 @@ module ActiveMerchant #:nodoc:
 
       FRAUD_REVIEW_CODE = "11610"
 
+      STANDARD_ERROR_CODE_MAPPING = {
+        '15005' => :card_declined,
+        '10754' => :card_declined,
+        '10752' => :card_declined,
+        '10759' => :card_declined,
+        '10761' => :card_declined,
+        '15002' => :card_declined,
+        '11084' => :card_declined,
+        '15004' => :incorrect_cvc,
+        '10762' => :invalid_cvc,
+      }
+
+      STANDARD_ERROR_CODE_MAPPING.default = :processing_error
+
       def self.included(base)
         base.default_currency = 'USD'
         base.cattr_accessor :pem_file
@@ -637,11 +651,21 @@ module ActiveMerchant #:nodoc:
           :test => test?,
           :authorization => authorization_from(response),
           :fraud_review => fraud_review?(response),
+          :error_code => standardized_error_code(response),
           :avs_result => { :code => response[:avs_code] },
           :cvv_result => response[:cvv2_code]
         )
       end
 
+      def standardized_error_code(response)
+        STANDARD_ERROR_CODE_MAPPING[error_codes(response).first]
+      end
+
+      def error_codes(response)
+        return [] unless response.has_key?(:error_codes)
+        response[:error_codes].split(',')
+      end
+
       def fraud_review?(response)
         response[:error_codes] == FRAUD_REVIEW_CODE
       end

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

@@ -11,11 +11,11 @@ module ActiveMerchant
         end
         base.live_redirect_url = 'https://www.paypal.com/cgi-bin/webscr'
       end
-      
+
       def redirect_url
         test? ? test_redirect_url : live_redirect_url
       end
-      
+
       def redirect_url_for(token, options = {})
         options = {:review => true, :mobile => false}.update(options)
 

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v10.rb

@@ -14,26 +14,26 @@ module ActiveMerchant
         super
       end
 
-      def purchase(money, credit_card, options = {})
+      def purchase(money, credit_card_or_reference, options = {})
         MultiResponse.run(true) do |r|
           r.process { create_payment(money, options) }
           r.process {
-            post = authorization_params(money, credit_card, options)
+            post = authorization_params(money, credit_card_or_reference, options)
             add_autocapture(post, false)
             commit(synchronized_path("/payments/#{r.authorization}/authorize"), post)
           }
           r.process {
-            post = capture_params(money, credit_card, options)
+            post = capture_params(money, credit_card_or_reference, options)
             commit(synchronized_path("/payments/#{r.authorization}/capture"), post)
           }
         end
       end
 
-      def authorize(money, credit_card, options = {})
+      def authorize(money, credit_card_or_reference, options = {})
         MultiResponse.run(true) do |r|
           r.process { create_payment(money, options) }
           r.process {
-            post = authorization_params(money, credit_card, options)
+            post = authorization_params(money, credit_card_or_reference, options)
             commit(synchronized_path("/payments/#{r.authorization}/authorize"), post)
           }
         end
@@ -68,16 +68,16 @@ module ActiveMerchant
       end
 
       def store(credit_card, options = {})
-        MultiResponse.run(true) do |r|
-          r.process { create_subscription(options) }
-          r.process {
-            authorize_subscription(r.authorization, credit_card, options)
-          }
+        MultiResponse.run do |r|
+          r.process { create_store(options) }
+          r.process { authorize_store(r.authorization, credit_card, options)}
+          r.process { create_token(r.authorization, options.merge({id: r.authorization}))}
         end
       end
 
       def unstore(identification)
-        commit(synchronized_path "/subscriptions/#{identification}/cancel")
+        identification = identification.split(";").last
+        commit(synchronized_path "/cards/#{identification}/cancel")
       end
 
       def supports_scrubbing?
@@ -97,7 +97,7 @@ module ActiveMerchant
           post = {}
 
           add_amount(post, money, options)
-          add_credit_card(post, credit_card)
+          add_credit_card_or_reference(post, credit_card)
           add_additional_params(:authorize, post, options)
 
           post
@@ -112,23 +112,24 @@ module ActiveMerchant
           post
         end
 
-        def create_subscription(options = {})
-          requires!(options, :currency)
+        def create_store(options = {})
           post = {}
-
-          add_currency(post, nil, options)
-          add_subscription_invoice(post, options)
-          commit('/subscriptions', post)
+          commit('/cards', post)
         end
 
-        def authorize_subscription(identification, credit_card, options = {})
+        def authorize_store(identification, credit_card, options = {})
           requires!(options, :amount)
           post = {}
 
           add_amount(post, nil, options)
-          add_credit_card(post, credit_card, options)
-          add_additional_params(:authorize_subscription, post, options)
-          commit(synchronized_path("/subscriptions/#{identification}/authorize"), post)
+          add_credit_card_or_reference(post, credit_card, options)
+          commit(synchronized_path("/cards/#{identification}/authorize"), post)
+        end
+
+        def create_token(identification, options)
+          post = {}
+          post[:id] = options[:id]
+          commit(synchronized_path("/cards/#{identification}/tokens"), post)
         end
 
         def create_payment(money, options = {})
@@ -151,14 +152,16 @@ module ActiveMerchant
 
           Response.new(success, message_from(success, response), response,
             :test => test?,
-            :authorization => response['id']
+            :authorization => authorization_from(response, params[:id])
           )
         end
 
-        def add_subscription_invoice(post, options = {})
-          requires!(options, :order_id, :description)
-          post[:order_id]    = options[:order_id]
-          post[:description] = options[:description]
+        def authorization_from(response, auth_id)
+          if response["token"]
+            "#{response["token"]};#{auth_id}"
+          else
+             response["id"]
+          end
         end
 
         def add_currency(post, money, options)
@@ -201,12 +204,17 @@ module ActiveMerchant
           end
         end
 
-        def add_credit_card(post, credit_card, options = {})
+        def add_credit_card_or_reference(post, credit_card_or_reference, options = {})
           post[:card]             ||= {}
-          post[:card][:number]     = credit_card.number
-          post[:card][:cvd]        = credit_card.verification_value
-          post[:card][:expiration] = expdate(credit_card)
-          post[:card][:issued_to]  = credit_card.name
+          if credit_card_or_reference.is_a?(String)
+            reference = credit_card_or_reference.split(";").first
+            post[:card][:token] = reference
+          else
+            post[:card][:number]     = credit_card_or_reference.number
+            post[:card][:cvd]        = credit_card_or_reference.verification_value
+            post[:card][:expiration] = expdate(credit_card_or_reference)
+            post[:card][:issued_to]  = credit_card_or_reference.name
+          end
         end
 
         def parse(body)

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

@@ -245,7 +245,12 @@ module ActiveMerchant #:nodoc:
           gsub(%r((%3CDS_MERCHANT_PAN%3E)\d+(%3C%2FDS_MERCHANT_PAN%3E))i, '\1[FILTERED]\2').
           gsub(%r((%3CDS_MERCHANT_CVV2%3E)\d+(%3C%2FDS_MERCHANT_CVV2%3E))i, '\1[FILTERED]\2').
           gsub(%r((<DS_MERCHANT_PAN>)\d+(</DS_MERCHANT_PAN>))i, '\1[FILTERED]\2').
-          gsub(%r((<DS_MERCHANT_CVV2>)\d+(</DS_MERCHANT_CVV2>))i, '\1[FILTERED]\2')
+          gsub(%r((<DS_MERCHANT_CVV2>)\d+(</DS_MERCHANT_CVV2>))i, '\1[FILTERED]\2').
+          gsub(%r((DS_MERCHANT_CVV2)%2F%3E%0A%3C%2F)i, '\1[BLANK]').
+          gsub(%r((DS_MERCHANT_CVV2%3E)(%3C%2FDS_MERCHANT_CVV2))i, '\1[BLANK]\2').
+          gsub(%r((<DS_MERCHANT_CVV2>)(</DS_MERCHANT_CVV2>))i, '\1[BLANK]\2').
+          gsub(%r((DS_MERCHANT_CVV2%3E)\++(%3C%2FDS_MERCHANT_CVV2))i, '\1[BLANK]\2').
+          gsub(%r((<DS_MERCHANT_CVV2>)\s+(</DS_MERCHANT_CVV2>))i, '\1[BLANK]\2')
       end
 
       private

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

@@ -254,6 +254,7 @@ module ActiveMerchant #:nodoc:
           add_metadata(post, options)
           post[:description] = options[:description]
           post[:statement_descriptor] = options[:statement_description]
+          post[:receipt_email] = options[:receipt_email] if options[:receipt_email]
           add_customer(post, payment, options)
           add_flags(post, options)
         end

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

@@ -132,6 +132,7 @@ module ActiveMerchant
               add_client_id(doc)
               add_amount(doc, money, options)
               add_payment_method(doc, payment_method, options)
+              add_options(doc, options)
               add_purchase_noise(doc)
             end
           end
@@ -238,6 +239,10 @@ module ActiveMerchant
         doc.ReasonForCredit("Refund requested")
       end
 
+      def add_options(doc, options)
+        doc.CustomerIPAddress(options[:ip]) if options[:ip]
+      end
+
       def add_client_id(doc)
         doc.ClientID(@options[:client_id])
       end

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

@@ -31,7 +31,7 @@ module ActiveMerchant #:nodoc:
       def authorize(money, payment, options={})
         post = {}
         add_invoice(post, money, options)
-        add_payment_method(post, payment)
+        add_credit_card(post, payment)
         add_customer_data(post, options)
 
         commit('authorize', post)
@@ -103,6 +103,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment_method(post, payment_method)
+        if card_brand(payment_method) == 'check'
+          add_check(post, payment_method)
+        else
+          add_credit_card(post, payment_method)
+        end
+      end
+
+      def add_credit_card(post, payment_method)
         post[:ccname] = payment_method.name
         post[:ccnum] = payment_method.number
         post[:cvv2] = payment_method.verification_value
@@ -110,6 +118,19 @@ module ActiveMerchant #:nodoc:
         post[:expmon] = format(payment_method.month, :two_digits)
       end
 
+      ACCOUNT_TYPES = {
+        "checking" => "1",
+        "savings" => "2",
+      }
+
+      def add_check(post, payment_method)
+        post[:action] = 'ns_quicksale_check'
+        post[:ckacct] = payment_method.account_number
+        post[:ckaba] = payment_method.routing_number
+        post[:ckno] = payment_method.number
+        post[:ckaccttype] = ACCOUNT_TYPES[payment_method.account_type] if ACCOUNT_TYPES[payment_method.account_type]
+      end
+
       def split_authorization(authorization)
         historyid, orderid = authorization.split("|")
         [historyid, orderid]
@@ -142,7 +163,7 @@ module ActiveMerchant #:nodoc:
       }
 
       def commit(action, post)
-        post[:action] = ACTIONS[action] if ACTIONS[action]
+        post[:action] = ACTIONS[action] unless post[:action]
         post[:acctid] = @options[:acctid]
         post[:subid] = @options[:subid]
         post[:merchantpin] = @options[:merchantpin]
@@ -151,7 +172,7 @@ module ActiveMerchant #:nodoc:
 
         raw = parse(ssl_post(live_url, post.to_query))
 
-        succeeded = success_from(raw['transresult'])
+        succeeded = success_from(raw['result'])
         Response.new(
           succeeded,
           message_from(succeeded, raw),
@@ -162,7 +183,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(result)
-        result == 'APPROVED'
+        result == '1'
       end
 
       def message_from(succeeded, response)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.53.0"
+  VERSION = "1.54.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.53.0
+  version: 1.54.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport