From 01696d92b09d54c40f47bd86aa89a70fe08df695 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 23 Jan 2019 17:34:51 +0000
Subject: [PATCH 1/8] Add comments and round to 10

---
 assets/js/frontend/price-slider.js                |  1 +
 includes/widgets/class-wc-widget-price-filter.php | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/js/frontend/price-slider.js b/assets/js/frontend/price-slider.js
index 682a2255d6f..aedd6c7aba8 100644
--- a/assets/js/frontend/price-slider.js
+++ b/assets/js/frontend/price-slider.js
@@ -41,6 +41,7 @@ jQuery( function( $ ) {
 			animate: true,
 			min: min_price,
 			max: max_price,
+			step: 10,
 			values: [ current_min_price, current_max_price ],
 			create: function() {
 
diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index 0949c7518dc..208bdfe56f4 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -70,17 +70,20 @@ class WC_Widget_Price_Filter extends WC_Widget {
 
 		$min_price = isset( $_GET['min_price'] ) ? wc_clean( wp_unslash( $_GET['min_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
 		$max_price = isset( $_GET['max_price'] ) ? wc_clean( wp_unslash( $_GET['max_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
-		if ( ! wc()->query->get_main_query()->post_count && null === $min_price && null === $max_price ) {
+
+		// If there are not posts and we're not filtering, hide the widget.
+		if ( ! WC()->query->get_main_query()->post_count && null === $min_price && null === $max_price ) {
 			return;
 		}
 
 		wp_enqueue_script( 'wc-price-slider' );
 
-		// Find min and max price in current result set.
+		// Find min and max price in current result set, rounding to the nearest 10.
 		$prices = $this->get_filtered_price();
-		$min    = floor( $prices->min_price );
-		$max    = ceil( $prices->max_price );
+		$min    = floor( $prices->min_price / 10 ) * 10;
+		$max    = ceil( $prices->max_price / 10 ) * 10;
 
+		// If both min and max are equal, we don't need a slider.
 		if ( $min === $max ) {
 			return;
 		}

From b9de20ed275359262a676f1736ad401b4873d1ce Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 23 Jan 2019 15:31:26 +0000
Subject: [PATCH 2/8] Exclude paged from price slider

---
 includes/widgets/class-wc-widget-price-filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index 208bdfe56f4..ac27a5948ed 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -109,7 +109,7 @@ class WC_Widget_Price_Filter extends WC_Widget {
 					<div class="price_label" style="display:none;">
 						' . esc_html__( 'Price:', 'woocommerce' ) . ' <span class="from"></span> &mdash; <span class="to"></span>
 					</div>
-					' . wc_query_string_form_fields( null, array( 'min_price', 'max_price' ), '', true ) . '
+					' . wc_query_string_form_fields( null, array( 'min_price', 'max_price', 'paged' ), '', true ) . '
 					<div class="clear"></div>
 				</div>
 			</div>

From 3a94fc6d00001f8952bf7a69a96d899599e49929 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 23 Jan 2019 18:29:33 +0000
Subject: [PATCH 3/8] Introduce steps and cleanup variable names for clarity

---
 assets/js/frontend/price-slider.js            |  7 +++--
 .../widgets/class-wc-widget-price-filter.php  | 29 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/assets/js/frontend/price-slider.js b/assets/js/frontend/price-slider.js
index aedd6c7aba8..3b89b117c8b 100644
--- a/assets/js/frontend/price-slider.js
+++ b/assets/js/frontend/price-slider.js
@@ -31,8 +31,9 @@ jQuery( function( $ ) {
 		$( 'input#min_price, input#max_price' ).hide();
 		$( '.price_slider, .price_label' ).show();
 
-		var min_price = $( '.price_slider_amount #min_price' ).data( 'min' ),
-			max_price = $( '.price_slider_amount #max_price' ).data( 'max' ),
+		var min_price         = $( '.price_slider_amount #min_price' ).data( 'min' ),
+			max_price         = $( '.price_slider_amount #max_price' ).data( 'max' ),
+			step              = $( '.price_slider_amount' ).data( 'step' ) || 1,
 			current_min_price = $( '.price_slider_amount #min_price' ).val(),
 			current_max_price = $( '.price_slider_amount #max_price' ).val();
 
@@ -41,7 +42,7 @@ jQuery( function( $ ) {
 			animate: true,
 			min: min_price,
 			max: max_price,
-			step: 10,
+			step: step,
 			values: [ current_min_price, current_max_price ],
 			create: function() {
 
diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index ac27a5948ed..86f8f75833a 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -68,23 +68,27 @@ class WC_Widget_Price_Filter extends WC_Widget {
 			return;
 		}
 
-		$min_price = isset( $_GET['min_price'] ) ? wc_clean( wp_unslash( $_GET['min_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
-		$max_price = isset( $_GET['max_price'] ) ? wc_clean( wp_unslash( $_GET['max_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
+		// Current active min and max price is retrieved from the query string.
+		$current_min_price = isset( $_GET['min_price'] ) ? wc_clean( wp_unslash( $_GET['min_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
+		$current_max_price = isset( $_GET['max_price'] ) ? wc_clean( wp_unslash( $_GET['max_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
 
 		// If there are not posts and we're not filtering, hide the widget.
-		if ( ! WC()->query->get_main_query()->post_count && null === $min_price && null === $max_price ) {
+		if ( ! WC()->query->get_main_query()->post_count && null === $current_min_price && null === $current_max_price ) {
 			return;
 		}
 
 		wp_enqueue_script( 'wc-price-slider' );
 
-		// Find min and max price in current result set, rounding to the nearest 10.
-		$prices = $this->get_filtered_price();
-		$min    = floor( $prices->min_price / 10 ) * 10;
-		$max    = ceil( $prices->max_price / 10 ) * 10;
+		// Find min and max price in current result set.
+		$prices            = $this->get_filtered_price();
+		$min_price         = apply_filters( 'woocommerce_price_filter_widget_min_amount', floor( $prices->min_price / 10 ) * 10 );
+		$max_price         = apply_filters( 'woocommerce_price_filter_widget_max_amount', ceil( $prices->max_price / 10 ) * 10 );
+		$current_min_price = is_null( $current_min_price ) ? $min_price : floor( $current_min_price / 10 ) * 10;
+		$current_max_price = is_null( $current_max_price ) ? $max_price : ceil( $current_max_price / 10 ) * 10;
+		$step              = apply_filters( 'woocommerce_price_filter_widget_step', 10 );
 
 		// If both min and max are equal, we don't need a slider.
-		if ( $min === $max ) {
+		if ( $min_price === $max_price ) {
 			return;
 		}
 
@@ -96,15 +100,12 @@ class WC_Widget_Price_Filter extends WC_Widget {
 			$form_action = preg_replace( '%\/page/[0-9]+%', '', home_url( trailingslashit( $wp->request ) ) );
 		}
 
-		$min_price = null !== $min_price ? $min_price : apply_filters( 'woocommerce_price_filter_widget_min_amount', $min );
-		$max_price = null !== $max_price ? $max_price : apply_filters( 'woocommerce_price_filter_widget_max_amount', $max );
-
 		echo '<form method="get" action="' . esc_url( $form_action ) . '">
 			<div class="price_slider_wrapper">
 				<div class="price_slider" style="display:none;"></div>
-				<div class="price_slider_amount">
-					<input type="text" id="min_price" name="min_price" value="' . esc_attr( $min_price ) . '" data-min="' . esc_attr( apply_filters( 'woocommerce_price_filter_widget_min_amount', $min ) ) . '" placeholder="' . esc_attr__( 'Min price', 'woocommerce' ) . '" />
-					<input type="text" id="max_price" name="max_price" value="' . esc_attr( $max_price ) . '" data-max="' . esc_attr( apply_filters( 'woocommerce_price_filter_widget_max_amount', $max ) ) . '" placeholder="' . esc_attr__( 'Max price', 'woocommerce' ) . '" />
+				<div class="price_slider_amount" data-step="' . esc_attr( $step ) . '">
+					<input type="text" id="min_price" name="min_price" value="' . esc_attr( $current_min_price ) . '" data-min="' . esc_attr( $min_price ) . '" placeholder="' . esc_attr__( 'Min price', 'woocommerce' ) . '" />
+					<input type="text" id="max_price" name="max_price" value="' . esc_attr( $current_max_price ) . '" data-max="' . esc_attr( $max_price ) . '" placeholder="' . esc_attr__( 'Max price', 'woocommerce' ) . '" />
 					<button type="submit" class="button">' . esc_html__( 'Filter', 'woocommerce' ) . '</button>
 					<div class="price_label" style="display:none;">
 						' . esc_html__( 'Price:', 'woocommerce' ) . ' <span class="from"></span> &mdash; <span class="to"></span>

From 31263f2a4ceaaa24d271e03bfc718b0185c24d32 Mon Sep 17 00:00:00 2001
From: Gerhard <potgieterg@gmail.com>
Date: Fri, 16 Nov 2018 11:26:49 +0200
Subject: [PATCH 4/8] Tax calc for price filter

Co-Authored-By: Gerhard Potgieter <kloon@users.noreply.github.com>
---
 includes/wc-product-functions.php             | 27 ++++++++++-----
 .../widgets/class-wc-widget-price-filter.php  | 34 +++++++++++++++----
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/includes/wc-product-functions.php b/includes/wc-product-functions.php
index 4fe4ecdd4e4..4e75fb0df94 100644
--- a/includes/wc-product-functions.php
+++ b/includes/wc-product-functions.php
@@ -795,6 +795,7 @@ function wc_get_product_visibility_options() {
 function wc_get_min_max_price_meta_query( $args ) {
 	$min = isset( $args['min_price'] ) ? floatval( $args['min_price'] ) : 0;
 	$max = isset( $args['max_price'] ) ? floatval( $args['max_price'] ) : 9999999999;
+	$src = isset( $args['min_max_source'] ) ? wc_clean( $args['min_max_source'] ) : '';
 
 	/**
 	 * Adjust if the store taxes are not displayed how they are stored.
@@ -809,8 +810,14 @@ function wc_get_min_max_price_meta_query( $args ) {
 			$tax_rates = WC_Tax::get_rates( $tax_class );
 
 			if ( $tax_rates ) {
-				$class_min = $min + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
-				$class_max = $max - WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
+				// Price filter widget values already contain taxes, we need to subtract taxes and not add.
+				if ( 'price_filter_widget' === $src ) {
+					$class_min = $min - WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
+					$class_max = $max - WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
+				} else {
+					$class_min = $min + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
+					$class_max = $max + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
+				}
 			}
 		}
 
@@ -818,12 +825,16 @@ function wc_get_min_max_price_meta_query( $args ) {
 		$max = $class_max;
 	}
 
-	return apply_filters( 'woocommerce_get_min_max_price_meta_query', array(
-		'key'     => '_price',
-		'value'   => array( $min, $max ),
-		'compare' => 'BETWEEN',
-		'type'    => 'DECIMAL(10,' . wc_get_price_decimals() . ')',
-	), $args );
+	return apply_filters(
+		'woocommerce_get_min_max_price_meta_query',
+		array(
+			'key'     => '_price',
+			'value'   => array( $min, $max ),
+			'compare' => 'BETWEEN',
+			'type'    => 'DECIMAL(10,' . wc_get_price_decimals() . ')',
+		),
+		$args
+	);
 }
 
 /**
diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index 86f8f75833a..2aac88a5300 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -80,18 +80,40 @@ class WC_Widget_Price_Filter extends WC_Widget {
 		wp_enqueue_script( 'wc-price-slider' );
 
 		// Find min and max price in current result set.
-		$prices            = $this->get_filtered_price();
-		$min_price         = apply_filters( 'woocommerce_price_filter_widget_min_amount', floor( $prices->min_price / 10 ) * 10 );
-		$max_price         = apply_filters( 'woocommerce_price_filter_widget_max_amount', ceil( $prices->max_price / 10 ) * 10 );
-		$current_min_price = is_null( $current_min_price ) ? $min_price : floor( $current_min_price / 10 ) * 10;
-		$current_max_price = is_null( $current_max_price ) ? $max_price : ceil( $current_max_price / 10 ) * 10;
-		$step              = apply_filters( 'woocommerce_price_filter_widget_step', 10 );
+		$prices    = $this->get_filtered_price();
+		$min_price = $prices->min_price;
+		$max_price = $prices->max_price;
+
+		// Check to see if we should add taxes to the prices if store are excl tax but display incl.
+		$tax_display_mode = get_option( 'woocommerce_tax_display_shop' );
+
+		if ( wc_tax_enabled() && ! wc_prices_include_tax() && 'incl' === $tax_display_mode ) {
+			$class_min   = $min_price;
+			$class_max   = $max_price;
+			$tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
+			foreach ( $tax_classes as $tax_class ) {
+				$tax_rates = WC_Tax::get_rates( $tax_class );
+				if ( $tax_rates ) {
+					$class_min = $min_price + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min_price, $tax_rates ) );
+					$class_max = $max_price + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max_price, $tax_rates ) );
+				}
+			}
+			$min_price = $class_min;
+			$max_price = $class_max;
+		}
+
+		$min_price = apply_filters( 'woocommerce_price_filter_widget_min_amount', floor( $min_price / 10 ) * 10 );
+		$max_price = apply_filters( 'woocommerce_price_filter_widget_max_amount', ceil( $max_price / 10 ) * 10 );
 
 		// If both min and max are equal, we don't need a slider.
 		if ( $min_price === $max_price ) {
 			return;
 		}
 
+		$current_min_price = is_null( $current_min_price ) ? $min_price : floor( $current_min_price / 10 ) * 10;
+		$current_max_price = is_null( $current_max_price ) ? $max_price : ceil( $current_max_price / 10 ) * 10;
+		$step              = apply_filters( 'woocommerce_price_filter_widget_step', 10 );
+
 		$this->widget_start( $args, $instance );
 
 		if ( '' === get_option( 'permalink_structure' ) ) {

From 08a14b4ce9abea1b507d94ef65e223dbd92fa0c9 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 23 Jan 2019 19:39:28 +0000
Subject: [PATCH 5/8] Move out tax logic

Co-Authored-By: Gerhard Potgieter <kloon@users.noreply.github.com>
---
 includes/wc-product-functions.php | 35 +++----------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/includes/wc-product-functions.php b/includes/wc-product-functions.php
index 4e75fb0df94..092b779e5eb 100644
--- a/includes/wc-product-functions.php
+++ b/includes/wc-product-functions.php
@@ -793,43 +793,14 @@ function wc_get_product_visibility_options() {
  * @return array
  */
 function wc_get_min_max_price_meta_query( $args ) {
-	$min = isset( $args['min_price'] ) ? floatval( $args['min_price'] ) : 0;
-	$max = isset( $args['max_price'] ) ? floatval( $args['max_price'] ) : 9999999999;
-	$src = isset( $args['min_max_source'] ) ? wc_clean( $args['min_max_source'] ) : '';
-
-	/**
-	 * Adjust if the store taxes are not displayed how they are stored.
-	 * Kicks in when prices excluding tax are displayed including tax.
-	 */
-	if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) {
-		$tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
-		$class_min   = $min;
-		$class_max   = $max;
-
-		foreach ( $tax_classes as $tax_class ) {
-			$tax_rates = WC_Tax::get_rates( $tax_class );
-
-			if ( $tax_rates ) {
-				// Price filter widget values already contain taxes, we need to subtract taxes and not add.
-				if ( 'price_filter_widget' === $src ) {
-					$class_min = $min - WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
-					$class_max = $max - WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
-				} else {
-					$class_min = $min + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min, $tax_rates ) );
-					$class_max = $max + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max, $tax_rates ) );
-				}
-			}
-		}
-
-		$min = $class_min;
-		$max = $class_max;
-	}
+	$current_min_price = isset( $args['min_price'] ) ? floatval( $args['min_price'] ) : 0;
+	$current_max_price = isset( $args['max_price'] ) ? floatval( $args['max_price'] ) : 9999999999;
 
 	return apply_filters(
 		'woocommerce_get_min_max_price_meta_query',
 		array(
 			'key'     => '_price',
-			'value'   => array( $min, $max ),
+			'value'   => array( $current_min_price, $current_max_price ),
 			'compare' => 'BETWEEN',
 			'type'    => 'DECIMAL(10,' . wc_get_price_decimals() . ')',
 		),

From b8e60e44c00a4bb878f3e0c2942c4727dd23a87c Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 23 Jan 2019 19:39:46 +0000
Subject: [PATCH 6/8] Handle tax in price filter specific query

Co-Authored-By: Gerhard Potgieter <kloon@users.noreply.github.com>
---
 includes/class-wc-query.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/includes/class-wc-query.php b/includes/class-wc-query.php
index e60979b2d98..0a4628a08ae 100644
--- a/includes/class-wc-query.php
+++ b/includes/class-wc-query.php
@@ -679,7 +679,33 @@ class WC_Query {
 	 */
 	private function price_filter_meta_query() {
 		if ( isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) { // WPCS: input var ok, CSRF ok.
-			$meta_query                 = wc_get_min_max_price_meta_query( $_GET ); // WPCS: input var ok, CSRF ok.
+			$current_min_price = isset( $_GET['min_price'] ) ? floatval( wp_unslash( $_GET['min_price'] ) ) : 0; // WPCS: input var ok, CSRF ok.
+			$current_max_price = isset( $_GET['max_price'] ) ? floatval( wp_unslash( $_GET['max_price'] ) ) : 9999999999; // WPCS: input var ok, CSRF ok.
+
+			/**
+			 * Adjust if the store taxes are not displayed how they are stored.
+			 * Kicks in when prices excluding tax are displayed including tax.
+			 */
+			if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) {
+				$tax_class = apply_filters( 'woocommerce_price_filter_widget_tax_class', '' ); // Uses standard tax class.
+				$tax_rates = WC_Tax::get_rates( $tax_class );
+
+				if ( $tax_rates ) {
+					$current_min_price -= WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $current_min_price, $tax_rates ) );
+					$current_max_price -= WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $current_max_price, $tax_rates ) );
+				}
+			}
+
+			$step              = max( apply_filters( 'woocommerce_price_filter_widget_step', 10 ), 1 );
+			$current_min_price = floor( $current_min_price / $step ) * $step;
+			$current_max_price = ceil( $current_max_price / $step ) * $step;
+
+			$meta_query = wc_get_min_max_price_meta_query(
+				array(
+					'min_price' => $current_min_price,
+					'max_price' => $current_max_price,
+				)
+			); // WPCS: input var ok, CSRF ok.
 			$meta_query['price_filter'] = true;
 
 			return $meta_query;

From 536c933612cd703c590f4cd15358509e6ff4a191 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 23 Jan 2019 19:39:59 +0000
Subject: [PATCH 7/8] correctly handle steps

Co-Authored-By: Gerhard Potgieter <kloon@users.noreply.github.com>
---
 .../widgets/class-wc-widget-price-filter.php  | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index 2aac88a5300..4eb70173547 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -68,17 +68,16 @@ class WC_Widget_Price_Filter extends WC_Widget {
 			return;
 		}
 
-		// Current active min and max price is retrieved from the query string.
-		$current_min_price = isset( $_GET['min_price'] ) ? wc_clean( wp_unslash( $_GET['min_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
-		$current_max_price = isset( $_GET['max_price'] ) ? wc_clean( wp_unslash( $_GET['max_price'] ) ) : null; // WPCS: input var ok, CSRF ok.
-
 		// If there are not posts and we're not filtering, hide the widget.
-		if ( ! WC()->query->get_main_query()->post_count && null === $current_min_price && null === $current_max_price ) {
+		if ( ! WC()->query->get_main_query()->post_count && ! isset( $_GET['min_price'] ) && ! isset( $_GET['max_price'] ) ) { // WPCS: input var ok, CSRF ok.
 			return;
 		}
 
 		wp_enqueue_script( 'wc-price-slider' );
 
+		// Round values to nearest 10 by default.
+		$step = max( apply_filters( 'woocommerce_price_filter_widget_step', 10 ), 1 );
+
 		// Find min and max price in current result set.
 		$prices    = $this->get_filtered_price();
 		$min_price = $prices->min_price;
@@ -88,31 +87,25 @@ class WC_Widget_Price_Filter extends WC_Widget {
 		$tax_display_mode = get_option( 'woocommerce_tax_display_shop' );
 
 		if ( wc_tax_enabled() && ! wc_prices_include_tax() && 'incl' === $tax_display_mode ) {
-			$class_min   = $min_price;
-			$class_max   = $max_price;
-			$tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
-			foreach ( $tax_classes as $tax_class ) {
-				$tax_rates = WC_Tax::get_rates( $tax_class );
-				if ( $tax_rates ) {
-					$class_min = $min_price + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min_price, $tax_rates ) );
-					$class_max = $max_price + WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max_price, $tax_rates ) );
-				}
+			$tax_class = apply_filters( 'woocommerce_price_filter_widget_tax_class', '' ); // Uses standard tax class.
+			$tax_rates = WC_Tax::get_rates( $tax_class );
+
+			if ( $tax_rates ) {
+				$min_price += WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $min_price, $tax_rates ) );
+				$max_price += WC_Tax::get_tax_total( WC_Tax::calc_exclusive_tax( $max_price, $tax_rates ) );
 			}
-			$min_price = $class_min;
-			$max_price = $class_max;
 		}
 
-		$min_price = apply_filters( 'woocommerce_price_filter_widget_min_amount', floor( $min_price / 10 ) * 10 );
-		$max_price = apply_filters( 'woocommerce_price_filter_widget_max_amount', ceil( $max_price / 10 ) * 10 );
+		$min_price = apply_filters( 'woocommerce_price_filter_widget_min_amount', floor( $min_price / $step ) * $step );
+		$max_price = apply_filters( 'woocommerce_price_filter_widget_max_amount', ceil( $max_price / $step ) * $step );
 
 		// If both min and max are equal, we don't need a slider.
 		if ( $min_price === $max_price ) {
 			return;
 		}
 
-		$current_min_price = is_null( $current_min_price ) ? $min_price : floor( $current_min_price / 10 ) * 10;
-		$current_max_price = is_null( $current_max_price ) ? $max_price : ceil( $current_max_price / 10 ) * 10;
-		$step              = apply_filters( 'woocommerce_price_filter_widget_step', 10 );
+		$current_min_price = isset( $_GET['min_price'] ) ? floor( floatval( wp_unslash( $_GET['min_price'] ) ) / $step ) * $step : $min_price; // WPCS: input var ok, CSRF ok.
+		$current_max_price = isset( $_GET['max_price'] ) ? ceil( floatval( wp_unslash( $_GET['max_price'] ) ) / $step ) * $step : $max_price; // WPCS: input var ok, CSRF ok.
 
 		$this->widget_start( $args, $instance );
 

From b6e53d9109ee2e86520204f372b72c97475b1455 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 6 Mar 2019 12:46:58 +0000
Subject: [PATCH 8/8] PHP_INT_MAX

---
 includes/wc-product-functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/wc-product-functions.php b/includes/wc-product-functions.php
index 879816b8b07..44d6561ee8e 100644
--- a/includes/wc-product-functions.php
+++ b/includes/wc-product-functions.php
@@ -787,7 +787,7 @@ function wc_get_product_visibility_options() {
  */
 function wc_get_min_max_price_meta_query( $args ) {
 	$current_min_price = isset( $args['min_price'] ) ? floatval( $args['min_price'] ) : 0;
-	$current_max_price = isset( $args['max_price'] ) ? floatval( $args['max_price'] ) : 9999999999;
+	$current_max_price = isset( $args['max_price'] ) ? floatval( $args['max_price'] ) : PHP_INT_MAX;
 
 	return apply_filters(
 		'woocommerce_get_min_max_price_meta_query',