activemerchant 1.29.1 → 1.30.0

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.

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

@@ -68,8 +68,10 @@ module ActiveMerchant #:nodoc:
         Braintree::Configuration.custom_user_agent = "ActiveMerchant #{ActiveMerchant::VERSION}"
 
         if wiredump_device
-          Braintree::Configuration.logger = wiredump_device
+          Braintree::Configuration.logger = ((Logger === wiredump_device) ? wiredump_device : Logger.new(wiredump_device))
           Braintree::Configuration.logger.level = Logger::DEBUG
+        else
+          Braintree::Configuration.logger.level = Logger::WARN
         end
       end
 
@@ -135,7 +137,8 @@ module ActiveMerchant #:nodoc:
             {
               :braintree_customer => (customer_hash(result.customer) if result.success?),
               :customer_vault_id => (result.customer.id if result.success?)
-            }
+            },
+            :authorization => (result.customer.id if result.success?)
           )
         end
       end

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

@@ -13,6 +13,7 @@ module ActiveMerchant #:nodoc:
     # names.
     #
     # Important Notes
+    # * For checks you can purchase and store.
     # * AVS and CVV only work against the production server.  You will always
     #   get back X for AVS and no response for CVV against the test server.
     # * Nexus is the list of states or provinces where you have a physical
@@ -131,10 +132,10 @@ module ActiveMerchant #:nodoc:
 
       # Purchase is an auth followed by a capture
       # You must supply an order_id in the options hash
-      def purchase(money, creditcard_or_reference, options = {})
+      def purchase(money, payment_method_or_reference, options = {})
         requires!(options, :order_id)
         setup_address_hash(options)
-        commit(build_purchase_request(money, creditcard_or_reference, options), options)
+        commit(build_purchase_request(money, payment_method_or_reference, options), options)
       end
 
       def void(identification, options = {})
@@ -154,10 +155,10 @@ module ActiveMerchant #:nodoc:
       # Stores a customer subscription/profile with type "on-demand".
       # To charge the card while creating a profile, pass
       # options[:setup_fee] => money
-      def store(creditcard, options = {})
+      def store(payment_method, options = {})
         requires!(options, :order_id)
         setup_address_hash(options)
-        commit(build_create_subscription_request(creditcard, options), options)
+        commit(build_create_subscription_request(payment_method, options), options)
       end
 
       # Updates a customer subscription/profile
@@ -222,7 +223,7 @@ module ActiveMerchant #:nodoc:
 
       def build_auth_request(money, creditcard_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
-        add_creditcard_or_subscription(xml, money, creditcard_or_reference, options)
+        add_payment_method_or_subscription(xml, money, creditcard_or_reference, options)
         add_auth_service(xml)
         add_business_rules_data(xml)
         xml.target!
@@ -250,11 +251,15 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_purchase_request(money, creditcard_or_reference, options)
+      def build_purchase_request(money, payment_method_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
-        add_creditcard_or_subscription(xml, money, creditcard_or_reference, options)
-        add_purchase_service(xml, options)
-        add_business_rules_data(xml)
+        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?)
+          add_check_service(xml)
+        else
+          add_purchase_service(xml, options)
+          add_business_rules_data(xml)
+        end
         xml.target!
       end
 
@@ -297,16 +302,22 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_create_subscription_request(creditcard, options)
+      def build_create_subscription_request(payment_method, options)
         options[:subscription] = (options[:subscription] || {}).merge(:frequency => "on-demand", :amount => 0, :automatic_renew => false)
 
         xml = Builder::XmlMarkup.new :indent => 2
-        add_address(xml, creditcard, options[:billing_address], options)
+        add_address(xml, payment_method, options[:billing_address], options)
         add_purchase_data(xml, options[:setup_fee] || 0, true, options)
-        add_creditcard(xml, creditcard)
-        add_creditcard_payment_method(xml)
+        if payment_method.check?
+          add_check(xml, payment_method)
+          add_check_payment_method(xml)
+          add_check_service(xml, options) if options[:setup_fee]
+        else
+          add_creditcard(xml, payment_method)
+          add_creditcard_payment_method(xml)
+          add_purchase_service(xml, options) if options[:setup_fee]
+        end
         add_subscription(xml, options)
-        add_purchase_service(xml, options) if options[:setup_fee]
         add_subscription_create_service(xml, options)
         add_business_rules_data(xml)
         xml.target!
@@ -372,12 +383,12 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_address(xml, creditcard, address, options, shipTo = false)
+      def add_address(xml, payment_method, address, options, shipTo = false)
         requires!(options, :email)
 
         xml.tag! shipTo ? 'shipTo' : 'billTo' do
-          xml.tag! 'firstName',             creditcard.first_name             if creditcard
-          xml.tag! 'lastName',              creditcard.last_name              if creditcard
+          xml.tag! 'firstName',             payment_method.first_name             if payment_method
+          xml.tag! 'lastName',              payment_method.last_name              if payment_method
           xml.tag! 'street1',               address[:address1]
           xml.tag! 'street2',               address[:address2]                unless address[:address2].blank?
           xml.tag! 'city',                  address[:city]
@@ -403,6 +414,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_check(xml, check)
+        xml.tag! 'check' do
+          xml.tag! 'accountNumber', check.account_number
+          xml.tag! 'accountType', check.account_type[0]
+          xml.tag! 'bankTransitNumber', check.routing_number
+        end
+      end
+
       def add_tax_service(xml)
         xml.tag! 'taxService', {'run' => 'true'} do
           xml.tag!('nexus', @options[:nexus]) unless @options[:nexus].blank?
@@ -447,6 +466,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_check_service(xml)
+        xml.tag! 'ecDebitService', {'run' => 'true'}
+      end
+
       def add_subscription_create_service(xml, options)
         xml.tag! 'paySubscriptionCreateService', {'run' => 'true'}
       end
@@ -491,14 +514,24 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_creditcard_or_subscription(xml, money, creditcard_or_reference, options)
-        if creditcard_or_reference.is_a?(String)
+      def add_check_payment_method(xml)
+        xml.tag! 'subscription' do
+          xml.tag! 'paymentMethod', "check"
+        end
+      end
+
+      def add_payment_method_or_subscription(xml, money, payment_method_or_reference, options)
+        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?
+          add_address(xml, payment_method_or_reference, options[:billing_address], options)
           add_purchase_data(xml, money, true, options)
-          add_subscription(xml, options, creditcard_or_reference)
+          add_check(xml, payment_method_or_reference)
         else
-          add_address(xml, creditcard_or_reference, options[:billing_address], options)
+          add_address(xml, payment_method_or_reference, options[:billing_address], options)
           add_purchase_data(xml, money, true, options)
-          add_creditcard(xml, creditcard_or_reference)
+          add_creditcard(xml, payment_method_or_reference)
         end
       end