activemerchant 1.51.0 → 1.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 410fa6679494b0904c1bff664722c9b23c907e06
-  data.tar.gz: bf3827fcd65d592b51d9e5d06b28dfeec0e05ac2
+  metadata.gz: 1b14d2c1c73ff33e03eda050a96c1de86f89619a
+  data.tar.gz: 89f173df6f5343c3da814920e5b4006ca928204d
 SHA512:
-  metadata.gz: 228a238436b76648adcfab724d7807fa75c1af50c5b975057da9461a64cf9863c1b1693c65e24ceb2250e9e3bebbadca189c7d07ff4bff9b45fcd79c2ae57d23
-  data.tar.gz: 0922949cb3d6db73cbb74324ae57865f4eb72bcdafaba4ce4cbf468558b8d7f514dabe74cec344ca43f7a4e98906c8eff82195f604219ff851492aa5f7fadab5
+  metadata.gz: 9886654ba8fd2e3167ba753dc267fbe8ff585b8866b7201151b57e096a88cfb9e380a95f8ca95efa936b5d02a4965072318b3e29d60195c640a0f95ec17ca47d
+  data.tar.gz: 8b321b19d61ae62a920ebb55e3f70e267453bc8a73ee811f09ea162d16cea90124c384df699d1e43d6927096ddfc0777d982fd221a92f8b13a8901590ec1285e

data/CHANGELOG

@@ -1,5 +1,25 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.52.0 (July 20, 2015)
+
+* Authorize.Net: Add device type to authorize.net retail requests [abecevello]
+* Vanco: Change transaction type to WEB for echecks [duff]
+* PayPal: Allow soft descriptor to be specified [davidsantoso]
+* Authorize.net: Add disable_partial_auth field [anellis]
+* SagePay: Add apply_avscv2 field [anellis]
+* S5: Add Store [anellis]
+* Merchant Ware v4: Add support for verify [davidsantoso]
+* Mercury: No longer default to allow partial auth [duff]
+* PayPal: Fix soft_descriptor and support soft_descriptor_city [duff]
+* Merchant Ware: Add scrubbing [davidsantoso]
+* Stripe: Make purchase via vaulted card consistent [duff]
+* Moneris: Add network tokenization support [andrewpaliga]
+* Ogone: Allow specifying a timeout value for requests [tomhipkin]
+* PayU India: Increase allowed txnid to 30 characters [ntalbott]
+* Authorize.Net: Allow passing device type through options, make wireless POS the default [abecevello]
+* Authorize.Net: Update to new Akamai URL [taf2]
+* Braintree: Add hold_in_escrow [anellis]
+* Stripe: Allow purchases with tokens without customer specification [bizla]
 
 == Version 1.51.0 (July 2, 2015)
 

data/README.md

@@ -146,6 +146,7 @@ The [ActiveMerchant Wiki](http://github.com/activemerchant/active_merchant/wikis
 * [Metrics Global](http://www.metricsglobal.com) - US
 * [MasterCard Internet Gateway Service (MiGS)](http://mastercard.com/mastercardsps) - AU, AE, BD, BN, EG, HK, ID, IN, JO, KW, LB, LK, MU, MV, MY, NZ, OM, PH, QA, SA, SG, TT, VN
 * [Modern Payments](http://www.modpay.com) - US
+* [MONEI](http://www.monei.net/) - ES
 * [Moneris](http://www.moneris.com/) - CA
 * [Moneris (US)](http://www.monerisusa.com/) - US
 * [MoneyMovers](http://mmoa.us/) - US

data/lib/active_merchant/billing/gateway.rb

@@ -72,6 +72,7 @@ module ActiveMerchant #:nodoc:
       # :incorrect_cvc - Secerity code was not matched by the processor
       # :incorrect_zip - Zip code is not in correct format
       # :incorrect_address - Billing address info was not matched by the processor
+      # :incorrect_pin - Card PIN is incorrect
       # :card_declined - Card number declined by processor
       # :processing_error - Processor error
       # :call_issuer - Transaction requires voice authentication, call issuer
@@ -86,6 +87,7 @@ module ActiveMerchant #:nodoc:
         :incorrect_cvc => 'incorrect_cvc',
         :incorrect_zip => 'incorrect_zip',
         :incorrect_address => 'incorrect_address',
+        :incorrect_pin => 'incorrect_pin',
         :card_declined => 'card_declined',
         :processing_error => 'processing_error',
         :call_issuer => 'call_issuer',

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

@@ -40,6 +40,19 @@ module ActiveMerchant #:nodoc:
         :retail  => '2'
       }
 
+      DEVICE_TYPE = {
+        :unknown => '1',
+        :unattended_terminal => '2',
+        :self_service_terminal => '3',
+        :electronic_cash_register => '4',
+        :personal_computer_terminal => '5',
+        :airpay => '6',
+        :wireless_pos => '7',
+        :website => '8',
+        :dial_terminal => '9',
+        :virtual_terminal => '10'
+      }
+
       class_attribute :duplicate_window
 
       APPROVED, DECLINED, ERROR, FRAUD_REVIEW = 1, 2, 3, 4
@@ -204,7 +217,7 @@ module ActiveMerchant #:nodoc:
           add_payment_source(xml, payment)
           add_invoice(xml, options)
           add_customer_data(xml, payment, options)
-          add_market_type(xml, payment)
+          add_market_type_device_type(xml, payment, options)
           add_settings(xml, payment, options)
           add_user_fields(xml, amount, options)
         end
@@ -327,6 +340,12 @@ module ActiveMerchant #:nodoc:
               xml.settingValue("true")
             end
           end
+          if options[:disable_partial_auth]
+            xml.setting do
+              xml.settingName("allowPartialAuth")
+              xml.settingValue("false")
+            end
+          end
           if options[:duplicate_window]
             set_duplicate_window(xml, options[:duplicate_window])
           elsif self.class.duplicate_window
@@ -407,11 +426,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_market_type(xml, payment)
+      def add_market_type_device_type(xml, payment, options)
         return if payment.is_a?(String) || card_brand(payment) == 'check' || card_brand(payment) == 'apple_pay'
         if valid_track_data
           xml.retail do
             xml.marketType(MARKET_TYPE[:retail])
+
+            device_type = options[:device_type] || DEVICE_TYPE[:wireless_pos]
+            xml.deviceType(device_type)
           end
         elsif payment.manual_entry
           xml.retail do

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

@@ -28,7 +28,7 @@ module ActiveMerchant #:nodoc:
     # 5. Click Submit
     class AuthorizeNetCimGateway < Gateway
       self.test_url = 'https://apitest.authorize.net/xml/v1/request.api'
-      self.live_url = 'https://api.authorize.net/xml/v1/request.api'
+      self.live_url = 'https://api2.authorize.net/xml/v1/request.api'
 
       AUTHORIZE_NET_CIM_NAMESPACE = 'AnetApi/xml/v1/schema/AnetApiSchema.xsd'
 

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

@@ -517,7 +517,8 @@ module ActiveMerchant #:nodoc:
           },
           :options => {
             :store_in_vault => options[:store] ? true : false,
-            :submit_for_settlement => options[:submit_for_settlement]
+            :submit_for_settlement => options[:submit_for_settlement],
+            :hold_in_escrow => options[:hold_in_escrow]
           }
         }
 

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

@@ -2,7 +2,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class MerchantWareVersionFourGateway < Gateway
       self.live_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
-      self.test_url = 'https://staging.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
+      self.test_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
 
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -108,6 +108,24 @@ module ActiveMerchant #:nodoc:
         commit(:refund, request)
       end
 
+      def verify(credit_card, options={})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<merchantKey>).+?(</merchantKey>))i, '\1[FILTERED]\2').
+          gsub(%r((<cardNumber>).+?(</cardNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<cardSecurityCode>).+?(</cardSecurityCode>))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def soap_request(action)

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

@@ -90,7 +90,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! "Transaction" do
             xml.tag! 'TranType', 'Credit'
             xml.tag! 'TranCode', action
-            if action == 'PreAuth' || action == 'Sale'
+            if options[:allow_partial_auth] && (action == 'PreAuth' || action == 'Sale')
               xml.tag! "PartialAuth", "Allow"
             end
             add_invoice(xml, options[:order_id], nil, options)
@@ -113,7 +113,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! "TStream" do
           xml.tag! "Transaction" do
             xml.tag! 'TranType', 'Credit'
-            if action == 'PreAuthCapture'
+            if options[:allow_partial_auth] && (action == 'PreAuthCapture')
               xml.tag! "PartialAuth", "Allow"
             end
             xml.tag! 'TranCode', (@use_tokenization ? (action + "ByRecordNo") : action)

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

@@ -51,7 +51,13 @@ module ActiveMerchant #:nodoc:
         post[:order_id]   = options[:order_id]
         post[:address]    = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        action = (post[:data_key].blank?) ? 'preauth' : 'res_preauth_cc'
+        action = if post[:cavv]
+          'cavv_preauth'
+        elsif post[:data_key].blank? 
+          'preauth'
+        else
+          'res_preauth_cc'
+        end
         commit(action, post)
       end
 
@@ -67,7 +73,13 @@ module ActiveMerchant #:nodoc:
         post[:order_id]   = options[:order_id]
         post[:address]    = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        action = (post[:data_key].blank?) ? 'purchase' : 'res_purchase_cc'
+        action = if post[:cavv]
+          'cavv_purchase'
+        elsif post[:data_key].blank?
+          'purchase'
+        else
+          'res_purchase_cc'
+        end
         commit(action, post)
       end
 
@@ -161,6 +173,7 @@ module ActiveMerchant #:nodoc:
             post[:pan]        = source.number
             post[:expdate]    = expdate(source)
             post[:cvd_value]  = source.verification_value if source.verification_value?
+            post[:cavv] = source.payment_cryptogram if source.is_a?(NetworkTokenizationCreditCard)
           end
           post[:cust_id] = options[:customer] || source.name
         end
@@ -291,8 +304,8 @@ module ActiveMerchant #:nodoc:
           "indrefund"          => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
           "completion"         => [:order_id, :comp_amount, :txn_number, :crypt_type],
           "purchasecorrection" => [:order_id, :txn_number, :crypt_type],
-          "cavvpurcha"         => [:order_id, :cust_id, :amount, :pan, :expdate, :cav],
-          "cavvpreaut"         => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv],
+          "cavv_preauth"       => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv],
+          "cavv_purchase"      => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv],
           "transact"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
           "Batchcloseall"      => [],
           "opentotals"         => [:ecr_number],

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

@@ -335,6 +335,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
+        add_pair parameters, 'RTIMEOUT', @options[:timeout] if @options[:timeout]
         add_pair parameters, 'PSPID',  @options[:login]
         add_pair parameters, 'USERID', @options[:user]
         add_pair parameters, 'PSWD',   @options[:password]

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

@@ -74,6 +74,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'n2:' + transaction_type + 'RequestDetails' do
               xml.tag! 'n2:ReferenceID', reference_id if transaction_type == 'DoReferenceTransaction'
               xml.tag! 'n2:PaymentAction', action
+              add_descriptors(xml, options)
               add_payment_details(xml, money, currency_code, options)
               add_credit_card(xml, credit_card_or_referenced_id, billing_address, options) unless transaction_type == 'DoReferenceTransaction'
               xml.tag! 'n2:IPAddress', options[:ip]
@@ -110,6 +111,11 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_descriptors(xml, options)
+        xml.tag! 'n2:SoftDescriptor', options[:soft_descriptor] unless options[:soft_descriptor].blank?
+        xml.tag! 'n2:SoftDescriptorCity', options[:soft_descriptor_city] unless options[:soft_descriptor_city].blank?
+      end
+
       def credit_card_type(type)
         case type
         when 'visa'             then 'Visa'

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -604,9 +604,9 @@ module ActiveMerchant #:nodoc:
 
       def add_express_only_payment_details(xml, options = {})
         add_optional_fields(xml,
-                            %w{n2:NoteText          n2:SoftDescriptor
+                            %w{n2:NoteText          n2:PaymentAction
                                n2:TransactionId     n2:AllowedPaymentMethodType
-                               n2:PaymentRequestID  n2:PaymentAction},
+                               n2:PaymentRequestID  },
                             options)
       end
 

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

@@ -124,7 +124,7 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, options)
         post[:amount] = amount(money)
 
-        post[:txnid] = clean(options[:order_id], :alphanumeric, 25)
+        post[:txnid] = clean(options[:order_id], :alphanumeric, 30)
         post[:productinfo] = clean(options[:description] || "Purchase", nil, 100)
 
         post[:surl] = "http://example.com"

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

@@ -19,6 +19,7 @@ module ActiveMerchant #:nodoc:
         'capture'   => 'CC.CP',
         'refund'    => 'CC.RF',
         'void'      => 'CC.RV',
+        'store'     => 'CC.RG'
       }
 
       def initialize(options={})
@@ -75,6 +76,16 @@ module ActiveMerchant #:nodoc:
         commit(request)
       end
 
+      def store(payment, options = {})
+        request = build_xml_request do |xml|
+          xml.Payment(code: SUPPORTED_TRANSACTIONS["store"])
+          add_account(xml, payment)
+          add_customer(xml, payment, options)
+        end
+
+        commit(request)
+      end
+
       def verify(credit_card, options={})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, credit_card, options) }
@@ -82,6 +93,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+
       def supports_scrubbing?
         true
       end
@@ -112,17 +124,22 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_account(xml, creditcard)
-        xml.Account do
-          xml.Number        creditcard.number
-          xml.Holder        "#{creditcard.first_name} #{creditcard.last_name}"
-          xml.Brand         creditcard.brand
-          xml.Expiry(year: creditcard.year, month: creditcard.month)
-          xml.Verification  creditcard.verification_value
+      def add_account(xml, payment_method)
+        if !payment_method.respond_to?(:number)
+          xml.Account(registration: payment_method)
+        else
+          xml.Account do
+            xml.Number        payment_method.number
+            xml.Holder        "#{payment_method.first_name} #{payment_method.last_name}"
+            xml.Brand         payment_method.brand
+            xml.Expiry(year: payment_method.year, month: payment_method.month)
+            xml.Verification  payment_method.verification_value
+          end
         end
       end
 
       def add_customer(xml, creditcard, options)
+        return unless creditcard.respond_to?(:number)
         address = options[:billing_address]
         xml.Customer do
           xml.Contact do

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

@@ -187,6 +187,7 @@ module ActiveMerchant #:nodoc:
 
       def add_optional_data(post, options)
         add_pair(post, :GiftAidPayment, options[:gift_aid_payment]) unless options[:gift_aid_payment].blank?
+        add_pair(post, :ApplyAVSCV2, options[:apply_avscv2]) unless options[:apply_avscv2].blank?
         add_pair(post, :Apply3DSecure, options[:apply_3d_secure]) unless options[:apply_3d_secure].blank?
         add_pair(post, :CreateToken, 1) unless options[:store].blank?
         add_pair(post, :FIRecipientAcctNumber, options[:recipient_account_number])

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

@@ -43,7 +43,8 @@ module ActiveMerchant #:nodoc:
         'incorrect_zip' => STANDARD_ERROR_CODE[:incorrect_zip],
         'card_declined' => STANDARD_ERROR_CODE[:card_declined],
         'call_issuer' => STANDARD_ERROR_CODE[:call_issuer],
-        'processing_error' => STANDARD_ERROR_CODE[:processing_error]
+        'processing_error' => STANDARD_ERROR_CODE[:processing_error],
+        'incorrect_pin' => STANDARD_ERROR_CODE[:incorrect_pin]
       }
 
       def initialize(options = {})
@@ -187,17 +188,16 @@ module ActiveMerchant #:nodoc:
         commit(:post, "customers/#{CGI.escape(customer_id)}", options, options)
       end
 
-      def unstore(customer_id, options = {}, deprecated_options = {})
+      def unstore(identification, options = {}, deprecated_options = {})
+        customer_id, card_id = identification.split("|")
+
         if options.kind_of?(String)
-          ActiveMerchant.deprecated "Passing the card_id as the 2nd parameter is deprecated. Put it in the options hash instead."
-          options = deprecated_options.merge(card_id: options)
+          ActiveMerchant.deprecated "Passing the card_id as the 2nd parameter is deprecated. The response authorization includes both the customer_id and the card_id."
+          card_id ||= options
+          options = deprecated_options
         end
 
-        if options[:card_id]
-          commit(:delete, "customers/#{CGI.escape(customer_id)}/cards/#{CGI.escape(options[:card_id])}", nil, options)
-        else
-          commit(:delete, "customers/#{CGI.escape(customer_id)}", nil, options)
-        end
+        commit(:delete, "customers/#{CGI.escape(customer_id)}/cards/#{CGI.escape(card_id)}", nil, options)
       end
 
       def tokenize_apple_pay_token(apple_pay_payment_token, options = {})
@@ -243,6 +243,7 @@ module ActiveMerchant #:nodoc:
         else
           add_creditcard(post, payment, options)
         end
+
         unless emv_payment?(payment)
           add_amount(post, money, options, true)
           add_customer_data(post, options)
@@ -309,6 +310,7 @@ module ActiveMerchant #:nodoc:
           if creditcard.respond_to?(:track_data) && creditcard.track_data.present?
             card[:swipe_data] = creditcard.track_data
             card[:fallback_reason] = creditcard.fallback_reason if creditcard.fallback_reason
+            card[:read_method] = "contactless" if creditcard.contactless
           else
             card[:number] = creditcard.number
             card[:exp_month] = creditcard.month
@@ -329,6 +331,10 @@ module ActiveMerchant #:nodoc:
         elsif creditcard.kind_of?(String)
           if options[:track_data]
             card[:swipe_data] = options[:track_data]
+          elsif creditcard.include?("|")
+            customer_id, card_id = creditcard.split("|")
+            card = card_id
+            post[:customer] = customer_id
           else
             card = creditcard
           end
@@ -345,7 +351,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer(post, payment, options)
-        post[:customer] = options[:customer] if options[:customer] && !payment.respond_to?(:number)
+        if options[:customer] && !payment.respond_to?(:number)
+          ActiveMerchant.deprecated "Passing the customer in the options is deprecated. Just use the response.authorization instead."
+          post[:customer] = options[:customer]
+        end
       end
 
       def add_flags(post, options)
@@ -436,7 +445,7 @@ module ActiveMerchant #:nodoc:
           success ? "Transaction approved" : response["error"]["message"],
           response,
           :test => response.has_key?("livemode") ? !response["livemode"] : false,
-          :authorization => success ? response["id"] : response["error"]["charge"],
+          :authorization => authorization_from(success, url, method, response),
           :avs_result => { :code => avs_code },
           :cvv_result => cvc_code,
           :emv_authorization => emv_authorization_from_response(response),
@@ -444,6 +453,18 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def authorization_from(success, url, method, response)
+        return response["error"]["charge"] unless success
+
+        if url == "customers"
+          [response["id"], response["sources"]["data"].first["id"]].join("|")
+        elsif method == :post && url.match(/customers\/.*\/cards/)
+          [response["customer"], response["id"]].join("|")
+        else
+          response["id"]
+        end
+      end
+
       def response_error(raw_response)
         begin
           parse(raw_response)

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

@@ -223,7 +223,7 @@ module ActiveMerchant
         doc.CustomerName("#{echeck.last_name}, #{echeck.first_name}")
         doc.AccountNumber(echeck.account_number)
         doc.RoutingNumber(echeck.routing_number)
-        doc.TransactionTypeCode("TEL")
+        doc.TransactionTypeCode("WEB")
       end
 
       def add_purchase_noise(doc)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.51.0"
+  VERSION = "1.52.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.51.0
+  version: 1.52.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport