Merge remote-tracking branch 'origin/release/5.8.1' into trunk

Author: diegocurbelo

changelog.txt

@@ -1,5 +1,8 @@
 *** Changelog ***
 
+= 5.8.1 - 2021-11-23 =
+* Fix - Run filters that disable Stripe JS on cart and product pages when PRBs are disabled.
+
 = 5.8.0 - 2021-11-18 =
 * Fix - Hong Kong addresses are now mapped more thoroughly to WooCommerce addresses when paying with Apple Pay.
 * Fix - Error when changing payment method for a subscription with new checkout experience.

includes/class-wc-stripe-helper.php

@@ -584,21 +584,57 @@ public static function should_enqueue_in_current_tab_section( $tab, $section ) {
 		return true;
 	}
 
+	/**
+	 * Returns true if the Stripe JS should be loaded on product pages.
+	 *
+	 * The critical part here is running the filter to allow merchants to disable Stripe's JS to
+	 * improve their store's performance when PRBs are disabled.
+	 *
+	 * @since 5.8.0
+	 * @return boolean True if Stripe's JS should be loaded, false otherwise.
+	 */
 	public static function should_load_scripts_on_product_page() {
-		$prb_locations = self::get_settings( null, 'payment_request_button_locations' ) ?? [ 'product', 'cart' ];
-		if ( ! in_array( 'product', $prb_locations, true ) ) {
-			return apply_filters( 'wc_stripe_load_scripts_on_product_page_when_prbs_disabled', true );
+		if ( self::should_load_scripts_for_prb_location( 'product' ) ) {
+			return true;
 		}
 
-		return true;
+		return apply_filters( 'wc_stripe_load_scripts_on_product_page_when_prbs_disabled', true );
 	}
 
+	/**
+	 * Returns true if the Stripe JS should be loaded on the cart page.
+	 *
+	 * The critical part here is running the filter to allow merchants to disable Stripe's JS to
+	 * improve their store's performance when PRBs are disabled.
+	 *
+	 * @since 5.8.0
+	 * @return boolean True if Stripe's JS should be loaded, false otherwise.
+	 */
 	public static function should_load_scripts_on_cart_page() {
-		$prb_locations = self::get_settings( null, 'payment_request_button_locations' ) ?? [ 'product', 'cart' ];
-		if ( ! in_array( 'cart', $prb_locations, true ) ) {
-			return apply_filters( 'wc_stripe_load_scripts_on_cart_page_when_prbs_disabled', true );
+		if ( self::should_load_scripts_for_prb_location( 'cart' ) ) {
+			return true;
 		}
 
-		return true;
+		return apply_filters( 'wc_stripe_load_scripts_on_cart_page_when_prbs_disabled', true );
+	}
+
+	/**
+	 * Returns true if the Stripe JS should be loaded for the provided location.
+	 *
+	 * @since 5.8.1
+	 * @param string $location  Either 'product' or 'cart'. Used to specify which location to check.
+	 * @return boolean True if Stripe's JS should be loaded for the provided location, false otherwise.
+	 */
+	private static function should_load_scripts_for_prb_location( $location ) {
+		// Make sure location parameter is sanitized.
+		$location         = in_array( $location, [ 'product', 'cart' ], true ) ? $location : '';
+		$are_prbs_enabled = self::get_settings( null, 'payment_request' ) ?? 'yes';
+		$prb_locations    = self::get_settings( null, 'payment_request_button_locations' ) ?? [ 'product', 'cart' ];
+
+		// The scripts should be loaded when all of the following are true:
+		//   1. The PRBs are enabled; and
+		//   2. The PRB location settings have an array value (saving an empty option in the GUI results in non-array value); and
+		//   3. The PRBs are enabled at $location.
+		return 'yes' === $are_prbs_enabled && is_array( $prb_locations ) && in_array( $location, $prb_locations, true );
 	}
 }

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {

package.json

@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, sofort,
 Requires at least: 5.6
 Tested up to: 5.8
 Requires PHP: 7.0
-Stable tag: 5.8.0
+Stable tag: 5.8.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -128,15 +128,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 5.8.0 - 2021-11-18 =
-* Fix - Hong Kong addresses are now mapped more thoroughly to WooCommerce addresses when paying with Apple Pay.
-* Fix - Error when changing payment method for a subscription with new checkout experience.
-* Fix - Payment Requests are now updated correctly when updating items in the Cart Block.
-* Add - Support for WooCommerce Pre-Orders with new checkout experience.
-* Fix - Stripe JS is no longer loaded on cart and product pages when PRBs are disabled on those pages.
-* Tweak - Update the minimum required PHP version to 7.0 to reflect our L-2 support policy.
-* Fix - Add support for MYR (Malaysian ringgit) for Alipay.
-* Add - New Settings UI.
-* Fix - Hide payment request button when variations of a variable product are out-of-stock.
+= 5.8.1 - 2021-11-23 =
+* Fix - Run filters that disable Stripe JS on cart and product pages when PRBs are disabled.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

readme.txt

@@ -5,7 +5,7 @@
  * Description: Take credit card payments on your store using Stripe.
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 5.8.0
+ * Version: 5.8.1
  * Requires at least: 5.6
  * Tested up to: 5.8
  * WC requires at least: 5.6
@@ -21,7 +21,7 @@
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '5.8.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '5.8.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_STRIPE_MIN_PHP_VER', '7.0.0' );
 define( 'WC_STRIPE_MIN_WC_VER', '5.6' );
 define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '5.7' );