activemerchant 1.36.0 → 1.37.0

data/CHANGELOG

@@ -1,5 +1,14 @@
 = ActiveMerchant CHANGELOG
 
+* MerchantWarrior: Fix handling of amounts [duff]
+* Ipay88: New gateway [kamal, siong1987, jduff]
+* IATS: New gateway [unkown, jduff]
+* MerchantWarrior: Send the CVV to the gateway [duff]
+* PayU: Fix a major bug with status types [melari]
+* SecureNet: Allow production transactions [duff]
+* Stripe: Allow a card_not_present_fee to be specified [melari]
+
+
 == Version 1.36.0 (August 2, 2013)
 
 * Fat Zebra: More consistent handling of tokens [adrianmacneil]
@@ -10,6 +19,8 @@
 * Mercury: Proper refund and void support [opendining]
 * PaymentExpress: Return token in authorization [ntalbott]
 * Stripe: Support for partial application fee refunds [melari, odorcicd]
+* NMI: Support for recurring flag [duff]
+* SecureNet: Use working live url [duff]
 
 == Version 1.35.1 (July 22, 2013)
 

data/lib/active_merchant/billing/base.rb

@@ -31,7 +31,8 @@ module ActiveMerchant #:nodoc:
       #
       #   ActiveMerchant::Billing::Base.gateway('moneris').new
       def self.gateway(name)
-        Billing.const_get("#{name.to_s.downcase}_gateway".camelize)
+        raise NameError if (name_str = name.to_s.downcase).blank?
+        Billing.const_get("#{name_str}_gateway".camelize)
       end
 
       # Return the matching integration module

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

@@ -342,7 +342,7 @@ module ActiveMerchant #:nodoc:
         post[:description] = options[:description]
       end
 
-      def add_creditcard(post, creditcard)
+      def add_creditcard(post, creditcard, options={})
         post[:card_num]   = creditcard.number
         post[:card_code]  = creditcard.verification_value if creditcard.verification_value?
         post[:exp_date]   = expdate(creditcard)
@@ -354,7 +354,7 @@ module ActiveMerchant #:nodoc:
         if card_brand(source) == "check"
           add_check(params, source, options)
         else
-          add_creditcard(params, source)
+          add_creditcard(params, source, options)
         end
       end
 

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

@@ -0,0 +1,35 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class IatsPaymentsGateway < AuthorizeNetGateway
+      self.live_url = self.test_url = 'https://www.iatspayments.com/netgate/AEGateway.aspx'
+
+      self.homepage_url = 'http://www.iatspayments.com/'
+      self.display_name = 'IATSPayments'
+
+      def authorize(money, paysource, options = {})
+        raise NotImplementedError
+      end
+
+      def capture(money, authorization, options = {})
+        raise NotImplementedError
+      end
+
+      def void(authorization, options = {})
+        raise NotImplementedError
+      end
+
+      def refund(money, identification, options = {})
+        raise NotImplementedError
+      end
+
+      def credit(money, identification, options = {})
+        raise NotImplementedError
+      end
+
+      private
+      def split(response)
+        response.split(',')
+      end
+    end
+  end
+end

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
-        post.merge!('captureAmount' => money.to_s)
+        post.merge!('captureAmount' => amount(money))
         commit('processCapture', post)
       end
 
@@ -54,7 +54,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
-        post['refundAmount'] = money
+        post['refundAmount'] = amount(money)
         commit('refundCard', post)
       end
 
@@ -105,14 +105,15 @@ module ActiveMerchant #:nodoc:
         post['paymentCardNumber'] = creditcard.number
         post['paymentCardName'] = creditcard.name
         post['paymentCardExpiry'] = creditcard.expiry_date.expiration.strftime("%m%y")
+        post['paymentCardCSC'] = creditcard.verification_value if creditcard.verification_value?
       end
 
       def add_amount(post, money, options)
         currency = (options[:currency] || currency(money))
 
-        post['transactionAmount'] = money.to_s
+        post['transactionAmount'] = amount(money)
         post['transactionCurrency'] = currency
-        post['hash'] = verification_hash(money, currency)
+        post['hash'] = verification_hash(amount(money), currency)
       end
 
       def verification_hash(money, currency)

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

@@ -67,15 +67,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options = {})
-        commit :refund, build_reference_request(money, authorization)
+        commit :refund, build_reference_request(money, authorization, options)
       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)
+      def capture(money, authorization, options = {})
+        commit :capture, build_reference_request(money, authorization, options)
       end
 
       def store(creditcard, options = {})
@@ -116,7 +116,7 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_reference_request(money, reference)
+      def build_reference_request(money, reference, options)
         xml = Builder::XmlMarkup.new
 
         transaction_id, order_id, preauth_id, original_amount = reference.split('*')

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

@@ -7,7 +7,14 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'NMI'
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+
+      private
+      def add_creditcard(post, creditcard, options={})
+        super
+        post[:recurring_billing] = "TRUE" if options[:recurring]
+      end
     end
+
   end
 end
 

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

@@ -24,7 +24,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'SecureNet'
 
       self.test_url = 'https://certify.securenet.com/API/gateway.svc/webHttp/ProcessTransaction'
-      self.live_url = 'https://gateway.securenet.com/api/Gateway.svc'
+      self.live_url = 'https://gateway.securenet.com/api/Gateway.svc/webHttp/ProcessTransaction'
 
       APPROVED, DECLINED = 1, 2
 
@@ -65,12 +65,12 @@ module ActiveMerchant #:nodoc:
       private
       def commit(request)
         xml = build_request(request)
-        data = ssl_post(self.test_url, xml, "Content-Type" => "text/xml")
+        url = test? ? self.test_url : self.live_url
+        data = ssl_post(url, xml, "Content-Type" => "text/xml")
         response = parse(data)
 
-        test_mode = test?
         Response.new(success?(response), message_from(response), response,
-          :test => test_mode,
+          :test => test?,
           :authorization => build_authorization(response),
           :avs_result => { :code => response[:avs_result_code] },
           :cvv_result => response[:card_code_response_code]
@@ -207,7 +207,7 @@ module ActiveMerchant #:nodoc:
 
       def add_more_required_params(xml, options)
         xml.tag! 'RETAIL_LANENUM', '0'
-        xml.tag! 'TEST', 'TRUE'
+        xml.tag! 'TEST', 'TRUE' if test?
         xml.tag! 'TOTAL_INSTALLMENTCOUNT', 0
         xml.tag! 'TRANSACTION_SERVICE', 0
       end

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

@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
         post = create_post_for_auth_or_purchase(money, creditcard, options)
         post[:capture] = "false"
 
-        commit(:post, 'charges', post, generate_meta(options))
+        commit(:post, 'charges', post, generate_meta(options), creditcard)
       end
 
       # To create a charge on a card or a token, call
@@ -53,12 +53,12 @@ module ActiveMerchant #:nodoc:
       def purchase(money, creditcard, options = {})
         post = create_post_for_auth_or_purchase(money, creditcard, options)
 
-        commit(:post, 'charges', post, generate_meta(options))
+        commit(:post, 'charges', post, generate_meta(options), creditcard)
       end
 
       def capture(money, authorization, options = {})
         post = {:amount => amount(money)}
-        add_application_fee(post, options)
+        add_application_fee(post, nil, options)
 
         commit(:post, "charges/#{CGI.escape(authorization)}/capture", post)
       end
@@ -131,7 +131,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post,options)
         post[:description] = options[:description] || options[:email]
         add_flags(post, options)
-        add_application_fee(post, options)
+        add_application_fee(post, creditcard, options)
         post
       end
 
@@ -140,8 +140,25 @@ module ActiveMerchant #:nodoc:
         post[:currency] = (options[:currency] || currency(money)).downcase
       end
 
-      def add_application_fee(post, options)
-        post[:application_fee] = options[:application_fee] if options[:application_fee]
+      def add_application_fee(post, creditcard, options)
+        return unless options[:application_fee]
+        if use_card_not_present_fee?(creditcard, options)
+          post[:application_fee] = options[:card_not_present_fee]
+        else
+          post[:application_fee] = options[:application_fee]
+        end
+      end
+
+      def use_card_not_present_fee?(creditcard, options)
+        options[:card_not_present_fee].present? && !includes_track_data?(creditcard, options)
+      end
+
+      def includes_track_data?(creditcard, options)
+        if creditcard.respond_to?(:track_data)
+          creditcard.track_data.present?
+        else
+          options[:track_data].present?
+        end
       end
 
       def add_customer_data(post, options)
@@ -248,7 +265,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def commit(method, url, parameters=nil, options = {})
+      def commit(method, url, parameters=nil, options = {}, creditcard = nil)
         raw_response = response = nil
         success = false
         begin
@@ -262,6 +279,8 @@ module ActiveMerchant #:nodoc:
           response = json_error(raw_response)
         end
 
+        response[:card_present] = includes_track_data?(creditcard, options)
+
         card = response["card"] || response["active_card"] || {}
         avs_code = AVS_CODE_TRANSLATOR["line1: #{card["address_line1_check"]}, zip: #{card["address_zip_check"]}"]
         cvc_code = CVC_CODE_TRANSLATOR[card["cvc_check"]]

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

@@ -0,0 +1,19 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        autoload :Return,       "active_merchant/billing/integrations/ipay88/return.rb"
+        autoload :Helper,       "active_merchant/billing/integrations/ipay88/helper.rb"
+        autoload :Notification, "active_merchant/billing/integrations/ipay88/notification.rb"
+
+        def self.service_url
+          "https://www.mobile88.com/epayment/entry.asp"
+        end
+
+        def self.return(query_string, options={})
+          Return.new(query_string, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,114 @@
+require "digest/sha1"
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          include RequiresParameters
+
+          # Currencies supported
+          #   MYR (Malaysian Ringgit - for all payment methods except China Union Pay and PayPal)
+          #   USD (US Dollar - only for PayPal)
+          #   CNY (Yuan Renminbi - only for China Union Pay)
+          SUPPORTED_CURRENCIES = %w[MYR USD CNY]
+
+          # Languages supported
+          #   ISO-8859-1 (English)
+          #   UTF-8      (Unicode)
+          #   GB2312     (Chinese Simplified)
+          #   GD18030    (Chinese Simplified)
+          #   BIG5       (Chinese Traditional)
+          SUPPORTED_LANGS      = %w[ISO-8859-1 UTF-8 GB2312 GD18030 BIG5]
+
+          # Payment methods supported
+          #   8  (Alliance Online Transfer)
+          #   10 (AmBank)
+          #   21 (China Union Pay)
+          #   20 (CIMB Click)
+          #   2  (Credit Card MYR)
+          #   16 (FPX)
+          #   15 (Hong Leong Bank Transfer)
+          #   6  (Maybank2u.com)
+          #   23 (MEPS Cash)
+          #   17 (Mobile Money)
+          #   33 (PayPal)
+          #   14 (RHB)
+          PAYMENT_METHODS      = %w[8 10 21 20 2 16 15 6 23 17 33 14]
+
+          attr_reader :amount_in_cents, :merchant_key
+
+          def initialize(order, account, options = {})
+            requires!(options, :amount, :currency, :credential2)
+            @merchant_key = options[:credential2]
+            @amount_in_cents = options[:amount]
+            super
+            add_field mappings[:signature], signature
+          end
+
+          def amount=(money)
+            cents = money.respond_to?(:cents) ? money.cents : money
+            if money.is_a?(String) or cents.to_i < 0
+              raise ArgumentError, "money amount must be either a Money object or a positive integer in cents."
+            end
+            add_field mappings[:amount], sprintf("%.2f", cents.to_f/100)
+          end
+
+          def currency(symbol)
+            raise ArgumentError, "unsupported currency" unless SUPPORTED_CURRENCIES.include?(symbol)
+            add_field mappings[:currency], symbol
+          end
+
+          def language(lang)
+            raise ArgumentError, "unsupported language" unless SUPPORTED_LANGS.include?(lang)
+            add_field mappings[:language], lang
+          end
+
+          def payment(pay_method)
+            raise ArgumentError, "unsupported payment method" unless PAYMENT_METHODS.include?(pay_method.to_s)
+            add_field mappings[:payment], pay_method
+          end
+
+          def customer(params = {})
+            add_field(mappings[:customer][:name], "#{params[:first_name]} #{params[:last_name]}")
+            add_field(mappings[:customer][:email], params[:email])
+            add_field(mappings[:customer][:phone], params[:phone])
+          end
+
+          def self.sign(str)
+            [Digest::SHA1.digest(str)].pack("m").chomp
+          end
+
+          def signature
+            self.class.sign(self.sig_components)
+          end
+
+          mapping :account,     "MerchantCode"
+          mapping :amount,      "Amount"
+          mapping :currency,    "Currency"
+          mapping :order,       "RefNo"
+          mapping :description, "ProdDesc"
+          mapping :customer, :name  => "UserName",
+                             :email => "UserEmail",
+                             :phone => "UserContact"
+          mapping :remark,      "Remark"
+          mapping :language,    "Lang"
+          mapping :payment,     "PaymentId"
+          mapping :return_url,  "ResponseURL"
+          mapping :signature,   "Signature"
+
+          protected
+
+          def sig_components
+            components  = [merchant_key]
+            components << fields[mappings[:account]]
+            components << fields[mappings[:order]]
+            components << amount_in_cents
+            components << fields[mappings[:currency]]
+            components.join
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/ipay88/return.rb

@@ -0,0 +1,95 @@
+require "digest/sha1"
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        class Return < ActiveMerchant::Billing::Integrations::Return
+          include ActiveMerchant::PostsData
+
+          def account
+            params["MerchantCode"]
+          end
+
+          def payment
+            params["PaymentId"].to_i
+          end
+
+          def order
+            params["RefNo"]
+          end
+
+          def amount
+            params["Amount"]
+          end
+
+          def currency
+            params["Currency"]
+          end
+
+          def remark
+            params["Remark"]
+          end
+
+          def transaction
+            params["TransId"]
+          end
+
+          def auth_code
+            params["AuthCode"]
+          end
+
+          def status
+            params["Status"]
+          end
+
+          def error
+            params["ErrDesc"]
+          end
+
+          def signature
+            params["Signature"]
+          end
+
+          def secure?
+            self.generated_signature == self.signature
+          end
+
+          def success?
+            self.secure? && self.requery == "00" && self.status == "1"
+          end
+
+          protected
+
+          def generated_signature
+            Helper.sign(self.sig_components)
+          end
+
+          def sig_components
+            components = [@options[:credential2]]
+            [:account, :payment, :order, :amount_in_cents, :currency, :status].each do |i|
+              components << self.send(i)
+            end
+            components.join
+          end
+
+          def requery
+            data   = { "MerchantCode" => self.account, "RefNo" => self.order, "Amount" => self.amount }
+            params = parameterize(data)
+            ssl_post Ipay88.service_url, params, { "Content-Length" => params.size.to_s, "User-Agent" => "Active Merchant -- http://activemerchant.org" }
+          end
+
+          private
+
+          def parameterize(params)
+            params.reject { |k, v| v.blank? }.keys.sort.collect { |key| "#{key}=#{CGI.escape(params[key].to_s)}" }.join("&")
+          end
+
+          def amount_in_cents
+            @amount_in_cents ||= (self.amount || "").gsub(/[.,]/, "")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/payu_in/notification.rb

@@ -11,24 +11,22 @@ module ActiveMerchant #:nodoc:
           end
 
           def complete?
-            status == "success"
+            status == "Completed"
           end
 
-          # Status of the transaction. List of possible values:
-          # <tt>invalid</tt>:: transaction id is not present
-          # <tt>tampered</tt>:: transaction data has been tampered
-          # <tt>success</tt>:: transaction successful
-          # <tt>pending</tt>:: transaction is pending for some approval
-          # <tt>failure</tt>:: transaction failure
           def status
             @status ||= if checksum_ok?
               if transaction_id.blank?
-                'invalid'
+                'Invalid'
               else
-                transaction_status.downcase
+                case transaction_status.downcase
+                when 'success' then 'Completed'
+                when 'failure' then 'Failed'
+                when 'pending' then 'Pending'
+                end
               end
             else
-              'tampered'
+              'Tampered'
             end
           end
 

data/lib/active_merchant/billing/integrations/payu_in/return.rb

@@ -9,37 +9,20 @@ module ActiveMerchant #:nodoc:
             @notification = Notification.new(query_string, options)
           end
 
-          # PayU Transaction Id
-          #
           def transaction_id
             @notification.transaction_id
           end
 
-          # Returns the status of the transaction as a string
-          # The status can be one of the following
-          #
-          # invalid - transaction id not present
-          # tampered - checksum does not mismatch
-          # mismatch - order id mismatch
-          # success - transaction success
-          # pending - transaction pending
-          # failure - transaction failure
-          #
-          # payu does not put the discount field in the checksum
-          # it can be easily forged by the attacker without detection
-          #
           def status( order_id, order_amount )
             if @notification.invoice_ok?( order_id ) && @notification.amount_ok?( BigDecimal.new(order_amount) )
               @notification.status
             else
-              'mismatch'
+              'Mismatch'
             end
           end
 
-          # check success of the transaction
-          # check order_id and
           def success?
-            status( @params['txnid'], @params['amount'] ) == 'success'
+            status( @params['txnid'], @params['amount'] ) == 'Completed'
           end
 
           def message

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.36.0"
+  VERSION = "1.37.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.37.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -276,6 +276,7 @@ files:
 - lib/active_merchant/billing/gateways/firstdata_e4.rb
 - lib/active_merchant/billing/gateways/garanti.rb
 - lib/active_merchant/billing/gateways/hdfc.rb
+- lib/active_merchant/billing/gateways/iats_payments.rb
 - lib/active_merchant/billing/gateways/ideal/ideal_base.rb
 - lib/active_merchant/billing/gateways/ideal/ideal_rabobank.pem
 - lib/active_merchant/billing/gateways/ideal/ideal_response.rb
@@ -429,6 +430,9 @@ files:
 - lib/active_merchant/billing/integrations/hi_trust/notification.rb
 - lib/active_merchant/billing/integrations/hi_trust/return.rb
 - lib/active_merchant/billing/integrations/hi_trust.rb
+- lib/active_merchant/billing/integrations/ipay88/helper.rb
+- lib/active_merchant/billing/integrations/ipay88/return.rb
+- lib/active_merchant/billing/integrations/ipay88.rb
 - lib/active_merchant/billing/integrations/liqpay/helper.rb
 - lib/active_merchant/billing/integrations/liqpay/notification.rb
 - lib/active_merchant/billing/integrations/liqpay/return.rb