activemerchant 1.29.1 → 1.33.0

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

@@ -93,8 +93,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:login</tt> -- The Authorize.Net API Login ID (REQUIRED)
       # * <tt>:password</tt> -- The Authorize.Net Transaction Key. (REQUIRED)
       # * <tt>:test</tt> -- +true+ or +false+. If true, perform transactions against the test server.
-      # * <tt>:delimiter</tt> -- The delimiter used in the direct response.  Default is ',' (comma).
       #   Otherwise, perform transactions against the production server.
+      # * <tt>:delimiter</tt> -- The delimiter used in the direct response.  Default is ',' (comma).
       def initialize(options = {})
         requires!(options, :login, :password)
         super
@@ -338,7 +338,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:type</tt> -- The type of transaction. Can be either <tt>:auth_only</tt>, <tt>:capture_only</tt>, <tt>:auth_capture</tt>, <tt>:prior_auth_capture</tt>, <tt>:refund</tt> or <tt>:void</tt>. (REQUIRED)
       # * <tt>:amount</tt> -- The amount for the tranaction. Formatted with a decimal. For example "4.95" (CONDITIONAL)
       #     - :type == :void (NOT USED)
-      #     - :type == (:refund, :auth_only, :capture_only, :auth_capture, :prior_auth_capture) (REQUIRED)
+      #     - :type == :refund (OPTIONAL)
+      #     - :type == (:auth_only, :capture_only, :auth_capture, :prior_auth_capture) (REQUIRED)
       #
       # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction. (CONDITIONAL)
       #     - :type == (:void, :prior_auth_capture) (OPTIONAL)
@@ -468,7 +469,11 @@ module ActiveMerchant #:nodoc:
       private
 
       def expdate(credit_card)
-        sprintf('%04d-%02d', credit_card.year, credit_card.month)
+        if credit_card.year.present? && credit_card.month.present?
+          sprintf('%04d-%02d', credit_card.year, credit_card.month)
+        else
+          'XXXX'
+        end
       end
 
       def build_request(action, options = {})
@@ -599,8 +604,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_create_customer_profile_transaction_request(xml, options)
+        options[:extra_options] ||= {}
+        options[:extra_options].merge!('x_test_request' => 'TRUE') if @options[:test]
+
         add_transaction(xml, options[:transaction])
-        xml.tag!('extraOptions', "x_test_request=TRUE") if @options[:test]
+        tag_unless_blank(xml, 'extraOptions', format_extra_options(options[:extra_options]))
 
         xml.target!
       end
@@ -652,7 +660,7 @@ module ActiveMerchant #:nodoc:
                 tag_unless_blank(xml,'customerShippingAddressId', transaction[:customer_shipping_address_id])
                 xml.tag!('transId', transaction[:trans_id])
               when :refund
-                #TODO - add lineItems and extraOptions fields
+                #TODO - add lineItems field
                 xml.tag!('amount', transaction[:amount])
                 tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
                 tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
@@ -849,6 +857,10 @@ module ActiveMerchant #:nodoc:
         xml.tag!(tag_name, data) unless data.blank? || data.nil?
       end
 
+      def format_extra_options(options)
+        options.map{ |k, v| "#{k}=#{v}" }.join(',') unless options.nil?
+      end
+
       def parse_direct_response(params)
         delimiter = @options[:delimiter] || ','
         direct_response = {'raw' => params}

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

@@ -91,8 +91,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:login</tt> -- The Balanced API Secret (REQUIRED)
       def initialize(options = {})
         requires!(options, :login)
-        initialize_marketplace(options[:marketplace] || load_marketplace)
         super
+        initialize_marketplace(options[:marketplace] || load_marketplace)
       end
 
       # Performs an authorization (Hold in Balanced nonclementure), which
@@ -197,6 +197,7 @@ module ActiveMerchant #:nodoc:
         post[:hold_uri] = authorization
         post[:amount] = money if money
         post[:description] = options[:description] if options[:description]
+        post[:on_behalf_of_uri] = options[:on_behalf_of_uri] if options[:on_behalf_of_uri]
 
         create_transaction(:post, @debits_uri, post)
       rescue Error => ex
@@ -234,11 +235,16 @@ module ActiveMerchant #:nodoc:
       # * <tt>`:amount`<tt> -- specify an amount if you want to perform a
       #   partial refund. This value will default to the total amount of the
       #   debit that has not been refunded so far.
-      def refund(debit_uri, options = {})
+      def refund(amount, debit_uri = "deprecated", options = {})
+        if(debit_uri == "deprecated" || debit_uri.kind_of?(Hash))
+          deprecated "Calling the refund method without an amount parameter is deprecated and will be removed in a future version."
+          return refund(options[:amount], amount, options)
+        end
+
         requires!(debit_uri)
         post = {}
         post[:debit_uri] = debit_uri
-        post[:amount] = options[:amount] if options[:amount]
+        post[:amount] = amount
         post[:description] = options[:description]
         create_transaction(:post, @refunds_uri, post)
       rescue Error => ex

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

@@ -71,7 +71,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(money, parameters)
-        response = parse(ssl_post(URL, post_data(parameters)))
+        raw_response = ssl_post(URL, post_data(parameters))
+        begin
+          response = parse(raw_response)
+        rescue JSON::ParserError
+          response = json_error(raw_response)
+        end
+
         Response.new(success?(response),
                      response["message"],
                      response,
@@ -86,6 +92,14 @@ module ActiveMerchant #:nodoc:
       def post_data(parameters = {})
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
+
+      def json_error(raw_response)
+        msg = 'Invalid response received from the Banwire API.  Please contact Banwire support if you continue to receive this message.'
+        msg += "  (The raw response returned by the API was #{raw_response.inspect})"
+        {
+          "message" => msg
+        }
+      end
     end
   end
 end

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

@@ -134,7 +134,14 @@ module ActiveMerchant #:nodoc:
         end
 
         def parse
-          doc = REXML::Document.new(@response)
+          require 'iconv' unless String.method_defined?(:encode)
+          if String.method_defined?(:encode)
+            doc = REXML::Document.new(@response.encode("UTF-8", "ISO-8859-1"))
+          else
+            ic = Iconv.new('UTF-8', 'ISO-8859-1')
+            doc = REXML::Document.new(ic.iconv(@response))
+          end
+
           auth_type = find(doc, "//Transaction/Type").to_s
 
           message = find(doc, "//Message/Text")

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

@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
         base.supported_countries = ['CA']
 
         # The card types supported by the payment gateway
-        base.supported_cardtypes = [:visa, :master, :american_express]
+        base.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
 
         # The homepage URL of the gateway
         base.homepage_url = 'http://www.beanstream.com/'
@@ -119,6 +119,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_customer_ip(post, options)
+        post[:customerIP] = options[:ip] if options[:ip]
+      end
+
       def void_action(original_transaction_type)
         (original_transaction_type == TRANSACTIONS[:refund]) ? :void_refund : :void_purchase
       end
@@ -235,6 +239,7 @@ module ActiveMerchant #:nodoc:
 
       def add_recurring_invoice(post, options)
         post[:rbApplyTax1] = options[:apply_tax1]
+        post[:rbApplyTax2] = options[:apply_tax2]
       end
 
       def add_recurring_operation_type(post, operation)
@@ -288,7 +293,7 @@ module ActiveMerchant #:nodoc:
         results = {}
         if !body.nil?
           body.split(/&/).each do |pair|
-            key, val = pair.split(/=/)
+            key, val = pair.split(/\=/)
             results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
           end
         end

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

@@ -6,34 +6,34 @@ module ActiveMerchant #:nodoc:
     # It is also named TD Canada Trust Online Mart payment gateway.
     # To learn more about the specification of Beanstream gateway, please read the OM_Direct_Interface_API.pdf,
     # which you can get from your Beanstream account or get from me by email.
-    #  
+    #
     # == Supported transaction types by Beanstream:
     # * +P+ - Purchase
     # * +PA+ - Pre Authorization
     # * +PAC+ - Pre Authorization Completion
-    #  
+    #
     # == Secure Payment Profiles:
     # BeanStream supports payment profiles (vaults). This allows you to store cc information with BeanStream and process subsequent transactions with a customer id.
     # Secure Payment Profiles must be enabled on your account (must be done over the phone).
     # Your API Access Passcode must be set in Administration => account settings => order settings.
     # To learn more about storing credit cards with the Beanstream gateway, please read the BEAN_Payment_Profiles.pdf (I had to phone BeanStream to request it.)
-    # 
-    # == Notes 
+    #
+    # == Notes
     # * Adding of order products information is not implemented.
     # * Ensure that country and province data is provided as a code such as "CA", "US", "QC".
     # * login is the Beanstream merchant ID, username and password should be enabled in your Beanstream account and passed in using the <tt>:user</tt> and <tt>:password</tt> options.
     # * Test your app with your true merchant id and test credit card information provided in the api pdf document.
-    # * Beanstream does not allow Payment Profiles to be deleted with their API. The accounts are 'closed', but have to be deleted manually.  
-    #  
+    # * Beanstream does not allow Payment Profiles to be deleted with their API. The accounts are 'closed', but have to be deleted manually.
+    #
     #  Example authorization (Beanstream PA transaction type):
-    #  
+    #
     #   twenty = 2000
     #   gateway = BeanstreamGateway.new(
     #     :login => '100200000',
     #     :user => 'xiaobozz',
     #     :password => 'password'
     #   )
-    #   
+    #
     #   credit_card = CreditCard.new(
     #     :number => '4030000010001234',
     #     :month => 8,
@@ -63,37 +63,39 @@ module ActiveMerchant #:nodoc:
     #   )
     class BeanstreamGateway < Gateway
       include BeanstreamCore
- 
+
       def authorize(money, source, options = {})
         post = {}
         add_amount(post, money)
         add_invoice(post, options)
-        add_source(post, source)        
+        add_source(post, source)
         add_address(post, options)
         add_transaction_type(post, :authorization)
+        add_customer_ip(post, options)
         commit(post)
       end
-      
+
       def purchase(money, source, options = {})
         post = {}
-        add_amount(post, money) 
+        add_amount(post, money)
         add_invoice(post, options)
         add_source(post, source)
         add_address(post, options)
         add_transaction_type(post, purchase_action(source))
+        add_customer_ip(post, options)
         commit(post)
-      end                       
-          
+      end
+
       def void(authorization, options = {})
         reference, amount, type = split_auth(authorization)
-        
+
         post = {}
         add_reference(post, reference)
         add_original_amount(post, amount)
         add_transaction_type(post, void_action(type))
         commit(post)
       end
-      
+
       def recurring(money, source, options = {})
         post = {}
         add_amount(post, money)
@@ -104,7 +106,7 @@ module ActiveMerchant #:nodoc:
         add_recurring_type(post, options)
         commit(post)
       end
-      
+
       def update_recurring(amount, source, options = {})
         post = {}
         add_recurring_amount(post, amount)
@@ -115,7 +117,7 @@ module ActiveMerchant #:nodoc:
         add_recurring_service(post, options)
         recurring_commit(post)
       end
-      
+
       def cancel_recurring(options = {})
         post = {}
         add_recurring_operation_type(post, :cancel)
@@ -126,25 +128,25 @@ module ActiveMerchant #:nodoc:
       def interac
         @interac ||= BeanstreamInteracGateway.new(@options)
       end
-      
+
       # To match the other stored-value gateways, like TrustCommerce,
       # store and unstore need to be defined
       def store(credit_card, options = {})
-        post = {}        
+        post = {}
         add_address(post, options)
-        add_credit_card(post, credit_card)      
+        add_credit_card(post, credit_card)
         add_secure_profile_variables(post,options)
         commit(post, true)
       end
-      
+
       #can't actually delete a secure profile with the supplicaed API. This function sets the status of the profile to closed (C).
       #Closed profiles will have to removed manually.
       def delete(vault_id)
         update(vault_id, false, {:status => "C"})
       end
-      
+
       alias_method :unstore, :delete
-      
+
       # Update the values (such as CC expiration) stored at
       # the gateway.  The CC number must be supplied in the
       # CreditCard object.