braintree 4.35.0 → 4.37.0

data/lib/braintree/successful_result.rb

@@ -27,6 +27,7 @@ module Braintree
     attr_reader :us_bank_account_verification
     attr_reader :session_id
     attr_reader :customer_recommendations
+    attr_reader :payment_context
 
     def initialize(attributes = {})
       @attrs = attributes.keys

data/lib/braintree/transaction.rb

@@ -122,6 +122,7 @@ module Braintree
     attr_reader :installment_count
     attr_reader :installments
     attr_reader :local_payment_details
+    attr_reader :mastercard_transaction_link_id
     attr_reader :merchant_account_id
     attr_reader :merchant_advice_code
     attr_reader :merchant_advice_code_text
@@ -172,6 +173,7 @@ module Braintree
     attr_reader :status_history
     attr_reader :subscription_details
     attr_reader :subscription_id
+    attr_reader :surcharge_amount
     attr_reader :tax_amount
     attr_reader :tax_exempt
     attr_reader :three_d_secure_info
@@ -321,6 +323,7 @@ module Braintree
       @shipping_details = AddressDetails.new(@shipping)
       @status_history = attributes[:status_history] ? attributes[:status_history].map { |s| StatusDetails.new(s) } : []
       @subscription_details = SubscriptionDetails.new(@subscription)
+      @surcharge_amount = Util.to_big_decimal(surcharge_amount)
       @partially_authorized = %w[1004].include?(processor_response_code)
       @tax_amount = Util.to_big_decimal(tax_amount)
       @venmo_account_details = VenmoAccountDetails.new(@venmo_account)

data/lib/braintree/transaction_gateway.rb

@@ -168,8 +168,12 @@ module Braintree
       return_object_or_raise(:transaction) { submit_for_partial_settlement(*args) }
     end
 
-    def void(transaction_id)
-      response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/void")
+    def void(transaction_id, options = {})
+      transaction_params = options.empty? ? nil : options
+      response = @config.http.put(
+        "#{@config.base_merchant_path}/transactions/#{transaction_id}/void",
+        transaction_params ? {:transaction => transaction_params} : nil,
+      )
       _handle_transaction_response(response)
     end
 
@@ -194,13 +198,13 @@ module Braintree
     # three_d_secure_token has been deprecated in favor of three_d_secure_authentication_id
     def self._create_signature
       [
-        :accept_partial_authorization, :amount, :billing_address_id, :channel, :currency_iso_code, :customer_id, :device_data,
+        :accept_partial_authorization, :amount, :api_request_key, :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, :processing_merchant_category_code,
         :product_sku, :purchase_order_number, :service_fee_amount, :shared_billing_address_id,
         :shared_customer_id, :shared_payment_method_nonce, :shared_payment_method_token,
         :shared_shipping_address_id, :shipping_address_id, :shipping_amount, :shipping_tax_amount,
-        :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,:three_d_secure_token, #Deprecated
+        :ships_from_postal_code,:surcharge_amount, :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,
         {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
@@ -208,7 +212,7 @@ module Braintree
           :billing => AddressGateway._shared_signature
         },
         {: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]},
+        {:customer => [:id, :company, :email, :fax, :first_name, {:international_phone => [:country_code, :national_number]}, :last_name, :phone, :website]},
         {:custom_fields => :_any_key_},
         {:descriptor => [:name, :phone, :url]},
         {:external_vault => [
@@ -318,6 +322,7 @@ module Braintree
 
     def self._submit_for_settlement_signature
       [
+        :api_request_key,
         :order_id,
         {:descriptor => [:name, :phone, :url]},
         {:industry => [
@@ -369,6 +374,7 @@ module Braintree
     def self._refund_signature
       [
         :amount,
+        :api_request_key,
         :merchant_account_id,
         :order_id,
       ]

data/lib/braintree/transaction_search.rb

@@ -1,6 +1,7 @@
 module Braintree
   class TransactionSearch < AdvancedSearch
     text_fields(
+      :acquirer_reference_number,
       :billing_company,
       :billing_country_name,
       :billing_extended_address,

data/lib/braintree/validation_error_collection.rb

@@ -39,7 +39,7 @@ module Braintree
     end
 
     def for_index(index)
-      self.for("index_#{index}".to_sym)
+      self.for(:"index_#{index}")
     end
 
     def inspect

data/lib/braintree/version.rb

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

data/lib/braintree.rb

@@ -89,6 +89,10 @@ require "braintree/graphql/inputs/update_customer_session_input"
 require "braintree/graphql/inputs/paypal_purchase_unit_input"
 require "braintree/graphql/inputs/paypal_payee_input"
 require "braintree/graphql/inputs/monetary_amount_input"
+require "braintree/graphql/inputs/create_local_payment_context_input"
+require "braintree/graphql/inputs/payer_info_input"
+require "braintree/graphql/inputs/billing_address_input"
+require "braintree/graphql/inputs/shipping_address_input"
 require "braintree/graphql/types/customer_recommendations_payload"
 require "braintree/graphql/types/payment_options"
 require "braintree/graphql/types/payment_recommendations"
@@ -97,17 +101,20 @@ require "braintree/graphql_client"
 require "braintree/google_pay_card"
 require "braintree/local_payment_completed"
 require "braintree/local_payment_completed/blik_alias"
-require "braintree/local_payment_reversed"
+require "braintree/local_payment_context"
+require "braintree/local_payment_context_gateway"
 require "braintree/local_payment_expired"
 require "braintree/local_payment_funded"
-require "braintree/transaction/local_payment_details"
+require "braintree/local_payment_reversed"
+require "braintree/local_payment_type"
 require "braintree/merchant"
-require "braintree/merchant_gateway"
 require "braintree/merchant_account"
+require "braintree/merchant_gateway"
 require "braintree/merchant_account_gateway"
 require "braintree/merchant_account/address_details"
 require "braintree/meta_checkout_card"
 require "braintree/meta_checkout_token"
+require "braintree/monetary_amount"
 require "braintree/oauth_gateway"
 require "braintree/oauth_credentials"
 require "braintree/payment_instrument_type"
@@ -172,6 +179,7 @@ require "braintree/transaction/installment/adjustment"
 require "braintree/transaction/payment_receipt"
 require "braintree/transaction/payment_receipt/card_present_data.rb"
 require "braintree/transaction/payment_receipt/merchant_address.rb"
+require "braintree/transaction/local_payment_details"
 require "braintree/transaction/meta_checkout_card_details"
 require "braintree/transaction/meta_checkout_token_details"
 require "braintree/transaction/package_details"
@@ -206,3 +214,12 @@ require "braintree/xml/generator"
 require "braintree/xml/nokogiri"
 require "braintree/xml/rexml"
 require "braintree/xml/parser"
+
+module Braintree
+  ApplePayDetails = Transaction::ApplePayDetails
+  CreditCardDetails = Transaction::CreditCardDetails
+  GooglePayDetails = Transaction::GooglePayDetails
+  MetaCheckoutCardDetails = Transaction::MetaCheckoutCardDetails
+  MetaCheckoutTokenDetails = Transaction::MetaCheckoutTokenDetails
+  VisaCheckoutCardDetails = Transaction::VisaCheckoutCardDetails
+end

data/spec/integration/braintree/credit_card_verification_spec.rb

@@ -48,6 +48,42 @@ describe Braintree::CreditCardVerification, "search" do
       expect(result.credit_card_verification.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
     end
 
+    it "returns mastercard transaction link id in response" do
+      verification_params = {
+        :credit_card => {
+          :expiration_date => "05/2032",
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+        },
+      }
+
+      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.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
+      expect(result.credit_card_verification.mastercard_transaction_link_id).to match(/\A[a-zA-Z0-9]{22}\z/)
+    end
+
+    it "doesnot return mastercard transaction link id in response for a non mastercard" do
+      verification_params = {
+        :credit_card => {
+          :expiration_date => "05/2032",
+          :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.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
+      expect(result.credit_card_verification.mastercard_transaction_link_id).to be_nil
+    end
+
     it "creates a new verification for Visa ANI" do
       verification_params = {
         :credit_card => {