braintree 4.21.0 → 4.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb377057ff689e5a04a7a2dbfa201a3243b5008898ab343ec76d02200d4ffba
-  data.tar.gz: 128bed5617e3793b7353fd10e76dd06afce28143f4ac5def37bc28c4efb07ce4
+  metadata.gz: 3eefd7e093c28bf6167e2147719c79ddfde8823a01d2a5941d3b88b7ddb7b001
+  data.tar.gz: b61191ffd282fad509d02061f26f4fd61bdead52eaa33a11c165cc32cde8e9c9
 SHA512:
-  metadata.gz: 1034c8cb638f8ecd4df2533fb4e22bc21710df5ce5b8c56da4801028b91322dbd0e690108081e7745e1c74c06be7290484872eb5a55f128c23cd3e5fc480bf3c
-  data.tar.gz: 36f48a290b8ffcfab8467d8b5b582b96d40320cf9929d996d5d703bab0cedaa0d033865c81e9b6434669fb5ca82bee911c591de5c4a9bfe0ced6c0c46fe761cd
+  metadata.gz: 80b27a7c007729e9236d3f8b3ececb6eb89c207e2954bfad63d225d28e2984054b36c3f3193f8ee65596471b2682ddf72c10dfac25651288709142238c73e3da
+  data.tar.gz: b7bece4ac524d149d38bb311bb125a56b6b80d2198218bdabbbf993a5a7208bc1d35e9d863ea6b63ca002409a35fde7e47793f6471daea6b3aa5d0202d12fc8e

data/lib/braintree/configuration.rb

@@ -239,7 +239,7 @@ module Braintree
       when :production
         "#{endpoint}.braintreegateway.com"
       when :qa
-        "gateway.qa.braintreepayments.com"
+        "gateway.qa2.braintreepayments.com"
       when :sandbox
         "api.sandbox.braintreegateway.com"
       end

data/lib/braintree/credit_card_verification.rb

@@ -26,6 +26,8 @@ module Braintree
     end
 
     attr_reader :amount
+    attr_reader :ani_first_name_response_code
+    attr_reader :ani_last_name_response_code
     attr_reader :avs_error_response_code
     attr_reader :avs_postal_code_response_code
     attr_reader :avs_street_address_response_code
@@ -45,8 +47,8 @@ module Braintree
     attr_reader :processor_response_text
     attr_reader :processor_response_type
     attr_reader :risk_data
-    attr_reader :three_d_secure_info
     attr_reader :status
+    attr_reader :three_d_secure_info
 
     def initialize(attributes)
       set_instance_variables_from_hash(attributes)
@@ -59,23 +61,25 @@ module Braintree
 
     def inspect
       attr_order = [
-        :status,
-        :processor_response_code,
-        :processor_response_text,
         :amount,
-        :currency_iso_code,
-        :cvv_response_code,
+        :ani_first_name_response_code,
+        :ani_last_name_response_code,
         :avs_error_response_code,
         :avs_postal_code_response_code,
         :avs_street_address_response_code,
-        :network_response_code,
-        :network_response_text,
-        :merchant_account_id,
+        :billing,
+        :created_at,
+        :credit_card,
+        :currency_iso_code,
+        :cvv_response_code,
         :gateway_rejection_reason,
         :id,
-        :credit_card,
-        :billing,
-        :created_at
+        :merchant_account_id,
+        :network_response_code,
+        :network_response_text,
+        :processor_response_code,
+        :processor_response_text,
+        :status
       ]
       formatted_attrs = attr_order.map do |attr|
         if attr == :amount

data/lib/braintree/local_payment_completed.rb

@@ -2,8 +2,11 @@ module Braintree
   class LocalPaymentCompleted
     include BaseModule
 
-    attr_reader :payment_id
+    attr_reader :bic
+    attr_reader :iban_last_chars
     attr_reader :payer_id
+    attr_reader :payer_name
+    attr_reader :payment_id
     attr_reader :payment_method_nonce
     attr_reader :transaction
 

data/lib/braintree/paypal_account.rb

@@ -5,6 +5,7 @@ module Braintree
     attr_reader :billing_agreement_id
     attr_reader :created_at
     attr_reader :customer_id
+    attr_reader :edit_paypal_vault_id
     attr_reader :email
     attr_reader :funding_source_description
     attr_reader :image_url

data/lib/braintree/transaction.rb

@@ -171,6 +171,7 @@ module Braintree
     attr_reader :settlement_batch_id
     attr_reader :shipping_amount
     attr_reader :shipping_details
+    attr_reader :shipping_tax_amount
     attr_reader :ships_from_postal_code
     attr_reader :status                                 # See Transaction::Status
     attr_reader :status_history

data/lib/braintree/transaction_gateway.rb

@@ -214,36 +214,45 @@ module Braintree
     # three_d_secure_token has been deprecated in favor of three_d_secure_authentication_id
     def self._create_signature
       [
-        :amount, :billing_address_id, :channel, :customer_id, :device_data, :discount_amount,
+        :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,
         :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,
+        :shared_shipping_address_id, :shipping_address_id, :shipping_amount, :shipping_tax_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, :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]}]},
-        {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
+        :sca_exemption,
+        {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
         {
           :billing => AddressGateway._shared_signature
         },
-        {
-          :shipping => AddressGateway._shared_signature + [:shipping_method],
-        },
-        {
-          :three_d_secure_pass_thru => [
-            :eci_flag,
-            :cavv,
-            :xid,
-            :three_d_secure_version,
-            :authentication_response,
-            :directory_response,
-            :cavv_algorithm,
-            :ds_transaction_id,
-          ]
-        },
+        {: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]}]},
+        {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
+        {:custom_fields => :_any_key_},
+        {:descriptor => [:name, :phone, :url]},
+        {:external_vault => [
+          :status,
+          :previous_network_transaction_id,
+        ]},
+        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]},
+        {:industry => [
+          :industry_type,
+          {:data => [
+            :country_code, :date_of_birth, :folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
+            :passenger_first_name, :passenger_last_name, :passenger_middle_initial, :passenger_title, :issued_date, :travel_agency_name, :travel_agency_code, :ticket_number,
+            :issuing_carrier_code, :customer_code, :fare_amount, :fee_amount, :tax_amount, :restricted_ticket, :no_show, :advanced_deposit, :fire_safe, :property_phone, :ticket_issuer_address, :arrival_date,
+            {:legs => [
+              :conjunction_ticket, :exchange_ticket, :coupon_number, :service_class, :carrier_code, :fare_basis_code, :flight_number, :departure_date, :departure_airport_code, :departure_time,
+              :arrival_airport_code, :arrival_time, :stopover_permitted, :fare_amount, :fee_amount, :tax_amount, :endorsement_or_restrictions,
+            ]},
+            {:additional_charges => [
+              :kind, :amount,
+            ]},
+          ]},
+        ]},
+        {: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,
@@ -265,31 +274,23 @@ module Braintree
           {:credit_card => [:account_type, :process_debit_as_credit]},
         ]
         },
-        {:external_vault => [
-          :status,
-          :previous_network_transaction_id,
-        ]},
-        {:custom_fields => :_any_key_},
-        {:descriptor => [:name, :phone, :url]},
         {:paypal_account => [:email, :token, :paypal_data, :payee_id, :payee_email, :payer_id, :payment_id]},
-        {:industry => [
-          :industry_type,
-          {:data => [
-            :country_code, :date_of_birth, :folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
-            :passenger_first_name, :passenger_last_name, :passenger_middle_initial, :passenger_title, :issued_date, :travel_agency_name, :travel_agency_code, :ticket_number,
-            :issuing_carrier_code, :customer_code, :fare_amount, :fee_amount, :tax_amount, :restricted_ticket, :no_show, :advanced_deposit, :fire_safe, :property_phone, :ticket_issuer_address, :arrival_date,
-            {:legs => [
-              :conjunction_ticket, :exchange_ticket, :coupon_number, :service_class, :carrier_code, :fare_basis_code, :flight_number, :departure_date, :departure_airport_code, :departure_time,
-              :arrival_airport_code, :arrival_time, :stopover_permitted, :fare_amount, :fee_amount, :tax_amount, :endorsement_or_restrictions,
-            ]},
-            {:additional_charges => [
-              :kind, :amount,
-            ]},
-          ]},
-        ]},
-        {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
-        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]},
-        {:installments => [:count]},
+        {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
+        {
+          :shipping => AddressGateway._shared_signature + [:shipping_method],
+        },
+        {
+          :three_d_secure_pass_thru => [
+            :eci_flag,
+            :cavv,
+            :xid,
+            :three_d_secure_version,
+            :authentication_response,
+            :directory_response,
+            :cavv_algorithm,
+            :ds_transaction_id,
+          ]
+        },
       ]
     end
 
@@ -317,6 +318,7 @@ module Braintree
         :tax_exempt,
         :discount_amount,
         :shipping_amount,
+        :shipping_tax_amount,
         :ships_from_postal_code,
         :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],
       ]

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_testing_gateway.rb

@@ -1096,8 +1096,11 @@ module Braintree
     def _local_payment_completed_sample_xml(id)
       <<-XML
         <local-payment>
-          <payment-id>PAY-XYZ123</payment-id>
+          <bic>BIC</bic>
+          <iban_last_chars>1234</iban_last_chars>
           <payer-id>ABCPAYER</payer-id>
+          <payer-name>PAYERNAME</payer-name>
+          <payment-id>PAY-XYZ123</payment-id>
           <payment-method-nonce>ee257d98-de40-47e8-96b3-a6954ea7a9a4</payment-method-nonce>
           <transaction>
             <id>#{id}</id>

data/spec/integration/braintree/apple_pay_spec.rb

@@ -10,7 +10,7 @@ describe Braintree::ApplePayGateway do
 
     result = gateway.merchant.create(
       :email => "name@email.com",
-      :country_code_alpha3 => "USA",
+      :country_code_alpha3 => "GBR",
       :payment_methods => ["credit_card", "paypal"],
     )
 

data/spec/integration/braintree/credit_card_verification_spec.rb

@@ -48,6 +48,25 @@ describe Braintree::CreditCardVerification, "search" do
       expect(result.credit_card_verification.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
     end
 
+    it "creates a new verification for Visa ANI" do
+      verification_params = {
+        :credit_card => {
+          :expiration_date => "05/2012",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+        },
+      }
+
+      result = Braintree::CreditCardVerification.create(verification_params)
+
+      expect(result).to be_success
+      expect(result.credit_card_verification.status).to eq(Braintree::CreditCardVerification::Status::Verified)
+      expect(result.credit_card_verification.processor_response_code).to eq("1000")
+      expect(result.credit_card_verification.processor_response_text).to eq("Approved")
+      expect(result.credit_card_verification.ani_first_name_response_code).to eq("I")
+      expect(result.credit_card_verification.ani_last_name_response_code).to eq("I")
+      expect(result.credit_card_verification.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
+    end
+
     it "creates a new verification from external vault param" do
       verification_params = {
         :credit_card => {

data/spec/integration/braintree/merchant_account_spec.rb

@@ -97,7 +97,7 @@ describe Braintree::MerchantAccount do
 
       result = gateway.merchant.create(
         :email => "name@email.com",
-        :country_code_alpha3 => "USA",
+        :country_code_alpha3 => "GBR",
         :payment_methods => ["credit_card", "paypal"],
       )
 
@@ -109,7 +109,7 @@ describe Braintree::MerchantAccount do
       result = gateway.merchant_account.all
       expect(result).to be_success
       expect(result.merchant_accounts.count).to eq(1)
-      expect(result.merchant_accounts.first.currency_iso_code).to eq("USD")
+      expect(result.merchant_accounts.first.currency_iso_code).to eq("GBP")
       expect(result.merchant_accounts.first.status).to eq("active")
       expect(result.merchant_accounts.first.default).to eq(true)
     end

data/spec/integration/braintree/merchant_spec.rb

@@ -11,7 +11,7 @@ describe Braintree::MerchantGateway do
 
       result = gateway.merchant.create(
         :email => "name@email.com",
-        :country_code_alpha3 => "USA",
+        :country_code_alpha3 => "GBR",
         :payment_methods => ["credit_card", "paypal"],
       )
 
@@ -21,10 +21,10 @@ describe Braintree::MerchantGateway do
       expect(merchant.id).not_to be_nil
       expect(merchant.email).to eq("name@email.com")
       expect(merchant.company_name).to eq("name@email.com")
-      expect(merchant.country_code_alpha3).to eq("USA")
-      expect(merchant.country_code_alpha2).to eq("US")
-      expect(merchant.country_code_numeric).to eq("840")
-      expect(merchant.country_name).to eq("United States of America")
+      expect(merchant.country_code_alpha3).to eq("GBR")
+      expect(merchant.country_code_alpha2).to eq("GB")
+      expect(merchant.country_code_numeric).to eq("826")
+      expect(merchant.country_name).to eq("United Kingdom")
 
       credentials = result.credentials
       expect(credentials.access_token).not_to be_nil
@@ -42,7 +42,7 @@ describe Braintree::MerchantGateway do
 
       result = gateway.merchant.create(
         :email => "name@email.com",
-        :country_code_alpha3 => "USA",
+        :country_code_alpha3 => "GBR",
         :payment_methods => ["fake_money"],
       )
 
@@ -70,7 +70,7 @@ describe Braintree::MerchantGateway do
         )
         result = gateway.merchant.create(
           :email => "name@email.com",
-          :country_code_alpha3 => "USA",
+          :country_code_alpha3 => "GBR",
           :payment_methods => ["credit_card", "paypal"],
         )
 
@@ -81,47 +81,12 @@ describe Braintree::MerchantGateway do
     context "multiple currencies" do
       before(:each) do
         @gateway = Braintree::Gateway.new(
-          :client_id => "client_id$development$signup_client_id",
-          :client_secret => "client_secret$development$signup_client_secret",
+          :client_id => "client_id$#{Braintree::Configuration.environment}$integration_client_id",
+          :client_secret => "client_secret$#{Braintree::Configuration.environment}$integration_client_secret",
           :logger => Logger.new("/dev/null"),
         )
       end
 
-      it "creates a US multi currency merchant for paypal and credit_card" do
-        result = @gateway.merchant.create(
-          :email => "name@email.com",
-          :country_code_alpha3 => "USA",
-          :payment_methods => ["credit_card", "paypal"],
-          :currencies => ["GBP", "USD"],
-        )
-
-        merchant = result.merchant
-        expect(merchant.id).not_to be_nil
-        expect(merchant.email).to eq("name@email.com")
-        expect(merchant.company_name).to eq("name@email.com")
-        expect(merchant.country_code_alpha3).to eq("USA")
-        expect(merchant.country_code_alpha2).to eq("US")
-        expect(merchant.country_code_numeric).to eq("840")
-        expect(merchant.country_name).to eq("United States of America")
-
-        credentials = result.credentials
-        expect(credentials.access_token).not_to be_nil
-        expect(credentials.refresh_token).not_to be_nil
-        expect(credentials.expires_at).not_to be_nil
-        expect(credentials.token_type).to eq("bearer")
-
-        merchant_accounts = merchant.merchant_accounts
-        expect(merchant_accounts.count).to eq(2)
-
-        merchant_account = merchant_accounts.detect { |ma| ma.id == "USD" }
-        expect(merchant_account.default).to eq(true)
-        expect(merchant_account.currency_iso_code).to eq("USD")
-
-        merchant_account = merchant_accounts.detect { |ma| ma.id == "GBP" }
-        expect(merchant_account.default).to eq(false)
-        expect(merchant_account.currency_iso_code).to eq("GBP")
-      end
-
       it "creates an EU multi currency merchant for paypal and credit_card" do
         result = @gateway.merchant.create(
           :email => "name@email.com",
@@ -161,7 +126,7 @@ describe Braintree::MerchantGateway do
       it "creates a paypal-only merchant that accepts multiple currencies" do
         result = @gateway.merchant.create(
           :email => "name@email.com",
-          :country_code_alpha3 => "USA",
+          :country_code_alpha3 => "GBR",
           :payment_methods => ["paypal"],
           :currencies => ["GBP", "USD"],
           :paypal_account => {
@@ -176,10 +141,10 @@ describe Braintree::MerchantGateway do
         expect(merchant.id).not_to be_nil
         expect(merchant.email).to eq("name@email.com")
         expect(merchant.company_name).to eq("name@email.com")
-        expect(merchant.country_code_alpha3).to eq("USA")
-        expect(merchant.country_code_alpha2).to eq("US")
-        expect(merchant.country_code_numeric).to eq("840")
-        expect(merchant.country_name).to eq("United States of America")
+        expect(merchant.country_code_alpha3).to eq("GBR")
+        expect(merchant.country_code_alpha2).to eq("GB")
+        expect(merchant.country_code_numeric).to eq("826")
+        expect(merchant.country_name).to eq("United Kingdom")
 
         credentials = result.credentials
         expect(credentials.access_token).not_to be_nil
@@ -191,90 +156,18 @@ describe Braintree::MerchantGateway do
         expect(merchant_accounts.count).to eq(2)
 
         merchant_account = merchant_accounts.detect { |ma| ma.id == "USD" }
-        expect(merchant_account.default).to eq(true)
+        expect(merchant_account.default).to eq(false)
         expect(merchant_account.currency_iso_code).to eq("USD")
 
         merchant_account = merchant_accounts.detect { |ma| ma.id == "GBP" }
-        expect(merchant_account.default).to eq(false)
-        expect(merchant_account.currency_iso_code).to eq("GBP")
-      end
-
-      it "allows creation of non-US merchant if onboarding application is internal" do
-        result = @gateway.merchant.create(
-          :email => "name@email.com",
-          :country_code_alpha3 => "JPN",
-          :payment_methods => ["paypal"],
-          :paypal_account => {
-            :client_id => "paypal_client_id",
-            :client_secret => "paypal_client_secret",
-          },
-        )
-
-        expect(result).to be_success
-
-        merchant = result.merchant
-        expect(merchant.id).not_to be_nil
-        expect(merchant.email).to eq("name@email.com")
-        expect(merchant.company_name).to eq("name@email.com")
-        expect(merchant.country_code_alpha3).to eq("JPN")
-        expect(merchant.country_code_alpha2).to eq("JP")
-        expect(merchant.country_code_numeric).to eq("392")
-        expect(merchant.country_name).to eq("Japan")
-
-        credentials = result.credentials
-        expect(credentials.access_token).not_to be_nil
-        expect(credentials.refresh_token).not_to be_nil
-        expect(credentials.expires_at).not_to be_nil
-        expect(credentials.token_type).to eq("bearer")
-
-        merchant_accounts = merchant.merchant_accounts
-        expect(merchant_accounts.count).to eq(1)
-
-        merchant_account = merchant_accounts.detect { |ma| ma.id == "JPY" }
         expect(merchant_account.default).to eq(true)
-        expect(merchant_account.currency_iso_code).to eq("JPY")
-      end
-
-      it "defaults to USD for non-US merchant if onboarding application is internal and country currency not supported" do
-        result = @gateway.merchant.create(
-          :email => "name@email.com",
-          :country_code_alpha3 => "YEM",
-          :payment_methods => ["paypal"],
-          :paypal_account => {
-            :client_id => "paypal_client_id",
-            :client_secret => "paypal_client_secret",
-          },
-        )
-
-        expect(result).to be_success
-
-        merchant = result.merchant
-        expect(merchant.id).not_to be_nil
-        expect(merchant.email).to eq("name@email.com")
-        expect(merchant.company_name).to eq("name@email.com")
-        expect(merchant.country_code_alpha3).to eq("YEM")
-        expect(merchant.country_code_alpha2).to eq("YE")
-        expect(merchant.country_code_numeric).to eq("887")
-        expect(merchant.country_name).to eq("Yemen")
-
-        credentials = result.credentials
-        expect(credentials.access_token).not_to be_nil
-        expect(credentials.refresh_token).not_to be_nil
-        expect(credentials.expires_at).not_to be_nil
-        expect(credentials.token_type).to eq("bearer")
-
-        merchant_accounts = merchant.merchant_accounts
-        expect(merchant_accounts.count).to eq(1)
-
-        merchant_account = merchant_accounts.detect { |ma| ma.id == "USD" }
-        expect(merchant_account.default).to eq(true)
-        expect(merchant_account.currency_iso_code).to eq("USD")
+        expect(merchant_account.currency_iso_code).to eq("GBP")
       end
 
       it "returns error if invalid currency is passed" do
         result = @gateway.merchant.create(
           :email => "name@email.com",
-          :country_code_alpha3 => "USA",
+          :country_code_alpha3 => "GBR",
           :payment_methods => ["paypal"],
           :currencies => ["FAKE", "GBP"],
           :paypal_account => {
@@ -317,20 +210,6 @@ describe Braintree::MerchantGateway do
       end
     end
 
-    context "merchant has no processor connection supporting apple pay" do
-      before do
-        Braintree::Configuration.merchant_id = "forward_payment_method_merchant_id"
-        Braintree::Configuration.public_key = "forward_payment_method_public_key"
-        Braintree::Configuration.private_key = "forward_payment_method_private_key"
-      end
-
-      it "returns a validation error" do
-        result = Braintree::Merchant.provision_raw_apple_pay
-        expect(result).not_to be_success
-        expect(result.errors.for(:apple_pay).first.code).to eq(Braintree::ErrorCodes::ApplePay::ApplePayCardsAreNotAccepted)
-      end
-    end
-
     def _save_config
       @original_config = {
         :merchant_id => Braintree::Configuration.merchant_id,

data/spec/integration/braintree/paypal_account_spec.rb

@@ -26,6 +26,7 @@ describe Braintree::PayPalAccount do
       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.edit_paypal_vault_id).to be_nil
       expect(paypal_account.revoked_at).to be_nil
     end
 

data/spec/integration/braintree/transaction_spec.rb

@@ -1153,7 +1153,7 @@ describe Braintree::Transaction do
         )
         result = gateway.merchant.create(
           :email => "name@email.com",
-          :country_code_alpha3 => "USA",
+          :country_code_alpha3 => "GBR",
           :payment_methods => ["credit_card", "paypal"],
         )
 
@@ -7935,4 +7935,59 @@ describe Braintree::Transaction do
       expect(result.transaction.merchant_advice_code_text).to eq("New account information available")
     end
   end
+
+  context "Shipping Tax Amount" do
+    it "accepts shipping-tax-amount field" do
+      result = Braintree::Transaction.create(
+        :type => "sale",
+        :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+        :amount => "10.00",
+        :shipping_amount => "1.00",
+        :shipping_tax_amount => "1.00",
+        :discount_amount => "2.00",
+        :ships_from_postal_code => "12345",
+      )
+
+      expect(result.success?).to eq(true)
+      expect(result.transaction.shipping_amount).to eq("1.00")
+      expect(result.transaction.shipping_tax_amount).to eq("1.00")
+      expect(result.transaction.discount_amount).to eq("2.00")
+      expect(result.transaction.ships_from_postal_code).to eq("12345")
+    end
+
+    it "submit for settlement succeeds when shipping tax amount  is provided" do
+      result = Braintree::Transaction.sale(
+        :amount => Braintree::Test::TransactionAmounts::Authorize,
+        :merchant_account_id => SpecHelper::FakeFirstDataMerchantAccountId,
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2029"
+        },
+      )
+      expect(result.success?).to eq(true)
+
+      result = Braintree::Transaction.submit_for_settlement(
+        result.transaction.id,
+        nil,
+        :discount_amount => "2.00",
+        :shipping_amount => "1.23",
+        :shipping_tax_amount => "0.40",
+        :ships_from_postal_code => "90210",
+        :line_items => [
+          {
+            :quantity => 1,
+            :unit_amount => 1,
+            :name => "New line item",
+            :kind => "debit",
+            :total_amount => "18.00",
+            :discount_amount => "12.00",
+            :tax_amount => "0",
+          },
+        ],
+      )
+      expect(result.success?).to eq(true)
+      expect(result.transaction.shipping_tax_amount).to eq("0.40")
+      expect(result.transaction.status).to eq(Braintree::Transaction::Status::SubmittedForSettlement)
+    end
+  end
 end

data/spec/unit/braintree/configuration_spec.rb

@@ -399,7 +399,7 @@ describe Braintree::Configuration do
 
     it "is qa.braintreegateway.com for qa" do
       Braintree::Configuration.environment = :qa
-      expect(Braintree::Configuration.instantiate.server).to eq("gateway.qa.braintreepayments.com")
+      expect(Braintree::Configuration.instantiate.server).to eq("gateway.qa2.braintreepayments.com")
     end
 
     it "can by changed by configuring the production endpoint" do

data/spec/unit/braintree/credit_card_verification_spec.rb

@@ -6,6 +6,8 @@ describe Braintree::CreditCardVerification do
       verification = Braintree::CreditCardVerification._new(
         :status => "verified",
         :amount => "12.45",
+        :ani_first_name_response_code => "I",
+        :ani_last_name_response_code => "I",
         :currency_iso_code => "USD",
         :avs_error_response_code => "I",
         :avs_postal_code_response_code => "I",
@@ -17,8 +19,7 @@ describe Braintree::CreditCardVerification do
         :network_response_code => "05",
         :network_response_text => "Do not Honor",
       )
-
-      expect(verification.inspect).to eq(%(#<Braintree::CreditCardVerification status: "verified", processor_response_code: "2000", processor_response_text: "Do Not Honor", amount: "12.45", currency_iso_code: "USD", cvv_response_code: "I", avs_error_response_code: "I", avs_postal_code_response_code: "I", avs_street_address_response_code: "I", network_response_code: "05", network_response_text: "Do not Honor", merchant_account_id: "some_id", gateway_rejection_reason: nil, id: nil, credit_card: nil, billing: nil, created_at: nil>))
+      expect(verification.inspect).to eq(%(#<Braintree::CreditCardVerification amount: "12.45", ani_first_name_response_code: "I", ani_last_name_response_code: "I", avs_error_response_code: "I", avs_postal_code_response_code: "I", avs_street_address_response_code: "I", billing: nil, created_at: nil, credit_card: nil, currency_iso_code: "USD", cvv_response_code: "I", gateway_rejection_reason: nil, id: nil, merchant_account_id: "some_id", network_response_code: "05", network_response_text: "Do not Honor", processor_response_code: "2000", processor_response_text: "Do Not Honor", status: "verified">))
     end
 
     it "has a status" do
@@ -37,6 +38,16 @@ describe Braintree::CreditCardVerification do
     end
   end
 
+  it "accepts ani name reponse codes" do
+    verification = Braintree::CreditCardVerification._new(
+      :ani_first_name_response_code => "M",
+      :ani_last_name_response_code => "M",
+    )
+
+    expect(verification.ani_first_name_response_code).to eq("M")
+    expect(verification.ani_last_name_response_code).to eq("M")
+  end
+
   it "accepts amount as either a String or BigDecimal" do
     expect(Braintree::CreditCardVerification._new(:amount => "12.34").amount).to eq(BigDecimal("12.34"))
     expect(Braintree::CreditCardVerification._new(:amount => BigDecimal("12.34")).amount).to eq(BigDecimal("12.34"))

data/spec/unit/braintree/error_result_spec.rb

@@ -38,7 +38,7 @@ describe Braintree::ErrorResult do
         :verification => {},
         :transaction => nil,
       )
-      expect(result.inspect).to include("credit_card_verification: #<Braintree::CreditCardVerification status: ")
+      expect(result.inspect).to include("credit_card_verification: #<Braintree::CreditCardVerification amount: ")
     end
 
     it "does not include the credit_card_verification if there isn't one" do

data/spec/unit/braintree/local_payment_completed_spec.rb

@@ -12,8 +12,11 @@ describe Braintree::LocalPaymentCompleted do
   describe "self._new" do
     it "initializes the object with the appropriate attributes set" do
       params = {
-        payment_id: "a-payment-id",
+        bic: "a-bic",
+        iban_last_chars: "1234",
         payer_id: "a-payer-id",
+        payer_name: "John Doe",
+        payment_id: "a-payment-id",
         payment_method_nonce: "a-nonce",
         transaction: {
           id: "a-transaction-id",
@@ -24,25 +27,34 @@ describe Braintree::LocalPaymentCompleted do
       }
       local_payment_completed = Braintree::LocalPaymentCompleted._new(params)
 
-      expect(local_payment_completed.payment_id).to eq("a-payment-id")
+      expect(local_payment_completed.bic).to eq("a-bic")
+      expect(local_payment_completed.iban_last_chars).to eq("1234")
       expect(local_payment_completed.payer_id).to eq("a-payer-id")
+      expect(local_payment_completed.payer_name).to eq("John Doe")
+      expect(local_payment_completed.payment_id).to eq("a-payment-id")
       expect(local_payment_completed.payment_method_nonce).to eq("a-nonce")
-      expect(local_payment_completed.transaction.id).to eq("a-transaction-id")
       expect(local_payment_completed.transaction.amount).to eq(31.0)
+      expect(local_payment_completed.transaction.id).to eq("a-transaction-id")
       expect(local_payment_completed.transaction.order_id).to eq("an-order-id")
       expect(local_payment_completed.transaction.status).to eq(Braintree::Transaction::Status::Authorized)
     end
 
     it "initializes the object with the appropriate attributes set if no transaction is provided" do
       params = {
-        payment_id: "a-payment-id",
+        bic: "a-bic",
+        iban_last_chars: "1234",
         payer_id: "a-payer-id",
+        payer_name: "John Doe",
+        payment_id: "a-payment-id",
         payment_method_nonce: "a-nonce",
       }
       local_payment_completed = Braintree::LocalPaymentCompleted._new(params)
 
-      expect(local_payment_completed.payment_id).to eq("a-payment-id")
+      expect(local_payment_completed.bic).to eq("a-bic")
+      expect(local_payment_completed.iban_last_chars).to eq("1234")
       expect(local_payment_completed.payer_id).to eq("a-payer-id")
+      expect(local_payment_completed.payer_name).to eq("John Doe")
+      expect(local_payment_completed.payment_id).to eq("a-payment-id")
       expect(local_payment_completed.payment_method_nonce).to eq("a-nonce")
       expect(local_payment_completed.transaction).to be_nil
     end

data/spec/unit/braintree/paypal_account_spec.rb

@@ -41,4 +41,13 @@ describe Braintree::PayPalAccount do
       expect(paypal_account.updated_at).to eq(now)
     end
   end
+
+  describe "edit_paypal_vault_id" do
+    it "exposes edit_paypal_vault_id" do
+      mock_edit_paypal_vault_id = "ENCR-BA-ID1"
+      paypal_account = Braintree::PayPalAccount._new(:gateway, :edit_paypal_vault_id => mock_edit_paypal_vault_id)
+
+      expect(paypal_account.edit_paypal_vault_id).to eq(mock_edit_paypal_vault_id)
+    end
+  end
 end

data/spec/unit/braintree/transaction_gateway_spec.rb

@@ -33,36 +33,45 @@ describe Braintree::TransactionGateway do
     # three_d_secure_token has been deprecated in favor of three_d_secure_authentication_id
     it "creates a transaction gateway signature" do
       expect(Braintree::TransactionGateway._create_signature).to match([
-        :amount, :billing_address_id, :channel, :customer_id, :device_data, :discount_amount,
+        :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,
         :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,
+        :shared_shipping_address_id, :shipping_address_id, :shipping_amount, :shipping_tax_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, :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]}]},
-        {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
+        :transaction_source, :type, :venmo_sdk_payment_method_code, # Deprecated
+        :sca_exemption,
+        {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
         {
           :billing => Braintree::AddressGateway._shared_signature
         },
-        {
-          :shipping => Braintree::AddressGateway._shared_signature + [:shipping_method],
-        },
-        {
-          :three_d_secure_pass_thru => [
-            :eci_flag,
-            :cavv,
-            :xid,
-            :three_d_secure_version,
-            :authentication_response,
-            :directory_response,
-            :cavv_algorithm,
-            :ds_transaction_id,
-          ]
-        },
+        {: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]}]},
+        {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
+        {:custom_fields => :_any_key_},
+        {:descriptor => [:name, :phone, :url]},
+        {:external_vault => [
+          :status,
+          :previous_network_transaction_id,
+        ]},
+        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]},
+        {:industry => [
+          :industry_type,
+          {:data => [
+            :country_code, :date_of_birth, :folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
+            :passenger_first_name, :passenger_last_name, :passenger_middle_initial, :passenger_title, :issued_date, :travel_agency_name, :travel_agency_code, :ticket_number,
+            :issuing_carrier_code, :customer_code, :fare_amount, :fee_amount, :tax_amount, :restricted_ticket, :no_show, :advanced_deposit, :fire_safe, :property_phone, :ticket_issuer_address, :arrival_date,
+            {:legs => [
+              :conjunction_ticket, :exchange_ticket, :coupon_number, :service_class, :carrier_code, :fare_basis_code, :flight_number, :departure_date, :departure_airport_code, :departure_time,
+              :arrival_airport_code, :arrival_time, :stopover_permitted, :fare_amount, :fee_amount, :tax_amount, :endorsement_or_restrictions,
+            ]},
+            {:additional_charges => [
+              :kind, :amount,
+            ]},
+          ]},
+        ]},
+        {: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,
@@ -70,7 +79,7 @@ describe Braintree::TransactionGateway do
           :submit_for_settlement,
           :add_billing_address_to_payment_method,
           :store_shipping_address_in_vault,
-          :venmo_sdk_session, #Deprecated
+          :venmo_sdk_session, # Deprecated
           :payee_id,
           :payee_email,
           :skip_advanced_fraud_checking,
@@ -84,31 +93,23 @@ describe Braintree::TransactionGateway do
           {:credit_card => [:account_type, :process_debit_as_credit]},
         ]
         },
-        {:external_vault => [
-          :status,
-          :previous_network_transaction_id,
-        ]},
-        {:custom_fields => :_any_key_},
-        {:descriptor => [:name, :phone, :url]},
         {:paypal_account => [:email, :token, :paypal_data, :payee_id, :payee_email, :payer_id, :payment_id]},
-        {:industry => [
-          :industry_type,
-          {:data => [
-            :country_code, :date_of_birth, :folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
-            :passenger_first_name, :passenger_last_name, :passenger_middle_initial, :passenger_title, :issued_date, :travel_agency_name, :travel_agency_code, :ticket_number,
-            :issuing_carrier_code, :customer_code, :fare_amount, :fee_amount, :tax_amount, :restricted_ticket, :no_show, :advanced_deposit, :fire_safe, :property_phone, :ticket_issuer_address, :arrival_date,
-            {:legs => [
-              :conjunction_ticket, :exchange_ticket, :coupon_number, :service_class, :carrier_code, :fare_basis_code, :flight_number, :departure_date, :departure_airport_code, :departure_time,
-              :arrival_airport_code, :arrival_time, :stopover_permitted, :fare_amount, :fee_amount, :tax_amount, :endorsement_or_restrictions,
-            ]},
-            {:additional_charges => [
-              :kind, :amount,
-            ]},
-          ]},
-        ]},
-        {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
-        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]},
-        {:installments => [:count]},
+        {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
+        {
+          :shipping => Braintree::AddressGateway._shared_signature + [:shipping_method],
+        },
+        {
+          :three_d_secure_pass_thru => [
+            :eci_flag,
+            :cavv,
+            :xid,
+            :three_d_secure_version,
+            :authentication_response,
+            :directory_response,
+            :cavv_algorithm,
+            :ds_transaction_id,
+          ]
+        },
       ])
     end
 
@@ -136,6 +137,7 @@ describe Braintree::TransactionGateway do
         :tax_exempt,
         :discount_amount,
         :shipping_amount,
+        :shipping_tax_amount,
         :ships_from_postal_code,
         :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],
       ])

metadata

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