spree_braintree_vzero 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771cd46e87b5da70e1d9145ea38a084154a2329002598538b01da3f116409526
-  data.tar.gz: 84ab1f12fd88cce62738419cc2de7cde03f73c1999d1b4b26c8160ce41fba489
+  metadata.gz: '09e02a4cf3c79e5be3e0964676effe42b4633d8aa4ed2b991b7f301c962f5545'
+  data.tar.gz: 646f04bc68b92b1347ab313ef428ab47171cab19d2db364f714ea57320750350
 SHA512:
-  metadata.gz: 177d2a5421ae0e22794b8b8e5333b0ee0788f2f97654ee9f48c2571a6dcb07c3ee423be13f0ca84a624d8cc7edf0012fa2e6ac0ec5577632b2efacd4045ea63a
-  data.tar.gz: e10a7db15dfa14c87648c1e8b26954442dd3471456bd25418f81d2fb5c0db72f7bc1557cd1c2e2e904eb997092958188182200e2148e54a4b2974e39a44114e5
+  metadata.gz: 1bb01d7427a967624664259f2cd13679b2c6678ef81b2265b81a8bc67af912dcdf3dea095764e1ad25f8c9646d89548b70c2b45aca8de31cd901749f64ed6eb3
+  data.tar.gz: d9ef517a4204b61b2eca65f4412ebd62e583c34e3a53517541ca4c8d48624203a96657ea571acca80fad2090793ddf188af6514d9e8d9323f7f7bda700126e7e

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: webmock
+    versions:
+    - 3.11.2

data/.travis.yml

@@ -1,5 +1,16 @@
-sudo: required
-dist: trusty
+os: linux
+dist: bionic
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+services:
+  - mysql
+  - postgresql
 
 language: ruby
 
@@ -7,57 +18,39 @@ env:
   - DB=postgres
   - DB=mysql
 
+rvm:
+  - 2.7
+  - 3.0
+
 gemfile:
-  - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_5_spree_auth_devise.gemfile
   - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_3_7_spree_auth_devise.gemfile
   - gemfiles/spree_4_0.gemfile
-  - gemfiles/spree_4_0_spree_auth_devise.gemfile
+  - gemfiles/spree_4_1.gemfile
+  - gemfiles/spree_4_2.gemfile
   - gemfiles/spree_master.gemfile
-  - gemfiles/spree_master_spree_auth_devise.gemfile
 
 script:
   - bundle exec rake test_app
   - bundle exec rake spec
   - bundle exec codeclimate-test-reporter
 
-rvm:
-  - 2.3.8
-  - 2.4.4
-  - 2.5.1
-
-matrix:
-    allow_failures:
-          - gemfile: gemfiles/spree_master.gemfile
-          - gemfile: gemfiles/spree_master_spree_auth_devise.gemfile
-    exclude:
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_4_0_spree_auth_devise.gemfile
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_master_spree_auth_devise.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0_spree_auth_devise.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master_spree_auth_devise.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_5.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_5_spree_auth_devise.gemfile
-
-
-addons:
-  apt:
-    packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
-  postgresql: 9.4
+jobs:
+  exclude:
+  - rvm: 3.0
+    gemfile: gemfiles/spree_3_7.gemfile
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_0.gemfile
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_1.gemfile
+  allow_failures:
+    - gemfile: gemfiles/spree_master.gemfile
+
+before_install:
+  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
+
+before_script:
+  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
+  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
+  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
+  - unzip chromedriver_linux64.zip -d ~/bin
+  - nvm install 14

data/Appraisals

@@ -1,44 +1,35 @@
-appraise 'spree-3-5' do
-  ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
-
-  gem 'spree', '~> 3.5.0'
-end
-
-appraise 'spree-3-5-spree-auth-devise' do
-  gem 'spree', '~> 3.5.0'
-  gem 'spree_auth_devise', '~> 3.3.0'
-end
-
 appraise 'spree-3-7' do
-  ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
-
+  gem 'sassc-rails'
   gem 'spree', '~> 3.7.1'
-end
-
-appraise 'spree-3-7-spree-auth-devise' do
-  gem 'spree', '~> 3.7.1'
-  gem 'spree_auth_devise', '~> 3.3.0'
+  gem 'pg'
+  gem 'mysql2'
+  gem 'webmock', '>= 2.3.1'
+  gem 'rails-controller-testing'
+  gem 'spree_auth_devise', '~> 3.5.2'
 end
 
 appraise 'spree-4-0' do
-  ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
-
-  gem 'spree', '~> 4.0.0'
-end
-
-appraise 'spree-4-0-spree-auth-devise' do
   gem 'spree', '~> 4.0.0'
+  gem 'pg'
+  gem 'mysql2'
+  gem 'webmock', '>= 2.3.1'
+  gem 'rails-controller-testing'
   gem 'spree_auth_devise', '~> 4.0.0'
 end
 
-appraise 'spree-master' do
-  ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
+appraise 'spree-4-1' do
+  gem 'spree', '~> 4.1.0'
+  gem 'spree_auth_devise', '~> 4.1.0'
+  gem 'rails-controller-testing'
+end
 
-  gem 'spree', github: 'spree/spree', branch: 'master'
+appraise 'spree-4-2' do
+  gem 'spree', '~> 4.2.0'
+  gem 'spree_auth_devise', '~> 4.2.0'
   gem 'rails-controller-testing'
 end
 
-appraise 'spree-master-spree-auth-devise' do
+appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
   gem 'rails-controller-testing'

data/README.md

@@ -1,8 +1,8 @@
-# Braintree v.zero extension for Spree Commerce
+# Official Braintree + PayPal integration for Spree Commerce
 
-[![Build Status](https://travis-ci.org/spree-contrib/spree_braintree_vzero.svg?branch=master)](https://travis-ci.org/spree-contrib/spree_braintree_vzero) [![Code Climate](https://codeclimate.com/repos/560308aa6956801375000a4e/badges/9874199a656054d613cd/gpa.svg)](https://codeclimate.com/repos/560308aa6956801375000a4e/feed)
+[![Build Status](https://travis-ci.com/spree-contrib/spree_braintree_vzero.svg?branch=master)](https://travis-ci.com/spree-contrib/spree_braintree_vzero) [![Code Climate](https://codeclimate.com/repos/560308aa6956801375000a4e/badges/9874199a656054d613cd/gpa.svg)](https://codeclimate.com/repos/560308aa6956801375000a4e/feed)
 
-This is the official Braintree v.zero extension for [Spree](https://spreecommerce.org). It supports:
+This is the official Braintree + PayPal extension for [Spree Commerce](https://spreecommerce.org). It supports:
 * [Braintree Hosted Fields](https://github.com/spree-contrib/spree_braintree_vzero/wiki/1.-Hosted-Fields) -  style the credit card form to match your UI with full PCI compliance
 * [PayPal Express Checkout](https://github.com/spree-contrib/spree_braintree_vzero/wiki/2.-PayPal-Express) - the fastest way for buyers to pay with PayPal - available on Spree for the first time
 * [Braintree Drop-in UI](http://github.com/spree-contrib/spree_braintree_vzero/wiki/3.-Drop-in-UI) - start accepting payments ASAP
@@ -43,7 +43,9 @@ Behind-the-scenes, this extension uses [Braintree Ruby SDK](https://github.com/b
 
     If your server was running, restart it so that it can find the assets properly.
 
+## Documentation
 
+See [wiki](https://github.com/spree-contrib/spree_braintree_vzero/wiki) for more detailed documentation.
 
 ## Heroku installation (optional)
 
@@ -64,7 +66,7 @@ pull request.
 
 ## License
 
-Spree Braintree V.zero is copyright © 2015-2020
+Spree Braintree V.zero is copyright © 2015-2021
 [Spark Solutions Sp. z o.o.][spark]. It is free software,
 and may be redistributed under the terms specified in the
 [LICENCE](LICENSE) file.

data/app/assets/images/backend-settle.svg

@@ -0,0 +1,3 @@
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2">
+  <path fill="currentColor" d="M474.975 82.072c-5.79-5.77-15.123-5.77-20.874 0L173.92 362.589 58.76 247.27c-5.75-5.75-15.085-5.79-20.874 0-5.77 5.75-5.77 15.104 0 20.874l125.597 125.774c2.875 2.895 6.656 4.333 10.437 4.333 3.8 0 7.562-1.438 10.437-4.333l290.62-290.953c5.769-5.77 5.769-15.144 0-20.894z" fill-rule="nonzero" stroke="currentColor" stroke-width="24.024606"/>
+</svg>

data/app/assets/javascripts/spree/frontend/spree_braintree_vzero.js

@@ -46,7 +46,8 @@ SpreeBraintreeVzero = {
   }
 }
 
-$(document).ready(function() {
+$(document).ready(function () {
+  var event = new Event('spreebraintree:ready');
   paymentMethods = $('div[data-hook="checkout_payment_step"] input[type="radio"]').click(function (e) {
     SpreeBraintreeVzero.setSaveAndContinueVisibility();
   });
@@ -65,4 +66,5 @@ $(document).ready(function() {
     SpreeBraintreeVzero.addDeviceData();
   });
   SpreeBraintreeVzero.setSaveAndContinueVisibility();
+  window.dispatchEvent(event);
 })

data/app/controllers/spree/admin/payments_controller_decorator.rb

@@ -1,6 +1,11 @@
 module Spree
   module Admin
     module PaymentsControllerDecorator
+      def self.prepended(base)
+        base.include Spree::BraintreeHelper
+        base.helper_method [:asset_available?, :options_from_braintree_payments]
+      end
+
       def create
         invoke_callbacks(:create, :before)
         @payment ||= @order.payments.build(object_params)
@@ -8,11 +13,11 @@ module Spree
         if @payment.payment_method.source_required?
           if params[:card].present? && params[:card] != 'new'
             @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
-          elsif @payment.payment_source.is_a?(Spree::Gateway::BraintreeVzeroBase)
-            @payment.braintree_token = params[:payment_method_token]
-            @payment.braintree_nonce = params[:payment_method_nonce]
-            @payment.source = Spree::BraintreeCheckout.create!(admin_payment: true)
           end
+        elsif @payment.payment_source.is_a?(Spree::Gateway::BraintreeVzeroBase)
+          @payment.braintree_token = params[:payment_method_token]
+          @payment.braintree_nonce = params[:payment_method_nonce]
+          @payment.source = Spree::BraintreeCheckout.create!(admin_payment: true)
         end
 
         begin

data/app/controllers/spree/orders_controller_decorator.rb

@@ -7,6 +7,8 @@ module Spree
     end
 
     def process_paypal_express
+      return false if current_order.blank?
+
       if params[:paypal].blank? || params[:paypal][:payment_method_nonce].blank?
         # when user goes back from checkout, paypal express payments should be invalidated  to ensure standard checkout flow
         current_order.invalidate_paypal_express_payments

data/app/helpers/spree/admin/payment_methods_helper.rb

@@ -84,11 +84,17 @@ module Spree
         keys.reject { |k| k == :currency_merchant_accounts }.map do |key|
           next unless object.has_preference?(key)
 
-          content_tag(:div, class: 'form-group', 'data-hook' => "preferred_#{key}") do
-            form.label("preferred_#{key}", Spree.t(key) + ': ') +
-              preference_field_for(form, "preferred_#{key}", type: object.preference_type(key),
-                                 values: object.send("preferred_#{key}_default").is_a?(Hash) ? object.send("preferred_#{key}_default")[:values] : nil,
-                                 selected: object.preferences[key])
+          if object.preference_type(key) == :boolean
+            content_tag(:div, preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
+              form.label("preferred_#{key}", Spree.t(key), class: 'form-check-label'),
+                        class: 'form-group form-check', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+          else
+            content_tag(:div, class: 'form-group', 'data-hook' => "preferred_#{key}") do
+              form.label("preferred_#{key}", Spree.t(key) + ': ') +
+                preference_field_for(form, "preferred_#{key}", type: object.preference_type(key),
+                                   values: object.send("preferred_#{key}_default").is_a?(Hash) ? object.send("preferred_#{key}_default")[:values] : nil,
+                                   selected: object.preferences[key])
+            end
           end
         end.join(' ').html_safe
       end

data/app/helpers/spree/braintree_helper.rb

@@ -6,14 +6,14 @@ module Spree
                            else
                              []
                            end
-      additional_options + payment_methods.map do |method|
+      (additional_options + payment_methods.map do |method|
         text = if method.is_a?(Braintree::CreditCard)
                  Spree.t('admin.vaulted_payments.credit_card', card_type: method.card_type, last_4: method.last_4)
                elsif method.is_a?(Braintree::PayPalAccount)
                  Spree.t('admin.vaulted_payments.paypal', email: method.email)
                end
         "<option value='#{method.token}'>#{text}</option>"
-      end.join.html_safe
+      end).join.html_safe
     end
 
     def asset_available?(logical_path)

data/app/models/concerns/spree/gateway/braintree_vzero/legacy_rails_patch.rb

@@ -0,0 +1,20 @@
+module Spree
+  class Gateway
+    module BraintreeVzero
+      module LegacyRailsPatch
+        extend ActiveSupport::Concern
+
+        private
+
+        # https://github.com/spree-contrib/spree_braintree_vzero/issues/216
+        def method_name_for_attributes_after_save
+          Rails::VERSION::STRING >= '5.1' ? :saved_changes : :changes
+        end
+
+        def attributes_after_save
+          method(method_name_for_attributes_after_save).call
+        end
+      end
+    end
+  end
+end

data/app/models/spree/address_decorator.rb

@@ -2,9 +2,9 @@ module Spree
   module AddressDecorator
     def self.prepended(base)
       base.scope :vaulted_duplicates, ->(address) do
-        where.not(id: address.id).
+        base.where.not(id: address.id).
           where.not(braintree_id: nil).
-          where(address.attributes.except('id', 'updated_at', 'created_at', 'braintree_id'))
+          where(address.attributes.except('id', 'updated_at', 'created_at', 'braintree_id', 'preferences'))
       end
     end
 

data/app/models/spree/braintree_vzero/order_decorator.rb

@@ -0,0 +1,155 @@
+module Spree
+  module BraintreeVzero
+    module OrderDecorator
+      def self.prepended(base)
+        base.state_machine.before_transition to: :complete, do: :process_paypal_express_payments
+      end
+
+      def save_paypal_address(type, address_hash)
+        return if address_hash.blank?
+        address = Spree::Address.new(prepare_address_hash(address_hash))
+        return unless address.save
+
+        update_column("#{type}_id", address.id)
+      end
+
+      def save_paypal_payment(options)
+        options[:source] = Spree::BraintreeCheckout.create!(options.slice(:paypal_email, :advanced_fraud_data))
+        payments.create(options.slice(:braintree_nonce, :payment_method_id, :source))
+      end
+
+      def set_billing_address
+        return if bill_address_id
+        return unless ship_address_id
+
+        address = Spree::Address.create(shipping_address.attributes.except('id', 'updated_at', 'created_at', 'braintree_id'))
+        update_column(:bill_address_id, address.try(:id))
+      end
+
+      # override needed to add braintree source attribute
+      def update_from_params(params, permitted_params, request_env = {})
+        success = false
+        @updating_params = params
+        run_callbacks :updating_from_params do
+          # Set existing card after setting permitted parameters because
+          # rails would slice parameters containg ruby objects, apparently
+          existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
+
+          attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params).delete_if { |_k, v| v.nil? } : {}
+          payment_attributes = attributes[:payments_attributes].first if attributes[:payments_attributes].present?
+
+          if existing_card_id.present?
+            credit_card = Spree::CreditCard.find existing_card_id
+            if credit_card.user_id != user_id || credit_card.user_id.blank?
+              raise Spree::Core::GatewayError, Spree.t(:invalid_credit_card)
+            end
+
+            credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
+
+            attributes[:payments_attributes].first[:source] = credit_card
+            attributes[:payments_attributes].first[:payment_method_id] = credit_card.payment_method_id
+            attributes[:payments_attributes].first.delete :source_attributes
+          end
+
+          if payment_attributes.present?
+            payment_attributes[:request_env] = request_env
+
+            if (token = payment_attributes[:braintree_token]).present?
+              payment_attributes[:source] = Spree::BraintreeCheckout.create_from_token(token, payment_attributes[:payment_method_id])
+            elsif payment_attributes[:braintree_nonce].present?
+              payment_attributes[:source] = Spree::BraintreeCheckout.create_from_params(params)
+            end
+          end
+
+          success = update(attributes)
+          set_shipments_cost if shipments.any?
+        end
+
+        @updating_params = nil
+        success
+      end
+
+      def payment_required?
+        # default payment processing requires order to have state == payment
+        # so there is no need to divide this method for checkout steps and actual payment processing
+        return false if paid_with_paypal_express?
+        total.to_f > 0.0
+      end
+
+      def confirmation_required?
+        Spree::Config[:always_include_confirm_step] ||
+          payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
+          # setting payment_profiles_supported? for braintree gateways would require few additional changes in payments profiles system
+          braintree_confirmation_required? || state == 'confirm'
+      end
+
+      def paid_with_braintree?
+        payments.valid.map(&:payment_method).compact.any? { |p| p.is_a?(Spree::Gateway::BraintreeVzeroBase) }
+      end
+
+      def paid_with_paypal_express?
+        payments.valid.map(&:payment_method).compact.any? { |p| p.is_a?(Spree::Gateway::BraintreeVzeroPaypalExpress) }
+      end
+
+      def invalidate_paypal_express_payments
+        return unless paid_with_paypal_express?
+
+        payments.valid.each do |payment|
+          payment.invalidate! if payment.payment_method.is_a?(Spree::Gateway::BraintreeVzeroPaypalExpress)
+        end
+      end
+
+      def no_phone_number?
+        [ship_address, bill_address].each do |address|
+          return true if address.try(:phone).eql?(I18n.t('braintree.phone_number_placeholder'))
+        end
+        false
+      end
+
+      def remove_phone_number_placeholder
+        [ship_address, bill_address].each do |address|
+          address.update_column(:phone, nil) if address.try(:phone).eql?(I18n.t('braintree.phone_number_placeholder'))
+        end
+      end
+
+      private
+
+      def braintree_confirmation_required?
+        paid_with_braintree? && state.eql?('payment')
+      end
+
+      def prepare_address_hash(hash)
+        hash.delete_if { |e| hash[e].eql?('undefined') }
+        country_id = Spree::Country.find_by(iso: hash.delete(:country)).try(:id)
+
+        hash[:country_id] = country_id
+        state_param = hash.delete(:state)
+        state = Spree::State.where('spree_states.abbr = :abbr OR upper(spree_states.name) = :name',
+                                  abbr: state_param, name: state_param.upcase).find_by(country_id: country_id)
+        hash[:state_id] = state.try(:id)
+        hash[:phone] ||= I18n.t('braintree.phone_number_placeholder')
+
+        return hash if hash[:full_name].blank?
+
+        full_name = hash.delete(:full_name).split(' ')
+        hash[:lastname] = full_name.slice!(-1)
+        hash[:firstname] = full_name.join(' ')
+        hash
+      end
+
+      def process_paypal_express_payments
+        return unless paid_with_paypal_express?
+
+        if payments.valid.empty?
+          order.errors.add(:base, Spree.t(:no_payment_found))
+          false
+        else
+          payments.valid.last.update(amount: total)
+          process_payments!
+        end
+      end
+    end
+  end
+end
+
+::Spree::Order.prepend(Spree::BraintreeVzero::OrderDecorator)

data/app/models/spree/gateway/braintree_vzero_base/utils.rb

@@ -39,7 +39,9 @@ module Spree
         def order_data(identifier, amount)
           identifier.merge(
             amount: amount,
-            order_id: order.number
+            order_id: order.number,
+            line_items: collect_line_items,
+            shipping_amount: order_shipping
           )
         end
 
@@ -81,9 +83,11 @@ module Spree
 
         def payment_in_vault(data = {})
           store_ship_address = data['shipping_address_id'].blank?
-          if gateway.preferred_store_payments_in_vault == 'store_only_on_success'
+
+          case gateway.preferred_store_payments_in_vault.to_s
+          when 'store_only_on_success'
             { store_in_vault_on_success: true, store_shipping_address_in_vault: store_ship_address }
-          elsif gateway.preferred_store_payments_in_vault == 'store_all'
+          when 'store_all'
             { store_in_vault: true, store_shipping_address_in_vault: store_ship_address }
           else
             { store_in_vault: false }
@@ -102,6 +106,49 @@ module Spree
             'failed'
           end
         end
+
+        private
+
+        PAYPAL_MAX_LINEITEMS = 249
+
+        # Because of strange PayPal behaviour with accepting discounts
+        # the only solution to add needed discount (if it exist) to
+        # create a virtual Line Item with discount amount and with 'credit'
+        # and name it as 'discount' to be reflected in PayPal email to customer
+        #
+        def collect_line_items # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          items =
+            @order
+            .line_items
+            .reject { |li| li.price.zero? || li.quantity.zero? }
+            .map do |li|
+            {
+              name: li.name.truncate(127, omission: ''),
+              kind: 'debit',
+              quantity: li.quantity.to_s,
+              unit_amount: li.price.to_s,
+              unit_of_measure: 'unit',
+              product_code: li.sku,
+              total_amount: (li.price * li.quantity).to_s,
+              tax_amount: li.additional_tax_total.to_s
+            }
+          end.
+            take(PAYPAL_MAX_LINEITEMS - 1)
+          total = @order.adjustment_total.abs
+          return items if total.zero?
+
+          items.append({
+                         name: 'discount',
+                         kind: 'credit',
+                         quantity: '1',
+                         unit_amount: total.to_s,
+                         total_amount: total.to_s
+                       })
+        end
+
+        def order_shipping
+          @order.shipment_total.to_s
+        end
       end
     end
   end

data/app/models/spree/gateway/braintree_vzero_base.rb

@@ -87,6 +87,10 @@ module Spree
       provider::PaymentMethod.find(token)
     end
 
+    def source_required?
+      false
+    end
+
     private
 
     def sale(data, order, source = nil)

data/app/models/spree/gateway/braintree_vzero_drop_in_ui.rb

@@ -1,5 +1,7 @@
 module Spree
   class Gateway::BraintreeVzeroDropInUi < Spree::Gateway::BraintreeVzeroBase
+    include ::Spree::Gateway::BraintreeVzero::LegacyRailsPatch
+
     preference :dropin_container, :string, default: 'payment-form'
     preference :checkout_form_id, :string, default: 'checkout_form_payment'
     preference :error_messages_container_id, :string, default: 'content'
@@ -7,7 +9,7 @@ module Spree
     preference :'3dsecure', :boolean_select, default: false
 
     after_save :disable_hosted_gateways, if: proc {
-      active? && (saved_changes.keys & %w[active id]).any?
+      active? && (attributes_after_save.keys & %w[active id]).any?
     }
 
     def method_type

data/app/models/spree/gateway/braintree_vzero_hosted_fields.rb

@@ -1,5 +1,7 @@
 module Spree
   class Gateway::BraintreeVzeroHostedFields < Spree::Gateway::BraintreeVzeroBase
+    include ::Spree::Gateway::BraintreeVzero::LegacyRailsPatch
+
     preference :checkout_form_id, :string, default: 'checkout_form_payment'
     preference :error_messages_container_id, :string, default: 'content'
     preference :number_selector, :string, default: '#hosted-fields-number'
@@ -12,7 +14,7 @@ module Spree
     preference :'3dsecure', :boolean_select, default: false
 
     after_save :disable_dropin_gateways, if: proc {
-      active? && (saved_changes.keys & %w[active id]).any?
+      active? && (attributes_after_save.keys & %w[active id]).any?
     }
 
     def method_type