activemerchant 1.30.0 → 1.31.0

data/CHANGELOG

@@ -1,5 +1,15 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.31.0 (February 20, 2013)
+
+* Worldpay: XML encoding is required to be ISO-8859-1 [dougal]
+* Worldpay: Add card code for more supported card types [dougal]
+* Ogone: Add action option [pwoestelandt]
+* PayPal Express gateway: Add support for BuyerEmailOptInEnable [chrisrbnelson]
+* Add Paymill gateway [duff]
+* Add EVO Canada gateway [alexdunae]
+* Fixed credit card and check interface, used correct method for checking payment type [jduff]
+
 == Version 1.30.0 (February 13, 2013)
 
 * Add FirstData Global Gateway e4 [frobcode]

data/CONTRIBUTORS

@@ -370,9 +370,17 @@ Pin gateway (February 2013)
 
 * Myles Eftos (madpilot)
 
-Merchant Warrior
+Merchant Warrior (February 2013)
 
 * Ben Bruscella (benbruscella)
 * Дмитрий Василец (pronix)
 * Kirill Shirinkin (Fodoj)
 * Nathaniel Talbott (ntalbott)
+
+Paymill (February 2013)
+
+* Duff O'Melia (duff)
+
+EVO Canada (February 2013)
+
+* Alex Dunae (alexdunae)

data/README.md

@@ -94,6 +94,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Efsnet](http://www.concordefsnet.com/) - US
 * [Elavon MyVirtualMerchant](http://www.elavon.com) - US, CA
 * [ePay](http://www.epay.dk/) - DK, SE, NO
+* [EVO Canada](http://www.evocanada.com/) - CA
 * [eWAY](http://www.eway.com.au/) - AU
 * [eWay Rapid 3.0](http://www.eway.com.au/) - AU
 * [E-xact](http://www.e-xact.com) - CA, US
@@ -132,6 +133,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [PayGate PayXML](http://paygate.co.za/) - US, ZA
 * [PayJunction](http://www.payjunction.com/) - US
 * [PaymentExpress](http://www.paymentexpress.com/) - AU, MY, NZ, SG, ZA, UK, US
+* [Paymill](https://www.paymill.com) - AT, BE, CH, CZ, DE, DK, EE, ES, FI, FR, GB, HU, IE, IS, IT, LI, LU, LV, NL, NO, PL, PT, SE, SI, TR
 * [PayPal Express Checkout](https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside) - US, CA, SG, AU
 * [PayPal Payflow Pro](https://www.paypal.com/cgi-bin/webscr?cmd=_payflow-pro-overview-outside) - US, CA, SG, AU
 * [PayPal Website Payments Pro (UK)](https://www.paypal.com/uk/cgi-bin/webscr?cmd=_wp-pro-overview-outside) - UK

data/lib/active_merchant/billing/check.rb

@@ -45,10 +45,6 @@ module ActiveMerchant #:nodoc:
         'check'
       end
 
-      def check?
-        true
-      end
-
       # Routing numbers may be validated by calculating a checksum and dividing it by 10. The
       # formula is:
       #   (3(d1 + d4 + d7) + 7(d2 + d5 + d8) + 1(d3 + d6 + d9))mod 10 = 0

data/lib/active_merchant/billing/credit_card.rb

@@ -209,10 +209,6 @@ module ActiveMerchant #:nodoc:
         require_verification_value
       end
 
-      def check?
-        false
-      end
-
       private
 
       def before_validate #:nodoc:

data/lib/active_merchant/billing/gateway.rb

@@ -130,7 +130,7 @@ module ActiveMerchant #:nodoc:
 
       # Are we running in test mode?
       def test?
-        (@options[:test] || Base.test?)
+        (@options.has_key?(:test) ? @options[:test] : Base.test?)
       end
 
       private # :nodoc: all

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

@@ -254,7 +254,7 @@ module ActiveMerchant #:nodoc:
       def build_purchase_request(money, payment_method_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
         add_payment_method_or_subscription(xml, money, payment_method_or_reference, options)
-        if(payment_method_or_reference.respond_to?(:check?) && payment_method_or_reference.check?)
+        if card_brand(payment_method_or_reference) == 'check'
           add_check_service(xml)
         else
           add_purchase_service(xml, options)
@@ -308,7 +308,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         add_address(xml, payment_method, options[:billing_address], options)
         add_purchase_data(xml, options[:setup_fee] || 0, true, options)
-        if payment_method.check?
+        if card_brand(payment_method) == 'check'
           add_check(xml, payment_method)
           add_check_payment_method(xml)
           add_check_service(xml, options) if options[:setup_fee]
@@ -524,7 +524,7 @@ module ActiveMerchant #:nodoc:
         if payment_method_or_reference.is_a?(String)
           add_purchase_data(xml, money, true, options)
           add_subscription(xml, options, payment_method_or_reference)
-        elsif payment_method_or_reference.check?
+        elsif card_brand(payment_method_or_reference) == 'check'
           add_address(xml, payment_method_or_reference, options[:billing_address], options)
           add_purchase_data(xml, money, true, options)
           add_check(xml, payment_method_or_reference)

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

@@ -0,0 +1,308 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    # === EVO Canada payment gateway.
+    #
+    # EVO returns two different identifiers for most transactions, the
+    # +authcode+ and the +transactionid+.  Since +transactionid+ is used more
+    # often (i.e. for {#capture}, {#refund}, {#void} and {#update}) we store it in the
+    # Response#authorization attribute.  The +authcode+ from the merchant
+    # account is accessible via {Response#params}.
+    #
+    # Two different but related response messages are also returned from EVO.
+    # The message indicated by EVO's <tt>response_code</tt> parameter is returned as
+    # {Response#message} (Those messages can be seen in the {MESSAGES} hash.)
+    # The other, shorter message is available via {Response#params}.
+    #
+    # It's recommended to save the contents of the {Response#params} in your
+    # transaction log for future reference.
+    #
+    # === Sample Use
+    #
+    #    gateway = ActiveMerchant::Billing::EvoCaGateway.new(username: 'demo', password: 'password')
+    #
+    #    response = gateway.authorize(1000, credit_card, options)
+    #
+    #    puts response.authorization          # the transactionid
+    #    puts response.params['authcode']     # the authcode from the merchant account
+    #    puts response.message                # the 'pretty' response message
+    #    puts response.params['responsetext'] # the 'terse' response message
+    #
+    #    gateway.capture(1000, response.authorization)
+    #    gateway.update(response.authorization, shipping_carrier: 'fedex')
+    #    gateway.refund(500, response.authorization)
+    #
+    class EvoCaGateway < Gateway
+      self.test_url = 'https://secure.evoepay.com/api/transact.php'
+      self.live_url = 'https://secure.evoepay.com/api/transact.php'
+
+      self.supported_countries  = ['CA']
+      self.supported_cardtypes  = [:visa, :master, :american_express, :jcb, :discover]
+      self.money_format         = :dollars
+      self.homepage_url         = 'http://www.evocanada.com/'
+      self.display_name         = 'EVO Canada'
+
+      APPROVED, DECLINED, ERROR = 1, 2, 3
+
+      MESSAGES = {
+        100 => 'Transaction was approved',
+        200 => 'Transaction was declined by processor',
+        201 => 'Do not honor',
+        202 => 'Insufficient funds',
+        203 => 'Over limit',
+        204 => 'Transaction not allowed',
+        220 => 'Incorrect payment data',
+        221 => 'No such card issuer',
+        222 => 'No card number on file with issuer',
+        223 => 'Expired card',
+        224 => 'Invalid expiration date',
+        225 => 'Invalid card security code',
+        240 => 'Call issuer for futher information',
+        250 => 'Pick up card',
+        251 => 'Lost card',
+        252 => 'Stolen card',
+        253 => 'Fraudulant card',
+        260 => 'Declined with further instructions available',
+        261 => 'Declined - stop all recurring payments',
+        262 => 'Declined - stop this recurring program',
+        263 => 'Declined - updated cardholder data available',
+        264 => 'Declined - retry in a few days',
+        300 => 'Transaction was rejected by gateway',
+        400 => 'Transaction error returned by processor',
+        410 => 'Invalid merchant configuration',
+        411 => 'Merchant account is inactive',
+        420 => 'Communication error',
+        421 => 'Communication error with issuer',
+        430 => 'Duplicate transaction at processor',
+        440 => 'Processor format error',
+        441 => 'Invalid transaction information',
+        460 => 'Processor feature not available',
+        461 => 'Unsupported card type'
+      }
+
+      # This gateway requires that a valid username and password be passed
+      # in the +options+ hash.
+      #
+      # === Required Options
+      #
+      # * <tt>:username</tt>
+      # * <tt>:password</tt>
+      def initialize(options = {})
+        requires!(options, :username, :password)
+        super
+      end
+
+      # Transaction sales are submitted and immediately flagged for settlement.
+      # These transactions will automatically be settled.
+      #
+      # Payment source can be either a {CreditCard} or {Check}.
+      #
+      # === Additional Options
+      # In addition to the standard options, this gateway supports
+      #
+      # * <tt>:tracking_number</tt> - Shipping tracking number
+      # * <tt>:shipping_carrier</tt> - ups/fedex/dhl/usps
+      # * <tt>:po_number</tt> - Purchase order
+      # * <tt>:tax</tt> - Tax amount
+      # * <tt>:shipping</tt> - Shipping cost
+      def purchase(money, credit_card_or_check, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_order(post, options)
+        add_paymentmethod(post, credit_card_or_check)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('sale', money, post)
+      end
+
+      # Transaction authorizations are authorized immediately but are not
+      # flagged for settlement. These transactions must be flagged for
+      # settlement using the _capture_ transaction type. Authorizations
+      # typically remain activate for three to seven business days.
+      #
+      # Payment source must be a {CreditCard}.
+      def authorize(money, credit_card, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_order(post, options)
+        add_paymentmethod(post, credit_card)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('auth', money, post)
+      end
+
+      # Transaction captures flag existing _authorizations_ for settlement. Only
+      # authorizations can be captured. Captures can be submitted for an amount
+      # equal to or less than the original authorization.
+      #
+      # The <tt>authorization</tt> parameter is the transaction ID, retrieved
+      # from Response#authorization. See EvoCaGateway#purchase for the
+      # <tt>options</tt>.
+      def capture(money, authorization, options = {})
+        post = {
+          :amount         => amount(money),
+          :transactionid  => authorization
+        }
+        add_order(post, options)
+        commit('capture', money, post)
+      end
+
+      # Transaction refunds will reverse a previously settled transaction. If
+      # the transaction has not been settled, it must be _voided_ instead of
+      # refunded.
+      #
+      # The <tt>identification</tt> parameter is the transaction ID, retrieved
+      # from {Response#authorization}.
+      def refund(money, identification)
+        post = {:transactionid => identification}
+        commit('refund', money, post)
+      end
+
+      # Transaction credits apply a negative amount to the cardholder's card.
+      # In most situations credits are disabled as transaction refunds should
+      # be used instead.
+      #
+      # Note that this is different from a {#refund} (which is usually what
+      # you'll be looking for).
+      def credit(money, credit_card, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_order(post, options)
+        add_paymentmethod(post, credit_card)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('credit', money, post)
+      end
+
+      # Transaction voids will cancel an existing sale or captured
+      # authorization. In addition, non-captured authorizations can be voided to
+      # prevent any future capture. Voids can only occur if the transaction has
+      # not been settled.
+      #
+      # The <tt>identification</tt> parameter is the transaction ID, retrieved
+      # from {Response#authorization}.
+      def void(identification)
+        post = {:transactionid => identification}
+        commit('void', nil, post)
+      end
+
+      # Transaction updates can be used to update previous transactions with
+      # specific order information, such as a tracking number and shipping
+      # carrier. See EvoCaGateway#purchase for <tt>options</tt>.
+      #
+      # The <tt>identification</tt> parameter is the transaction ID, retrieved
+      # from {Response#authorization}.
+      def update(identification, options)
+        post = {:transactionid => identification}
+        add_order(post, options)
+        commit('update', nil, post)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        post[:email]      = options[:email]
+        post[:ipaddress]  = options[:ip]
+      end
+
+      def add_address(post, options)
+        if address = options[:billing_address] || options[:address]
+          post[:firstname]    = address[:first_name]
+          post[:lastname]     = address[:last_name]
+          post[:address1]     = address[:address1]
+          post[:address2]     = address[:address2]
+          post[:company]      = address[:company]
+          post[:phone]        = address[:phone]
+          post[:city]         = address[:city]
+          post[:state]        = address[:state]
+          post[:zip]          = address[:zip]
+          post[:country]      = address[:country]
+        end
+
+        if address = options[:shipping_address]
+          post[:shipping_firstname]   = address[:first_name]
+          post[:shipping_lastname]    = address[:last_name]
+          post[:shipping_address1]    = address[:address1]
+          post[:shipping_address2]    = address[:address2]
+          post[:shipping_company]     = address[:company]
+          post[:shipping_zip]         = address[:zip]
+          post[:shipping_city]        = address[:city]
+          post[:shipping_state]       = address[:state]
+          post[:shipping_country]     = address[:country]
+        end
+      end
+
+      def add_order(post, options)
+        post[:orderid]          = options[:order_id]
+        post[:tracking_number]  = options[:tracking_number]
+        post[:shipping_carrier] = options[:shipping_carrier]
+      end
+
+      def add_invoice(post, options)
+        post[:orderdescription] = options[:description]
+        post[:ponumber]         = options[:po_number]
+        post[:shipping]         = amount(options[:shipping])
+        post[:tax]              = amount(options[:tax])
+      end
+
+      def add_paymentmethod(post, payment)
+        if card_brand(payment)=='check'
+          post[:payment]              = 'check'
+          post[:checkname]            = payment.name
+          post[:checkaba]             = payment.routing_number
+          post[:checkaccount]         = payment.account_number
+          post[:account_holder_type]  = payment.account_holder_type
+          post[:account_type]         = payment.account_type
+        else
+          post[:payment]  = 'creditcard'
+          post[:ccnumber] = payment.number
+          post[:ccexp]    = "#{format(payment.month, :two_digits)}#{format(payment.year, :two_digits)}"
+          post[:cvv]      = payment.verification_value
+        end
+      end
+
+      def parse(body)
+        fields = {}
+        CGI::parse(body).each do |k, v|
+          fields[k.to_s] = v.kind_of?(Array) ? v[0] : v
+        end
+        fields
+      end
+
+      def success?(response)
+        response['response'].to_i == APPROVED
+      end
+
+      def commit(action, money, parameters)
+        parameters[:amount] = amount(money) unless action == 'void'
+
+        data = ssl_post self.live_url, post_data(action, parameters)
+        response = parse(data)
+        message = message_from(response)
+
+        Response.new(success?(response), message, response,
+          :test          => test?,
+          :authorization => response['transactionid'],
+          :avs_result    => { :code => response['avsresponse'] },
+          :cvv_result    => response['cvvresponse']
+        )
+      end
+
+      def message_from(response)
+        MESSAGES.fetch(response['response_code'].to_i, false) || response['message']
+      end
+
+      def post_data(action, parameters = {})
+        post = {:type => action}
+
+        if test?
+          post[:username] = 'demo'
+          post[:password] = 'password'
+        else
+          post[:username] = options[:username]
+          post[:password] = options[:password]
+        end
+        post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" unless value.nil? }.compact.join("&")
+      end
+    end
+  end
+end

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

@@ -27,6 +27,16 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = "http://www.firstdata.com"
       self.display_name = "FirstData Global Gateway e4"
 
+      # Create a new FirstdataE4Gateway
+      #
+      # The gateway requires that a valid login and password be passed
+      # in the +options+ hash.
+      #
+      # ==== Options
+      #
+      # * <tt>:login</tt> --    The EXACT ID.  Also known as the Gateway ID.
+      #                         (Found in your administration terminal settings)
+      # * <tt>:password</tt> -- The terminal password (not your account password)
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options

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

@@ -154,23 +154,25 @@ module ActiveMerchant #:nodoc:
 
       # Verify and transfer the specified amount.
       def purchase(money, payment_source, options = {})
-        post = {}
+        post   = {}
+        action = options[:action] || 'SAL'
         add_invoice(post, options)
         add_payment_source(post, payment_source, options)
         add_address(post, payment_source, options)
         add_customer_data(post, options)
         add_money(post, money, options)
-        commit('SAL', post)
+        commit(action, post)
       end
 
       # Complete a previously authorized transaction.
       def capture(money, authorization, options = {})
-        post = {}
+        post   = {}
+        action = options[:action] || 'SAL'
         add_authorization(post, reference_from(authorization))
         add_invoice(post, options)
         add_customer_data(post, options)
         add_money(post, money, options)
-        commit('SAL', post)
+        commit(action, post)
       end
 
       # Cancels a previously authorized transaction.

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

@@ -0,0 +1,161 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class PaymillGateway < Gateway
+      self.supported_countries = %w(AT BE CH CZ DE DK EE ES FI FR GB HU IE
+                                    IS IT LI LU LV NL NO PL PT SE SI TR)
+
+      self.supported_cardtypes = [:visa, :master]
+      self.homepage_url = 'https://paymill.com'
+      self.display_name = 'Paymill'
+      self.money_format = :cents
+      self.default_currency = 'EUR'
+
+      def initialize(options = {})
+        requires!(options, :public_key, :private_key)
+        super
+      end
+
+      def purchase(money, credit_card, options = {})
+        MultiResponse.run do |r|
+          r.process { save_card(credit_card) }
+          r.process { purchase_with_token(money, r.authorization, options) }
+        end
+      end
+
+      def authorize(money, credit_card, options = {})
+        MultiResponse.run do |r|
+          r.process { save_card(credit_card) }
+          r.process { authorize_with_token(money, r.authorization, options) }
+        end
+      end
+
+      def capture(money, authorization, options = {})
+        post = {}
+
+        add_amount(post, money, options)
+        post[:preauthorization] = preauth(authorization)
+        post[:description] = options[:description]
+        commit(:post, 'transactions', post)
+      end
+
+      def refund(money, authorization, options={})
+        post = {}
+
+        post[:amount] = amount(money)
+        post[:description] = options[:description]
+        commit(:post, "refunds/#{transaction_id(authorization)}", post)
+      end
+
+      private
+
+      def add_credit_card(post, credit_card)
+        post['account.number'] = credit_card.number
+        post['account.expiry.month'] = sprintf("%.2i", credit_card.month)
+        post['account.expiry.year'] = sprintf("%.4i", credit_card.year)
+        post['account.verification'] = credit_card.verification_value
+      end
+
+      def headers
+        { 'Authorization' => ('Basic ' + Base64.strict_encode64("#{@options[:private_key]}:X").chomp) }
+      end
+
+      def commit(method, url, parameters=nil)
+        begin
+          raw_response = ssl_request(method, "https://api.paymill.com/v2/#{url}", post_data(parameters), headers)
+        rescue ResponseError => e
+          parsed = JSON.parse(e.response.body)
+          return Response.new(false, parsed['error'], parsed, {})
+        end
+
+        response_from(raw_response)
+      end
+
+      def response_from(raw_response)
+        parsed = JSON.parse(raw_response)
+
+        options = {
+          :authorization => authorization_from(parsed),
+          :test => (parsed['mode'] == 'test'),
+        }
+
+        Response.new(true, 'Transaction approved', parsed, options)
+      end
+
+      def authorization_from(parsed_response)
+        [
+          parsed_response['data']['id'],
+          parsed_response['data']['preauthorization'].try(:[], 'id')
+        ].join(";")
+      end
+
+      def purchase_with_token(money, card_token, options)
+        post = {}
+
+        add_amount(post, money, options)
+        post[:token] = card_token
+        post[:description] = options[:description]
+        commit(:post, 'transactions', post)
+      end
+
+      def authorize_with_token(money, card_token, options)
+        post = {}
+
+        add_amount(post, money, options)
+        post[:token] = card_token
+        commit(:post, 'preauthorizations', post)
+      end
+
+      def save_card(credit_card)
+        post = {}
+
+        add_credit_card(post, credit_card)
+        post['channel.id'] = @options[:public_key]
+        post['jsonPFunction'] = 'jsonPFunction'
+        post['transaction.mode'] = (test? ? 'CONNECTOR_TEST' : 'LIVE')
+
+        begin
+          raw_response = ssl_request(:get, "#{save_card_url}?#{post_data(post)}", nil, {})
+        rescue ResponseError => e
+          return Response.new(false, e.response.body, e.response.body, {})
+        end
+
+        response_for_save_from(raw_response)
+      end
+
+      def response_for_save_from(raw_response)
+        parsed = JSON.parse(raw_response.sub(/jsonPFunction\(/, '').sub(/\)\z/, ''))
+        succeeded = parsed['transaction']['processing']['result'] == 'ACK'
+
+        options = { :test => test? }
+        if succeeded
+          options[:authorization] = parsed['transaction']['identification']['uniqueId']
+        end
+
+        message = parsed['transaction']['processing']['return']['message']
+        Response.new(succeeded, message, parsed, options)
+      end
+
+      def save_card_url
+        (test? ? 'https://test-token.paymill.de' : 'https://token-v2.paymill.de')
+      end
+
+      def post_data(params)
+        no_blanks = params.reject { |key, value| value.blank? }
+        no_blanks.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+      end
+
+      def add_amount(post, money, options)
+        post[:amount] = amount(money)
+        post[:currency] = (options[:currency] || currency(money))
+      end
+
+      def preauth(authorization)
+        authorization.split(";").last
+      end
+
+      def transaction_id(authorization)
+        authorization.split(';').first
+      end
+    end
+  end
+end

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

@@ -30,16 +30,16 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside'
       self.display_name = 'PayPal Express Checkout'
-      
+
       def setup_authorization(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
-        
+
         commit 'SetExpressCheckout', build_setup_request('Authorization', money, options)
       end
-      
+
       def setup_purchase(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
-        
+
         commit 'SetExpressCheckout', build_setup_request('Sale', money, options)
       end
 
@@ -49,13 +49,13 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, options = {})
         requires!(options, :token, :payer_id)
-      
+
         commit 'DoExpressCheckoutPayment', build_sale_or_authorization_request('Authorization', money, options)
       end
 
       def purchase(money, options = {})
         requires!(options, :token, :payer_id)
-        
+
         commit 'DoExpressCheckoutPayment', build_sale_or_authorization_request('Sale', money, options)
       end
 
@@ -77,10 +77,10 @@ module ActiveMerchant #:nodoc:
 
         xml.target!
       end
-      
+
       def build_sale_or_authorization_request(action, money, options)
         currency_code = options[:currency] || currency(money)
-        
+
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'DoExpressCheckoutPaymentReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'DoExpressCheckoutPaymentRequest', 'xmlns:n2' => EBAY_NAMESPACE do
@@ -141,7 +141,7 @@ module ActiveMerchant #:nodoc:
                 xml.tag! 'n2:AllowNote', options[:allow_note] ? '1' : '0'
               end
               xml.tag! 'n2:CallbackURL', options[:callback_url] unless options[:callback_url].blank?
-              
+
               add_payment_details(xml, with_money_default(money), currency_code, options)
               if options[:shipping_options]
                 options[:shipping_options].each do |shipping_option|
@@ -155,16 +155,20 @@ module ActiveMerchant #:nodoc:
 
               xml.tag! 'n2:CallbackTimeout', options[:callback_timeout] unless options[:callback_timeout].blank?
               xml.tag! 'n2:CallbackVersion', options[:callback_version] unless options[:callback_version].blank?
+
+              if options.has_key?(:allow_buyer_optin)
+                xml.tag! 'n2:BuyerEmailOptInEnable', (options[:allow_buyer_optin] ? '1' : '0')
+              end
             end
           end
         end
 
         xml.target!
       end
-      
+
       def build_reference_transaction_request(action, money, options)
         currency_code = options[:currency] || currency(money)
-        
+
         # I am not sure why it's set like this for express gateway
         # but I don't want to break the existing behavior
         xml = Builder::XmlMarkup.new :indent => 2

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

@@ -16,6 +16,9 @@ module ActiveMerchant #:nodoc:
         'master'           => 'ECMC-SSL',
         'discover'         => 'DISCOVER-SSL',
         'american_express' => 'AMEX-SSL',
+        'jcb'              => 'JCB-SSL',
+        'maestro'          => 'MAESTRO-SSL',
+        'laser'            => 'LASER-SSL'
       }
 
       def initialize(options = {})
@@ -84,7 +87,7 @@ module ActiveMerchant #:nodoc:
 
       def build_request
         xml = Builder::XmlMarkup.new :indent => 2
-        xml.instruct!
+        xml.instruct! :xml, :encoding => 'ISO-8859-1'
         xml.declare! :DOCTYPE, :paymentService, :PUBLIC, "-//WorldPay//DTD WorldPay PaymentService v1//EN", "http://dtd.wp3.rbsworldpay.com/paymentService_v1.dtd"
         xml.tag! 'paymentService', 'version' => "1.4", 'merchantCode' => @options[:login] do
           yield xml

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.30.0"
+  VERSION = "1.31.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
+  version: 1.31.0
   prerelease: 
-  version: 1.30.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,184 +37,129 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70206840641520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
-  name: activesupport
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
-    none: false
+  version_requirements: *70206840641520
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: &70206840641100 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: i18n
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  version_requirements: *70206840641100
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: money
+  requirement: &70206840640640 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: money
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  version_requirements: *70206840640640
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: builder
+  requirement: &70206840640080 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
-  name: builder
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    none: false
+  version_requirements: *70206840640080
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70206840639440 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
-    none: false
-  name: json
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-    none: false
+  version_requirements: *70206840639440
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: active_utils
+  requirement: &70206840638860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
-  name: active_utils
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-    none: false
+  version_requirements: *70206840638860
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: &70206840638080 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: nokogiri
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  version_requirements: *70206840638080
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70206840637200 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  version_requirements: *70206840637200
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: &70206840636380 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.3
-    none: false
-  name: mocha
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.3
-    none: false
+  version_requirements: *70206840636380
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rails
+  requirement: &70206840635740 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
-  name: rails
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
-    none: false
+  version_requirements: *70206840635740
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &70206840684480 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: thor
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  version_requirements: *70206840684480
 description: Active Merchant is a simple payment abstraction library used in and sponsored
   by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim
   of the project is to feel natural to Ruby users and to abstract as many parts as
@@ -261,6 +206,7 @@ files:
 - lib/active_merchant/billing/gateways/efsnet.rb
 - lib/active_merchant/billing/gateways/elavon.rb
 - lib/active_merchant/billing/gateways/epay.rb
+- lib/active_merchant/billing/gateways/evo_ca.rb
 - lib/active_merchant/billing/gateways/eway.rb
 - lib/active_merchant/billing/gateways/eway_managed.rb
 - lib/active_merchant/billing/gateways/eway_rapid.rb
@@ -316,6 +262,7 @@ files:
 - lib/active_merchant/billing/gateways/payflow_express_uk.rb
 - lib/active_merchant/billing/gateways/payflow_uk.rb
 - lib/active_merchant/billing/gateways/payment_express.rb
+- lib/active_merchant/billing/gateways/paymill.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_recurring_api.rb
@@ -512,21 +459,22 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Framework and tools for dealing with credit card transactions.
 test_files: []
+has_rdoc: