braintree 4.19.0 → 4.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43df747b2db22253268db6e5f01b79ea162b6c0911125b056b7bab73684dd3f
-  data.tar.gz: 6fad0280817f00e0c0e3e8c6ef3761a5bd20d3e3a777a9f91182e556fad59aba
+  metadata.gz: abb377057ff689e5a04a7a2dbfa201a3243b5008898ab343ec76d02200d4ffba
+  data.tar.gz: 128bed5617e3793b7353fd10e76dd06afce28143f4ac5def37bc28c4efb07ce4
 SHA512:
-  metadata.gz: 7e6aa6b5b10734d82c66f9f7f315c5759700412ddda2642e2424f71c8be71aca06d35aa77b69936514c8e3d0ddc2e5dd24d479e8c4359ff9d67e43222ebe0256
-  data.tar.gz: f762c62cadc6476aebfc9f0f2aee72bd254b32b93c1c069c22c67661482ac433b2598ff1f86f2f1cad943dcf28878bac4f3293025d7b45e26cb34aec3c6fbc81
+  metadata.gz: 1034c8cb638f8ecd4df2533fb4e22bc21710df5ce5b8c56da4801028b91322dbd0e690108081e7745e1c74c06be7290484872eb5a55f128c23cd3e5fc480bf3c
+  data.tar.gz: 36f48a290b8ffcfab8467d8b5b582b96d40320cf9929d996d5d703bab0cedaa0d033865c81e9b6434669fb5ca82bee911c591de5c4a9bfe0ced6c0c46fe761cd

data/lib/braintree/address.rb

@@ -12,6 +12,7 @@ module Braintree
     attr_reader :extended_address
     attr_reader :first_name
     attr_reader :id
+    attr_reader :international_phone
     attr_reader :last_name
     attr_reader :locality
     attr_reader :phone_number

data/lib/braintree/address_gateway.rb

@@ -76,8 +76,9 @@ module Braintree
 
     def self._shared_signature
       [:company, :country_code_alpha2, :country_code_alpha3, :country_code_numeric,
-        :country_name, :extended_address, :first_name, :last_name, :locality, :phone_number,
-        :postal_code, :region, :street_address]
+       :country_name, :extended_address, :first_name,
+       {:international_phone => [:country_code, :national_number]},
+       :last_name, :locality, :phone_number, :postal_code, :region, :street_address]
     end
 
     def self._update_signature

data/lib/braintree/client_token_gateway.rb

@@ -29,6 +29,7 @@ module Braintree
       [
         :address_id, :customer_id, :proxy_merchant_id, :merchant_account_id,
         :version,
+        {:domains => [:_any_key_]},
         {:options => [:make_default, :verify_card, :fail_on_duplicate_payment_method]}
       ]
     end

data/lib/braintree/credit_card.rb

@@ -81,11 +81,17 @@ module Braintree
       Configuration.gateway.credit_card.create!(*args)
     end
 
+    # NEXT_MAJOR_VERSION remove this method
+    # CreditCard.credit has been deprecated in favor of Transaction.credit
     def self.credit(token, transaction_attributes)
+      warn "[DEPRECATED] CreditCard.credit is deprecated. Use Transaction.credit instead"
       Transaction.credit(transaction_attributes.merge(:payment_method_token => token))
     end
 
+    # NEXT_MAJOR_VERSION remove this method
+    # CreditCard.credit has been deprecated in favor of Transaction.credit
     def self.credit!(token, transaction_attributes)
+      warn "[DEPRECATED] CreditCard.credit is deprecated. Use Transaction.credit instead"
       return_object_or_raise(:transaction) { credit(token, transaction_attributes) }
     end
 
@@ -109,11 +115,17 @@ module Braintree
       Configuration.gateway.credit_card.from_nonce(*args)
     end
 
+    # NEXT_MAJOR_VERSION remove this method
+    # CreditCard.sale has been deprecated in favor of Transaction.sale
     def self.sale(token, transaction_attributes)
+      warn "[DEPRECATED] CreditCard.sale is deprecated. Use Transaction.sale instead"
       Configuration.gateway.transaction.sale(transaction_attributes.merge(:payment_method_token => token))
     end
 
+    # NEXT_MAJOR_VERSION remove this method
+    # CreditCard.sale has been deprecated in favor of Transaction.sale
     def self.sale!(token, transaction_attributes)
+      warn "[DEPRECATED] CreditCard.sale is deprecated. Use Transaction.sale instead"
       return_object_or_raise(:transaction) { sale(token, transaction_attributes) }
     end
 

data/lib/braintree/credit_card_gateway.rb

@@ -24,11 +24,17 @@ module Braintree
       return_object_or_raise(:credit_card) { create(*args) }
     end
 
+    # NEXT_MAJOR_VERSION remove this method
+    # CreditCard.credit has been deprecated in favor of Transaction.credit
     def credit(token, transaction_attributes)
+      warn "[DEPRECATED] CreditCard.credit is deprecated. Use Transaction.credit instead"
       @gateway.transaction.credit(transaction_attributes.merge(:payment_method_token => token))
     end
 
+     # NEXT_MAJOR_VERSION remove this method
+     # CreditCard.credit has been deprecated in favor of Transaction.credit
     def credit!(*args)
+      warn "[DEPRECATED] CreditCard.credit is deprecated. Use Transaction.credit instead"
       return_object_or_raise(:transaction) { credit(*args) }
     end
 

data/lib/braintree/customer.rb

@@ -15,6 +15,7 @@ module Braintree
     attr_reader :google_pay_cards
     attr_reader :graphql_id
     attr_reader :id
+    attr_reader :international_phone
     attr_reader :last_name
     attr_reader :paypal_accounts
     attr_reader :phone
@@ -148,8 +149,8 @@ module Braintree
 
     def self._attributes
       [
-        :addresses, :company, :credit_cards, :email, :fax, :first_name, :id, :last_name, :phone, :website,
-        :created_at, :updated_at, :tax_identifiers
+        :addresses, :company, :credit_cards, :email, :fax, :first_name, :id, :international_phone,
+        :last_name, :phone, :website, :created_at, :updated_at, :tax_identifiers
       ]
     end
 

data/lib/braintree/customer_gateway.rb

@@ -75,7 +75,9 @@ module Braintree
         ],
       ]
       [
-        :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,
+        :company, :email, :fax, :first_name, :id,
+        {:international_phone => [:country_code, :national_number]},
+        :last_name, :phone, :website,
         :device_data, :payment_method_nonce,
         {:risk_data => [:customer_browser, :customer_ip]},
         {:credit_card => credit_card_signature},
@@ -139,7 +141,9 @@ module Braintree
         ],
       ]
       [
-        :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,
+        :company, :email, :fax, :first_name, :id,
+        {:international_phone => [:country_code, :national_number]},
+        :last_name, :phone, :website,
         :device_data, :payment_method_nonce, :default_payment_method_token,
         {:credit_card => credit_card_signature},
         {:tax_identifiers => [:country_code, :identifier]},

data/lib/braintree/error_codes.rb

@@ -185,6 +185,10 @@ module Braintree
       KindIsInvalid = "84901"
     end
 
+    module GooglePayCard
+      AndroidPayCardsAreNotAccepted = "83708"
+    end
+
     module PayPalAccount
       AuthExpired = "92911"
       CannotHaveBothAccessTokenAndConsentCode = "82903"
@@ -708,9 +712,11 @@ module Braintree
     module ClientToken
       CustomerDoesNotExist = "92804"
       FailOnDuplicatePaymentMethodRequiresCustomerId = "92803"
+      InvalidDomainFormat = "92011"
       MakeDefaultRequiresCustomerId = "92801"
       MerchantAccountDoesNotExist = "92807"
       ProxyMerchantDoesNotExist = "92805"
+      TooManyDomains = "92810"
       UnsupportedVersion = "92806"
       VerifyCardRequiresCustomerId = "92802"
     end

data/lib/braintree/paypal_account.rb

@@ -6,6 +6,7 @@ module Braintree
     attr_reader :created_at
     attr_reader :customer_id
     attr_reader :email
+    attr_reader :funding_source_description
     attr_reader :image_url
     attr_reader :payer_id
     attr_reader :revoked_at

data/lib/braintree/transaction/address_details.rb

@@ -21,6 +21,7 @@ module Braintree
       attr_reader :extended_address
       attr_reader :first_name
       attr_reader :id
+      attr_reader :international_phone
       attr_reader :last_name
       attr_reader :locality
       attr_reader :phone_number

data/lib/braintree/transaction/customer_details.rb

@@ -8,6 +8,7 @@ module Braintree
       attr_reader :fax
       attr_reader :first_name
       attr_reader :id
+      attr_reader :international_phone
       attr_reader :last_name
       attr_reader :phone
       attr_reader :website
@@ -17,7 +18,7 @@ module Braintree
       end
 
       def inspect
-        attr_order = [:id, :first_name, :last_name, :email, :company, :website, :phone, :fax]
+        attr_order = [:id, :first_name, :last_name, :email, :company, :website, :phone, :international_phone, :fax]
         formatted_attrs = attr_order.map do |attr|
           "#{attr}: #{send(attr).inspect}"
         end

data/lib/braintree/transaction/package_details.rb

@@ -5,11 +5,14 @@ module Braintree
 
             attr_reader :carrier
             attr_reader :id
+            # NEXT_MAJOR_VERSION Remove this method
+            # use paypal_tracker_id going forward
             attr_reader :paypal_tracking_id
+            attr_reader :paypal_tracker_id
             attr_reader :tracking_number
 
             def initialize(attributes)
-                set_instance_variables_from_hash attributes unless attributes.nil?
+              set_instance_variables_from_hash attributes unless attributes.nil?
             end
         end
     end

data/lib/braintree/transaction.rb

@@ -121,6 +121,7 @@ module Braintree
     attr_reader :escrow_status
     attr_reader :facilitated_details
     attr_reader :facilitator_details
+    attr_reader :foreign_retailer
     attr_reader :gateway_rejection_reason
     attr_reader :google_pay_details
     attr_reader :graphql_id

data/lib/braintree/transaction_gateway.rb

@@ -178,7 +178,7 @@ module Braintree
 
     def submit_for_partial_settlement(authorized_transaction_id, amount = nil, options = {})
       raise ArgumentError, "authorized_transaction_id is invalid" unless authorized_transaction_id =~ /\A[0-9a-z]+\z/
-      Util.verify_keys(TransactionGateway._submit_for_settlement_signature, options)
+      Util.verify_keys(TransactionGateway._submit_for_partial_settlement_signature, options)
       transaction_params = {:amount => amount}.merge(options)
       response = @config.http.post("#{@config.base_merchant_path}/transactions/#{authorized_transaction_id}/submit_for_partial_settlement", :transaction => transaction_params)
       _handle_transaction_response(response)
@@ -221,7 +221,7 @@ module Braintree
         :shared_shipping_address_id, :shipping_address_id, :shipping_amount,
         :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,:three_d_secure_token, #Deprecated
         :transaction_source, :type, :venmo_sdk_payment_method_code, # Deprecated
-        :sca_exemption, :currency_iso_code, :exchange_rate_quote_id,
+        :sca_exemption, :currency_iso_code, :exchange_rate_quote_id, :foreign_retailer,
         {: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]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number, {:payment_reader_card_details => [:encrypted_card_data, :key_serial_number]}, {:network_tokenization_attributes => [:cryptogram, :ecommerce_indicator, :token_requestor_id]}]},
@@ -322,6 +322,12 @@ module Braintree
       ]
     end
 
+    def self._submit_for_partial_settlement_signature
+      _submit_for_settlement_signature + [
+        :final_capture
+      ]
+    end
+
     def self._adjust_authorization_signature
       [
         :amount

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification.rb

@@ -46,6 +46,8 @@ module Braintree
 
       RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
 
+      RefundFailed = "refund_failed"
+
       SubscriptionBillingSkipped = "subscription_billing_skipped"
       SubscriptionCanceled = "subscription_canceled"
       SubscriptionChargedSuccessfully = "subscription_charged_successfully"

data/lib/braintree/webhook_testing_gateway.rb

@@ -104,6 +104,8 @@ module Braintree
         _local_payment_reversed_sample_xml
       when Braintree::WebhookNotification::Kind::PaymentMethodCustomerDataUpdated
         _payment_method_customer_data_updated_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::RefundFailed
+        _refund_failed_sample_xml(id)
       else
         _subscription_sample_xml(id)
       end
@@ -1181,5 +1183,21 @@ module Braintree
         </venmo-account>
         XML
     end
+
+    def _refund_failed_sample_xml(id)
+      <<-XML
+        <transaction>
+          <id>#{id}</id>
+          <amount>100</amount>
+          <credit-card>
+            <number>1234560000001234</number>
+            <cvv>123</cvv>
+            <card-type>MasterCard</card-type>
+          </credit-card>
+          <status>processor_declined</status>
+          <refunded-transaction-id>1</refunded-transaction-id>
+        </transaction>
+      XML
+    end
   end
 end

data/spec/integration/braintree/address_spec.rb

@@ -15,6 +15,7 @@ describe Braintree::Address do
         :locality => "Chicago",
         :region => "Illinois",
         :phone_number => "5551231234",
+        :international_phone => {:country_code => "1", :national_number => "3121234567"},
         :postal_code => "60622",
         :country_name => "United States of America",
       )
@@ -28,6 +29,8 @@ describe Braintree::Address do
       expect(result.address.locality).to eq("Chicago")
       expect(result.address.region).to eq("Illinois")
       expect(result.address.phone_number).to eq("5551231234")
+      expect(result.address.international_phone[:country_code]).to eq("1")
+      expect(result.address.international_phone[:national_number]).to eq("3121234567")
       expect(result.address.postal_code).to eq("60622")
       expect(result.address.country_name).to eq("United States of America")
       expect(result.address.country_code_alpha2).to eq("US")
@@ -241,6 +244,7 @@ describe Braintree::Address do
         :region => "Illinois",
         :postal_code => "60621",
         :country_name => "United States of America",
+        :international_phone => {:country_code => "1", :national_number => "3121234567"},
       )
       expect(result.success?).to eq(true)
       expect(result.address.street_address).to eq("123 E New St")
@@ -252,6 +256,8 @@ describe Braintree::Address do
       expect(result.address.country_code_alpha2).to eq("US")
       expect(result.address.country_code_alpha3).to eq("USA")
       expect(result.address.country_code_numeric).to eq("840")
+      expect(result.address.international_phone[:country_code]).to eq("1")
+      expect(result.address.international_phone[:national_number]).to eq("3121234567")
     end
 
     it "accepts country_codes" do

data/spec/integration/braintree/client_api/client_token_spec.rb

@@ -20,6 +20,34 @@ describe Braintree::ClientToken do
       expect(response.code).to eq("200")
     end
 
+    describe "domains" do
+      it "allows a domain to be specified" do
+        client_token_string = Braintree::ClientToken.generate(:domains => ["example.com"])
+        client_token = decode_client_token(client_token_string)
+        authorization_fingerprint = Base64.decode64(client_token["authorizationFingerprint"])
+        expect(authorization_fingerprint.include? "example.com").to eq(true)
+      end
+
+      it "raises ClientTokenTooManyDomains on too many domains" do
+        expect do
+          Braintree::ClientToken.generate(
+            :domains => ["example1.com",
+              "example2.com",
+              "example3.com",
+              "example4.com",
+              "example5.com",
+              "example6.com"
+            ])
+        end.to raise_error(ArgumentError, "Cannot specify more than 5 client token domains")
+      end
+
+      it "raises ClientTokenInvalidDomainFormat on invalid format" do
+        expect do
+          Braintree::ClientToken.generate(:domains => ["example"])
+        end.to raise_error(ArgumentError, "Client token domains must be valid domain names (RFC 1035), e.g. example.com")
+      end
+    end
+
     it "raises ArgumentError on invalid parameters (422)" do
       expect do
         Braintree::ClientToken.generate(:options => {:make_default => true})

data/spec/integration/braintree/credit_card_spec.rb

@@ -707,6 +707,8 @@ describe Braintree::CreditCard do
     end
   end
 
+  # NEXT_MAJOR_VERSION remove this test
+  # CreditCard.credit has been deprecated in favor of Transaction.credit
   describe "self.credit" do
     it "creates a credit transaction using the payment method token, returning a result object" do
       customer = Braintree::Customer.create!(
@@ -1338,6 +1340,8 @@ describe Braintree::CreditCard do
     end
   end
 
+  # NEXT_MAJOR_VERSION remove these tests
+  # CreditCard.sale has been deprecated in favor of Transaction.sale
   describe "self.sale" do
     it "creates a sale transaction using the credit card, returning a result object" do
       customer = Braintree::Customer.create!(
@@ -1381,6 +1385,8 @@ describe Braintree::CreditCard do
     end
   end
 
+  # NEXT_MAJOR_VERSION remove this test
+  # CreditCard.sale has been deprecated in favor of Transaction.sale
   describe "self.sale!" do
     it "creates a sale transaction using the credit card, returning the transaction" do
       customer = Braintree::Customer.create!(

data/spec/integration/braintree/customer_spec.rb

@@ -38,6 +38,7 @@ describe Braintree::Customer do
         :company => "Microsoft",
         :email => "bill@microsoft.com",
         :phone => "312.555.1234",
+        :international_phone => {:country_code => "1", :national_number => "3121234567"},
         :fax => "614.555.5678",
         :website => "www.microsoft.com",
         :tax_identifiers => [{:country_code => "US", :identifier => "987654321"}],
@@ -49,6 +50,8 @@ describe Braintree::Customer do
       expect(result.customer.company).to eq("Microsoft")
       expect(result.customer.email).to eq("bill@microsoft.com")
       expect(result.customer.phone).to eq("312.555.1234")
+      expect(result.customer.international_phone[:country_code]).to eq("1")
+      expect(result.customer.international_phone[:national_number]).to eq("3121234567")
       expect(result.customer.fax).to eq("614.555.5678")
       expect(result.customer.website).to eq("www.microsoft.com")
       expect(result.customer.created_at.between?(Time.now - 10, Time.now)).to eq(true)
@@ -1193,6 +1196,7 @@ describe Braintree::Customer do
         customer.id,
         :first_name => "Mr. Joe",
         :last_name => "Super Cool",
+        :international_phone => {:country_code => "1", :national_number => "3121234567"},
         :custom_fields => {
           :store_me => "a value"
         },
@@ -1201,6 +1205,8 @@ describe Braintree::Customer do
       expect(result.customer.id).to eq(customer.id)
       expect(result.customer.first_name).to eq("Mr. Joe")
       expect(result.customer.last_name).to eq("Super Cool")
+      expect(result.customer.international_phone[:country_code]).to eq("1")
+      expect(result.customer.international_phone[:national_number]).to eq("3121234567")
       expect(result.customer.custom_fields[:store_me]).to eq("a value")
     end
 

data/spec/integration/braintree/package_tracking_spec.rb

@@ -1,18 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/client_api/spec_helper")
 
+# NEXT_MAJOR_VERSION Remove paypal_tracking_id assertions, use paypal_tracker_id going forward
 describe Braintree::Transaction do
     describe "self.package_tracking" do
+      let(:customer) { Braintree::Customer.create! }
         it "returns validation error message from gateway api" do
-            # Create Transaction
           result = Braintree::Transaction.sale(
             :amount => "100",
+            :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
             :options => {
               :submit_for_settlement => true
             },
-            :paypal_account => {
-              :payer_id => "fake-payer-id",
-              :payment_id => "fake-payment-id",
-            },
           )
 
           expect(result.success?).to eq(true)
@@ -27,17 +26,12 @@ describe Braintree::Transaction do
         end
 
         it "successfully calls gateway API and adds package tracking information" do
-
-          # Create Transaction
           result = Braintree::Transaction.sale(
             :amount => "100",
+            :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
             :options => {
               :submit_for_settlement => true
             },
-            :paypal_account => {
-              :payer_id => "fake-payer-id",
-              :payment_id => "fake-payment-id",
-            },
           )
 
           expect(result.success?).to eq(true)
@@ -77,7 +71,8 @@ describe Braintree::Transaction do
           expect(firstPackageResult.transaction.packages[0].id).not_to be_nil
           expect(firstPackageResult.transaction.packages[0].carrier).to eq("UPS")
           expect(firstPackageResult.transaction.packages[0].tracking_number).to eq("tracking_number_1")
-
+          expect(firstPackageResult.transaction.packages[0].paypal_tracker_id).to be_nil
+          expect(firstPackageResult.transaction.packages[0].paypal_tracking_id).to be_nil
 
           # Create second package with 1 product
           secondPackageResult = Braintree::Transaction.package_tracking(
@@ -102,10 +97,34 @@ describe Braintree::Transaction do
           expect(secondPackageResult.transaction.packages[1].id).not_to be_nil
           expect(secondPackageResult.transaction.packages[1].carrier).to eq("FEDEX")
           expect(secondPackageResult.transaction.packages[1].tracking_number).to eq("tracking_number_2")
+          expect(secondPackageResult.transaction.packages[1].paypal_tracker_id).to be_nil
+          expect(secondPackageResult.transaction.packages[1].paypal_tracking_id).to be_nil
 
           # Find transaction gives both packages
-          findTransaction = Braintree::Transaction.find(result.transaction.id)
-          expect(findTransaction.packages.length).to eq(2)
+          transaction = Braintree::Transaction.find(result.transaction.id)
+          expect(transaction.packages.length).to eq(2)
+          expect(transaction.packages[0].id).not_to be_nil
+          expect(transaction.packages[0].carrier).to eq("UPS")
+          expect(transaction.packages[0].tracking_number).to eq("tracking_number_1")
+          #In test environment, since we do not have jobstream setup paypal tracker id is going to be nil, this is just to access we could access it
+          expect(transaction.packages[0].paypal_tracker_id).to be_nil
+          expect(transaction.packages[0].paypal_tracking_id).to be_nil
+
+          expect(transaction.packages[1].id).not_to be_nil
+          expect(transaction.packages[1].carrier).to eq("FEDEX")
+          expect(transaction.packages[1].tracking_number).to eq("tracking_number_2")
+          expect(transaction.packages[1].paypal_tracker_id).to be_nil
+          expect(transaction.packages[1].paypal_tracking_id).to be_nil
+        end
+
+        it "retrieves paypal_tracker_id successfully" do
+          transaction = Braintree::Transaction.find("package_tracking_tx")
+          expect(transaction.packages.length).to eq(2)
+          expect(transaction.packages[0].paypal_tracker_id).to eq("paypal_tracker_id_1")
+          expect(transaction.packages[0].paypal_tracking_id).to be_nil
+
+          expect(transaction.packages[1].paypal_tracker_id).to eq("paypal_tracker_id_2")
+          expect(transaction.packages[1].paypal_tracking_id).to be_nil
         end
     end
-end
+end

data/spec/integration/braintree/payment_method_spec.rb

@@ -453,7 +453,8 @@ describe Braintree::PaymentMethod do
         :payment_method_nonce => nonce,
         :customer_id => customer.id,
         :billing_address => {
-          :street_address => "123 Abc Way"
+          :street_address => "123 Abc Way",
+          :international_phone => {:country_code => "1", :national_number => "3121234567"},
         },
       )
 
@@ -464,6 +465,8 @@ describe Braintree::PaymentMethod do
       found_credit_card = Braintree::CreditCard.find(token)
       expect(found_credit_card).not_to be_nil
       expect(found_credit_card.billing_address.street_address).to eq("123 Abc Way")
+      expect(found_credit_card.billing_address.international_phone[:country_code]).to eq("1")
+      expect(found_credit_card.billing_address.international_phone[:national_number]).to eq("3121234567")
     end
 
     it "allows passing a billing address id outside of the nonce" do
@@ -1677,12 +1680,15 @@ describe Braintree::PaymentMethod do
           )
           update_result = Braintree::PaymentMethod.update(credit_card.token,
             :billing_address => {
+              :international_phone => {:country_code => "1", :national_number => "3121234567"},
               :region => "IL",
               :options => {:update_existing => true}
             },
           )
           expect(update_result.success?).to eq(true)
           updated_credit_card = update_result.payment_method
+          expect(updated_credit_card.billing_address.international_phone[:country_code]).to eq("1")
+          expect(updated_credit_card.billing_address.international_phone[:national_number]).to eq("3121234567")
           expect(updated_credit_card.billing_address.region).to eq("IL")
           expect(updated_credit_card.billing_address.street_address).to eq("123 Nigeria Ave")
           expect(updated_credit_card.billing_address.id).to eq(credit_card.billing_address.id)

data/spec/integration/braintree/paypal_account_spec.rb

@@ -25,6 +25,7 @@ describe Braintree::PayPalAccount do
       expect(paypal_account.created_at).not_to be_nil
       expect(paypal_account.updated_at).not_to be_nil
       expect(paypal_account.customer_id).to eq(customer.id)
+      expect(paypal_account.funding_source_description).to be_nil
       expect(paypal_account.revoked_at).to be_nil
     end
 

data/spec/integration/braintree/transaction_spec.rb

@@ -718,6 +718,49 @@ describe Braintree::Transaction do
       end
     end
 
+    context "foreign_retailer" do
+      it "returns true when foreign_retailer param is true" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2025"
+          },
+          :foreign_retailer => true,
+        )
+        expect(result).to be_success
+        expect(result.transaction.foreign_retailer).to be_truthy
+      end
+
+      it "returns nil when foreign_retailer param is false" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2025"
+          },
+          :foreign_retailer => false,
+        )
+        expect(result).to be_success
+        expect(result.transaction.foreign_retailer).to be_nil
+      end
+
+      it "returns nil when foreign_retailer param is nil" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2025"
+          },
+        )
+        expect(result).to be_success
+        expect(result.transaction.foreign_retailer).to be_nil
+      end
+    end
+
     it "returns a successful result if successful" do
       result = Braintree::Transaction.create(
         :type => "sale",
@@ -5219,6 +5262,7 @@ describe Braintree::Transaction do
           :locality => "Chicago",
           :region => "IL",
           :phone_number => "122-555-1237",
+          :international_phone => {:country_code => "1", :national_number => "3121234567"},
           :postal_code => "60622",
           :country_name => "United States of America"
         },
@@ -5231,6 +5275,7 @@ describe Braintree::Transaction do
           :locality => "Bartlett",
           :region => "IL",
           :phone_number => "122-555-1236",
+          :international_phone => {:country_code => "1", :national_number => "3121234567"},
           :postal_code => "60103",
           :country_name => "United States of America",
           :shipping_method => Braintree::Transaction::AddressDetails::ShippingMethod::Electronic
@@ -5277,6 +5322,9 @@ describe Braintree::Transaction do
       expect(transaction.billing_details.country_code_alpha2).to eq("US")
       expect(transaction.billing_details.country_code_alpha3).to eq("USA")
       expect(transaction.billing_details.country_code_numeric).to eq("840")
+      expect(transaction.billing_details.phone_number).to eq("122-555-1237")
+      expect(transaction.billing_details.international_phone[:country_code]).to eq("1")
+      expect(transaction.billing_details.international_phone[:national_number]).to eq("3121234567")
       expect(transaction.shipping_details.first_name).to eq("Andrew")
       expect(transaction.shipping_details.last_name).to eq("Mason")
       expect(transaction.shipping_details.company).to eq("Braintree")
@@ -5289,6 +5337,9 @@ describe Braintree::Transaction do
       expect(transaction.shipping_details.country_code_alpha2).to eq("US")
       expect(transaction.shipping_details.country_code_alpha3).to eq("USA")
       expect(transaction.shipping_details.country_code_numeric).to eq("840")
+      expect(transaction.shipping_details.phone_number).to eq("122-555-1236")
+      expect(transaction.shipping_details.international_phone[:country_code]).to eq("1")
+      expect(transaction.shipping_details.international_phone[:national_number]).to eq("3121234567")
     end
 
     it "allows merchant account to be specified" do
@@ -6579,6 +6630,39 @@ describe Braintree::Transaction do
       result = Braintree::Transaction.submit_for_partial_settlement(transaction.id, Braintree::Test::TransactionAmounts::Authorize, industry_data_flight_params)
       expect(result.success?).to be_truthy
     end
+
+    it "final_capture indicates the current partial_capture as final" do
+      authorized_transaction = Braintree::Transaction.sale!(
+        :amount => Braintree::Test::TransactionAmounts::Authorize,
+        :merchant_account_id => SpecHelper::DefaultMerchantAccountId,
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "06/2009"
+        },
+      )
+
+      result1 = Braintree::Transaction.submit_for_partial_settlement(authorized_transaction.id, 100)
+      expect(result1.success?).to eq(true)
+      partial_settlement_transaction1 = result1.transaction
+      expect(partial_settlement_transaction1.amount).to eq(100)
+      expect(partial_settlement_transaction1.type).to eq(Braintree::Transaction::Type::Sale)
+      expect(partial_settlement_transaction1.status).to eq(Braintree::Transaction::Status::SubmittedForSettlement)
+      expect(partial_settlement_transaction1.authorized_transaction_id).to eq(authorized_transaction.id)
+      refreshed_authorized_transaction1 = Braintree::Transaction.find(authorized_transaction.id)
+      expect(refreshed_authorized_transaction1.status).to eq(Braintree::Transaction::Status::SettlementPending)
+
+      options = {:final_capture => true}
+      result2 = Braintree::Transaction.submit_for_partial_settlement(authorized_transaction.id, 100, options)
+      expect(result2.success?).to eq(true)
+      partial_settlement_transaction2 = result2.transaction
+      expect(partial_settlement_transaction2.amount).to eq(100)
+      expect(partial_settlement_transaction2.type).to eq(Braintree::Transaction::Type::Sale)
+      expect(partial_settlement_transaction2.status).to eq(Braintree::Transaction::Status::SubmittedForSettlement)
+      expect(partial_settlement_transaction2.authorized_transaction_id).to eq(authorized_transaction.id)
+
+      refreshed_authorized_transaction2 = Braintree::Transaction.find(authorized_transaction.id)
+      expect(refreshed_authorized_transaction2.status).to eq(Braintree::Transaction::Status::SettlementPending)
+    end
   end
 
   describe "self.submit_for_partial_settlement!" do

data/spec/unit/braintree/credit_card_spec.rb

@@ -34,6 +34,7 @@ describe Braintree::CreditCard do
           :country_name,
           :extended_address,
           :first_name,
+          {:international_phone=>[:country_code, :national_number]},
           :last_name,
           :locality,
           :phone_number,
@@ -81,6 +82,7 @@ describe Braintree::CreditCard do
           :country_name,
           :extended_address,
           :first_name,
+          {:international_phone=>[:country_code, :national_number]},
           :last_name,
           :locality,
           :phone_number,

data/spec/unit/braintree/customer_spec.rb

@@ -16,6 +16,7 @@ describe Braintree::Customer do
         :first_name => "Patrick",
         :last_name => "Smith",
         :phone => "802-483-5932",
+        :international_phone => {:country_code => "1", :national_number => "3121234567"},
         :website => "patrick.smith.com",
         :created_at => Time.now,
         :updated_at => Time.now,
@@ -27,6 +28,7 @@ describe Braintree::Customer do
       expect(output).to include(%q(first_name: "Patrick"))
       expect(output).to include(%q(last_name: "Smith"))
       expect(output).to include(%q(phone: "802-483-5932"))
+      expect(output).to include(%q(international_phone: {:country_code=>"1", :national_number=>"3121234567"}))
       expect(output).to include(%q(website: "patrick.smith.com"))
       expect(output).to include(%q(addresses: []))
       expect(output).to include(%q(credit_cards: []))
@@ -82,6 +84,7 @@ describe Braintree::Customer do
         :fax,
         :first_name,
         :id,
+        {:international_phone=>[:country_code, :national_number]},
         :last_name,
         :phone,
         :website,
@@ -111,6 +114,7 @@ describe Braintree::Customer do
             :country_name,
             :extended_address,
             :first_name,
+            {:international_phone=>[:country_code, :national_number]},
             :last_name,
             :locality,
             :phone_number,
@@ -154,6 +158,7 @@ describe Braintree::Customer do
               :country_name,
               :extended_address,
               :first_name,
+              {:international_phone=>[:country_code, :national_number]},
               :last_name,
               :locality,
               :phone_number,
@@ -176,6 +181,7 @@ describe Braintree::Customer do
         :fax,
         :first_name,
         :id,
+        {:international_phone=>[:country_code, :national_number]},
         :last_name,
         :phone,
         :website,
@@ -215,6 +221,7 @@ describe Braintree::Customer do
             :country_name,
             :extended_address,
             :first_name,
+            {:international_phone=>[:country_code, :national_number]},
             :last_name,
             :locality,
             :phone_number,
@@ -253,6 +260,7 @@ describe Braintree::Customer do
               :country_name,
               :extended_address,
               :first_name,
+              {:international_phone=>[:country_code, :national_number]},
               :last_name,
               :locality,
               :phone_number,

data/spec/unit/braintree/package_tracking_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
+# NEXT_MAJOR_VERSION Remove paypal_tracking_id assertions, use paypal_tracker_id going forward
 describe "Package Tracking Unit Tests" do
     describe "creates and validates requests" do
         let(:gateway) do
@@ -39,8 +40,8 @@ describe "Package Tracking Unit Tests" do
           transaction = Braintree::Transaction._new(
             :gateway,
             :shipments => [
-              {:id => "id1", :carrier => "UPS", :tracking_number => "tracking_number_1", :paypal_tracking_id => "pp_tracking_number_1"},
-              {:id => "id2", :carrier => "FEDEX", :tracking_number => "tracking_number_2", :paypal_tracking_id => "pp_tracking_number_2"}
+              {:id => "id1", :carrier => "UPS", :tracking_number => "tracking_number_1", :paypal_tracking_id => "pp_tracking_number_1", :paypal_tracker_id => "pp_tracking_number_1"},
+              {:id => "id2", :carrier => "FEDEX", :tracking_number => "tracking_number_2", :paypal_tracking_id => "pp_tracking_number_2", :paypal_tracker_id => "pp_tracking_number_2"}
             ],
           )
           expect(transaction.packages.size).to eq(2)
@@ -48,11 +49,13 @@ describe "Package Tracking Unit Tests" do
           expect(transaction.packages[0].carrier).to eq("UPS")
           expect(transaction.packages[0].tracking_number).to eq("tracking_number_1")
           expect(transaction.packages[0].paypal_tracking_id).to eq("pp_tracking_number_1")
+          expect(transaction.packages[0].paypal_tracker_id).to eq("pp_tracking_number_1")
 
           expect(transaction.packages[1].id).to eq("id2")
           expect(transaction.packages[1].carrier).to eq("FEDEX")
           expect(transaction.packages[1].tracking_number).to eq("tracking_number_2")
           expect(transaction.packages[1].paypal_tracking_id).to eq("pp_tracking_number_2")
+          expect(transaction.packages[1].paypal_tracker_id).to eq("pp_tracking_number_2")
         end
 
         it "doesn't blow up if no shipments are present in the transaction response" do

data/spec/unit/braintree/transaction/customer_details_spec.rb

@@ -11,9 +11,10 @@ describe Braintree::Transaction::CustomerDetails do
         :company => "Smith Co.",
         :website => "http://www.example.com",
         :phone => "6145551234",
+        :international_phone => {:country_code=>"1", :national_number=>"3121234567"},
         :fax => "3125551234",
       )
-      expect(details.inspect).to eq(%(#<id: "id", first_name: "Amy", last_name: "Smith", email: "amy.smith@example.com", company: "Smith Co.", website: "http://www.example.com", phone: "6145551234", fax: "3125551234">))
+      expect(details.inspect).to eq(%(#<id: "id", first_name: "Amy", last_name: "Smith", email: "amy.smith@example.com", company: "Smith Co.", website: "http://www.example.com", phone: "6145551234", international_phone: {:country_code=>\"1\", :national_number=>\"3121234567\"}, fax: "3125551234">))
     end
   end
 end

data/spec/unit/braintree/transaction_gateway_spec.rb

@@ -40,7 +40,7 @@ describe Braintree::TransactionGateway do
         :shared_shipping_address_id, :shipping_address_id, :shipping_amount,
         :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,:three_d_secure_token, #Deprecated
         :transaction_source, :type, :venmo_sdk_payment_method_code, #Deprecated
-        :sca_exemption, :currency_iso_code, :exchange_rate_quote_id,
+        :sca_exemption, :currency_iso_code, :exchange_rate_quote_id, :foreign_retailer,
         {: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]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number, {:payment_reader_card_details => [:encrypted_card_data, :key_serial_number]}, {:network_tokenization_attributes => [:cryptogram, :ecommerce_indicator, :token_requestor_id]}]},
@@ -140,5 +140,9 @@ describe Braintree::TransactionGateway do
         :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],
       ])
     end
+
+    it "creates transaction gateway submit for partial settlement signature" do
+       expect(Braintree::TransactionGateway._submit_for_partial_settlement_signature).to include(:final_capture)
+    end
   end
 end

data/spec/unit/braintree/webhook_notification_spec.rb

@@ -941,4 +941,16 @@ describe Braintree::WebhookNotification do
       end.to raise_error(Braintree::InvalidChallenge, /challenge contains non-hex characters/)
     end
   end
+
+  describe "refund failed" do
+    it "builds a sample notification for refund failed" do
+      sample_notification = Braintree::WebhookTesting.sample_notification(
+        Braintree::WebhookNotification::Kind::RefundFailed,
+        "my_id",
+      )
+      notification = Braintree::WebhookNotification.parse(sample_notification[:bt_signature], sample_notification[:bt_payload])
+      expect(notification.kind.should).to eq(Braintree::WebhookNotification::Kind::RefundFailed)
+      expect(notification.transaction.id).to eq("my_id")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 4.19.0
+  version: 4.21.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder