braintree 4.23.0 → 4.34.0

data/lib/braintree/transaction/credit_card_details.rb

@@ -5,9 +5,12 @@ module Braintree
 
       attr_reader :account_type
       attr_reader :bin
+      attr_reader :business
       attr_reader :card_type
       attr_reader :cardholder_name
       attr_reader :commercial
+      attr_reader :consumer
+      attr_reader :corporate
       attr_reader :country_of_issuance
       attr_reader :customer_location
       attr_reader :debit
@@ -18,9 +21,12 @@ module Braintree
       attr_reader :image_url
       attr_reader :issuing_bank
       attr_reader :last_4
+      attr_reader :payment_account_reference
       attr_reader :payroll
       attr_reader :prepaid
+      attr_reader :prepaid_reloadable
       attr_reader :product_id
+      attr_reader :purchase
       attr_reader :token
       attr_reader :unique_number_identifier
 
@@ -34,23 +40,29 @@ module Braintree
 
       def inspect
         attr_order = [
-          :token,
           :bin,
-          :last_4,
+          :business,
           :card_type,
-          :expiration_date,
           :cardholder_name,
+          :commercial,
+          :consumer,
+          :corporate,
+          :country_of_issuance,
           :customer_location,
-          :prepaid,
-          :healthcare,
-          :durbin_regulated,
           :debit,
-          :commercial,
+          :durbin_regulated,
+          :expiration_date,
+          :healthcare,
+          :image_url,
+          :issuing_bank,
+          :last_4,
+          :payment_account_reference,
           :payroll,
+          :prepaid,
+          :prepaid_reloadable,
           :product_id,
-          :country_of_issuance,
-          :issuing_bank,
-          :image_url,
+          :purchase,
+          :token,
           :unique_number_identifier,
         ]
 

data/lib/braintree/transaction/google_pay_details.rb

@@ -4,28 +4,34 @@ module Braintree
       include BaseModule
 
       attr_reader :bin
+      attr_reader :business
       attr_reader :card_type
+      attr_reader :commercial
+      attr_reader :consumer
+      attr_reader :corporate
+      attr_reader :country_of_issuance
+      attr_reader :debit
+      attr_reader :durbin_regulated
       attr_reader :expiration_month
       attr_reader :expiration_year
+      attr_reader :global_id
       attr_reader :google_transaction_id
+      attr_reader :healthcare
       attr_reader :image_url
+      attr_reader :issuing_bank
       attr_reader :last_4
+      attr_reader :payment_account_reference
+      attr_reader :payroll
+      attr_reader :prepaid
+      attr_reader :prepaid_reloadable
+      attr_reader :product_id
+      attr_reader :purchase
       attr_reader :source_card_last_4
       attr_reader :source_card_type
       attr_reader :source_description
       attr_reader :token
       attr_reader :virtual_card_last_4
       attr_reader :virtual_card_type
-      attr_reader :prepaid
-      attr_reader :healthcare
-      attr_reader :debit
-      attr_reader :durbin_regulated
-      attr_reader :commercial
-      attr_reader :payroll
-      attr_reader :issuing_bank
-      attr_reader :country_of_issuance
-      attr_reader :product_id
-      attr_reader :global_id
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?

data/lib/braintree/transaction/meta_checkout_card_details.rb

@@ -4,10 +4,13 @@ module Braintree
         include BaseModule
 
         attr_reader :bin
+        attr_reader :business
         attr_reader :card_type
         attr_reader :cardholder_name
         attr_reader :commercial
+        attr_reader :consumer
         attr_reader :container_id
+        attr_reader :corporate
         attr_reader :country_of_issuance
         attr_reader :created_at
         attr_reader :customer_location
@@ -22,7 +25,9 @@ module Braintree
         attr_reader :last_4
         attr_reader :payroll
         attr_reader :prepaid
+        attr_reader :prepaid_reloadable
         attr_reader :product_id
+        attr_reader :purchase
         attr_reader :token
         attr_reader :unique_number_identifier
         attr_reader :updated_at
@@ -36,8 +41,12 @@ module Braintree
         end
 
         def inspect
-          attr_order = [:token, :bin, :last_4, :card_type, :expiration_date, :cardholder_name, :customer_location, :prepaid,
-          :healthcare, :durbin_regulated, :debit, :commercial, :payroll, :product_id, :country_of_issuance, :issuing_bank, :image_url, :container_id]
+          attr_order = [
+            :bin, :business, :card_type, :cardholder_name, :commercial, :consumer, :container_id,
+            :corporate, :country_of_issuance, :customer_location, :debit, :durbin_regulated,
+            :expiration_date, :healthcare, :image_url, :issuing_bank, :last_4, :payroll,
+            :prepaid, :prepaid_reloadable, :product_id, :purchase, :token
+          ]
           formatted_attrs = attr_order.map do |attr|
             "#{attr}: #{send(attr).inspect}"
           end

data/lib/braintree/transaction/meta_checkout_token_details.rb

@@ -4,10 +4,13 @@ module Braintree
         include BaseModule
 
         attr_reader :bin
-        attr_reader :container_id
+        attr_reader :business
         attr_reader :card_type
         attr_reader :cardholder_name
         attr_reader :commercial
+        attr_reader :consumer
+        attr_reader :container_id
+        attr_reader :corporate
         attr_reader :country_of_issuance
         attr_reader :created_at
         attr_reader :cryptogram
@@ -24,7 +27,9 @@ module Braintree
         attr_reader :last_4
         attr_reader :payroll
         attr_reader :prepaid
+        attr_reader :prepaid_reloadable
         attr_reader :product_id
+        attr_reader :purchase
         attr_reader :token
         attr_reader :unique_number_identifier
         attr_reader :updated_at
@@ -38,8 +43,13 @@ module Braintree
         end
 
         def inspect
-          attr_order = [:container_id, :cryptogram, :ecommerce_indicator, :token, :bin, :last_4, :card_type, :expiration_date, :cardholder_name, :customer_location, :prepaid,
-          :healthcare, :durbin_regulated, :debit, :commercial, :payroll, :product_id, :country_of_issuance, :issuing_bank, :is_network_tokenized, :image_url]
+          attr_order = [
+            :bin, :business, :card_type, :cardholder_name, :commercial, :consumer, :container_id,
+            :corporate, :country_of_issuance, :cryptogram, :customer_location, :debit,
+            :durbin_regulated, :ecommerce_indicator, :expiration_date, :healthcare, :image_url,
+            :is_network_tokenized, :issuing_bank, :last_4, :payroll, :prepaid, :prepaid_reloadable,
+            :product_id, :purchase, :token
+          ]
           formatted_attrs = attr_order.map do |attr|
             "#{attr}: #{send(attr).inspect}"
           end

data/lib/braintree/transaction/paypal_details.rb

@@ -20,6 +20,8 @@ module Braintree
       attr_reader :payer_last_name
       attr_reader :payer_status
       attr_reader :payment_id
+      attr_reader :recipient_email
+      attr_reader :recipient_phone
       attr_reader :refund_from_transaction_fee_amount
       attr_reader :refund_from_transaction_fee_currency_iso_code
       attr_reader :refund_id

data/lib/braintree/transaction/visa_checkout_card_details.rb

@@ -4,10 +4,13 @@ module Braintree
       include BaseModule
 
       attr_reader :bin
+      attr_reader :business
       attr_reader :call_id
       attr_reader :card_type
       attr_reader :cardholder_name
       attr_reader :commercial
+      attr_reader :consumer
+      attr_reader :corporate
       attr_reader :country_of_issuance
       attr_reader :customer_location
       attr_reader :debit
@@ -20,7 +23,9 @@ module Braintree
       attr_reader :last_4
       attr_reader :payroll
       attr_reader :prepaid
+      attr_reader :prepaid_reloadable
       attr_reader :product_id
+      attr_reader :purchase
       attr_reader :token
 
       def initialize(attributes)
@@ -32,8 +37,11 @@ module Braintree
       end
 
       def inspect
-        attr_order = [:token, :bin, :last_4, :card_type, :expiration_date, :cardholder_name, :customer_location, :prepaid,
-        :healthcare, :durbin_regulated, :debit, :commercial, :payroll, :product_id, :country_of_issuance, :issuing_bank, :image_url, :call_id]
+        attr_order = [
+          :bin, :business, :call_id, :card_type, :cardholder_name, :commercial, :consumer, :corporate,
+          :country_of_issuance, :customer_location, :debit, :durbin_regulated, :expiration_date,
+          :healthcare, :image_url, :issuing_bank, :last_4, :payroll, :prepaid, :prepaid_reloadable,
+          :product_id, :purchase, :token]
         formatted_attrs = attr_order.map do |attr|
           "#{attr}: #{send(attr).inspect}"
         end

data/lib/braintree/transaction.rb

@@ -9,15 +9,6 @@ module Braintree
       Unrecognized = "unrecognized"
     end
 
-    module EscrowStatus
-      HoldPending    = "hold_pending"
-      Held           = "held"
-      ReleasePending = "release_pending"
-      Released       = "released"
-      Refunded       = "refunded"
-      Unrecognized   = "unrecognized"
-    end
-
     module GatewayRejectionReason
       ApplicationIncomplete = "application_incomplete"
       AVS          = "avs"
@@ -91,6 +82,8 @@ module Braintree
       end
     end
 
+    attr_reader :account_funding_transaction
+    attr_reader :ach_reject_reason
     attr_reader :ach_return_code
     attr_reader :ach_return_responses
     attr_reader :acquirer_reference_number
@@ -118,7 +111,6 @@ module Braintree
     attr_reader :discount_amount
     attr_reader :discounts
     attr_reader :disputes
-    attr_reader :escrow_status
     attr_reader :facilitated_details
     attr_reader :facilitator_details
     attr_reader :foreign_retailer
@@ -181,6 +173,7 @@ module Braintree
     attr_reader :tax_exempt
     attr_reader :three_d_secure_info
     attr_reader :type
+    attr_reader :upcoming_retry_date
     attr_reader :updated_at
     attr_reader :us_bank_account_details
     attr_reader :venmo_account_details
@@ -235,14 +228,6 @@ module Braintree
       Configuration.gateway.transaction_line_item.find_all(*args)
     end
 
-    def self.hold_in_escrow(*args)
-      Configuration.gateway.transaction.hold_in_escrow(*args)
-    end
-
-    def self.hold_in_escrow!(*args)
-      Configuration.gateway.transaction.hold_in_escrow!(*args)
-    end
-
     def self.refund(*args)
       Configuration.gateway.transaction.refund(*args)
     end
@@ -263,14 +248,6 @@ module Braintree
       Configuration.gateway.transaction.search(&block)
     end
 
-    def self.release_from_escrow(*args)
-      Configuration.gateway.transaction.release_from_escrow(*args)
-    end
-
-    def self.release_from_escrow!(*args)
-      Configuration.gateway.transaction.release_from_escrow!(*args)
-    end
-
     def self.submit_for_settlement(*args)
       Configuration.gateway.transaction.submit_for_settlement(*args)
     end

data/lib/braintree/transaction_gateway.rb

@@ -31,16 +31,6 @@ module Braintree
       return_object_or_raise(:transaction) { cancel_release(*args) }
     end
 
-    def hold_in_escrow(transaction_id)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
-      response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/hold_in_escrow")
-      _handle_transaction_response(response)
-    end
-
-    def hold_in_escrow!(*args)
-      return_object_or_raise(:transaction) { hold_in_escrow(*args) }
-    end
-
     def _handle_transaction_response(response)
       if response[:transaction]
         SuccessfulResult.new(:transaction => Transaction._new(@gateway, response[:transaction]))
@@ -135,16 +125,6 @@ module Braintree
       end
     end
 
-    def release_from_escrow(transaction_id)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
-      response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/release_from_escrow")
-      _handle_transaction_response(response)
-    end
-
-    def release_from_escrow!(*args)
-      return_object_or_raise(:transaction) { release_from_escrow(*args) }
-    end
-
     def submit_for_settlement(transaction_id, amount = nil, options = {})
       raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
       Util.verify_keys(TransactionGateway._submit_for_settlement_signature, options)
@@ -216,7 +196,7 @@ module Braintree
       [
         :amount, :billing_address_id, :channel, :currency_iso_code, :customer_id, :device_data,
         :discount_amount, :exchange_rate_quote_id, :foreign_retailer,
-        :merchant_account_id, :order_id, :payment_method_nonce, :payment_method_token,
+        :merchant_account_id, :order_id, :payment_method_nonce, :payment_method_token, :processing_merchant_category_code,
         :product_sku, :purchase_order_number, :service_fee_amount, :shared_billing_address_id,
         :shared_customer_id, :shared_payment_method_nonce, :shared_payment_method_token,
         :shared_shipping_address_id, :shipping_address_id, :shipping_amount, :shipping_tax_amount,
@@ -254,27 +234,36 @@ module Braintree
         {:installments => [:count]},
         {:line_items => [:commodity_code, :description, :discount_amount, :image_url, :kind, :name, :product_code, :quantity, :tax_amount, :total_amount, :unit_amount, :unit_of_measure, :unit_tax_amount, :upc_code, :upc_type, :url]},
         {:options => [
-          :hold_in_escrow,
-          :store_in_vault,
-          :store_in_vault_on_success,
-          :submit_for_settlement,
           :add_billing_address_to_payment_method,
-          :store_shipping_address_in_vault,
-          :venmo_sdk_session, # Deprecated
+          {:amex_rewards => [:request_id, :points, :currency_amount, :currency_iso_code]},
+          {:credit_card => [:account_type, :process_debit_as_credit]},
+          :hold_in_escrow,
           :payee_id,
           :payee_email,
+          {:paypal => [:custom_field, :description, :payee_id, :payee_email, :recipient_email,  {:recipient_phone => [:country_code, :national_number]}, {:supplementary_data => :_any_key_}]},
+          {:processing_overrides => [:customer_email, :customer_first_name, :customer_last_name, :customer_tax_identifier]},
           :skip_advanced_fraud_checking,
           :skip_avs,
           :skip_cvv,
-          {:paypal => [:custom_field, :payee_id, :payee_email, :description, {:supplementary_data => :_any_key_}]},
-          {:processing_overrides => [:customer_email, :customer_first_name, :customer_last_name, :customer_tax_identifier]},
+          :store_in_vault,
+          :store_in_vault_on_success,
+          :store_shipping_address_in_vault,
+          :submit_for_settlement,
           {:three_d_secure => [:required]},
-          {:amex_rewards => [:request_id, :points, :currency_amount, :currency_iso_code]},
           {:venmo => [:profile_id]},
-          {:credit_card => [:account_type, :process_debit_as_credit]},
+          :venmo_sdk_session, # Deprecated
         ]
         },
         {:paypal_account => [:email, :token, :paypal_data, :payee_id, :payee_email, :payer_id, :payment_id]},
+        {:payment_facilitator => [
+          :payment_facilitator_id,
+          {:sub_merchant => [:reference_number, :tax_id, :legal_name,
+            {:address => [ :street_address, :locality, :region, :country_code_alpha2, :postal_code,
+              {:international_phone => [:country_code, :national_number
+              ]}
+            ]}
+          ]}
+        ]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {
           :shipping => AddressGateway._shared_signature + [:shipping_method],
@@ -291,6 +280,38 @@ module Braintree
             :ds_transaction_id,
           ]
         },
+        {
+          :transfer => [
+            :type,
+            {
+              :sender => [
+                :account_reference_number,
+                :date_of_birth,
+                :first_name,
+                :last_name,
+                :middle_name,
+                :tax_id,
+                {:address => AddressGateway._address_attributes}
+              ]
+            },
+            {
+              :receiver => [
+                :account_reference_number,
+                :first_name,
+                :last_name,
+                :middle_name,
+                :tax_id,
+                {:address => AddressGateway._address_attributes}
+              ]
+            },
+          ]
+        },
+        {
+          :us_bank_account => [
+            :ach_mandate_text,
+            :ach_mandate_accepted_at,
+          ]
+        },
       ]
     end
 

data/lib/braintree/us_bank_account_verification.rb

@@ -15,11 +15,12 @@ module Braintree
 
     module VerificationMethod
       IndependentCheck = "independent_check"
+      InstantVerificationAccountValidation = "instant_verification_account_validation"
       NetworkCheck = "network_check"
       TokenizedCheck = "tokenized_check"
       MicroTransfers = "micro_transfers"
 
-      All = [IndependentCheck, NetworkCheck, TokenizedCheck, MicroTransfers]
+      All = [IndependentCheck, InstantVerificationAccountValidation, NetworkCheck, TokenizedCheck, MicroTransfers]
     end
 
     module VerificationAddOns
@@ -42,6 +43,7 @@ module Braintree
 
     def initialize(attributes)
       set_instance_variables_from_hash(attributes)
+      @us_bank_account = UsBankAccount._new(nil, attributes[:us_bank_account]) if attributes[:us_bank_account]
     end
 
     def inspect

data/lib/braintree/version.rb

@@ -1,7 +1,7 @@
 module Braintree
   module Version
     Major = 4
-    Minor = 23
+    Minor = 34
     Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"

data/lib/braintree/visa_checkout_card.rb

@@ -5,10 +5,13 @@ module Braintree
 
     attr_reader :billing_address
     attr_reader :bin
+    attr_reader :business
     attr_reader :call_id
     attr_reader :card_type
     attr_reader :cardholder_name
     attr_reader :commercial
+    attr_reader :consumer
+    attr_reader :corporate
     attr_reader :country_of_issuance
     attr_reader :created_at
     attr_reader :customer_id
@@ -23,7 +26,9 @@ module Braintree
     attr_reader :last_4
     attr_reader :payroll
     attr_reader :prepaid
+    attr_reader :prepaid_reloadable
     attr_reader :product_id
+    attr_reader :purchase
     attr_reader :subscriptions
     attr_reader :token
     attr_reader :unique_number_identifier
@@ -75,11 +80,11 @@ module Braintree
 
     def self._attributes
       [
-        :billing_address, :bin, :card_type, :cardholder_name, :created_at,
-        :customer_id, :customer_location, :expiration_month, :expiration_year,
-        :last_4, :token, :updated_at, :prepaid, :payroll, :product_id,
-        :commercial, :debit, :durbin_regulated, :healthcare,
-        :country_of_issuance, :issuing_bank, :image_url, :call_id
+        :bin, :billing_address, :business, :card_type, :cardholder_name, :commercial,
+        :consumer, :container_id, :corporate, :country_of_issuance, :created_at, :customer_id,
+        :customer_location, :debit, :durbin_regulated, :expiration_month, :expiration_year,
+        :healthcare, :image_url, :issuing_bank, :last_4, :payroll, :prepaid, :prepaid_reloadable,
+        :product_id, :purchase, :token, :updated_at
       ]
     end
 

data/lib/braintree/webhook_notification.rb

@@ -13,7 +13,6 @@ module Braintree
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
       ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       Disbursement = "disbursement"
-      DisbursementException = "disbursement_exception"
 
       DisputeAccepted = "dispute_accepted"
       DisputeAutoAccepted = "dispute_auto_accepted"
@@ -57,10 +56,8 @@ module Braintree
       SubscriptionWentActive = "subscription_went_active"
       SubscriptionWentPastDue = "subscription_went_past_due"
 
-      SubMerchantAccountApproved = "sub_merchant_account_approved"
-      SubMerchantAccountDeclined = "sub_merchant_account_declined"
-
       TransactionDisbursed = "transaction_disbursed"
+      TransactionRetried = "transaction_retried"
       TransactionReviewed = "transaction_reviewed"
       TransactionSettlementDeclined = "transaction_settlement_declined"
       TransactionSettled = "transaction_settled"

data/lib/braintree/webhook_testing_gateway.rb

@@ -58,20 +58,16 @@ module Braintree
         _partner_merchant_declined_sample_xml(id)
       when Braintree::WebhookNotification::Kind::OAuthAccessRevoked
         _oauth_access_revoked_sample_xml(id)
-      when Braintree::WebhookNotification::Kind::SubMerchantAccountApproved
-        _merchant_account_approved_sample_xml(id)
-      when Braintree::WebhookNotification::Kind::SubMerchantAccountDeclined
-        _merchant_account_declined_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionDisbursed
         _transaction_disbursed_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::TransactionRetried
+        _transaction_retried_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionReviewed
         _transaction_reviewed_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionSettled
         _transaction_settled_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionSettlementDeclined
         _transaction_settlement_declined_sample_xml(id)
-      when Braintree::WebhookNotification::Kind::DisbursementException
-        _disbursement_exception_sample_xml(id)
       when Braintree::WebhookNotification::Kind::Disbursement
         _disbursement_sample_xml(id)
       when Braintree::WebhookNotification::Kind::SubscriptionBillingSkipped
@@ -275,6 +271,20 @@ module Braintree
       XML
     end
 
+    def _transaction_retried_sample_xml(id)
+
+      <<-XML
+        <transaction>
+          <id>#{id}</id>
+          <amount>100</amount>
+          <status>submitted_for_settlement</status>
+          <type>sale</type>
+          <currency-iso-code>USD</currency-iso-code>
+          <retried-transaction-id>original_txn_id</retried-transaction-id>
+        </transaction>
+      XML
+    end
+
     def _transaction_reviewed_sample_xml(id)
 
       <<-XML
@@ -959,33 +969,7 @@ module Braintree
       XML
     end
 
-    def _disbursement_exception_sample_xml(id)
-
-      <<-XML
-        <disbursement>
-          <id>#{id}</id>
-          <transaction-ids type="array">
-            <item>afv56j</item>
-            <item>kj8hjk</item>
-          </transaction-ids>
-          <success type="boolean">false</success>
-          <retry type="boolean">false</retry>
-          <merchant-account>
-            <id>merchant_account_token</id>
-            <currency-iso-code>USD</currency-iso-code>
-            <sub-merchant-account type="boolean">false</sub-merchant-account>
-            <status>active</status>
-          </merchant-account>
-          <amount>100.00</amount>
-          <disbursement-date type="date">2014-02-10</disbursement-date>
-          <exception-message>bank_rejected</exception-message>
-          <follow-up-action>update_funding_information</follow-up-action>
-        </disbursement>
-      XML
-    end
-
     def _disbursement_sample_xml(id)
-
       <<-XML
         <disbursement>
           <id>#{id}</id>
@@ -1010,7 +994,6 @@ module Braintree
     end
 
     def _account_updater_daily_report_sample_xml(id)
-
       <<-XML
         <account-updater-daily-report>
           <report-date type="date">2016-01-14</report-date>