Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26998 from woocommerce/fix/is-tax-displayed-private 

Fixed the accessibility of WC_Cart::is_tax_displayed()
This commit is contained in:
Christopher Allford 2020-07-14 09:05:19 -07:00 committed by GitHub
parent ac1d4c010a 2ef15f02e3
commit 9c492853b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/class-wc-cart.php
View File

@ -353,9 +353,7 @@ class WC_Cart extends WC_Legacy_Cart {
* @return bool
*/
public function display_prices_including_tax() {
$customer_exempt = $this->get_customer() && $this->get_customer()->get_is_vat_exempt();
return apply_filters( 'woocommerce_cart_' . __FUNCTION__, 'incl' === $this->is_tax_displayed() && ! $customer_exempt );
return apply_filters( 'woocommerce_cart_' . __FUNCTION__, 'incl' === $this->get_tax_price_display_mode() );
}
/*
@ -1935,7 +1933,7 @@ class WC_Cart extends WC_Legacy_Cart {
*
* @return string
*/
private function is_tax_displayed() {
public function get_tax_price_display_mode() {
if ( $this->get_customer() && $this->get_customer()->get_is_vat_exempt() ) {
return 'excl';
}

4
includes/legacy/class-wc-legacy-cart.php
View File

@ -200,8 +200,8 @@ abstract class WC_Legacy_Cart {
$value = 0;
break;
case 'tax_display_cart':
wc_deprecated_argument( 'WC_Cart->tax_display_cart', '4.3', 'Use WC_Cart->is_tax_displayed() instead.' );
$value = $this->is_tax_displayed();
wc_deprecated_argument( 'WC_Cart->tax_display_cart', '4.4', 'Use WC_Cart->get_tax_price_display_mode() instead.' );
$value = $this->get_tax_price_display_mode();
break;
}
return $value;