From ad1b9f3f2f8cdeeab4bc5e9c317f3eaa4cad3b36 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 16 Jun 2021 17:38:27 +0100 Subject: [PATCH] Update Adjustment#has_tax? --- app/models/spree/adjustment.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/spree/adjustment.rb b/app/models/spree/adjustment.rb index 2494d372c9..4f3ab3da96 100644 --- a/app/models/spree/adjustment.rb +++ b/app/models/spree/adjustment.rb @@ -134,11 +134,15 @@ module Spree end def has_tax? - included_tax.positive? + tax_total.positive? end private + def tax_total + adjustments.tax.sum(:amount) + end + def update_adjustable_adjustment_total Spree::ItemAdjustments.new(adjustable).update if adjustable end