braintree 2.101.0 → 3.0.1

data/lib/braintree/exceptions.rb

@@ -8,9 +8,7 @@ module Braintree # :nodoc:
 
   class ConfigurationError < BraintreeError; end
 
-  class DownForMaintenanceError < BraintreeError; end
-
-  class ForgedQueryString < BraintreeError; end
+  class GatewayTimeoutError < BraintreeError; end
 
   class InvalidSignature < BraintreeError; end
 
@@ -18,8 +16,12 @@ module Braintree # :nodoc:
 
   class NotFoundError < BraintreeError; end
 
+  class RequestTimeoutError < BraintreeError; end
+
   class ServerError < BraintreeError; end
 
+  class ServiceUnavailableError < BraintreeError; end
+
   class SSLCertificateError < BraintreeError; end
 
   class TooManyRequestsError < BraintreeError; end

data/lib/braintree/gateway.rb

@@ -74,12 +74,6 @@ module Braintree
       UsBankAccountGateway.new(self)
     end
 
-    # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-    # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-    def ideal_payment
-      IdealPaymentGateway.new(self)
-    end
-
     def merchant
       MerchantGateway.new(self)
     end
@@ -88,10 +82,6 @@ module Braintree
       MerchantAccountGateway.new(self)
     end
 
-    def europe_bank_account
-      EuropeBankAccountGateway.new(self)
-    end
-
     def settlement_batch_summary
       SettlementBatchSummaryGateway.new(self)
     end
@@ -100,10 +90,6 @@ module Braintree
       SubscriptionGateway.new(self)
     end
 
-    def transparent_redirect
-      TransparentRedirectGateway.new(self)
-    end
-
     def transaction
       TransactionGateway.new(self)
     end

data/lib/braintree/{android_pay_card.rb → google_pay_card.rb}

@@ -1,5 +1,5 @@
 module Braintree
-  class AndroidPayCard
+  class GooglePayCard
     include BaseModule # :nodoc:
 
     attr_reader :bin

data/lib/braintree/local_payment_completed.rb

@@ -9,7 +9,7 @@ module Braintree
 
     def initialize(attributes) # :nodoc:
       set_instance_variables_from_hash(attributes)
-      @transaction = Transaction._new(Configuration.gateway, transaction)
+      @transaction = Transaction._new(Configuration.gateway, transaction) unless transaction.nil?
     end
 
     class << self

data/lib/braintree/merchant_account_gateway.rb

@@ -83,6 +83,7 @@ module Braintree
       end
     end
 
+    # this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
     def self._detect_signature(attributes)
       if attributes.has_key?(:applicant_details)
         warn "[DEPRECATED] Passing :applicant_details to create is deprecated. Please use :individual, :business, and :funding."
@@ -92,6 +93,7 @@ module Braintree
       end
     end
 
+    # this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
     def self._deprecated_create_signature # :nodoc:
       [
         {:applicant_details => [

data/lib/braintree/payment_instrument_type.rb

@@ -1,15 +1,12 @@
 module Braintree
   module PaymentInstrumentType
     PayPalAccount = 'paypal_account'
-    EuropeBankAccount = 'europe_bank_account'
     CreditCard = 'credit_card'
-    CoinbaseAccount = 'coinbase_account'
     ApplePayCard = 'apple_pay_card'
-    AndroidPayCard = 'android_pay_card'
+    GooglePayCard = 'android_pay_card'
     VenmoAccount = 'venmo_account'
     UsBankAccount = 'us_bank_account'
     VisaCheckoutCard = 'visa_checkout_card'
-    MasterpassCard = 'masterpass_card'
     SamsungPayCard = 'samsung_pay_card'
     LocalPayment = 'local_payment'
     PayPalHere = 'paypal_here'

data/lib/braintree/payment_method_gateway.rb

@@ -43,16 +43,12 @@ module Braintree
         CreditCard._new(@gateway, response[:credit_card])
       elsif response.has_key?(:paypal_account)
         PayPalAccount._new(@gateway, response[:paypal_account])
-      elsif response[:coinbase_account]
-        SuccessfulResult.new(:payment_method => CoinbaseAccount._new(@gateway, response[:coinbase_account]))
       elsif response.has_key?(:us_bank_account)
         UsBankAccount._new(@gateway, response[:us_bank_account])
-      elsif response.has_key?(:europe_bank_account)
-        EuropeBankAccount._new(@gateway, response[:europe_bank_account])
       elsif response.has_key?(:apple_pay_card)
         ApplePayCard._new(@gateway, response[:apple_pay_card])
       elsif response.has_key?(:android_pay_card)
-        AndroidPayCard._new(@gateway, response[:android_pay_card])
+        GooglePayCard._new(@gateway, response[:android_pay_card])
       elsif response.has_key?(:venmo_account)
         VenmoAccount._new(@gateway, response[:venmo_account])
       else
@@ -166,12 +162,24 @@ module Braintree
         ],
       ]
       signature = [
-        :billing_address_id, :cardholder_name, :cvv, :device_session_id, :expiration_date,
-        :expiration_month, :expiration_year, :number, :token, :venmo_sdk_payment_method_code,
-        :device_data, :fraud_merchant_id, :payment_method_nonce,
+        :billing_address_id, :cardholder_name, :cvv, :expiration_date, :expiration_month,
+        :expiration_year, :number, :token, :venmo_sdk_payment_method_code, :device_data,
+        :payment_method_nonce,
         {:options => options},
         {:billing_address => billing_address_params}
       ]
+      signature << {
+        :three_d_secure_pass_thru => [
+          :eci_flag,
+          :cavv,
+          :xid,
+          :three_d_secure_version,
+          :authentication_response,
+          :directory_response,
+          :cavv_algorithm,
+          :ds_transaction_id,
+        ]
+      }
 
       case type
       when :create

data/lib/braintree/payment_method_nonce.rb

@@ -19,12 +19,14 @@ module Braintree
     attr_reader :nonce
     attr_reader :three_d_secure_info
     attr_reader :type
+    attr_reader :authentication_insight
 
     def initialize(gateway, attributes) # :nodoc:
       @gateway = gateway
       @nonce = attributes.fetch(:nonce)
       @type = attributes.fetch(:type)
       @details = attributes.fetch(:details)
+      @authentication_insight = attributes.fetch(:authentication_insight, nil)
       @three_d_secure_info = ThreeDSecureInfo.new(attributes[:three_d_secure_info]) if attributes[:three_d_secure_info]
       @bin_data = BinData.new(attributes[:bin_data]) if attributes[:bin_data]
     end

data/lib/braintree/payment_method_nonce_gateway.rb

@@ -8,12 +8,23 @@ module Braintree
       @config.assert_has_access_token_or_keys
     end
 
-    def create(payment_method_token)
-      response = @config.http.post("#{@config.base_merchant_path}/payment_methods/#{payment_method_token}/nonces")
+    def create(payment_method_token, args = { payment_method_nonce: {} })
+      Util.verify_keys(PaymentMethodNonceGateway._create_signature, args)
+
+      response = @config.http.post("#{@config.base_merchant_path}/payment_methods/#{payment_method_token}/nonces", args)
       payment_method_nonce = PaymentMethodNonce._new(@gateway, response.fetch(:payment_method_nonce))
       SuccessfulResult.new(:payment_method_nonce => payment_method_nonce)
     end
 
+    def self._create_signature
+      [ {
+        :payment_method_nonce=> [
+          :merchant_account_id, :authentication_insight,
+          {:authentication_insight_options => [:amount, :recurring_customer_consent, :recurring_max_amount]}
+        ]
+      }]
+    end
+
     def create!(*args)
       return_object_or_raise(:payment_method_nonce) { create(*args) }
     end

data/lib/braintree/payment_method_parser.rb

@@ -6,22 +6,16 @@ module Braintree
         CreditCard._new(gateway, attributes[:credit_card])
       elsif attributes[:paypal_account]
         PayPalAccount._new(gateway, attributes[:paypal_account])
-      elsif attributes[:coinbase_account]
-        CoinbaseAccount._new(gateway, attributes[:coinbase_account])
       elsif attributes[:us_bank_account]
         UsBankAccount._new(gateway, attributes[:us_bank_account])
       elsif attributes[:apple_pay_card]
         ApplePayCard._new(gateway, attributes[:apple_pay_card])
       elsif attributes[:android_pay_card]
-        AndroidPayCard._new(gateway, attributes[:android_pay_card])
-      elsif attributes[:amex_express_checkout_card]
-        AmexExpressCheckoutCard._new(gateway, attributes[:amex_express_checkout_card])
+        GooglePayCard._new(gateway, attributes[:android_pay_card])
       elsif attributes[:venmo_account]
         VenmoAccount._new(gateway, attributes[:venmo_account])
       elsif attributes[:visa_checkout_card]
         VisaCheckoutCard._new(gateway, attributes[:visa_checkout_card])
-      elsif attributes[:masterpass_card]
-        MasterpassCard._new(gateway, attributes[:masterpass_card])
       elsif attributes[:samsung_pay_card]
         SamsungPayCard._new(gateway, attributes[:samsung_pay_card])
       else

data/lib/braintree/risk_data.rb

@@ -2,10 +2,13 @@ module Braintree
   class RiskData # :nodoc:
     include BaseModule
 
+    attr_reader :customer_device_id
+    attr_reader :customer_location_zip
+    attr_reader :customer_tenure
     attr_reader :decision
     attr_reader :device_data_captured
-    attr_reader :id
     attr_reader :fraud_service_provider
+    attr_reader :id
 
     def initialize(attributes)
       set_instance_variables_from_hash attributes unless attributes.nil?

data/lib/braintree/subscription.rb

@@ -101,11 +101,11 @@ module Braintree
       add_ons.map! { |attrs| AddOn._new(attrs) }
       discounts.map! { |attrs| Discount._new(attrs) }
       @status_history = attributes[:status_history] ? attributes[:status_history].map { |s| StatusDetails.new(s) } : []
-    end
-
-    def next_bill_amount
-      warn "[DEPRECATED] Subscription.next_bill_amount is deprecated. Please use Subscription.next_billing_period_amount"
-      @next_bill_amount
+      @first_billing_date = Date.parse(first_billing_date) unless first_billing_date.nil?
+      @next_billing_date = Date.parse(next_billing_date) unless next_billing_date.nil?
+      @billing_period_start_date = Date.parse(billing_period_start_date) unless billing_period_start_date.nil?
+      @billing_period_end_date = Date.parse(billing_period_end_date) unless billing_period_end_date.nil?
+      @paid_through_date = Date.parse(paid_through_date) unless paid_through_date.nil?
     end
 
     def never_expires?

data/lib/braintree/successful_result.rb

@@ -13,7 +13,6 @@ module Braintree
     attr_reader :merchant
     attr_reader :merchant_account
     attr_reader :merchant_accounts
-    attr_reader :new_transaction
     attr_reader :payment_method
     attr_reader :payment_method_nonce
     attr_reader :paypal_account

data/lib/braintree/test/authentication_id.rb

@@ -0,0 +1,21 @@
+module Braintree
+  module Test
+    module AuthenticationId
+      ThreeDSecureVisaFullAuthentication = "fake-three-d-secure-visa-full-authentication-id"
+      ThreeDSecureVisaLookupTimeout = "fake-three-d-secure-visa-lookup-timeout-id"
+      ThreeDSecureVisaFailedSignature = "fake-three-d-secure-visa-failed-signature-id"
+      ThreeDSecureVisaFailedAuthentication = "fake-three-d-secure-visa-failed-authentication-id"
+      ThreeDSecureVisaAttemptsNonParticipating = "fake-three-d-secure-visa-attempts-non-participating-id"
+      ThreeDSecureVisaNoteEnrolled = "fake-three-d-secure-visa-not-enrolled-id"
+      ThreeDSecureVisaUnavailable = "fake-three-d-secure-visa-unavailable-id"
+      ThreeDSecureVisaMPILookupError = "fake-three-d-secure-visa-mpi-lookup-error-id"
+      ThreeDSecureVisaMPIAuthenticateError = "fake-three-d-secure-visa-mpi-authenticate-error-id"
+      ThreeDSecureVisaAuthenticationUnavailable = "fake-three-d-secure-visa-authentication-unavailable-id"
+      ThreeDSecureVisaBypassedAuthentication = "fake-three-d-secure-visa-bypassed-authentication-id"
+      ThreeDSecureTwoVisaSuccessfulFrictionlessAuthentication = "fake-three-d-secure-two-visa-successful-frictionless-authentication-id"
+      ThreeDSecureTwoVisaSuccessfulStepUpAuthentication = "fake-three-d-secure-two-visa-successful-step-up-authentication-id"
+      ThreeDSecureTwoVisaErrorOnLookup = "fake-three-d-secure-two-visa-error-on-lookup-id"
+      ThreeDSecureTwoVisaTimeoutOnLookup = "fake-three-d-secure-two-visa-timeout-on-lookup-id"
+    end
+  end
+end

data/lib/braintree/test/credit_card.rb

@@ -40,6 +40,7 @@ module Braintree
       VisaPrepaid = "4500600000000061"
 
       Fraud = "4000111111111511"
+      RiskThreshold = "4111130000000003"
 
       Visas = %w[4009348888881881 4012888888881881 4111111111111111 4000111111111115 4500600000000061]
       Unknowns = %w[1000000000000008]

data/lib/braintree/test/nonce.rb

@@ -12,15 +12,27 @@ module Braintree
       ApplePayAmEx = "fake-apple-pay-amex-nonce"
       AbstractTransactable = "fake-abstract-transactable-nonce"
       Europe = "fake-europe-bank-account-nonce"
-      Coinbase = "fake-coinbase-nonce"
-      AndroidPayDiscover = "fake-android-pay-discover-nonce"
-      AndroidPayVisa = "fake-android-pay-visa-nonce"
-      AndroidPayMasterCard = "fake-android-pay-mastercard-nonce"
-      AndroidPayAmEx = "fake-android-pay-amex-nonce"
-      AmexExpressCheckout = "fake-amex-express-checkout-nonce"
+      GooglePayDiscover = "fake-android-pay-discover-nonce"
+      GooglePayVisa = "fake-android-pay-visa-nonce"
+      GooglePayMasterCard = "fake-android-pay-mastercard-nonce"
+      GooglePayAmEx = "fake-android-pay-amex-nonce"
       VenmoAccount = "fake-venmo-account-nonce"
       VenmoAccountTokenIssuanceError = "fake-token-issuance-error-venmo-account-nonce"
       ThreeDSecureVisaFullAuthentication = "fake-three-d-secure-visa-full-authentication-nonce"
+      ThreeDSecureVisaLookupTimeout = "fake-three-d-secure-visa-lookup-timeout-nonce"
+      ThreeDSecureVisaFailedSignature = "fake-three-d-secure-visa-failed-signature-nonce"
+      ThreeDSecureVisaFailedAuthentication = "fake-three-d-secure-visa-failed-authentication-nonce"
+      ThreeDSecureVisaAttemptsNonParticipating = "fake-three-d-secure-visa-attempts-non-participating-nonce"
+      ThreeDSecureVisaNoteEnrolled = "fake-three-d-secure-visa-not-enrolled-nonce"
+      ThreeDSecureVisaUnavailable = "fake-three-d-secure-visa-unavailable-nonce"
+      ThreeDSecureVisaMPILookupError = "fake-three-d-secure-visa-mpi-lookup-error-nonce"
+      ThreeDSecureVisaMPIAuthenticateError = "fake-three-d-secure-visa-mpi-authenticate-error-nonce"
+      ThreeDSecureVisaAuthenticationUnavailable = "fake-three-d-secure-visa-authentication-unavailable-nonce"
+      ThreeDSecureVisaBypassedAuthentication = "fake-three-d-secure-visa-bypassed-authentication-nonce"
+      ThreeDSecureTwoVisaSuccessfulFrictionlessAuthentication = "fake-three-d-secure-two-visa-successful-frictionless-authentication-nonce"
+      ThreeDSecureTwoVisaSuccessfulStepUpAuthentication = "fake-three-d-secure-two-visa-successful-step-up-authentication-nonce"
+      ThreeDSecureTwoVisaErrorOnLookup = "fake-three-d-secure-two-visa-error-on-lookup-nonce"
+      ThreeDSecureTwoVisaTimeoutOnLookup = "fake-three-d-secure-two-visa-timeout-on-lookup-nonce"
       TransactableVisa = "fake-valid-visa-nonce"
       TransactableAmEx = "fake-valid-amex-nonce"
       TransactableMasterCard = "fake-valid-mastercard-nonce"
@@ -46,12 +58,8 @@ module Braintree
       ProcessorFailureJCB = "fake-processor-failure-jcb-nonce"
       LuhnInvalid = "fake-luhn-invalid-nonce"
       PayPalFuturePaymentRefreshToken = "fake-paypal-future-refresh-token-nonce"
-      SEPA = "fake-sepa-bank-account-nonce"
       GatewayRejectedFraud = "fake-gateway-rejected-fraud-nonce"
-      MasterpassAmEx = "fake-masterpass-amex-nonce"
-      MasterpassDiscover = "fake-masterpass-discover-nonce"
-      MasterpassMasterCard = "fake-masterpass-mastercard-nonce"
-      MasterpassVisa = "fake-masterpass-visa-nonce"
+      GatewayRejectedRiskThresholds = "fake-gateway-rejected-risk-thresholds-nonce"
       VisaCheckoutAmEx = "fake-visa-checkout-amex-nonce"
       VisaCheckoutDiscover = "fake-visa-checkout-discover-nonce"
       VisaCheckoutMasterCard = "fake-visa-checkout-mastercard-nonce"
@@ -60,15 +68,6 @@ module Braintree
       SamsungPayDiscover = "tokensam_fake_discover"
       SamsungPayMasterCard = "tokensam_fake_mastercard"
       SamsungPayVisa = "tokensam_fake_visa"
-
-      def self.const_missing(const_name)
-        if const_name == :AndroidPay
-          warn "[DEPRECATED] Braintree::Test::Nonce::AndroidPay is deprecated. Use a card-specific nonce, e.g. Braintree::Test::Nonce::AndroidPayMasterCard"
-          "fake-android-pay-nonce"
-        else
-          super
-        end
-      end
     end
   end
 end

data/lib/braintree/transaction.rb

@@ -25,6 +25,7 @@ module Braintree
       CVV          = "cvv"
       Duplicate    = "duplicate"
       Fraud        = "fraud"
+      RiskThreshold = "risk_threshold"
       ThreeDSecure = "three_d_secure"
       TokenIssuance = "token_issuance"
       Unrecognized = "unrecognized"
@@ -91,9 +92,8 @@ module Braintree
 
     attr_reader :add_ons
     attr_reader :additional_processor_response          # The raw response from the processor.
-    attr_reader :amex_express_checkout_details
     attr_reader :amount
-    attr_reader :android_pay_details
+    attr_reader :google_pay_details
     attr_reader :apple_pay_details
     attr_reader :authorization_adjustments
     attr_reader :authorization_expires_at
@@ -103,7 +103,6 @@ module Braintree
     attr_reader :avs_street_address_response_code
     attr_reader :billing_details
     attr_reader :channel
-    attr_reader :coinbase_details
     attr_reader :created_at
     attr_reader :credit_card_details
     attr_reader :currency_iso_code
@@ -121,11 +120,7 @@ module Braintree
     attr_reader :gateway_rejection_reason
     attr_reader :graphql_id
     attr_reader :id
-    # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-    # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-    attr_reader :ideal_payment_details
     attr_reader :local_payment_details
-    attr_reader :masterpass_card_details
     attr_reader :merchant_account_id
     attr_reader :network_response_code                  # Response code from the card network
     attr_reader :network_response_text                  # Response text from the card network
@@ -142,6 +137,7 @@ module Braintree
     attr_reader :processor_response_type                # Response type from the processor.
     attr_reader :processor_settlement_response_code     # Settlement response code from the processor.
     attr_reader :processor_settlement_response_text     # Settlement response text from the processor.
+    attr_reader :product_sku
     attr_reader :purchase_order_number
     attr_reader :recurring
     attr_reader :refund_ids
@@ -166,6 +162,7 @@ module Braintree
     attr_reader :venmo_account_details
     attr_reader :visa_checkout_card_details
     attr_reader :voice_referral_number
+    attr_reader :retrieval_reference_number
 
     def self.create(*args)
       Configuration.gateway.transaction.create(*args)
@@ -191,18 +188,6 @@ module Braintree
       Configuration.gateway.transaction.clone_transaction!(*args)
     end
 
-    # Deprecated. Use Braintree::TransparentRedirect.confirm
-    def self.create_from_transparent_redirect(*args)
-      warn "[DEPRECATED] Transaction.create_from_transparent_redirect is deprecated. Please use TransparentRedirect.confirm"
-      Configuration.gateway.transaction.create_from_transparent_redirect(*args)
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.url
-    def self.create_transaction_url
-      warn "[DEPRECATED] Transaction.create_transaction_url is deprecated. Please use TransparentRedirect.url"
-      Configuration.gateway.transaction.create_transaction_url
-    end
-
     def self.credit(*args)
       Configuration.gateway.transaction.credit(*args)
     end
@@ -305,10 +290,8 @@ module Braintree
       @paypal_details = PayPalDetails.new(@paypal)
       @paypal_here_details = PayPalHereDetails.new(@paypal_here)
       @apple_pay_details = ApplePayDetails.new(@apple_pay)
-      @android_pay_details = AndroidPayDetails.new(@android_pay_card)
-      @amex_express_checkout_details = AmexExpressCheckoutDetails.new(@amex_express_checkout_card)
+      @google_pay_details = GooglePayDetails.new(@google_pay_card)
       @venmo_account_details = VenmoAccountDetails.new(@venmo_account)
-      @coinbase_details = CoinbaseDetails.new(@coinbase_account)
       disputes.map! { |attrs| Dispute._new(attrs) } if disputes
       @custom_fields = attributes[:custom_fields].is_a?(Hash) ? attributes[:custom_fields] : {}
       add_ons.map! { |attrs| AddOn._new(attrs) } if add_ons
@@ -319,9 +302,7 @@ module Braintree
       @facilitator_details = FacilitatorDetails.new(attributes[:facilitator_details]) if attributes[:facilitator_details]
       @three_d_secure_info = ThreeDSecureInfo.new(attributes[:three_d_secure_info]) if attributes[:three_d_secure_info]
       @us_bank_account_details = UsBankAccountDetails.new(attributes[:us_bank_account]) if attributes[:us_bank_account]
-      @ideal_payment_details = IdealPaymentDetails.new(attributes[:ideal_payment]) if attributes[:ideal_payment]
       @visa_checkout_card_details = VisaCheckoutCardDetails.new(attributes[:visa_checkout_card])
-      @masterpass_card_details = MasterpassCardDetails.new(attributes[:masterpass_card])
       @samsung_pay_card_details = SamsungPayCardDetails.new(attributes[:samsung_pay_card])
       authorization_adjustments.map! { |attrs| AuthorizationAdjustment._new(attrs) } if authorization_adjustments
     end
@@ -343,18 +324,6 @@ module Braintree
       @gateway.transaction_line_item.find_all(id)
     end
 
-    # Deprecated. Use Braintree::Transaction.refund
-    def refund(amount = nil)
-      warn "[DEPRECATED] refund as an instance method is deprecated. Please use Transaction.refund"
-      result = @gateway.transaction.refund(id, amount)
-
-      if result.success?
-        SuccessfulResult.new(:new_transaction => result.transaction)
-      else
-        result
-      end
-    end
-
     # Returns true if the transaction has been refunded. False otherwise.
     def refunded?
       !@refund_id.nil?
@@ -365,27 +334,6 @@ module Braintree
       @disbursement_details.valid?
     end
 
-    def refund_id
-      warn "[DEPRECATED] Transaction.refund_id is deprecated. Please use Transaction.refund_ids"
-      @refund_id
-    end
-
-    # Deprecated. Use Braintree::Transaction.submit_for_settlement
-    def submit_for_settlement(amount = nil)
-      warn "[DEPRECATED] submit_for_settlement as an instance method is deprecated. Please use Transaction.submit_for_settlement"
-      result = @gateway.transaction.submit_for_settlement(id, amount)
-      if result.success?
-        copy_instance_variables_from_object result.transaction
-      end
-      result
-    end
-
-    # Deprecated. Use Braintree::Transaction.submit_for_settlement!
-    def submit_for_settlement!(amount = nil)
-      warn "[DEPRECATED] submit_for_settlement! as an instance method is deprecated. Please use Transaction.submit_for_settlement!"
-      return_object_or_raise(:transaction) { submit_for_settlement(amount) }
-    end
-
     # If this transaction was stored in the vault, or created from vault records,
     # vault_billing_address will return the associated Braintree::Address. Because the
     # vault billing address can be updated after the transaction was created, the attributes
@@ -422,20 +370,8 @@ module Braintree
       @gateway.address.find(customer_details.id, shipping_details.id)
     end
 
-    # Deprecated. Use Braintree::Transaction.void
-    def void
-      warn "[DEPRECATED] void as an instance method is deprecated. Please use Transaction.void"
-      result = @gateway.transaction.void(id)
-      if result.success?
-        copy_instance_variables_from_object result.transaction
-      end
-      result
-    end
-
-    # Deprecated. Use Braintree::Transaction.void!
-    def void!
-      warn "[DEPRECATED] void! as an instance method is deprecated. Please use Transaction.void!"
-      return_object_or_raise(:transaction) { void }
+    def processed_with_network_token?
+      @processed_with_network_token
     end
 
     class << self
@@ -446,7 +382,7 @@ module Braintree
     end
 
     def self._attributes # :nodoc:
-      [:amount, :created_at, :credit_card_details, :customer_details, :id, :status, :subscription_details, :type, :updated_at]
+      [:amount, :created_at, :credit_card_details, :customer_details, :id, :status, :subscription_details, :type, :updated_at, :processed_with_network_token?]
     end
   end
 end