braintree 4.25.0 → 4.27.0

data/lib/braintree/transaction/google_pay_details.rb

@@ -5,27 +5,28 @@ module Braintree
 
       attr_reader :bin
       attr_reader :card_type
+      attr_reader :commercial
+      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 :payroll
+      attr_reader :prepaid
+      attr_reader :prepaid_reloadable
+      attr_reader :product_id
       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

@@ -22,6 +22,7 @@ module Braintree
         attr_reader :last_4
         attr_reader :payroll
         attr_reader :prepaid
+        attr_reader :prepaid_reloadable
         attr_reader :product_id
         attr_reader :token
         attr_reader :unique_number_identifier
@@ -36,8 +37,10 @@ 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, :card_type, :cardholder_name, :commercial, :container_id, :country_of_issuance,
+            :customer_location, :debit, :durbin_regulated, :expiration_date, :healthcare, :image_url,
+            :issuing_bank, :last_4, :payroll, :prepaid, :prepaid_reloadable, :product_id, :token]
           formatted_attrs = attr_order.map do |attr|
             "#{attr}: #{send(attr).inspect}"
           end

data/lib/braintree/transaction/meta_checkout_token_details.rb

@@ -24,6 +24,7 @@ module Braintree
         attr_reader :last_4
         attr_reader :payroll
         attr_reader :prepaid
+        attr_reader :prepaid_reloadable
         attr_reader :product_id
         attr_reader :token
         attr_reader :unique_number_identifier
@@ -38,8 +39,11 @@ 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, :card_type, :cardholder_name, :commercial, :container_id, :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, :token]
           formatted_attrs = attr_order.map do |attr|
             "#{attr}: #{send(attr).inspect}"
           end

data/lib/braintree/transaction/visa_checkout_card_details.rb

@@ -20,6 +20,7 @@ module Braintree
       attr_reader :last_4
       attr_reader :payroll
       attr_reader :prepaid
+      attr_reader :prepaid_reloadable
       attr_reader :product_id
       attr_reader :token
 
@@ -32,8 +33,10 @@ 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, :call_id, :card_type, :cardholder_name, :commercial, :country_of_issuance, :customer_location,
+          :debit, :durbin_regulated, :expiration_date, :healthcare, :image_url, :issuing_bank, :last_4, :payroll,
+          :prepaid, :prepaid_reloadable, :product_id, :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"
@@ -118,7 +109,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
@@ -235,14 +225,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 +245,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)
@@ -275,6 +255,15 @@ module Braintree
         ]
         },
         {: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],

data/lib/braintree/version.rb

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

data/lib/braintree/visa_checkout_card.rb

@@ -23,6 +23,7 @@ module Braintree
     attr_reader :last_4
     attr_reader :payroll
     attr_reader :prepaid
+    attr_reader :prepaid_reloadable
     attr_reader :product_id
     attr_reader :subscriptions
     attr_reader :token
@@ -75,11 +76,10 @@ 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, :card_type, :cardholder_name, :commercial, :container_id, :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, :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,9 +56,6 @@ module Braintree
       SubscriptionWentActive = "subscription_went_active"
       SubscriptionWentPastDue = "subscription_went_past_due"
 
-      SubMerchantAccountApproved = "sub_merchant_account_approved"
-      SubMerchantAccountDeclined = "sub_merchant_account_declined"
-
       TransactionDisbursed = "transaction_disbursed"
       TransactionReviewed = "transaction_reviewed"
       TransactionSettlementDeclined = "transaction_settlement_declined"

data/lib/braintree/webhook_testing_gateway.rb

@@ -58,10 +58,6 @@ 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::TransactionReviewed
@@ -70,8 +66,6 @@ module Braintree
         _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
@@ -959,33 +953,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 +978,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>

data/lib/braintree.rb

@@ -98,9 +98,6 @@ require "braintree/merchant"
 require "braintree/merchant_gateway"
 require "braintree/merchant_account"
 require "braintree/merchant_account_gateway"
-require "braintree/merchant_account/individual_details"
-require "braintree/merchant_account/business_details"
-require "braintree/merchant_account/funding_details"
 require "braintree/merchant_account/address_details"
 require "braintree/meta_checkout_card"
 require "braintree/meta_checkout_token"
@@ -117,6 +114,8 @@ require "braintree/payment_method_nonce_gateway"
 require "braintree/payment_method_parser"
 require "braintree/paypal_account"
 require "braintree/paypal_account_gateway"
+require "braintree/paypal_payment_resource"
+require "braintree/paypal_payment_resource_gateway"
 require "braintree/plan"
 require "braintree/plan_gateway"
 require "braintree/processor_response_types"

data/spec/integration/braintree/credit_card_spec.rb

@@ -449,6 +449,18 @@ describe Braintree::CreditCard do
         expect(credit_card.prepaid).to eq(Braintree::CreditCard::Prepaid::Yes)
       end
 
+      it "sets the prepaid reloadable field if the card is prepaid reloadable" do
+        customer = Braintree::Customer.create!
+        result = Braintree::CreditCard.create(
+          :customer_id => customer.id,
+          :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::PrepaidReloadable,
+          :expiration_date => "05/2014",
+          :options => {:verify_card => true},
+        )
+        credit_card = result.credit_card
+        expect(credit_card.prepaid_reloadable).to eq(Braintree::CreditCard::PrepaidReloadable::Yes)
+      end
+
       it "sets the healthcare field if the card is healthcare" do
         customer = Braintree::Customer.create!
         result = Braintree::CreditCard.create(

data/spec/integration/braintree/credit_card_verification_spec.rb

@@ -322,6 +322,30 @@ describe Braintree::CreditCardVerification, "search" do
         found_verification = Braintree::CreditCardVerification.find(verification_id)
         expect(found_verification.credit_card[:prepaid]).to eq(Braintree::CreditCard::Prepaid::Yes)
       end
+
+      it "returns prepaid_reloadable on a prepaid card" do
+        cardholder_name = "Tom #{rand(1_000_000)} Smith"
+
+        Braintree::Customer.create(
+          :credit_card => {
+          :cardholder_name => cardholder_name,
+          :expiration_date => "05/2012",
+          :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::PrepaidReloadable,
+          :cvv => "200",
+          :options => {
+            :verify_card => true
+        }
+        })
+
+        search_results = Braintree::CreditCardVerification.search do |search|
+          search.credit_card_cardholder_name.is cardholder_name
+        end
+
+        verification_id = search_results.first.id
+
+        found_verification = Braintree::CreditCardVerification.find(verification_id)
+        expect(found_verification.credit_card[:prepaid_reloadable]).to eq(Braintree::CreditCard::PrepaidReloadable::Yes)
+      end
     end
   end
 

data/spec/integration/braintree/customer_spec.rb

@@ -991,18 +991,19 @@ describe Braintree::Customer do
       expect(found_customer.apple_pay_cards).not_to be_nil
       apple_pay_card = found_customer.apple_pay_cards.first
       expect(apple_pay_card).to be_a Braintree::ApplePayCard
-      expect(apple_pay_card.token).not_to be_nil
-      expect(apple_pay_card.expiration_year).not_to be_nil
-      expect(apple_pay_card.payment_instrument_name).to eq("AmEx 41002")
       expect(apple_pay_card.commercial).not_to be_nil
       expect(apple_pay_card.country_of_issuance).not_to be_nil
       expect(apple_pay_card.debit).not_to be_nil
       expect(apple_pay_card.durbin_regulated).not_to be_nil
+      expect(apple_pay_card.expiration_year).not_to be_nil
       expect(apple_pay_card.healthcare).not_to be_nil
       expect(apple_pay_card.issuing_bank).not_to be_nil
+      expect(apple_pay_card.payment_instrument_name).to eq("AmEx 41002")
       expect(apple_pay_card.payroll).not_to be_nil
       expect(apple_pay_card.prepaid).not_to be_nil
+      expect(apple_pay_card.prepaid_reloadable).not_to be_nil
       expect(apple_pay_card.product_id).not_to be_nil
+      expect(apple_pay_card.token).not_to be_nil
     end
 
     it "returns associated google pay proxy cards" do
@@ -1016,18 +1017,19 @@ describe Braintree::Customer do
       expect(found_customer.payment_methods.size).to eq(1)
       google_pay_card = found_customer.google_pay_cards.first
       expect(google_pay_card).to be_a Braintree::GooglePayCard
-      expect(google_pay_card.token).not_to be_nil
-      expect(google_pay_card.expiration_year).not_to be_nil
-      expect(google_pay_card.is_network_tokenized?).to eq(false)
       expect(google_pay_card.commercial).not_to be_nil
       expect(google_pay_card.country_of_issuance).not_to be_nil
       expect(google_pay_card.debit).not_to be_nil
       expect(google_pay_card.durbin_regulated).not_to be_nil
+      expect(google_pay_card.expiration_year).not_to be_nil
       expect(google_pay_card.healthcare).not_to be_nil
+      expect(google_pay_card.is_network_tokenized?).to eq(false)
       expect(google_pay_card.issuing_bank).not_to be_nil
       expect(google_pay_card.payroll).not_to be_nil
       expect(google_pay_card.prepaid).not_to be_nil
+      expect(google_pay_card.prepaid_reloadable).not_to be_nil
       expect(google_pay_card.product_id).not_to be_nil
+      expect(google_pay_card.token).not_to be_nil
     end
 
     it "returns associated google pay network tokens" do
@@ -1052,6 +1054,7 @@ describe Braintree::Customer do
       expect(google_pay_card.issuing_bank).not_to be_nil
       expect(google_pay_card.payroll).not_to be_nil
       expect(google_pay_card.prepaid).not_to be_nil
+      expect(google_pay_card.prepaid_reloadable).not_to be_nil
       expect(google_pay_card.product_id).not_to be_nil
     end
 
@@ -1912,4 +1915,17 @@ describe Braintree::Customer do
       end
     end
   end
+
+  it "returns prepaid_reloadable from VisaCheckoutCard" do
+    result = Braintree::Customer.create(
+      :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa,
+    )
+    expect(result.success?).to eq(true)
+
+    found_customer = Braintree::Customer.find(result.customer.id)
+    expect(found_customer.visa_checkout_cards).not_to be_nil
+    visa_checkout_card = found_customer.visa_checkout_cards.first
+    expect(visa_checkout_card).to be_a Braintree::VisaCheckoutCard
+    expect(visa_checkout_card.prepaid_reloadable).not_to be_nil
+  end
 end

data/spec/integration/braintree/disbursement_spec.rb

@@ -28,4 +28,4 @@ describe Braintree::Disbursement do
       expect(transaction.id).to eq("sub_merchant_transaction")
     end
   end
-end
+end