braintree 4.16.0 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbacdc492fa27aed57086131c1feab00ed435923034cae5dd7b5c6d4c3184a1a
-  data.tar.gz: a3c9be778fb88ef5a0ea6c23182f74654b511dca659e34529fade077712418ef
+  metadata.gz: b8d5039746bfcbc33e3899cb43cf5a014084278543b5c83ea0b09146a0c0b63b
+  data.tar.gz: 688a569cbff984a1d6a0571095a7f990efda7ce717ee9393c93263f8b9007f80
 SHA512:
-  metadata.gz: 3b6e24f668d3bd022069f5e85ed55afe9fbdce43205af6dd44a101f6aef3f78d2b2099d5b8d5c8297cbf3076dee72da16e61d7b758cb162278190e99d9f95d91
-  data.tar.gz: 3ee3af6a1854de4b02db4670b3d32232b2ce7d26ae478bfa792dcc4ccfe638f52259e80e818704d630c8a0b453a1f566062865045f370f5f83a377e0c7083d16
+  metadata.gz: df005acb10a67bdcf42ab131f49b93f595ad9431004922502b255c54d4222960e54a344a018abd0175c3b340d8474215a1f49b0a210b590fbe78fe020bf7daf1
+  data.tar.gz: 783676045da0d1240f5b9cd808149f04fd9a7005c99015ff5ec07ff0a0ffcf4093e1e0ab896334f2e7e0f953829a62b8532130a3057bef5c344d506c58064d67

data/lib/braintree/credit_card_verification_gateway.rb

@@ -47,22 +47,39 @@ module Braintree
     def self._create_signature
       [
         {:credit_card => [
-          :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year,
-          :number, {:billing_address => AddressGateway._shared_signature}
+          {:billing_address => AddressGateway._shared_signature},
+          :cardholder_name,
+          :cvv,
+          :expiration_date,
+          :expiration_month,
+          :expiration_year,
+          :number,
+        ]},
+        {:external_vault => [
+          :previous_network_transaction_id,
+          :status,
         ]},
         :intended_transaction_source,
-        {:options => [:amount, :merchant_account_id, :account_type]},
+        {:options => [
+          :account_type,
+          :amount,
+          :merchant_account_id,
+        ]},
         :payment_method_nonce,
+        {:risk_data => [
+          :customer_browser,
+          :customer_ip,
+        ]},
         :three_d_secure_authentication_id,
         {:three_d_secure_pass_thru => [
-            :eci_flag,
-            :cavv,
-            :xid,
-            :three_d_secure_version,
-            :authentication_response,
-            :directory_response,
-            :cavv_algorithm,
-            :ds_transaction_id,
+          :authentication_response,
+          :cavv,
+          :cavv_algorithm,
+          :directory_response,
+          :ds_transaction_id,
+          :eci_flag,
+          :three_d_secure_version,
+          :xid,
         ]},
       ]
     end

data/lib/braintree/error_codes.rb

@@ -561,6 +561,10 @@ module Braintree
       UnitTaxAmountCannotBeNegative = "95826"
       UnitTaxAmountFormatIsInvalid = "95824"
       UnitTaxAmountIsTooLarge = "95825"
+      UPCCodeIsMissing = "95830"
+      UPCCodeIsTooLong = "95831"
+      UPCTypeIsMissing = "95832"
+      UPCTypeIsInvalid = "95833"
     end
 
     module Merchant

data/lib/braintree/http.rb

@@ -7,8 +7,8 @@ module Braintree
       @config = config
     end
 
-    def delete(_path, query_params = {})
-      path = _path + _build_query_string(query_params)
+    def delete(path, query_params = {})
+      full_path = path + _build_query_string(query_params)
       response = _http_do Net::HTTP::Delete, path
       if response.code.to_i == 200 || response.code.to_i == 204
         true
@@ -19,8 +19,8 @@ module Braintree
       end
     end
 
-    def get(_path, query_params = {})
-      path = _path + _build_query_string(query_params)
+    def get(path, query_params = {})
+      full_path = path + _build_query_string(query_params)
       response = _http_do Net::HTTP::Get, path
       if response.code.to_i == 200 || response.code.to_i == 422
         Xml.hash_from_xml(_body(response))

data/lib/braintree/transaction/address_details.rb

@@ -10,6 +10,7 @@ module Braintree
         Ground = "ground"
         Electronic = "electronic"
         ShipToStore = "ship_to_store"
+        PickupInStore = "pickup_in_store"
       end
 
       attr_reader :company

data/lib/braintree/transaction/package_details.rb

@@ -0,0 +1,16 @@
+module Braintree
+    class Transaction
+        class PackageDetails
+            include BaseModule
+
+            attr_reader :carrier
+            attr_reader :id
+            attr_reader :paypal_tracking_id
+            attr_reader :tracking_number
+
+            def initialize(attributes)
+                set_instance_variables_from_hash attributes unless attributes.nil?
+            end
+        end
+    end
+end

data/lib/braintree/transaction.rb

@@ -138,6 +138,7 @@ module Braintree
     attr_reader :network_token_details
     attr_reader :network_transaction_id
     attr_reader :order_id
+    attr_reader :packages
     attr_reader :partial_settlement_transaction_ids
     attr_reader :payment_instrument_type
     attr_reader :payment_receipt
@@ -284,6 +285,14 @@ module Braintree
       return_object_or_raise(:transaction) { update_details(*args) }
     end
 
+    def self.package_tracking(*args)
+      Configuration.gateway.transaction.package_tracking(*args)
+    end
+
+    def self.package_tracking!(*args)
+      Configuration.gateway.transaction.package_tracking!(*args)
+    end
+
     def self.submit_for_partial_settlement(*args)
       Configuration.gateway.transaction.submit_for_partial_settlement(*args)
     end
@@ -325,6 +334,7 @@ module Braintree
       @sca_exemption_requested = attributes[:sca_exemption_requested]
       @sepa_direct_debit_account_details = SepaDirectDebitAccountDetails.new(@sepa_debit_account_detail)
       @service_fee_amount = Util.to_big_decimal(service_fee_amount)
+      @packages = attributes[:shipments] ? attributes[:shipments].map { |pd| PackageDetails.new(pd) } : []
       @shipping_details = AddressDetails.new(@shipping)
       @status_history = attributes[:status_history] ? attributes[:status_history].map { |s| StatusDetails.new(s) } : []
       @subscription_details = SubscriptionDetails.new(@subscription)

data/lib/braintree/transaction_gateway.rb

@@ -112,6 +112,16 @@ module Braintree
       return_object_or_raise(:transaction) { sale(*args) }
     end
 
+    def package_tracking(transaction_id, package_tracking_request)
+      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      Util.verify_keys(TransactionGateway._package_tracking_request_signature, package_tracking_request)
+      _do_create "/transactions/#{transaction_id}/shipments", :shipment => package_tracking_request
+    end
+
+    def package_tracking!(*args)
+      return_object_or_raise(:transaction) { package_tracking(*args) }
+    end
+
     def search(&block)
       search = TransactionSearch.new
       block.call(search) if block
@@ -187,6 +197,14 @@ module Braintree
       return_object_or_raise(:transaction) { void(*args) }
     end
 
+    def self._package_tracking_request_signature
+      [
+        :carrier,
+        {: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]},
+        :notify_payer, :tracking_number,
+      ]
+    end
+
     def self._clone_signature
       [:amount, :channel, {:options => [:submit_for_settlement]}]
     end
@@ -204,7 +222,7 @@ module Braintree
         :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,
-        {:line_items => [:quantity, :name, :description, :kind, :unit_amount, :unit_tax_amount, :total_amount, :discount_amount, :tax_amount, :unit_of_measure, :product_code, :commodity_code, :url]},
+        {: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]},
@@ -244,7 +262,7 @@ module Braintree
           {:three_d_secure => [:required]},
           {:amex_rewards => [:request_id, :points, :currency_amount, :currency_iso_code]},
           {:venmo => [:profile_id]},
-          {:credit_card => [:account_type]},
+          {:credit_card => [:account_type, :process_debit_as_credit]},
         ]
         },
         {:external_vault => [
@@ -300,7 +318,7 @@ module Braintree
         :discount_amount,
         :shipping_amount,
         :ships_from_postal_code,
-        :line_items => [:commodity_code, :description, :discount_amount, :kind, :name, :product_code, :quantity, :tax_amount, :total_amount, :unit_amount, :unit_of_measure, :unit_tax_amount, :url, :tax_amount],
+        :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
 

data/lib/braintree/transaction_line_item.rb

@@ -1,18 +1,21 @@
 module Braintree
   class TransactionLineItem
     include BaseModule
-    attr_reader :quantity
-    attr_reader :name
+    attr_reader :commodity_code
     attr_reader :description
-    attr_reader :kind
-    attr_reader :unit_amount
-    attr_reader :unit_tax_amount
-    attr_reader :unit_of_measure
     attr_reader :discount_amount
+    attr_reader :image_url
+    attr_reader :kind
+    attr_reader :name
+    attr_reader :product_code
+    attr_reader :quantity
     attr_reader :tax_amount
     attr_reader :total_amount
-    attr_reader :product_code
-    attr_reader :commodity_code
+    attr_reader :unit_amount
+    attr_reader :unit_of_measure
+    attr_reader :unit_tax_amount
+    attr_reader :upc_code
+    attr_reader :upc_type
     attr_reader :url
 
     def initialize(gateway, attributes)

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification_gateway.rb

@@ -27,7 +27,7 @@ module Braintree
       signature_pairs = signature_string.split("&")
       valid_pairs = signature_pairs.select { |pair| pair.include?("|") }.map { |pair| pair.split("|") }
 
-      valid_pairs.detect do |public_key, signature|
+      valid_pairs.detect do |public_key, _signature|
         public_key == @config.public_key
       end
     end
@@ -36,8 +36,8 @@ module Braintree
       public_key, signature = _matching_signature_pair(signature_string)
       raise InvalidSignature, "no matching public key" if public_key.nil?
 
-      signature_matches = [payload, payload + "\n"].any? do |_payload|
-        payload_signature = Braintree::Digest.hexdigest(@config.private_key, _payload)
+      signature_matches = [payload, payload + "\n"].any? do |p|
+        payload_signature = Braintree::Digest.hexdigest(@config.private_key, p)
         Braintree::Digest.secure_compare(signature, payload_signature)
       end
       raise InvalidSignature, "signature does not match payload - one has been modified" unless signature_matches

data/lib/braintree/xml/parser.rb

@@ -32,7 +32,7 @@ module Braintree
         case value.class.to_s
           when "Hash"
             if value["type"] == "array"
-              child_key, entries = value.detect { |k,v| k != "type" }   # child_key is throwaway
+              child_key, entries = value.detect { |k,_v| k != "type" }   # child_key is throwaway
               if entries.nil? || ((c = value[CONTENT_ROOT]) && c.strip.empty?)
                 []
               else

data/lib/braintree.rb

@@ -156,6 +156,7 @@ require "braintree/transaction/payment_receipt/card_present_data.rb"
 require "braintree/transaction/payment_receipt/merchant_address.rb"
 require "braintree/transaction/meta_checkout_card_details"
 require "braintree/transaction/meta_checkout_token_details"
+require "braintree/transaction/package_details"
 require "braintree/transaction/paypal_details"
 require "braintree/transaction/paypal_here_details"
 require "braintree/transaction/samsung_pay_card_details"

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

@@ -282,8 +282,8 @@ class ClientApiHttp
     params = {:credit_card => params}
     params.merge!(
       :authorization_fingerprint => @options[:authorization_fingerprint],
-      :shared_customer_identifier => "fake_identifier",
-      :shared_customer_identifier_type => "testing",
+      :shared_customer_identifier => @options[:shared_customer_identifier],
+      :shared_customer_identifier_type => @options[:shared_customer_identifier_type],
     )
 
     post("/merchants/#{config.merchant_id}/client_api/v1/payment_methods/credit_cards", params)

data/spec/integration/braintree/credit_card_spec.rb

@@ -276,7 +276,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :xid => "some_xid",
           :authentication_response => "Y",
@@ -298,7 +298,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :xid => "some_xid",
           :three_d_secure_version => "1.0.2",
@@ -310,7 +310,6 @@ describe Braintree::CreditCard do
         :options => {:verify_card => true},
       )
       expect(result.success?).to eq(true)
-
     end
 
     it "returns 3DS info on cc verification" do
@@ -793,7 +792,7 @@ describe Braintree::CreditCard do
       result = Braintree::CreditCard.update(credit_card.token,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :xid => "some_xid",
           :authentication_response => "Y",
@@ -821,7 +820,7 @@ describe Braintree::CreditCard do
       result = Braintree::CreditCard.update(credit_card.token,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :three_d_secure_version=> "2.1.0",
           :xid => "some_xid",

data/spec/integration/braintree/credit_card_verification_spec.rb

@@ -48,6 +48,51 @@ describe Braintree::CreditCardVerification, "search" do
       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 => {
+            :expiration_date => "05/2029",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+        },
+        :external_vault => {
+            :status => "will_vault"
+        }
+      }
+
+      result = Braintree::CreditCardVerification.create(verification_params)
+
+      expect(result).to be_success
+      expect(result.credit_card_verification.id).to match(/^\w{6,}$/)
+      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.network_transaction_id).not_to be_nil
+    end
+
+    it "creates a new verification from risk data param" do
+      verification_params = {
+        :credit_card => {
+            :expiration_date => "05/2029",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+        },
+        :risk_data => {
+            :customer_browser => "IE7",
+            :customer_ip => "192.168.0.1"
+        }
+      }
+
+      result = Braintree::CreditCardVerification.create(verification_params)
+
+      expect(result).to be_success
+      expect(result.credit_card_verification.id).to match(/^\w{6,}$/)
+      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.network_transaction_id).not_to be_nil
+    end
+
     it "returns processor response code and text as well as the additional processor response if declined" do
       verification_params = {
         :credit_card => {
@@ -360,7 +405,7 @@ describe Braintree::CreditCardVerification, "search" do
           :amount => "10.00",
         },
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :xid => "some_xid",
           :three_d_secure_version => "1.0.2",

data/spec/integration/braintree/customer_spec.rb

@@ -1132,7 +1132,7 @@ describe Braintree::Customer do
             :number => 4111111111111111,
             :expiration_date => "05/2060",
             :three_d_secure_pass_thru => {
-              :eci_flag => "02",
+              :eci_flag => "05",
               :cavv => "some_cavv",
               :xid => "some_xid",
               :three_d_secure_version => "1.0.2",
@@ -1167,7 +1167,7 @@ describe Braintree::Customer do
             :number => 4111111111111111,
             :expiration_date => "05/2060",
             :three_d_secure_pass_thru => {
-              :eci_flag => "02",
+              :eci_flag => "05",
               :cavv => "some_cavv",
               :xid => "some_xid",
               :authentication_response => "Y",
@@ -1451,7 +1451,7 @@ describe Braintree::Customer do
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
         :credit_card => {
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "xx",
@@ -1475,7 +1475,7 @@ describe Braintree::Customer do
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
         :credit_card => {
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "2.2.1",

data/spec/integration/braintree/package_tracking_spec.rb

@@ -0,0 +1,111 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Braintree::Transaction do
+    describe "self.package_tracking" do
+        it "returns validation error message from gateway api" do
+            # Create Transaction
+          result = Braintree::Transaction.sale(
+            :amount => "100",
+            :options => {
+              :submit_for_settlement => true
+            },
+            :paypal_account => {
+              :payer_id => "fake-payer-id",
+              :payment_id => "fake-payment-id",
+            },
+          )
+
+          expect(result.success?).to eq(true)
+
+          # Carrier name is required
+          invalidResult = Braintree::Transaction.package_tracking(result.transaction.id, {tracking_number: "tracking_number_1"})
+          expect(invalidResult.message).to eq("Carrier name is required.")
+
+           # Tracking number is required
+           invalidResult = Braintree::Transaction.package_tracking(result.transaction.id, {carrier: "UPS"})
+           expect(invalidResult.message).to eq("Tracking number is required.")
+        end
+
+        it "successfully calls gateway API and adds package tracking information" do
+
+          # Create Transaction
+          result = Braintree::Transaction.sale(
+            :amount => "100",
+            :options => {
+              :submit_for_settlement => true
+            },
+            :paypal_account => {
+              :payer_id => "fake-payer-id",
+              :payment_id => "fake-payment-id",
+            },
+          )
+
+          expect(result.success?).to eq(true)
+
+          # Create First Package with 2 products
+          firstPackageResult = Braintree::Transaction.package_tracking(
+            result.transaction.id,
+            {
+              carrier: "UPS",
+              notify_payer: true,
+              tracking_number: "tracking_number_1",
+              line_items: [
+                {
+                  product_code: "ABC 01",
+                  name: "Best Product Ever",
+                  quantity: "1",
+                  description: "Best Description Ever",
+                  upc_code: "51234567890",
+                  upc_type: "UPC-A",
+                  image_url: "https://example.com/image.png",
+                },
+                {
+                  product_code: "ABC 02",
+                  name: "Best Product Ever",
+                  quantity: "1",
+                  description: "Best Description Ever",
+                  upc_code: "51234567891",
+                  upc_type: "UPC-A",
+                  image_url: "https://example.com/image.png",
+                },
+              ],
+            },
+          )
+
+          # First package is shipped by the merchant
+          expect(firstPackageResult.success?).to eq(true)
+          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")
+
+
+          # Create second package with 1 product
+          secondPackageResult = Braintree::Transaction.package_tracking(
+            result.transaction.id,
+            {
+              carrier: "FEDEX",
+              notify_payer: true,
+              tracking_number: "tracking_number_2",
+              line_items: [
+                {
+                  product_code: "ABC 03",
+                  name: "Best Product Ever",
+                  quantity: "1",
+                  description: "Best Description Ever",
+                },
+              ]
+            },
+          )
+
+          # Second package is shipped by the merchant
+          expect(secondPackageResult.success?).to eq(true)
+          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")
+
+          # Find transaction gives both packages
+          findTransaction = Braintree::Transaction.find(result.transaction.id)
+          expect(findTransaction.packages.length).to eq(2)
+        end
+    end
+end

data/spec/integration/braintree/payment_method_nonce_spec.rb

@@ -97,7 +97,7 @@ describe Braintree::PaymentMethodNonce do
       nonce.details.bin.should == "401288"
       nonce.details.last_two.should == "81"
       nonce.details.card_type.should == "Visa"
-      nonce.details.expiration_year.should == "2024"
+      nonce.details.expiration_year.should == Date.today().next_year().year.to_s
       nonce.details.expiration_month.should == "12"
     end
 
@@ -107,7 +107,7 @@ describe Braintree::PaymentMethodNonce do
       nonce.details.bin.should == "401288"
       nonce.details.last_two.should == "81"
       nonce.details.card_type.should == "Visa"
-      nonce.details.expiration_year.should == "2024"
+      nonce.details.expiration_year.should == Date.today().next_year().year.to_s
       nonce.details.expiration_month.should == "12"
     end
 

data/spec/integration/braintree/payment_method_spec.rb

@@ -342,7 +342,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :xid => "some_xid",
           :three_d_secure_version => "xx",
@@ -365,7 +365,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => "02",
+          :eci_flag => "05",
           :cavv => "some_cavv",
           :xid => "some_xid",
           :three_d_secure_version => "1.0.2",

data/spec/integration/braintree/transaction_line_item_spec.rb

@@ -18,6 +18,9 @@ describe Braintree::TransactionLineItem do
             :kind => "debit",
             :unit_amount => "45.1232",
             :total_amount => "45.15",
+            :upc_code => "11223344556677889",
+            :upc_type => "UPC-A",
+            :image_url => "https://google.com/image.png",
           },
         ],
       )
@@ -32,6 +35,9 @@ describe Braintree::TransactionLineItem do
       expect(line_item.kind).to eq("debit")
       expect(line_item.unit_amount).to eq(BigDecimal("45.1232"))
       expect(line_item.total_amount).to eq(BigDecimal("45.15"))
+      expect(line_item.upc_type).to eq("UPC-A")
+      expect(line_item.upc_code).to eq("11223344556677889")
+      expect(line_item.image_url).to eq("https://google.com/image.png")
     end
   end
 end

data/spec/integration/braintree/transaction_spec.rb

@@ -2132,8 +2132,9 @@ describe Braintree::Transaction do
         meta_checkout_card_details.cardholder_name.should == "Meta Checkout Card Cardholder"
         meta_checkout_card_details.container_id.should == "container123"
         meta_checkout_card_details.customer_location.should == "US"
-        meta_checkout_card_details.expiration_date.should == "12/2024"
-        meta_checkout_card_details.expiration_year.should == "2024"
+        next_year = Date.today().next_year().year.to_s
+        meta_checkout_card_details.expiration_date.should == "12/".concat(next_year)
+        meta_checkout_card_details.expiration_year.should == next_year
         meta_checkout_card_details.expiration_month.should == "12"
         meta_checkout_card_details.image_url.should == "https://assets.braintreegateway.com/payment_method_logo/visa.png?environment=development"
         meta_checkout_card_details.is_network_tokenized.should == false
@@ -2161,8 +2162,9 @@ describe Braintree::Transaction do
         meta_checkout_token_details.cryptogram.should == "AlhlvxmN2ZKuAAESNFZ4GoABFA=="
         meta_checkout_token_details.customer_location.should == "US"
         meta_checkout_token_details.ecommerce_indicator.should == "07"
-        meta_checkout_token_details.expiration_date.should == "12/2024"
-        meta_checkout_token_details.expiration_year.should == "2024"
+        next_year = Date.today().next_year().year.to_s
+        meta_checkout_token_details.expiration_date.should == "12/".concat(next_year)
+        meta_checkout_token_details.expiration_year.should == next_year
         meta_checkout_token_details.expiration_month.should == "12"
         meta_checkout_token_details.image_url.should == "https://assets.braintreegateway.com/payment_method_logo/visa.png?environment=development"
         meta_checkout_token_details.is_network_tokenized.should == true
@@ -2748,7 +2750,7 @@ describe Braintree::Transaction do
             },
             :three_d_secure_authentication_id => three_d_secure_authentication_id,
             :three_d_secure_pass_thru => {
-              :eci_flag => "02",
+              :eci_flag => "05",
               :cavv => "some_cavv",
               :xid => "some_xid",
               :three_d_secure_version => "1.0.2",
@@ -2835,7 +2837,7 @@ describe Braintree::Transaction do
             :expiration_date => "12/12",
           },
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "1.0.2",
@@ -2860,7 +2862,7 @@ describe Braintree::Transaction do
             :expiration_date => "12/12",
           },
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "1.0.2",
@@ -2947,7 +2949,7 @@ describe Braintree::Transaction do
             :expiration_date => "12/12",
           },
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "invalid",
@@ -2971,7 +2973,7 @@ describe Braintree::Transaction do
             :expiration_date => "12/12",
           },
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "1.0.2",
@@ -2995,7 +2997,7 @@ describe Braintree::Transaction do
             :expiration_date => "12/12",
           },
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "1.0.2",
@@ -3019,7 +3021,7 @@ describe Braintree::Transaction do
             :expiration_date => "12/12",
           },
           :three_d_secure_pass_thru => {
-            :eci_flag => "02",
+            :eci_flag => "05",
             :cavv => "some_cavv",
             :xid => "some_xid",
             :three_d_secure_version => "1.0.2",
@@ -4605,6 +4607,84 @@ describe Braintree::Transaction do
         expect(result.success?).to eq(false)
         expect(result.errors.for(:transaction).on(:line_items)[0].code).to eq(Braintree::ErrorCodes::Transaction::TooManyLineItems)
       end
+
+      context "UPC code and type" do
+        let(:line_item) do
+          {
+            :quantity => "1",
+            :name => "Name #1",
+            :description => "Description #1",
+            :kind => "debit",
+            :unit_amount => "45.12",
+            :unit_tax_amount => "1.23",
+            :unit_of_measure => "gallon",
+            :discount_amount => "1.02",
+            :tax_amount => "4.50",
+            :total_amount => "45.15",
+            :product_code => "23434",
+            :commodity_code => "9SAASSD8724",
+            :url => "https://example.com/products/23434",
+            :upc_code => "042100005264",
+            :upc_type => "UPC-A",
+            :image_url => "https://google.com/image.png",
+          }
+        end
+
+        it "accepts valid values" do
+          result = Braintree::Transaction.create(
+            :type => "sale",
+            :amount => "45.15",
+            :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+            :line_items => [line_item],
+          )
+          expect(result.success?).to eq(true)
+          expect(result.transaction.line_items.length).to eq(1)
+          line_item = result.transaction.line_items[0]
+          expect(line_item.upc_code).to eq("042100005264")
+          expect(line_item.upc_type).to eq("UPC-A")
+        end
+
+        it "returns validation errors for invalid UPC code and type too long" do
+          line_item[:upc_code] = "THISCODELONGERTHAN17CHARS"
+          line_item[:upc_type] = "USB-C"
+          result = Braintree::Transaction.create(
+            :type => "sale",
+            :amount => "45.15",
+            :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+            :line_items => [line_item],
+          )
+
+          expect(result.success?).to eq(false)
+          expect(result.errors.for(:transaction).for(:line_items).for(:index_0).on(:upc_code)[0].code).to eq(Braintree::ErrorCodes::TransactionLineItem::UPCCodeIsTooLong)
+          expect(result.errors.for(:transaction).for(:line_items).for(:index_0).on(:upc_type)[0].code).to eq(Braintree::ErrorCodes::TransactionLineItem::UPCTypeIsInvalid)
+        end
+
+        it "returns UPC code missing error when code is not present" do
+          line_item.delete(:upc_code)
+          result = Braintree::Transaction.create(
+            :type => "sale",
+            :amount => "45.15",
+            :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+            :line_items => [line_item],
+          )
+
+          expect(result.success?).to eq(false)
+          expect(result.errors.for(:transaction).for(:line_items).for(:index_0).on(:upc_code)[0].code).to eq(Braintree::ErrorCodes::TransactionLineItem::UPCCodeIsMissing)
+        end
+
+        it "returns UPC type missing error when type is not present" do
+          line_item.delete(:upc_type)
+          result = Braintree::Transaction.create(
+            :type => "sale",
+            :amount => "45.15",
+            :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+            :line_items => [line_item],
+          )
+
+          expect(result.success?).to eq(false)
+          expect(result.errors.for(:transaction).for(:line_items).for(:index_0).on(:upc_type)[0].code).to eq(Braintree::ErrorCodes::TransactionLineItem::UPCTypeIsMissing)
+        end
+      end
     end
 
     context "level 3 summary data" do
@@ -5820,7 +5900,7 @@ describe Braintree::Transaction do
     end
 
     context "Pinless debit transaction" do
-      xit "succesfully submits for settlement" do
+      it "succesfully submits for settlement" do
         result = Braintree::Transaction.sale(
           :amount => Braintree::Test::TransactionAmounts::Authorize,
           :merchant_account_id => SpecHelper::PinlessDebitMerchantAccountId,
@@ -5831,10 +5911,28 @@ describe Braintree::Transaction do
           },
         )
         expect(result.success?).to be_truthy
-        expect(result.transaction.status).to eq(Braintree::Transaction::Status::SubmittedForSettlement)
         expect(result.transaction.debit_network).not_to be_nil
       end
     end
+
+    context "Process debit as credit" do
+      it "succesfully completed pinless eligible transaction in signature" do
+        result = Braintree::Transaction.sale(
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :merchant_account_id => SpecHelper::PinlessDebitMerchantAccountId,
+          :currency_iso_code => "USD",
+          :payment_method_nonce => Braintree::Test::Nonce::TransactablePinlessDebitVisa,
+          :options => {
+            :submit_for_settlement => true,
+            :credit_card => {
+              :process_debit_as_credit => true
+            }
+          },
+        )
+        expect(result.success?).to be_truthy
+        expect(result.transaction.debit_network).to be_nil
+      end
+    end
   end
 
   describe "self.sale!" do
@@ -7739,20 +7837,6 @@ describe Braintree::Transaction do
         expect(adjustment_transaction.errors.for(:authorization_adjustment).on(:base).first.code).to eq(Braintree::ErrorCodes::Transaction::NoNetAmountToPerformAuthAdjustment)
       end
 
-      it "returns failure, when transaction status is not authorized" do
-        additional_params = {:options => {:submit_for_settlement => true}}
-        initial_transaction = Braintree::Transaction.sale(first_data_master_transaction_params.merge(additional_params))
-        expect(initial_transaction.success?).to eq(true)
-
-        adjustment_transaction = Braintree::Transaction.adjust_authorization(
-          initial_transaction.transaction.id, "85.50"
-        )
-
-        expect(adjustment_transaction.success?).to eq(false)
-        expect(adjustment_transaction.transaction.amount).to eq(BigDecimal("75.50"))
-        expect(adjustment_transaction.errors.for(:transaction).on(:base).first.code).to eq(Braintree::ErrorCodes::Transaction::TransactionMustBeInStateAuthorized)
-      end
-
       it "returns failure, when transaction authorization type final or undefined" do
         additional_params = {:transaction_source => "recurring"}
         initial_transaction = Braintree::Transaction.sale(first_data_master_transaction_params.merge(additional_params))

data/spec/unit/braintree/base_module_spec.rb

@@ -8,11 +8,11 @@ describe Braintree::BaseModule do
         klass = Class.new { include Braintree::BaseModule }
         klass.return_object_or_raise(:obj) { result }
       rescue Braintree::ValidationsFailed => ex
-      end
       expect(ex).not_to eq(nil)
       expect(ex.error_result).to eq(result)
       expect(ex.inspect).to include(result.inspect)
       expect(ex.to_s).to include(result.inspect)
+      end
     end
   end
 end

data/spec/unit/braintree/credit_card_verification_gateway_spec.rb

@@ -22,30 +22,35 @@ describe Braintree::CreditCardVerificationGateway do
     it "creates a credit card verification gateway signature" do
       result = Braintree::CreditCardVerificationGateway._create_signature
       expect(result.inspect).to include("credit_card")
-      expect(result.inspect).to include("credit_card")
+      expect(result.inspect).to include("billing_address")
       expect(result.inspect).to include("cardholder_name")
       expect(result.inspect).to include("cvv")
       expect(result.inspect).to include("expiration_date")
       expect(result.inspect).to include("expiration_month")
       expect(result.inspect).to include("expiration_year")
       expect(result.inspect).to include("number")
-      expect(result.inspect).to include("billing_address")
+      expect(result.inspect).to include("external_vault")
+      expect(result.inspect).to include("previous_network_transaction_id")
+      expect(result.inspect).to include("status")
       expect(result.inspect).to include("intended_transaction_source")
       expect(result.inspect).to include("options")
+      expect(result.inspect).to include("account_type")
       expect(result.inspect).to include("amount")
       expect(result.inspect).to include("merchant_account_id")
-      expect(result.inspect).to include("account_type")
       expect(result.inspect).to include("payment_method_nonce")
+      expect(result.inspect).to include("risk_data")
+      expect(result.inspect).to include("customer_browser")
+      expect(result.inspect).to include("customer_ip")
       expect(result.inspect).to include("three_d_secure_authentication_id")
       expect(result.inspect).to include("three_d_secure_pass_thru")
-      expect(result.inspect).to include("eci_flag")
-      expect(result.inspect).to include("cavv")
-      expect(result.inspect).to include("xid")
-      expect(result.inspect).to include("three_d_secure_version")
       expect(result.inspect).to include("authentication_response")
-      expect(result.inspect).to include("directory_response")
+      expect(result.inspect).to include("cavv")
       expect(result.inspect).to include("cavv_algorithm")
+      expect(result.inspect).to include("directory_response")
       expect(result.inspect).to include("ds_transaction_id")
+      expect(result.inspect).to include("eci_flag")
+      expect(result.inspect).to include("three_d_secure_version")
+      expect(result.inspect).to include("xid")
     end
   end
 end

data/spec/unit/braintree/package_tracking_spec.rb

@@ -0,0 +1,74 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe "Package Tracking Unit Tests" do
+    describe "creates and validates requests" do
+        let(:gateway) do
+            config = Braintree::Configuration.new(
+              :merchant_id => "merchant_id",
+              :public_key => "public_key",
+              :private_key => "private_key",
+            )
+            Braintree::Gateway.new(config)
+        end
+
+          it "creates transaction gateway package tracking request signature" do
+            expect(Braintree::TransactionGateway._package_tracking_request_signature).to match(
+              [
+                :carrier,
+                {: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]},
+                :notify_payer, :tracking_number,
+              ],
+            )
+          end
+
+          it "raises an ArgumentError if transaction_id is an invalid format" do
+            expect do
+              Braintree::Transaction.package_tracking("invalid-transaction-id", {})
+            end.to raise_error(ArgumentError, "transaction_id is invalid")
+          end
+
+          it "raises an exception if attributes contain an invalid key" do
+            expect do
+                Braintree::Transaction.package_tracking("txn123", {:invalid_key => "random", :carrier => "UPS", :tracking_number => "123123"})
+            end.to raise_error(ArgumentError, "invalid keys: invalid_key")
+          end
+    end
+
+    describe "handles response" do
+        it "parses the packages response correctly" 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"}
+            ],
+          )
+          expect(transaction.packages.size).to eq(2)
+          expect(transaction.packages[0].id).to eq("id1")
+          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[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")
+        end
+
+        it "doesn't blow up if no shipments are present in the transaction response" do
+            transaction = Braintree::Transaction._new(
+                :gateway,
+                :shipments => [],
+              )
+              expect(transaction.packages.size).to eq(0)
+        end
+
+        it "doesn't blow up if shipments tag is not present in the transaction response" do
+            transaction = Braintree::Transaction._new(
+                :gateway,
+                {},
+              )
+              expect(transaction.packages.size).to eq(0)
+        end
+    end
+end

data/spec/unit/braintree/transaction_gateway_spec.rb

@@ -41,7 +41,7 @@ describe Braintree::TransactionGateway do
         :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,
-        {:line_items => [:quantity, :name, :description, :kind, :unit_amount, :unit_tax_amount, :total_amount, :discount_amount, :tax_amount, :unit_of_measure, :product_code, :commodity_code, :url]},
+        {: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]},
@@ -81,7 +81,7 @@ describe Braintree::TransactionGateway do
           {:three_d_secure => [:required]},
           {:amex_rewards => [:request_id, :points, :currency_amount, :currency_iso_code]},
           {:venmo => [:profile_id]},
-          {:credit_card => [:account_type]},
+          {:credit_card => [:account_type, :process_debit_as_credit]},
         ]
         },
         {:external_vault => [
@@ -137,7 +137,7 @@ describe Braintree::TransactionGateway do
         :discount_amount,
         :shipping_amount,
         :ships_from_postal_code,
-        :line_items => [:commodity_code, :description, :discount_amount, :kind, :name, :product_code, :quantity, :tax_amount, :total_amount, :unit_amount, :unit_of_measure, :unit_tax_amount, :url, :tax_amount],
+        :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
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.18.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -181,6 +181,7 @@ files:
 - lib/braintree/transaction/local_payment_details.rb
 - lib/braintree/transaction/meta_checkout_card_details.rb
 - lib/braintree/transaction/meta_checkout_token_details.rb
+- lib/braintree/transaction/package_details.rb
 - lib/braintree/transaction/payment_receipt.rb
 - lib/braintree/transaction/payment_receipt/card_present_data.rb
 - lib/braintree/transaction/payment_receipt/merchant_address.rb
@@ -250,6 +251,7 @@ files:
 - spec/integration/braintree/merchant_account_spec.rb
 - spec/integration/braintree/merchant_spec.rb
 - spec/integration/braintree/oauth_spec.rb
+- spec/integration/braintree/package_tracking_spec.rb
 - spec/integration/braintree/payment_method_nonce_spec.rb
 - spec/integration/braintree/payment_method_spec.rb
 - spec/integration/braintree/payment_method_us_bank_account_spec.rb
@@ -311,6 +313,7 @@ files:
 - spec/unit/braintree/meta_checkout_token_details_spec.rb
 - spec/unit/braintree/meta_checkout_token_spec.rb
 - spec/unit/braintree/modification_spec.rb
+- spec/unit/braintree/package_tracking_spec.rb
 - spec/unit/braintree/payment_method_customer_data_updated_metadata_spec.rb
 - spec/unit/braintree/payment_method_nonce_details_payer_info_spec.rb
 - spec/unit/braintree/payment_method_nonce_details_spec.rb