Ensure that tax is enabled before determining how it is calculated (#…

…9786) Co-authored-by: César Costa <10233985+cesarcosta99@users.noreply.github.com>
Automattic · Nov 22, 2024 · 8b1bcda · 8b1bcda
1 parent 986f195
commit 8b1bcda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog/as-fix-ece-tax-based-billing-address b/changelog/as-fix-ece-tax-based-billing-address
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Ensure ECE is displayed correctly taking into account the tax settings.
diff --git a/includes/express-checkout/class-wc-payments-express-checkout-button-helper.php b/includes/express-checkout/class-wc-payments-express-checkout-button-helper.php
@@ -427,7 +427,7 @@ public function should_show_express_checkout_button() {
 			)
 
 			// ...and billing is calculated based on billing address.
-			&& 'billing' === get_option( 'woocommerce_tax_based_on' )
+			&& wc_tax_enabled() && 'billing' === get_option( 'woocommerce_tax_based_on' )
 		) {
 			return false;
 		}