activemerchant 1.34.1 → 1.35.0

data/CHANGELOG

@@ -1,5 +1,21 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.35.0 (July 17, 2013)
+
+* Add Barclays ePDQ Extra Plus gateway [ntalbott]
+* PayPal: Add MassPay payment to recipients by UserID [damonmorgan]
+* Authorize.Net: Add authorization_code to response params [noahlh]
+* Make Rails 4 a supported version [sanemat]
+* CyberSource: Add pinless debit card support [JoshMcKin]
+* Verkkomaksut: Add item title field [kaapa]
+* Add MerchantWare V4 gateway [hron]
+* Eway Rapid: Add #store method [adrianmacneil]
+* Barclays ePDQ Extra Plus: Use correct PROD url [ntalbott]
+* Hitrust: update test & live urls [melari]
+* NAB Transact: Add auth & capture support [nagash]
+* Mercury: Support card-less capture and refund [ntalbott]
+* Mercury: Support void [ntalbott]
+
 == Version 1.34.1 (June 28, 2013)
 
 * WorldPay: Add dynamic return URL [jordanwheeler]

data/CONTRIBUTORS

@@ -400,3 +400,11 @@ Cardstream Modern (March 2013)
 Transnational (May 2013)
 
 * Ben VandenBos (bvandenbos)
+
+Barclays ePDQ Extra Plus (June 2013)
+
+* Nathaniel Talbott (ntalbott)
+
+MerchantWare V4 (July 2013)
+
+* Aleksei Gusev (hron)

data/README.md

@@ -1,4 +1,6 @@
 # Active Merchant
+[![Build Status](https://secure.travis-ci.org/Shopify/active_merchant.png)](http://travis-ci.org/Shopify/active_merchant)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Shopify/active_merchant)
 
 Active Merchant is an extraction from the e-commerce system [Shopify](http://www.shopify.com).
 Shopify's requirements for a simple and unified API to access dozens of different payment
@@ -83,7 +85,8 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Authorize.Net CIM](http://www.authorize.net/) - US
 * [Balanced](https://www.balancedpayments.com/) - US
 * [Banwire](https://www.banwire.com/) - MX
-* [Barclays ePDQ](http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/) - UK
+* [Barclays ePDQ MPI](http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/) - UK
+* [Barclays ePDQ Extra Plus](http://www.barclaycard.co.uk/business/accepting-payments/epdq-ecomm/) - UK
 * [Beanstream.com](http://www.beanstream.com/) - CA
 * [BluePay](http://www.bluepay.com/) - US
 * [Braintree](http://www.braintreepaymentsolutions.com) - US
@@ -215,7 +218,3 @@ information on adding a new gateway to ActiveMerchant.
 
 Please don't touch the CHANGELOG in your pull requests, we'll add the appropriate CHANGELOG entries
 at release time.
-
-[![Build Status](https://secure.travis-ci.org/Shopify/active_merchant.png)](http://travis-ci.org/Shopify/active_merchant)
-
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Shopify/active_merchant)

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

@@ -38,7 +38,7 @@ module ActiveMerchant #:nodoc:
 
       APPROVED, DECLINED, ERROR, FRAUD_REVIEW = 1, 2, 3, 4
 
-      RESPONSE_CODE, RESPONSE_REASON_CODE, RESPONSE_REASON_TEXT = 0, 2, 3
+      RESPONSE_CODE, RESPONSE_REASON_CODE, RESPONSE_REASON_TEXT, AUTHORIZATION_CODE = 0, 2, 3, 4
       AVS_RESULT_CODE, TRANSACTION_ID, CARD_CODE_RESPONSE_CODE  = 5, 6, 38
 
       self.default_currency = 'USD'
@@ -310,7 +310,8 @@ module ActiveMerchant #:nodoc:
           :response_reason_text => fields[RESPONSE_REASON_TEXT],
           :avs_result_code => fields[AVS_RESULT_CODE],
           :transaction_id => fields[TRANSACTION_ID],
-          :card_code => fields[CARD_CODE_RESPONSE_CODE]
+          :card_code => fields[CARD_CODE_RESPONSE_CODE],
+          :authorization_code => fields[AUTHORIZATION_CODE]
         }
         results
       end

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.supported_cardtypes = [:visa, :master, :american_express, :maestro, :switch ]
       self.money_format = :cents
       self.homepage_url = 'http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/'
-      self.display_name = 'Barclays ePDQ'
+      self.display_name = 'Barclays ePDQ MPI'
 
       def initialize(options = {})
         requires!(options, :login, :password, :client_id)

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

@@ -0,0 +1,15 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class BarclaysEpdqExtraPlusGateway < OgoneGateway
+      self.test_url = "https://mdepayments.epdq.co.uk/ncol/test/"
+      self.live_url = "https://payments.epdq.co.uk/ncol/prod/"
+
+      self.display_name = "Barclays ePDQ Extra Plus"
+      self.homepage_url = "http://www.barclaycard.co.uk/business/accepting-payments/epdq-ecomm/"
+
+      self.supported_countries = ["GB"]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro]
+      self.default_currency = "GBP"
+    end
+  end
+end

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

@@ -24,6 +24,9 @@ module ActiveMerchant #:nodoc:
     #   CyberSource what kind of item you are selling.  It is used when
     #   calculating tax/VAT.
     # * All transactions use dollar values.
+    # * To process pinless debit cards throught the pinless debit card
+    #   network, your Cybersource merchant account must accept pinless
+    #   debit card payments.
     class CyberSourceGateway < Gateway
       self.test_url = 'https://ics2wstest.ic3.com/commerce/1.x/transactionProcessor'
       self.live_url = 'https://ics2ws.ic3.com/commerce/1.x/transactionProcessor'
@@ -132,6 +135,7 @@ module ActiveMerchant #:nodoc:
 
       # 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 = {})
         requires!(options, :order_id)
         setup_address_hash(options)
@@ -212,6 +216,12 @@ module ActiveMerchant #:nodoc:
         commit(build_tax_calculation_request(creditcard, options), 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)
+      end
+
       private
 
       # Create all address hash key value pairs so that we still function if we
@@ -258,7 +268,7 @@ module ActiveMerchant #:nodoc:
           add_check_service(xml)
         else
           add_purchase_service(xml, options)
-          add_business_rules_data(xml)
+          add_business_rules_data(xml) unless options[:pinless_debit_card]
         end
         xml.target!
       end
@@ -349,6 +359,13 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_validate_pinless_debit_request(creditcard,options)
+        xml = Builder::XmlMarkup.new :indent => 2
+        add_creditcard(xml, creditcard)
+        add_validate_pinless_debit_service(xml)
+        xml.target!
+      end
+
       def add_business_rules_data(xml)
         xml.tag! 'businessRules' do
           xml.tag!('ignoreAVSResult', 'true') if @options[:ignore_avs]
@@ -441,8 +458,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_purchase_service(xml, options)
-        xml.tag! 'ccAuthService', {'run' => 'true'}
-        xml.tag! 'ccCaptureService', {'run' => 'true'}
+        if options[:pinless_debit_card]
+          xml.tag! 'pinlessDebitService', {'run' => 'true'}
+        else
+          xml.tag! 'ccAuthService', {'run' => 'true'}
+          xml.tag! 'ccCaptureService', {'run' => 'true'}
+        end
       end
 
       def add_void_service(xml, request_id, request_token)
@@ -535,6 +556,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_validate_pinless_debit_service(xml)
+        xml.tag!'pinlessDebitValidateService', {'run' => 'true'}
+      end
+
       # Where we actually build the full SOAP request using builder
       def build_request(body, options)
         xml = Builder::XmlMarkup.new :indent => 2

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

@@ -104,6 +104,23 @@ module ActiveMerchant #:nodoc:
         commit(url_for("GetAccessCodeResult"), request)
       end
 
+      # Public: Store card details and return a valid token
+      #
+      # options - A supplemented ActiveMerchant options hash:
+      #           :order_id         - A merchant-supplied identifier for the
+      #                               transaction (optional).
+      #           :billing_address  - Standard ActiveMerchant address hash
+      #                               (required).
+      #           :ip               - The ip of the consumer initiating the
+      #                               transaction (optional).
+      #           :application_id   - A string identifying the application
+      #                               submitting the transaction
+      #                               (default: "https://github.com/Shopify/active_merchant")
+      def store(payment_method, options = {})
+        requires!(options, :billing_address)
+        purchase(0, payment_method, options.merge(:request_method => "CreateTokenCustomer"))
+      end
+
       private
 
       def run_purchase(identification, payment_method, endpoint)
@@ -118,7 +135,7 @@ module ActiveMerchant #:nodoc:
       def add_metadata(doc, options)
         doc.RedirectUrl(options[:redirect_url])
         doc.CustomerIP options[:ip] if options[:ip]
-        doc.Method "ProcessPayment"
+        doc.Method options[:request_method] || "ProcessPayment"
         doc.DeviceID(options[:application_id] || application_id)
       end
 
@@ -148,13 +165,14 @@ module ActiveMerchant #:nodoc:
           doc.FirstName parts.shift if parts.size > 1
           doc.LastName parts.join(" ")
         end
+        doc.Title address[:title]
         doc.CompanyName address[:company] unless options[:skip_company]
         doc.Street1 address[:address1]
         doc.Street2 address[:address2]
         doc.City address[:city]
         doc.State address[:state]
         doc.PostalCode address[:zip]
-        doc.Country address[:country]
+        doc.Country address[:country].to_s.downcase
         doc.Phone address[:phone]
         doc.Fax address[:fax]
         doc.Email options[:email]
@@ -242,6 +260,8 @@ module ActiveMerchant #:nodoc:
       def success?(response)
         if response[:errors]
           false
+        elsif response[:responsecode] == "00"
+          true
         elsif response[:transactionstatus]
           (response[:transactionstatus] == "true")
         else

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

@@ -320,4 +320,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -0,0 +1,275 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class MerchantWareVersionFourGateway < Gateway
+      self.live_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
+      self.test_url = 'https://staging.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
+
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.homepage_url = 'http://merchantwarehouse.com/merchantware'
+      self.display_name = 'MerchantWARE'
+
+      ENV_NAMESPACES = { "xmlns:xsi"  => "http://www.w3.org/2001/XMLSchema-instance",
+                         "xmlns:xsd"  => "http://www.w3.org/2001/XMLSchema",
+                         "xmlns:soap" => "http://schemas.xmlsoap.org/soap/envelope/" }
+
+      TX_NAMESPACE = "http://schemas.merchantwarehouse.com/merchantware/40/Credit/"
+
+      ACTIONS = {
+        :purchase  => "SaleKeyed",
+        :reference_purchase => 'RepeatSale',
+        :authorize => "PreAuthorizationKeyed",
+        :capture   => "PostAuthorization",
+        :void      => "VoidPreAuthorization",
+        :refund    => "Refund"
+      }
+
+      # Creates a new MerchantWareVersionFourGateway
+      #
+      # The gateway requires that a valid login, password, and name be passed
+      # in the +options+ hash.
+      #
+      # ==== Options
+      #
+      # * <tt>:login</tt> - The MerchantWARE SiteID.
+      # * <tt>:password</tt> - The MerchantWARE Key.
+      # * <tt>:name</tt> - The MerchantWARE Name.
+      def initialize(options = {})
+        requires!(options, :login, :password, :name)
+        super
+      end
+
+      # Authorize a credit card for a given amount.
+      #
+      # ==== Parameters
+      # * <tt>money</tt> - The amount to be authorized as an Integer value in cents.
+      # * <tt>credit_card</tt> - The CreditCard details for the transaction.
+      # * <tt>options</tt>
+      #   * <tt>:order_id</tt> - A unique reference for this order (required).
+      #   * <tt>:billing_address</tt> - The billing address for the cardholder.
+      def authorize(money, credit_card, options = {})
+        request = build_purchase_request(:authorize, money, credit_card, options)
+        commit(:authorize, request)
+      end
+
+      # Authorize and immediately capture funds from a credit card.
+      #
+      # ==== Parameters
+      # * <tt>money</tt> - The amount to be authorized as anInteger value in cents.
+      # * <tt>payment_source</tt> - The CreditCard details or 'token' from prior transaction
+      # * <tt>options</tt>
+      #   * <tt>:order_id</tt> - A unique reference for this order (required).
+      #   * <tt>:billing_address</tt> - The billing address for the cardholder.
+      def purchase(money, payment_source, options = {})
+        action = payment_source.is_a?(String) ? :reference_purchase : :purchase
+        request = build_purchase_request(action, money, payment_source, options)
+        commit(action, request)
+      end
+
+      # Capture authorized funds from a credit card.
+      #
+      # ==== Parameters
+      # * <tt>money</tt> - The amount to be captured as anInteger value in cents.
+      # * <tt>authorization</tt> - The authorization string returned from the initial authorization.
+      def capture(money, authorization, options = {})
+        request = build_capture_request(:capture, money, authorization, options)
+        commit(:capture, request)
+      end
+
+      # Void a transaction.
+      #
+      # ==== Parameters
+      # * <tt>authorization</tt> - The authorization string returned from the initial authorization or purchase.
+      def void(authorization, options = {})
+        reference, options[:order_id] = split_reference(authorization)
+        request = soap_request(:void) do |xml|
+          add_reference_token(xml, reference)
+        end
+        commit(:void, request)
+      end
+
+      # Refund an amount back a cardholder
+      #
+      # ==== Parameters
+      #
+      # * <tt>money</tt> - The amount to be refunded as an Integer value in cents.
+      # * <tt>identification</tt> - The credit card you want to refund or the authorization for the existing transaction you are refunding.
+      # * <tt>options</tt>
+      #   * <tt>:order_id</tt> - A unique reference for this order (required when performing a non-referenced credit)
+      def refund(money, identification, options = {})
+        reference, options[:order_id] = split_reference(identification)
+
+        request = soap_request(:refund) do |xml|
+          add_reference_token(xml, reference)
+          add_invoice(xml, options)
+          add_amount(xml, money, "overrideAmount")
+        end
+
+        commit(:refund, request)
+      end
+
+      private
+
+      def soap_request(action)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.instruct!
+        xml.tag! "soap:Envelope", ENV_NAMESPACES do
+          xml.tag! "soap:Body" do
+            xml.tag! ACTIONS[action], "xmlns" => TX_NAMESPACE do
+              xml.tag! "merchantName", @options[:name]
+              xml.tag! "merchantSiteId", @options[:login]
+              xml.tag! "merchantKey", @options[:password]
+              yield xml
+            end
+          end
+        end
+        xml.target!
+      end
+
+      def build_purchase_request(action, money, payment_source, options)
+        requires!(options, :order_id)
+
+        request = soap_request(action) do |xml|
+          add_invoice(xml, options)
+          add_amount(xml, money)
+          add_payment_source(xml, payment_source)
+          add_address(xml, options)
+        end
+      end
+
+      def build_capture_request(action, money, identification, options)
+        reference, options[:order_id] = split_reference(identification)
+
+        request = soap_request(action) do |xml|
+          add_reference_token(xml, reference)
+          add_invoice(xml, options)
+          add_amount(xml, money)
+        end
+      end
+
+      def expdate(credit_card)
+        year  = sprintf("%.4i", credit_card.year)
+        month = sprintf("%.2i", credit_card.month)
+
+        "#{month}#{year[-2..-1]}"
+      end
+
+      def add_invoice(xml, options)
+        xml.tag! "invoiceNumber", options[:order_id].to_s.gsub(/[^\w]/, '').slice(0, 25)
+      end
+
+      def add_amount(xml, money, tag = "amount")
+        xml.tag! tag, amount(money)
+      end
+
+      def add_reference_token(xml, reference)
+        xml.tag! "token", reference
+      end
+
+      def add_address(xml, options)
+        address = options[:billing_address] || options[:address] || {}
+        xml.tag! "avsStreetAddress", address[:address1]
+        xml.tag! "avsStreetZipCode", address[:zip]
+      end
+
+      def add_payment_source(xml, source)
+        if source.is_a?(String)
+          add_reference_token(xml, source)
+        else
+          add_credit_card(xml, source)
+        end
+      end
+
+      def add_credit_card(xml, credit_card)
+        xml.tag! "cardNumber", credit_card.number
+        xml.tag! "expirationDate", expdate(credit_card)
+        xml.tag! "cardholder", credit_card.name
+        xml.tag! "cardSecurityCode", credit_card.verification_value if credit_card.verification_value?
+      end
+
+      def split_reference(reference)
+        reference.to_s.split(";")
+      end
+
+      def parse(action, data)
+        response = {}
+        xml = REXML::Document.new(data)
+
+        root = REXML::XPath.first(xml, "//#{ACTIONS[action]}Response/#{ACTIONS[action]}Result")
+
+        root.elements.each do |element|
+          response[element.name] = element.text
+        end
+
+        if response["ErrorMessage"].present?
+          response[:message] = response["ErrorMessage"]
+          response[:success] = false
+        else
+          status, code, message = response["ApprovalStatus"].split(";")
+          response[:status] = status
+
+          if response[:success] = status == "APPROVED"
+            response[:message] = status
+          else
+            response[:message] = message
+            response[:failure_code] = code
+          end
+        end
+
+        response
+      end
+
+      def parse_error(http_response, action)
+        response = {}
+        response[:http_code] = http_response.code
+        response[:http_message] = http_response.message
+        response[:success] = false
+
+        document = REXML::Document.new(http_response.body)
+        node = REXML::XPath.first(document, "//#{ACTIONS[action]}Response/#{ACTIONS[action]}Result")
+
+        node.elements.each do |element|
+          response[element.name] = element.text
+        end
+
+        response[:message] = response["ErrorMessage"].to_s.gsub("\n", " ")
+        response
+      rescue REXML::ParseException => e
+        response[:http_body]        = http_response.body
+        response[:message]          = "Failed to parse the failed response"
+        response
+      end
+
+      def soap_action(action)
+        "#{TX_NAMESPACE}#{ACTIONS[action]}"
+      end
+
+      def url
+        test? ? test_url : live_url
+      end
+
+      def commit(action, request)
+        begin
+          data = ssl_post(url, request,
+                   "Content-Type" => 'text/xml; charset=utf-8',
+                   "SOAPAction"   => soap_action(action)
+                 )
+          response = parse(action, data)
+        rescue ActiveMerchant::ResponseError => e
+          response = parse_error(e.response, action)
+        end
+
+        Response.new(response[:success], response[:message], response,
+          :test => test?,
+          :authorization => authorization_from(response),
+          :avs_result => { :code => response["AvsResponse"] },
+          :cvv_result => response["CvResponse"]
+        )
+      end
+
+      def authorization_from(response)
+        response['Token']
+      end
+    end
+  end
+end

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

@@ -1,5 +1,15 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
+    # The Mercury gateway integration by default requires that the Mercury
+    # account being used has tokenization turned. This enables the use of
+    # capture/refund/void without having to pass the credit card back in each
+    # time. Only the "OneTime" tokenization is used; there is no use of
+    # "Recurring" tokenization.
+    #
+    # If you don't wish to enable Mercury tokenization, you can pass
+    # <code>:tokenization => false</code> as an option when creating the
+    # gateway. If you do so, then passing a +:credit_card+ option to +capture+
+    # and +refund+ will become mandatory.
     class MercuryGateway < Gateway
       URLS = {
         :test => 'https://w1.mercurydev.net/ws/ws.asmx',
@@ -14,6 +24,7 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
+        @use_tokenization = (!options.has_key?(:tokenization) || options[:tokenization])
         super
       end
 
@@ -34,25 +45,28 @@ module ActiveMerchant #:nodoc:
       def authorize(money, credit_card, options = {})
         requires!(options, :order_id)
 
-        options[:authorized] ||= money
-        request = build_non_authorized_request('PreAuth', money, credit_card, options)
+        request = build_non_authorized_request('PreAuth', money, credit_card, options.merge(:authorized => money))
         commit('PreAuth', request)
       end
 
       def capture(money, authorization, options = {})
-        requires!(options, :credit_card)
-        options[:authorized] ||= money
-        request = build_authorized_request('PreAuthCapture', money, authorization, options[:credit_card], options)
+        requires!(options, :credit_card) unless @use_tokenization
+
+        request = build_authorized_request('PreAuthCapture', money, authorization, options[:credit_card], options.merge(:authorized => money))
         commit('PreAuthCapture', request)
       end
 
       def refund(money, authorization, options = {})
-        requires!(options, :credit_card)
+        requires!(options, :credit_card) unless @use_tokenization
 
         request = build_authorized_request('VoidSale', money, authorization, options[:credit_card], options)
         commit(options[:void], request)
       end
 
+      def void(authorization, options={})
+        refund(nil, authorization, options.merge(:void => true))
+      end
+
       private
 
       def build_non_authorized_request(action, money, credit_card, options)
@@ -78,19 +92,21 @@ module ActiveMerchant #:nodoc:
       def build_authorized_request(action, money, authorization, credit_card, options)
         xml = Builder::XmlMarkup.new
 
-        invoice_no, ref_no, auth_code, acq_ref_data, process_data = split_authorization(authorization)
+        invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount = split_authorization(authorization)
+        ref_no = invoice_no if options[:void]
 
         xml.tag! "TStream" do
           xml.tag! "Transaction" do
             xml.tag! 'TranType', 'Credit'
-            xml.tag! 'TranCode', action
+            xml.tag! 'TranCode', (@use_tokenization ? (action + "ByRecordNo") : action)
             if action == 'PreAuthCapture'
               xml.tag! "PartialAuth", "Allow"
             end
             add_invoice(xml, invoice_no, ref_no, options)
+            add_reference(xml, record_no) if @use_tokenization
             add_customer_data(xml, options)
-            add_amount(xml, money, options)
-            add_credit_card(xml, credit_card, action)
+            add_amount(xml, (money || amount.to_i), options)
+            add_credit_card(xml, credit_card, action) if credit_card
             add_address(xml, options)
             xml.tag! 'TranInfo' do
               xml.tag! "AuthCode", auth_code
@@ -108,9 +124,18 @@ module ActiveMerchant #:nodoc:
         end
 
         xml.tag! 'InvoiceNo', invoice_no
-        xml.tag! 'RefNo', ref_no || invoice_no
+        xml.tag! 'RefNo', (ref_no || invoice_no)
         xml.tag! 'OperatorID', options[:merchant] if options[:merchant]
         xml.tag! 'Memo', options[:description] if options[:description]
+        if @use_tokenization
+          xml.tag! 'Frequency', "OneTime"
+          xml.tag! 'RecordNo', "RecordNumberRequested"
+        end
+      end
+
+      def add_reference(xml, record_no)
+        xml.tag! "Frequency", "OneTime"
+        xml.tag! "RecordNo", record_no
       end
 
       def add_customer_data(xml, options)
@@ -240,18 +265,23 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
+        dollars, cents = (response[:purchase] || "").split(".").collect{|e| e.to_i}
+        dollars ||= 0
+        cents ||= 0
         [
           response[:invoice_no],
           response[:ref_no],
           response[:auth_code],
           response[:acq_ref_data],
-          response[:process_data]
+          response[:process_data],
+          response[:record_no],
+          ((dollars * 100) + cents).to_s
         ].join(";")
       end
 
       def split_authorization(authorization)
-        invoice_no, ref_no, auth_code, acq_ref_data, process_data = authorization.split(";")
-        [invoice_no, ref_no, auth_code, acq_ref_data, process_data]
+        invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount = authorization.split(";")
+        [invoice_no, ref_no, auth_code, acq_ref_data, process_data, record_no, amount]
       end
 
       ENVELOPE_NAMESPACES = {

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

@@ -70,6 +70,14 @@ module ActiveMerchant #:nodoc:
         commit :refund, build_reference_request(money, authorization)
       end
 
+      def authorize(money, credit_card, options = {})
+        commit :authorization, build_purchase_request(money, credit_card, options)
+      end
+
+      def capture(money, authorization)
+        commit :capture, build_reference_request(money, authorization)
+      end
+
       def store(creditcard, options = {})
         requires!(options, :billing_id, :amount)
         commit_periodic(build_periodic_item(:addcrn, options[:amount], creditcard, options))

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

@@ -99,12 +99,6 @@ module ActiveMerchant #:nodoc:
     #     :language        => Customer's language, for example: "en_EN"
     #
     class OgoneGateway < Gateway
-
-      URLS = {
-        :order       => 'https://secure.ogone.com/ncol/%s/orderdirect.asp',
-        :maintenance => 'https://secure.ogone.com/ncol/%s/maintenancedirect.asp'
-      }
-
       CVV_MAPPING = { 'OK' => 'M',
                       'KO' => 'N',
                       'NO' => 'P' }
@@ -125,8 +119,8 @@ module ActiveMerchant #:nodoc:
       OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = "Signature usage will be the default for a future release of ActiveMerchant. You should either begin using it, or update your configuration to explicitly disable it (signature_encryptor: none)"
       OGONE_STORE_OPTION_DEPRECATION_MESSAGE   = "The 'store' option has been renamed to 'billing_id', and its usage is deprecated."
 
-      self.test_url = URLS[:order] % "test"
-      self.live_url = URLS[:order] % "prod"
+      self.test_url = "https://secure.ogone.com/ncol/test/"
+      self.live_url = "https://secure.ogone.com/ncol/prod/"
 
       self.supported_countries = ['BE', 'DE', 'FR', 'NL', 'AT', 'CH']
       # also supports Airplus and UATP
@@ -331,8 +325,7 @@ module ActiveMerchant #:nodoc:
         add_pair parameters, 'USERID', @options[:user]
         add_pair parameters, 'PSWD',   @options[:password]
 
-        url = URLS[parameters['PAYID'] ? :maintenance : :order] % [test? ? "test" : "prod"]
-        response = parse(ssl_post(url, post_data(action, parameters)))
+        response = parse(ssl_post(url(parameters['PAYID']), post_data(action, parameters)))
 
         options = {
           :authorization => [response["PAYID"], action].join(";"),
@@ -343,6 +336,10 @@ module ActiveMerchant #:nodoc:
         OgoneResponse.new(successful?(response), message_from(response), response, options)
       end
 
+      def url(payid)
+        (test? ? test_url : live_url) + (payid ? "maintenancedirect.asp" : "orderdirect.asp")
+      end
+
       def successful?(response)
         response["NCERROR"] == "0"
       end

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

@@ -342,6 +342,7 @@ module ActiveMerchant #:nodoc:
       def build_mass_pay_request(*args)
         default_options = args.last.is_a?(Hash) ? args.pop : {}
         recipients = args.first.is_a?(Array) ? args : [args]
+        receiver_type = default_options[:receiver_type]
 
         xml = Builder::XmlMarkup.new
 
@@ -349,11 +350,18 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'MassPayRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'EmailSubject', default_options[:subject] if default_options[:subject]
+            xml.tag! 'ReceiverType', receiver_type if receiver_type
             recipients.each do |money, recipient, options|
               options ||= default_options
               xml.tag! 'MassPayItem' do
-                xml.tag! 'ReceiverEmail', recipient
-                xml.tag! 'Amount', amount(money), 'currencyID' => options[:currency] || currency(money)
+                if(!receiver_type || receiver_type == 'EmailAddress')
+                  xml.tag! 'ReceiverEmail', recipient
+                elsif receiver_type == 'UserID'
+                  xml.tag! 'ReceiverID', recipient
+                else
+                  raise ArgumentError.new("Unknown receiver_type: #{receiver_type}")
+                end
+                xml.tag! 'Amount', amount(money), 'currencyID' => (options[:currency] || currency(money))
                 xml.tag! 'Note', options[:note] if options[:note]
                 xml.tag! 'UniqueId', options[:unique_id] if options[:unique_id]
               end

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

@@ -394,7 +394,7 @@ module ActiveMerchant #:nodoc:
           post[:StreetAddress]  = address[:address1]
           post[:StreetAddress2] = address[:address2]
           post[:City]           = address[:city]
-          post[:State]          = address[:state]
+          post[:State]          = address[:state] || 'XX'
           post[:ZipCode]        = address[:zip]
           post[:Country]        = address[:country]
           post[:Phone]          = address[:phone]
@@ -406,7 +406,7 @@ module ActiveMerchant #:nodoc:
           post[:ShipToStreetAddress]  = address[:address1]
           post[:ShipToStreetAddress2] = address[:address2]
           post[:ShipToCity]           = address[:city]
-          post[:ShipToState]          = address[:state]
+          post[:ShipToState]          = address[:state] || 'XX'
           post[:ShipToZipCode]        = address[:zip]
           post[:ShipToCountry]        = address[:country]
           post[:ShipToPhone]          = address[:phone]

data/lib/active_merchant/billing/integrations/authorize_net_sim/helper.rb

@@ -1,4 +1,5 @@
-require 'active_support/core_ext/float/rounding.rb' # Float#round(precision)
+require 'active_support/version' # for ActiveSupport2.3
+require 'active_support/core_ext/float/rounding.rb' unless ActiveSupport::VERSION::MAJOR > 3 # Float#round(precision)
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -9,11 +10,11 @@ module ActiveMerchant #:nodoc:
         # so preferably pass in X.2 decimal so that no rounding occurs. It is
         # rounded because if it looks like 00.000 Authorize.Net fails the
         # transaction as incorrectly formatted.
-        # 
+        #
         #  payment_service_for('order_id', 'authorize_net_account', :service => :authorize_net_sim,  :amount => 157.0) do |service|
-        # 
+        #
         #    # You must call setup_hash and invoice
-        #    
+        #
         #    service.setup_hash :transaction_key => '8CP6zJ7uD875J6tY',
         #        :order_timestamp => 1206836763
         #    service.customer_id 8
@@ -24,7 +25,7 @@ module ActiveMerchant #:nodoc:
         #   service.billing_address :zip => 'g',
         #                   :country => 'United States of America',
         #                   :address => 'g'
-        # 
+        #
         #   service.ship_to_address :first_name => 'g',
         #                            :last_name => 'g',
         #                            :city => '',
@@ -33,7 +34,7 @@ module ActiveMerchant #:nodoc:
         #                            :state => address.state,
         #                            :country => 'United States of America',
         #                            :zip => 'g'
-        # 
+        #
         #   service.invoice "516428355" # your invoice number
         #   # The end-user is presented with the HTML produced by the notify_url.
         #   service.notify_url "http://t/authorize_net_sim/payment_received_notification_sub_step"
@@ -48,20 +49,20 @@ module ActiveMerchant #:nodoc:
         #   server.add_tax_as_line_item # same with tax
         #   # See the helper.rb file for various custom fields
         # end
-         
-        class Helper < ActiveMerchant::Billing::Integrations::Helper           
+
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
           mapping :order, 'x_fp_sequence'
           mapping :account, 'x_login'
-          
+
           mapping :customer, :first_name => 'x_first_name',
                              :last_name  => 'x_last_name',
                              :email      => 'x_email',
                              :phone      => 'x_phone'
-                            
+
           mapping :notify_url, 'x_relay_url'
           mapping :return_url, '' # unused
           mapping :cancel_return_url, '' # unused
-          
+
           # Custom fields for Authorize.net SIM.
           # See http://www.Authorize.Net/support/SIM_guide.pdf for more descriptions.
           mapping :fax, 'x_fax'
@@ -69,18 +70,18 @@ module ActiveMerchant #:nodoc:
           mapping :description, 'x_description'
           mapping :tax, 'x_tax'
           mapping :shipping, 'x_freight'
-          
+
           # True or false, or 0 or 1 same effect [not required to send one,
           # defaults to false].
           mapping :test_request, 'x_test_request'
-          
+
           # This one is necessary for the notify url to be able to parse its
           # information later! They also pass back customer id, if that's
           # useful.
           def invoice(number)
             add_field 'x_invoice_num', number
           end
-          
+
           # Set the billing address. Call like service.billing_address {:city =>
           # 'provo, :state => 'UT'}...
           def billing_address(options)
@@ -90,29 +91,29 @@ module ActiveMerchant #:nodoc:
             raise 'must use address1 and address2' if options[:address]
             add_field 'x_address', (options[:address1].to_s + ' ' + options[:address2].to_s).strip
           end
-          
+
           # Adds a custom field which you submit to Authorize.Net. These fields
           # are all passed back to you verbatim when it does its relay
           # (callback) to you note that if you call it twice with the same name,
-          # this function only uses keeps the second value you called it with.          
+          # this function only uses keeps the second value you called it with.
           def add_custom_field(name, value)
             add_field name, value
           end
-          
+
           # Displays tax as a line item, so they can see it. Otherwise it isn't
           # displayed.
           def add_tax_as_line_item
             raise unless @fields['x_tax']
             add_line_item :name => 'Total Tax', :quantity => 1, :unit_price => @fields['x_tax'], :tax => 0, :line_title => 'Tax'
           end
-          
+
           # Displays shipping as a line item, so they can see it. Otherwise it
           # isn't displayed.
           def add_shipping_as_line_item(extra_options = {})
             raise 'must set shipping/freight before calling this' unless @fields['x_freight']
             add_line_item extra_options.merge({:name => 'Shipping and Handling Cost', :quantity => 1, :unit_price => @fields['x_freight'], :line_title => 'Shipping'})
           end
-          
+
           # Add ship_to_address in the same format as the normal address is
           # added.
           def ship_to_address(options)
@@ -124,7 +125,7 @@ module ActiveMerchant #:nodoc:
             raise 'must use :address1 and/or :address2' if options[:address]
             add_field 'x_ship_to_address', (options[:address1].to_s + ' ' + options[:address2].to_s).strip
           end
-          
+
           # These control the look of the SIM payment page. Note that you can
           # include a CSS header in descriptors, etc.
           mapping :color_link, 'x_color_link'
@@ -133,7 +134,7 @@ module ActiveMerchant #:nodoc:
           mapping :background_url, 'x_background_url' # background image url for the page
           mapping :payment_header, 'x_header_html_payment_form'
           mapping :payment_footer, 'x_footer_html_payment_form'
-          
+
           # For this to work you must have also passed in an email for the
           # purchaser.
           def yes_email_customer_from_authorizes_side
@@ -149,7 +150,7 @@ module ActiveMerchant #:nodoc:
           # You can use the :line_title for the product name and then :name for description, if desired
           def add_line_item(options)
             raise 'needs name' unless options[:name]
-            
+
             if @line_item_count == 30
               # Add a note that we are not showing at least one -- AN doesn't
               # display more than 30 or so.
@@ -159,18 +160,18 @@ module ActiveMerchant #:nodoc:
               # Create a new description, which can't be too big, so truncate here.
               @raw_html_fields[-1][1] = description_of_last.gsub($1, $1[0..200] + ' + more unshown items after this one.')
             end
-            
+
             name = options[:name]
             quantity = options[:quantity] || 1
             line_title = options[:line_title] || ('Item ' + (@line_item_count + 1).to_s) # left most field
             unit_price = options[:unit_price] || 0
             unit_price = unit_price.to_f.round(2)
             tax_value = options[:tax_value] || 'N'
-            
+
             # Sanitization, in case they include a reserved word here, following
             # their guidelines; unfortunately, they require 'raw' fields here,
             # not CGI escaped, using their own delimiters.
-            # 
+            #
             # Authorize.net ignores the second field (sanitized_short_name)
             raise 'illegal char for line item <|>' if name.include? '<|>'
             raise 'illegal char for line item "' if name.include? '"'
@@ -180,19 +181,19 @@ module ActiveMerchant #:nodoc:
             # the HTML presented to the end-user's browser (e.g., spaces turn
             # into +'s).
             sanitized_short_name = name[0..30]
-            name = name[0..255]            
+            name = name[0..255]
 
             add_raw_html_field "x_line_item", "#{line_title}<|>#{sanitized_short_name}<|>#{name}<|>#{quantity}<|>#{unit_price}<|>#{tax_value}"
 
             @line_item_count += 1
           end
-            
+
           # If you call this it will e-mail to this address a copy of a receipt
           # after successful, from Authorize.Net.
           def email_merchant_from_authorizes_side(to_this_email)
             add_field 'x_email_merchant', to_this_email
           end
-          
+
           # You MUST call this at some point for it to actually work. Options
           # must include :transaction_key and :order_timestamp
           def setup_hash(options)
@@ -204,7 +205,7 @@ module ActiveMerchant #:nodoc:
             add_field 'x_fp_hash', hmac
             add_field 'x_fp_timestamp', options[:order_timestamp].to_i
           end
-          
+
           # Note that you should call #invoice and #setup_hash as well, for the
           # response_url to actually work.
           def initialize(order, account, options = {})

data/lib/active_merchant/billing/integrations/first_data/helper.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/float/rounding.rb' # Float#round(precision)
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:

data/lib/active_merchant/billing/integrations/hi_trust.rb

@@ -7,8 +7,8 @@ module ActiveMerchant #:nodoc:
         autoload :Return, File.dirname(__FILE__) + '/hi_trust/return.rb'
         autoload :Notification, File.dirname(__FILE__) + '/hi_trust/notification.rb'
 
-        TEST_URL = 'https://testtrustlink.hitrust.com.tw/TrustLink/TrxReq'
-        LIVE_URL = 'https://trustlink.hitrust.com.tw/TrustLink/TrxReq'
+        TEST_URL = 'https://testtrustlink.hitrust.com.tw/TrustLink/TrxReqForJava'
+        LIVE_URL = 'https://trustlink.hitrust.com.tw/TrustLink/TrxReqForJava'
         
         def self.service_url
           ActiveMerchant::Billing::Base.integration_mode == :test ? TEST_URL : LIVE_URL

data/lib/active_merchant/billing/integrations/pxpay/helper.rb

@@ -1,4 +1,5 @@
-require 'active_support/core_ext/float/rounding.rb' # Float#round(precision)
+require 'active_support/version' # for ActiveSupport2.3
+require 'active_support/core_ext/float/rounding.rb' unless ActiveSupport::VERSION::MAJOR > 3 # Float#round(precision)
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -13,7 +14,7 @@ module ActiveMerchant #:nodoc:
         # in addition to the user being redirected to your return_url, the return_url will
         # be accessed by the PxPay servers directly, immediately after transaction success.
         #
-        #  payment_service_for('order_id', 'pxpay_user_ID', :service => :pxpay, 
+        #  payment_service_for('order_id', 'pxpay_user_ID', :service => :pxpay,
         #                       :amount => 157.0, :currency => 'USD', :credential2 => 'pxpay_key') do |service|
         #
         #   service.customer :email => 'customer@email.com'

data/lib/active_merchant/billing/integrations/verkkomaksut/helper.rb

@@ -3,40 +3,40 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module Verkkomaksut
         class Helper < ActiveMerchant::Billing::Integrations::Helper
-          
+
           # Fetches the md5secret and adds MERCHANT_ID and API TYPE to the form
           def initialize(order, account, options = {})
             md5secret options.delete(:credential2)
             super
             add_field("MERCHANT_ID", account)
             add_field("TYPE", "E1")
-          end          
-          
+          end
+
           def md5secret(value)
             @md5secret = value
           end
-          
+
           # Adds the AUTHCODE to the form
           def form_fields
             @fields.merge("AUTHCODE" => generate_md5string)
           end
-          
+
           # Calculates the AUTHCODE
           def generate_md5string
             fields = [@md5secret, @fields["MERCHANT_ID"], @fields["ORDER_NUMBER"], @fields["REFERENCE_NUMBER"], @fields["ORDER_DESCRIPTION"], @fields["CURRENCY"], @fields["RETURN_ADDRESS"], @fields["CANCEL_ADDRESS"], @fields["PENDING_ADDRESS"],
                       @fields["NOTIFY_ADDRESS"], @fields["TYPE"], @fields["CULTURE"], @fields["PRESELECTED_METHOD"], @fields["MODE"], @fields["VISIBLE_METHODS"], @fields["GROUP"], @fields["CONTACT_TELNO"], @fields["CONTACT_CELLNO"],
                       @fields["CONTACT_EMAIL"], @fields["CONTACT_FIRSTNAME"], @fields["CONTACT_LASTNAME"], @fields["CONTACT_COMPANY"], @fields["CONTACT_ADDR_STREET"], @fields["CONTACT_ADDR_ZIP"], @fields["CONTACT_ADDR_CITY"], @fields["CONTACT_ADDR_COUNTRY"], @fields["INCLUDE_VAT"],
                       @fields["ITEMS"]]
-                      
+
             (0..@fields["ITEMS"].to_i-1).each do |i|
               fields += [@fields["ITEM_TITLE[#{i}]"], @fields["ITEM_NO[#{i}]"], @fields["ITEM_AMOUNT[#{i}]"], @fields["ITEM_PRICE[#{i}]"], @fields["ITEM_TAX[#{i}]"], @fields["ITEM_DISCOUNT[#{i}]"], @fields["ITEM_TYPE[#{i}]"]]
             end
-                      
+
             fields = fields.join("|")
-            
+
             return Digest::MD5.hexdigest(fields).upcase
           end
-          
+
           # Mappings
           mapping :merchant_id, "MERCHANT_ID"
           mapping :order, "ORDER_NUMBER"
@@ -47,8 +47,8 @@ module ActiveMerchant #:nodoc:
                              :phone      => "CONTACT_CELLNO",
                              :tellno     => "CONTACT_TELLNO",
                              :company    => "CONTACT_COMPANY"
-              
-          
+
+
           mapping :billing_address, :city     => "CONTACT_ADDR_CITY",
                                     :address1 => "CONTACT_ADDR_STREET",
                                     :address2 => "",
@@ -71,8 +71,9 @@ module ActiveMerchant #:nodoc:
           mapping :mode, "MODE"
           mapping :visible_methods, "VISIBLE_METHODS"
           mapping :group, "GROUP"
-          
+
           (0..499.to_i).each do |i|
+            mapping "item_title_#{i}".to_sym, "ITEM_TITLE[#{i}]"
             mapping "item_no_#{i}".to_sym, "ITEM_NO[#{i}]"
             mapping "item_amount_#{i}".to_sym, "ITEM_AMOUNT[#{i}]"
             mapping "item_price_#{i}".to_sym, "ITEM_PRICE[#{i}]"

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.34.1"
+  VERSION = "1.35.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: activemerchant
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.34.1
+  version: 1.35.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ files:
 - lib/active_merchant/billing/gateways/balanced.rb
 - lib/active_merchant/billing/gateways/banwire.rb
 - lib/active_merchant/billing/gateways/barclays_epdq.rb
+- lib/active_merchant/billing/gateways/barclays_epdq_extra_plus.rb
 - lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb
 - lib/active_merchant/billing/gateways/beanstream.rb
 - lib/active_merchant/billing/gateways/beanstream_interac.rb
@@ -289,6 +290,7 @@ files:
 - lib/active_merchant/billing/gateways/merchant_e_solutions.rb
 - lib/active_merchant/billing/gateways/merchant_one.rb
 - lib/active_merchant/billing/gateways/merchant_ware.rb
+- lib/active_merchant/billing/gateways/merchant_ware_version_four.rb
 - lib/active_merchant/billing/gateways/merchant_warrior.rb
 - lib/active_merchant/billing/gateways/mercury.rb
 - lib/active_merchant/billing/gateways/metrics_global.rb