activemerchant 1.37.0 → 1.38.0

data/CHANGELOG

@@ -1,13 +1,25 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.38.0 (September 6, 2013)
+
+* FirstData E4: Include missing address information for AVS and CVV [melari]
+* Litle: Deprecate credit method in favor of refund [melari]
+* Moneris: Add verification_value support [duff]
+* Webpay: Fixes issues with partial JPY currency [keikubo, melari]
+* SecureNet: Add INVOICENUM and INVOICEDESC optional fields [duff]
+* Balanced: Make BalancedGateway::Error inherit from ActiveMerchantError [duff]
+* Balanced: Fix #void interface [duff]
+* HiTrust: Return correct error message for positive retcodes [melari]
+* Moving to pessimistic versioning [davefp]
+
+== Version 1.37.0 (August 20, 2013)
+
 * 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)
 

data/README.md

@@ -166,7 +166,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [SecurePayTech](http://www.securepaytech.com/) - NZ
 * [SkipJack](http://www.skipjack.com/) - US, CA
 * [Spreedly Core](https://spreedlycore.com/) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
-* [Stripe](https://stripe.com/) - US
+* [Stripe](https://stripe.com/) - US, CA, GB
 * [TransFirst](http://www.transfirst.com/) - US
 * [Transnational](http://www.tnbci.com/) - US
 * [TrustCommerce](http://www.trustcommerce.com/) - US

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

@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Balanced'
       self.money_format = :cents
 
-      class Error < StandardError
+      class Error < ActiveMerchant::ActiveMerchantError
         attr_reader :response
 
         def initialize(response, msg=nil)
@@ -210,7 +210,7 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>authorization</tt> -- The uri of the authorization returned from
       #   an `authorize` request.
-      def void(authorization)
+      def void(authorization, options = {})
         post = {}
         post[:is_void] = true
 

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://www.eway.com.au'
 
       self.money_format = :cents
-      self.supported_countries = ['AU']
+      self.supported_countries = ['AU', 'NZ', 'GB']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY'

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

@@ -116,7 +116,7 @@ module ActiveMerchant #:nodoc:
         if credit_card_or_store_authorization.is_a? String
           add_credit_card_token(xml, credit_card_or_store_authorization)
         else
-          add_credit_card(xml, credit_card_or_store_authorization)
+          add_credit_card(xml, credit_card_or_store_authorization, options)
         end
 
         add_customer_data(xml, options)
@@ -138,7 +138,7 @@ module ActiveMerchant #:nodoc:
       def build_store_request(credit_card, options)
         xml = Builder::XmlMarkup.new
 
-        add_credit_card(xml, credit_card)
+        add_credit_card(xml, credit_card, options)
         add_customer_data(xml, options)
 
         xml.target!
@@ -164,12 +164,23 @@ module ActiveMerchant #:nodoc:
         xml.tag! "DollarAmount", amount(money)
       end
 
-      def add_credit_card(xml, credit_card)
+      def add_credit_card(xml, credit_card, options)
         xml.tag! "Card_Number", credit_card.number
         xml.tag! "Expiry_Date", expdate(credit_card)
         xml.tag! "CardHoldersName", credit_card.name
         xml.tag! "CardType", credit_card.brand
 
+        add_credit_card_verification_strings(xml, credit_card, options)
+      end
+
+      def add_credit_card_verification_strings(xml, credit_card, options)
+        address = options[:billing_address] || options[:address]
+        if address
+          address_values = []
+          [:address1, :zip, :city, :state, :country].each { |part| address_values << address[part].to_s }
+          xml.tag! "VerificationStr1", address_values.join("|")
+        end
+
         if credit_card.verification_value?
           xml.tag! "CVD_Presence_Ind", "1"
           xml.tag! "VerificationStr2", credit_card.verification_value

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

@@ -112,11 +112,16 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def credit(money, identification_or_token, options = {})
-        to_pass = build_credit_request(money, identification_or_token, options)
+      def refund(money, authorization, options = {})
+        to_pass = build_credit_request(money, authorization, options)
         build_response(:credit, @litle.credit(to_pass))
       end
 
+      def credit(money, authorization, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, authorization, options)
+      end
+
       def store(creditcard_or_paypage_registration_id, options = {})
         to_pass = create_token_hash(creditcard_or_paypage_registration_id, options)
         build_response(:registerToken, @litle.register_token_request(to_pass), %w(000 801 802))

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

@@ -128,6 +128,7 @@ module ActiveMerchant #:nodoc:
         else
           post[:pan]        = source.number
           post[:expdate]    = expdate(source)
+          post[:cvd_value]  = source.verification_value if source.verification_value?
         end
       end
 
@@ -155,6 +156,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(successful?(response), message_from(response[:message]), response,
           :test          => test?,
+          :cvv_result    => response[:cvd_result_code].try(:last),
           :authorization => authorization_from(response)
         )
       end
@@ -192,14 +194,35 @@ module ActiveMerchant #:nodoc:
         root  = xml.add_element("request")
         root.add_element("store_id").text  = options[:login]
         root.add_element("api_token").text = options[:password]
-        transaction = root.add_element(action)
+        root.add_element(transaction_element(action, parameters))
+
+        xml.to_s
+      end
+
+      def transaction_element(action, parameters)
+        transaction = REXML::Element.new(action)
 
         # Must add the elements in the correct order
         actions[action].each do |key|
-          transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
+          if key == :cvd_info
+            transaction.add_element(cvd_element(parameters[:cvd_value]))
+          else
+            transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
+          end
         end
 
-        xml.to_s
+        transaction
+      end
+
+      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_value').text = cvd_value
+        else
+          element.add_element('cvd_indicator').text = "0"
+        end
+        element
       end
 
       def message_from(message)
@@ -219,8 +242,8 @@ module ActiveMerchant #:nodoc:
 
       def actions
         {
-          "purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          "preauth"            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          "purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :cvd_info],
+          "preauth"            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :cvd_info],
           "command"            => [:order_id],
           "refund"             => [:order_id, :amount, :txn_number, :crypt_type],
           "indrefund"          => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],

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

@@ -182,8 +182,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(xml, options)
-        xml.tag! 'INVOICEDESC', options[:description]
-        xml.tag! 'INVOICENUM', 'inv-8'
+        xml.tag! 'NOTE', options[:description] if options[:description]
+        xml.tag! 'INVOICEDESC', options[:invoice_description] if options[:invoice_description]
+        xml.tag! 'INVOICENUM', options[:invoice_number] if options[:invoice_number]
       end
 
       def add_merchant_key(xml, options)

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
         'unchecked' => 'P'
       }
 
-      self.supported_countries = ['US', 'CA']
+      self.supported_countries = ['US', 'CA', 'GB']
       self.default_currency = 'USD'
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
@@ -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), creditcard)
+        commit(:post, 'charges', post, generate_meta(options))
       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), creditcard)
+        commit(:post, 'charges', post, generate_meta(options))
       end
 
       def capture(money, authorization, options = {})
         post = {:amount => amount(money)}
-        add_application_fee(post, nil, options)
+        add_application_fee(post, options)
 
         commit(:post, "charges/#{CGI.escape(authorization)}/capture", post)
       end
@@ -71,7 +71,7 @@ module ActiveMerchant #:nodoc:
         post = {:amount => amount(money)}
         commit_options = generate_meta(options)
 
-        MultiResponse.run do |r|
+        MultiResponse.run(:first) do |r|
           r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, commit_options) }
 
           return r unless options[:refund_fee_amount]
@@ -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, creditcard, options)
+        add_application_fee(post, options)
         post
       end
 
@@ -140,25 +140,8 @@ module ActiveMerchant #:nodoc:
         post[:currency] = (options[:currency] || currency(money)).downcase
       end
 
-      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
+      def add_application_fee(post, options)
+        post[:application_fee] = options[:application_fee] if options[:application_fee]
       end
 
       def add_customer_data(post, options)
@@ -207,7 +190,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer(post, options)
-        post[:customer] = options[:customer] if options[:customer] && !post[:card]
+        post[:customer] = options[:customer] if options[:customer] && post[:card].blank?
       end
 
       def add_flags(post, options)
@@ -265,7 +248,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def commit(method, url, parameters=nil, options = {}, creditcard = nil)
+      def commit(method, url, parameters=nil, options = {})
         raw_response = response = nil
         success = false
         begin
@@ -279,8 +262,6 @@ 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/gateways/webpay.rb

@@ -21,10 +21,33 @@ module ActiveMerchant #:nodoc:
         raise NotImplementedError.new
       end
 
+      def refund(money, identification, options = {})
+        post = {:amount => localized_amount(money)}
+        commit_options = generate_meta(options)
+
+        MultiResponse.run do |r|
+          r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, commit_options) }
+
+          return r unless options[:refund_fee_amount]
+
+          r.process { fetch_application_fees(identification, commit_options) }
+          r.process { refund_application_fee(options[:refund_fee_amount], application_fee_from_response(r), commit_options) }
+        end
+      end
+
       def refund_fee(identification, options, meta)
         raise NotImplementedError.new
       end
 
+      def localized_amount(money, currency = self.default_currency)
+        non_fractional_currency?(currency) ? (amount(money).to_f / 100).floor : amount(money)
+      end
+
+      def add_amount(post, money, options)
+        post[:currency] = (options[:currency] || currency(money)).downcase
+        post[:amount] = localized_amount(money, post[:currency].upcase)
+      end
+
       def json_error(raw_response)
         msg = 'Invalid response received from the WebPay API.  Please contact support@webpay.jp if you continue to receive this message.'
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"

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

@@ -7,10 +7,10 @@ module ActiveMerchant #:nodoc:
           CODES = { "00"   => "Operation completed successfully",
                     "-1"  => "Unable to initialize winsock dll.",
                     "-2"  => "Can't create stream socket.",
-                    "-3"  => "No Request Message.", 
+                    "-3"  => "No Request Message.",
                     "-4"  => "Can't connect to server.",
                     "-5"  => "Send socket error.",
-                    "-6"  => "Couldn't receive data.", 
+                    "-6"  => "Couldn't receive data.",
                     "-7"  => "Receive Broken message.",
                     "-8"  => "Unable to initialize Envirnment.",
                     "-9"  => "Can't Read Server RSA File.",
@@ -52,15 +52,16 @@ module ActiveMerchant #:nodoc:
                     "-308" => "Order Number already exists.",
                     "positive" => "Response from Bank. Please contact with Acquirer Bank Service or HiTRUST Call Center."
                   }
-          
+
           def success?
             params['retcode'] == SUCCESS
           end
-          
+
           def message
+            return CODES["positive"] if params['retcode'].to_i > 0
             CODES[ params['retcode'] ]
           end
-	      end
+        end
       end
     end
   end

data/lib/active_merchant/billing/response.rb

@@ -39,14 +39,18 @@ module ActiveMerchant #:nodoc:
     end
 
     class MultiResponse < Response
-      def self.run(&block)
-        new.tap(&block)
+      def self.run(primary_response = :last, &block)
+        response = new.tap(&block)
+        response.primary_response = primary_response
+        response
       end
 
       attr_reader :responses
+      attr_writer :primary_response
 
       def initialize
         @responses = []
+        @primary_response = :last
       end
 
       def process
@@ -65,10 +69,14 @@ module ActiveMerchant #:nodoc:
         @responses.all?{|r| r.success?}
       end
 
+      def primary_response
+        success? && @primary_response == :first ? @responses.first : @responses.last
+      end
+
       %w(params message test authorization avs_result cvv_result test? fraud_review?).each do |m|
         class_eval %(
           def #{m}
-            (@responses.empty? ? nil : @responses.last.#{m})
+            (@responses.empty? ? nil : primary_response.#{m})
           end
         )
       end

data/lib/active_merchant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.38.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,6 +47,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,38 +58,41 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +100,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -102,55 +111,58 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement