activemerchant 1.79.2 → 1.80.0

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

@@ -72,9 +72,15 @@ module ActiveMerchant #:nodoc:
         add_payment_source(post, creditcard_or_datakey, options)
         post[:amount]     = amount(money)
         post[:order_id]   = options[:order_id]
-        post[:address]    = options[:billing_address] || options[:address]
+        add_address(post, creditcard_or_datakey, options)
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        action = (post[:data_key].blank?) ? 'us_purchase' : 'us_res_purchase_cc'
+        action = if creditcard_or_datakey.is_a?(String)
+          'us_res_purchase_cc'
+        elsif card_brand(creditcard_or_datakey) == 'check'
+          'us_ach_debit'
+        elsif post[:data_key].blank?
+          'us_purchase'
+        end
         commit(action, post)
       end
 
@@ -114,12 +120,11 @@ module ActiveMerchant #:nodoc:
         commit 'us_refund', crediting_params(authorization, :amount => amount(money))
       end
 
-      def store(credit_card, options = {})
+      def store(payment_source, options = {})
         post = {}
-        post[:pan] = credit_card.number
-        post[:expdate] = expdate(credit_card)
+        add_payment_source(post, payment_source, options)
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        commit('us_res_add_cc', post)
+        card_brand(payment_source) == 'check' ? commit('us_res_add_ach', post) : commit('us_res_add_cc', post)
       end
 
       def unstore(data_key, options = {})
@@ -128,13 +133,11 @@ module ActiveMerchant #:nodoc:
         commit('us_res_delete', post)
       end
 
-      def update(data_key, credit_card, options = {})
+      def update(data_key, payment_source, options = {})
         post = {}
-        post[:pan] = credit_card.number
-        post[:expdate] = expdate(credit_card)
+        add_payment_source(post, payment_source, options)
         post[:data_key] = data_key
-        post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        commit('us_res_update_cc', post)
+        card_brand(payment_source) == 'check' ? commit('us_res_update_ach', post) : commit('us_res_update_cc', post)
       end
 
       def supports_scrubbing?
@@ -151,17 +154,44 @@ module ActiveMerchant #:nodoc:
       private # :nodoc: all
 
       def expdate(creditcard)
-        sprintf("%.4i", creditcard.year)[-2..-1] + sprintf("%.2i", creditcard.month)
+        sprintf('%.4i', creditcard.year)[-2..-1] + sprintf('%.2i', creditcard.month)
+      end
+
+      def add_address(post, payment_method, options)
+        if !payment_method.is_a?(String) && card_brand(payment_method) == 'check'
+          post[:ach_info][:cust_first_name] = payment_method.first_name if payment_method.first_name
+          post[:ach_info][:cust_last_name] = payment_method.last_name if payment_method.last_name
+          if address = options[:billing_address] || options[:address]
+            post[:ach_info][:cust_address1] = address[:address1] if address[:address1]
+            post[:ach_info][:cust_address2] = address[:address2] if address[:address2]
+            post[:ach_info][:city] = address[:city] if address[:city]
+            post[:ach_info][:state] = address[:state] if address[:state]
+            post[:ach_info][:zip] = address[:zip] if address[:zip]
+          end
+        else
+          post[:address] = options[:billing_address] || options[:address]
+        end
       end
 
       def add_payment_source(post, source, options)
         if source.is_a?(String)
           post[:data_key]   = source
           post[:cust_id]    = options[:customer]
+        elsif card_brand(source) == 'check'
+          ach_info = {}
+          ach_info[:sec] = 'web'
+          ach_info[:routing_num] = source.routing_number
+          ach_info[:account_num] = source.account_number
+          ach_info[:account_type] = source.account_type
+          ach_info[:check_num] = source.number if source.number
+          post[:ach_info] = ach_info
         else
           post[:pan]        = source.number
           post[:expdate]    = expdate(source)
           post[:cvd_value]  = source.verification_value if source.verification_value?
+          if crypt_type = options[:crypt_type] || @options[:crypt_type]
+            post[:crypt_type] = crypt_type
+          end
           post[:cust_id]    = options[:customer] || source.name
         end
       end
@@ -214,7 +244,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(xml)
-        response = { :message => "Global Error Receipt", :complete => false }
+        response = { :message => 'Global Error Receipt', :complete => false }
         hashify_xml!(xml, response)
         response
       end
@@ -229,9 +259,9 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, parameters = {})
         xml   = REXML::Document.new
-        root  = xml.add_element("request")
-        root.add_element("store_id").text  = options[:login]
-        root.add_element("api_token").text = options[:password]
+        root  = xml.add_element('request')
+        root.add_element('store_id').text  = options[:login]
+        root.add_element('api_token').text = options[:password]
         root.add_element(transaction_element(action, parameters))
 
         xml.to_s
@@ -247,6 +277,8 @@ module ActiveMerchant #:nodoc:
             transaction.add_element(avs_element(parameters[:address])) if @avs_enabled && parameters[:address]
           when :cvd_info
             transaction.add_element(cvd_element(parameters[:cvd_value])) if @cvv_enabled
+          when :ach_info
+            transaction.add_element(ach_element(parameters[:ach_info]))
           else
             transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
           end
@@ -269,39 +301,51 @@ module ActiveMerchant #:nodoc:
       def cvd_element(cvd_value)
         element = REXML::Element.new('cvd_info')
         if cvd_value
-          element.add_element('cvd_indicator').text = "1"
+          element.add_element('cvd_indicator').text = '1'
           element.add_element('cvd_value').text = cvd_value
         else
-          element.add_element('cvd_indicator').text = "0"
+          element.add_element('cvd_indicator').text = '0'
+        end
+        element
+      end
+
+      def ach_element(ach_info)
+        element = REXML::Element.new('ach_info')
+        actions['ach_info'].each do |key|
+          element.add_element(key.to_s).text = ach_info[key] unless ach_info[key].blank?
         end
         element
       end
 
       def message_from(message)
         return 'Unspecified error' if message.blank?
-        message.gsub(/[^\w]/, ' ').split.join(" ").capitalize
+        message.gsub(/[^\w]/, ' ').split.join(' ').capitalize
       end
 
       def actions
         {
-          "us_purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info],
-          "us_preauth"            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info],
-          "us_command"            => [:order_id],
-          "us_refund"             => [:order_id, :amount, :txn_number, :crypt_type],
-          "us_indrefund"          => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          "us_completion"         => [:order_id, :comp_amount, :txn_number, :crypt_type],
-          "us_purchasecorrection" => [:order_id, :txn_number, :crypt_type],
-          "us_cavvpurcha"         => [:order_id, :cust_id, :amount, :pan, :expdate, :cav],
-          "us_cavvpreaut"         => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv],
-          "us_transact"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          "us_Batchcloseall"      => [],
-          "us_opentotals"         => [:ecr_number],
-          "us_batchclose"         => [:ecr_number],
-          "us_res_add_cc"         => [:pan, :expdate, :crypt_type],
-          "us_res_delete"         => [:data_key],
-          "us_res_update_cc"      => [:data_key, :pan, :expdate, :crypt_type],
-          "us_res_purchase_cc"    => [:data_key, :order_id, :cust_id, :amount, :crypt_type],
-          "us_res_preauth_cc"     => [:data_key, :order_id, :cust_id, :amount, :crypt_type]
+          'us_purchase'           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info],
+          'us_preauth'            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info],
+          'us_command'            => [:order_id],
+          'us_refund'             => [:order_id, :amount, :txn_number, :crypt_type],
+          'us_indrefund'          => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          'us_completion'         => [:order_id, :comp_amount, :txn_number, :crypt_type],
+          'us_purchasecorrection' => [:order_id, :txn_number, :crypt_type],
+          'us_cavvpurcha'         => [:order_id, :cust_id, :amount, :pan, :expdate, :cav],
+          'us_cavvpreaut'         => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv],
+          'us_transact'           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          'us_Batchcloseall'      => [],
+          'us_opentotals'         => [:ecr_number],
+          'us_batchclose'         => [:ecr_number],
+          'us_res_add_cc'         => [:pan, :expdate, :crypt_type],
+          'us_res_delete'         => [:data_key],
+          'us_res_update_cc'      => [:data_key, :pan, :expdate, :crypt_type],
+          'us_res_purchase_cc'    => [:data_key, :order_id, :cust_id, :amount, :crypt_type],
+          'us_res_preauth_cc'     => [:data_key, :order_id, :cust_id, :amount, :crypt_type],
+          'us_ach_debit'          => [:order_id, :cust_id, :amount, :ach_info],
+          'us_res_add_ach'        => [:order_id, :cust_id, :amount, :ach_info],
+          'us_res_update_ach'     => [:order_id, :data_key, :cust_id, :amount, :ach_info],
+          'ach_info'              => [:sec, :cust_first_name, :cust_last_name, :cust_address1, :cust_address2, :cust_city, :cust_state, :cust_zip, :routing_num, :account_num, :check_num, :account_type]
         }
       end
     end

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

@@ -132,11 +132,11 @@ module ActiveMerchant #:nodoc:
       def message_from(response)
         case response['response'].to_i
         when APPROVED
-          "Transaction Approved"
+          'Transaction Approved'
         when DECLINED
-          "Transaction Declined"
+          'Transaction Declined'
         else
-          "Error in transaction data or system error"
+          'Error in transaction data or system error'
         end
       end
 

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

@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def void(authorization, options={})
-        commit('void', post=nil, authorization)
+        commit('void', nil, authorization)
       end
 
       def store(payment, options={})

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
     # be a rebadged Securepay Australia service, though some differences exist.
     class NabTransactGateway < Gateway
       API_VERSION = 'xml-4.2'
-      PERIODIC_API_VERSION = "spxml-4.2"
+      PERIODIC_API_VERSION = 'spxml-4.2'
 
       class_attribute :test_periodic_url, :live_periodic_url
 
@@ -84,7 +84,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        return "" if transcript.blank?
+        return '' if transcript.blank?
         transcript.
           gsub(%r((<cardNumber>)[^<]+(<))i, '\1[FILTERED]\2').
           gsub(%r((<cvv>)[^<]+(<))i, '\1[FILTERED]\2').
@@ -156,8 +156,8 @@ module ActiveMerchant #:nodoc:
 
           xml.tag! 'RequestType', 'Payment'
           xml.tag! 'Payment' do
-            xml.tag! 'TxnList', "count" => 1 do
-              xml.tag! 'Txn', "ID" => 1 do
+            xml.tag! 'TxnList', 'count' => 1 do
+              xml.tag! 'Txn', 'ID' => 1 do
                 xml.tag! 'txnType', TRANSACTIONS[action]
                 xml.tag! 'txnSource', 23
                 xml << body
@@ -187,8 +187,8 @@ module ActiveMerchant #:nodoc:
 
           xml.tag! 'RequestType', 'Periodic'
           xml.tag! 'Periodic' do
-            xml.tag! 'PeriodicList', "count" => 1 do
-              xml.tag! 'PeriodicItem', "ID" => 1 do
+            xml.tag! 'PeriodicList', 'count' => 1 do
+              xml.tag! 'PeriodicItem', 'ID' => 1 do
                 xml.tag! 'actionType', action.to_s
                 xml.tag! 'periodicType', PERIODIC_TYPES[action] if PERIODIC_TYPES[action]
                 xml << body

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

@@ -105,7 +105,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         doc = Nokogiri::XML(body)
         doc.remove_namespaces!
-        response = doc.xpath("/MonetraResp/Resp")[0]
+        response = doc.xpath('/MonetraResp/Resp')[0]
         resp_params = {}
 
         response.elements.each do |node|
@@ -129,7 +129,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(response)
-        response[:code] == "AUTH"
+        response[:code] == 'AUTH'
       end
 
       def message_from(response)
@@ -143,7 +143,7 @@ module ActiveMerchant #:nodoc:
       def request_body(action, parameters = {})
         Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
           xml.MonetraTrans do
-            xml.Trans(identifier: parameters.delete(:identifier) || "1") do
+            xml.Trans(identifier: parameters.delete(:identifier) || '1') do
               xml.username(options[:username])
               xml.password(options[:password])
               xml.action(action)

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

@@ -50,24 +50,24 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_credentials(post, options)
         add_authorization(post, authorization, money)
-        post[:operation] = "Capture"
-        commit("Netaxept/process.aspx", post)
+        post[:operation] = 'Capture'
+        commit('Netaxept/process.aspx', post)
       end
 
       def refund(money, authorization, options = {})
         post = {}
         add_credentials(post, options)
         add_authorization(post, authorization, money)
-        post[:operation] = "Credit"
-        commit("Netaxept/process.aspx", post)
+        post[:operation] = 'Credit'
+        commit('Netaxept/process.aspx', post)
       end
 
       def void(authorization, options = {})
         post = {}
         add_credentials(post, options)
         add_authorization(post, authorization)
-        post[:operation] = "Annul"
-        commit("Netaxept/process.aspx", post)
+        post[:operation] = 'Annul'
+        commit('Netaxept/process.aspx', post)
       end
 
       private
@@ -76,7 +76,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_credentials(post, options)
         add_order(post, money, options)
-        commit("Netaxept/Register.aspx", post)
+        commit('Netaxept/Register.aspx', post)
       end
 
       def add_and_auth_credit_card(authorization, creditcard, options)
@@ -84,14 +84,14 @@ module ActiveMerchant #:nodoc:
         add_credentials(post, options, false)
         add_authorization(post, authorization)
         add_creditcard(post, creditcard)
-        commit("terminal/default.aspx", post, false)
+        commit('terminal/default.aspx', post, false)
       end
 
       def query_transaction(authorization, options)
         post = {}
         add_credentials(post, options)
         add_authorization(post, authorization)
-        commit("Netaxept/query.aspx", post)
+        commit('Netaxept/query.aspx', post)
       end
 
       def add_credentials(post, options, secure=true)
@@ -109,7 +109,7 @@ module ActiveMerchant #:nodoc:
         post[:orderNumber] = options[:order_id]
         post[:amount] = amount(money)
         post[:currencyCode] = (options[:currency] || currency(money))
-        post[:autoAuth] = "true"
+        post[:autoAuth] = 'true'
       end
 
       def add_creditcard(post, options)
@@ -122,13 +122,13 @@ module ActiveMerchant #:nodoc:
         raw = parse(ssl_get(build_url(path, parameters)), xml)
 
         success = false
-        authorization = (raw["TransactionId"] || parameters[:transactionId])
+        authorization = (raw['TransactionId'] || parameters[:transactionId])
         if raw[:container] =~ /Exception|Error/
-          message = (raw["Message"] || raw["Error"]["Message"])
-        elsif raw["Error"] && !raw["Error"].empty?
-          message = (raw["Error"]["ResponseText"] || raw["Error"]["ResponseCode"])
+          message = (raw['Message'] || raw['Error']['Message'])
+        elsif raw['Error'] && !raw['Error'].empty?
+          message = (raw['Error']['ResponseText'] || raw['Error']['ResponseCode'])
         else
-          message = (raw["ResponseText"] || raw["ResponseCode"] || "OK")
+          message = (raw['ResponseText'] || raw['ResponseCode'] || 'OK')
           success = true
         end
 

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

@@ -212,7 +212,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(success, response)
-        success ? 'OK' : (response['error']['message'] || "Unknown error - please contact Netbanx-Paysafe")
+        success ? 'OK' : (response['error']['message'] || 'Unknown error - please contact Netbanx-Paysafe')
       end
 
       def authorization_from(success, url, method, response)
@@ -229,7 +229,7 @@ module ActiveMerchant #:nodoc:
           #
           # both id's are used to unstore, the payment token is only used for
           # purchase transactions
-          [response['id'], response['cards'].first['id'], response['cards'].first['paymentToken']].join("|")
+          [response['id'], response['cards'].first['id'], response['cards'].first['paymentToken']].join('|')
         end
       end
 

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

@@ -224,7 +224,7 @@ module ActiveMerchant #:nodoc:
         parameters[:pay_type] = 'C'
         parameters[:tran_type] = TRANSACTIONS[action]
 
-        parameters.reject{|k,v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        parameters.reject{|k,v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
     end

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

@@ -51,7 +51,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'NETPAY Gateway'
 
       CURRENCY_CODES = {
-        "MXN" => '484'
+        'MXN' => '484'
       }
 
       # The header keys that we will provide in the response params hash
@@ -157,7 +157,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def split_authorization(authorization)
-        order_id, amount, currency = authorization.split("|")
+        order_id, amount, currency = authorization.split('|')
         [order_id, amount, currency]
       end
 
@@ -166,8 +166,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
+        year  = sprintf('%.4i', credit_card.year)
+        month = sprintf('%.2i', credit_card.month)
 
         "#{month}/#{year[-2..-1]}"
       end
@@ -191,7 +191,7 @@ module ActiveMerchant #:nodoc:
         add_login_data(parameters)
         add_action(parameters, action, options)
 
-        post = parameters.collect{|key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        post = parameters.collect{|key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
         parse(ssl_post(url, post), parameters)
       end
 

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

@@ -3,7 +3,7 @@ module ActiveMerchant #:nodoc:
     class NmiGateway < Gateway
       include Empty
 
-      DUP_WINDOW_DEPRECATION_MESSAGE = "The class-level duplicate_window variable is deprecated. Please use the :dup_seconds transaction option instead."
+      DUP_WINDOW_DEPRECATION_MESSAGE = 'The class-level duplicate_window variable is deprecated. Please use the :dup_seconds transaction option instead.'
 
       self.test_url = self.live_url = 'https://secure.nmi.com/api/transact.php'
       self.default_currency = 'USD'
@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
-        commit("sale", post)
+        commit('sale', post)
       end
 
       def authorize(amount, payment_method, options={})
@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
-        commit("auth", post)
+        commit('auth', post)
       end
 
       def capture(amount, authorization, options={})
@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_merchant_defined_fields(post, options)
 
-        commit("capture", post)
+        commit('capture', post)
       end
 
       def void(authorization, options={})
@@ -61,7 +61,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_payment_type(post, authorization)
 
-        commit("void", post)
+        commit('void', post)
       end
 
       def refund(amount, authorization, options={})
@@ -70,7 +70,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_payment_type(post, authorization)
 
-        commit("refund", post)
+        commit('refund', post)
       end
 
       def credit(amount, payment_method, options={})
@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
         add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
 
-        commit("credit", post)
+        commit('credit', post)
       end
 
       def verify(payment_method, options={})
@@ -88,7 +88,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
-        commit("validate", post)
+        commit('validate', post)
       end
 
       def store(payment_method, options = {})
@@ -98,12 +98,12 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
-        commit("add_customer", post)
+        commit('add_customer', post)
       end
 
       def verify_credentials
-        response = void("0")
-        response.message != "Authentication Failed"
+        response = void('0')
+        response.message != 'Authentication Failed'
       end
 
       def supports_scrubbing?
@@ -131,7 +131,7 @@ module ActiveMerchant #:nodoc:
         post[:orderid] = options[:order_id]
         post[:orderdescription] = options[:description]
         post[:currency] = options[:currency] || currency(money)
-        post[:billing_method] = "recurring" if options[:recurring]
+        post[:billing_method] = 'recurring' if options[:recurring]
         if (dup_seconds = (options[:dup_seconds] || self.class.duplicate_window))
           post[:dup_seconds] = dup_seconds
         end
@@ -215,7 +215,7 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, params)
 
-        params[action == "add_customer" ? :customer_vault : :type] = action
+        params[action == 'add_customer' ? :customer_vault : :type] = action
         params[:username] = @options[:login]
         params[:password] = @options[:password]
 
@@ -235,15 +235,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response, payment_type)
-        [ response[:transactionid], payment_type ].join("#")
+        [ response[:transactionid], payment_type ].join('#')
       end
 
       def split_authorization(authorization)
-        authorization.split("#")
+        authorization.split('#')
       end
 
       def headers
-        { "Content-Type"  => "application/x-www-form-urlencoded;charset=UTF-8" }
+        { 'Content-Type'  => 'application/x-www-form-urlencoded;charset=UTF-8' }
       end
 
       def post_data(action, params)
@@ -259,12 +259,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(response)
-        response[:response] == "1"
+        response[:response] == '1'
       end
 
       def message_from(succeeded, response)
         if succeeded
-          "Succeeded"
+          'Succeeded'
         else
           response[:responsetext]
         end