@automattic/newspack-blocks 3.6.0 → 3.6.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.6.1](https://github.com/Automattic/newspack-blocks/compare/v3.6.0...v3.6.1) (2024-08-12)
+
+
+### Bug Fixes
+
+* **wc-subs-limiting:** handle not-logged-in user ([#1816](https://github.com/Automattic/newspack-blocks/issues/1816)) ([d85a818](https://github.com/Automattic/newspack-blocks/commit/d85a8188515cf1e90256b7ecb2b3dbdb5e83ec10))
+
 # [3.6.0](https://github.com/Automattic/newspack-blocks/compare/v3.5.0...v3.6.0) (2024-07-30)
 
 

package/includes/class-modal-checkout.php

@@ -34,6 +34,7 @@ final class Modal_Checkout {
 		add_action( 'wp_loaded', [ __CLASS__, 'process_checkout_request' ], 5 );
 		add_filter( 'wp_redirect', [ __CLASS__, 'pass_url_param_on_redirect' ] );
 		add_filter( 'woocommerce_cart_product_cannot_be_purchased_message', [ __CLASS__, 'woocommerce_cart_product_cannot_be_purchased_message' ], 10, 2 );
+		add_filter( 'woocommerce_add_error', [ __CLASS__, 'hide_expiry_message_shop_link' ] );
 		add_action( 'wp_footer', [ __CLASS__, 'render_modal_markup' ], 100 );
 		add_action( 'wp_footer', [ __CLASS__, 'render_variation_selection' ], 100 );
 		add_action( 'wp_enqueue_scripts', [ __CLASS__, 'enqueue_scripts' ] );
@@ -89,6 +90,7 @@ final class Modal_Checkout {
 			add_filter( 'woocommerce_subscription_variation_is_purchasable', [ 'WCS_Limiter', 'is_purchasable_renewal' ], 12, 2 );
 			add_filter( 'woocommerce_valid_order_statuses_for_order_again', [ 'WCS_Limiter', 'filter_order_again_statuses_for_limited_subscriptions' ] );
 		}
+		add_filter( 'woocommerce_subscriptions_product_limited_for_user', [ __CLASS__, 'subscriptions_product_limited_for_user' ], 10, 3 );
 	}
 
 	/**
@@ -1026,6 +1028,15 @@ final class Modal_Checkout {
 		return $location;
 	}
 
+	/**
+	 * Alternative error message to show when limiting a subscription product's purchase.
+	 *
+	 * @return string
+	 */
+	public static function get_subscription_limited_message() {
+		return __( 'You may only have one subscription of this product at a time.', 'newspack-blocks' );
+	}
+
 	/**
 	 * Filters the error message shown when a product can't be added to the cart.
 	 *
@@ -1038,13 +1049,28 @@ final class Modal_Checkout {
 		if ( method_exists( 'WCS_Limiter', 'is_purchasable' ) ) {
 			$product = \wc_get_product( $product_data->get_id() );
 			if ( ! \WCS_Limiter::is_purchasable( false, $product ) ) {
-				$message .= ' ' . __( 'You may only have one subscription of this product at a time.', 'newspack-blocks' );
+				$message .= ' ' . self::get_subscription_limited_message();
 			}
 		}
 
 		return $message;
 	}
 
+	/**
+	 * We don't want to show the Shop page link in modal checkout because the Shop page doesn't work well inside.
+	 * Unfortunately Woo doesn't provide a filter for this message, so we need to detect it by string matching.
+	 * May not work if the message has been translated or modified elsewhere.
+	 *
+	 * @param string $message The message.
+	 * @return string
+	 */
+	public static function hide_expiry_message_shop_link( $message ) {
+		if ( self::is_modal_checkout() && strpos( $message, 'Sorry, your session has expired' ) !== false ) {
+			return __( 'Could not complete this transaction. Please contact us for assistance.', 'newspack-blocks' );
+		}
+		return $message;
+	}
+
 	/**
 	 * Is this request using the modal checkout?
 	 */
@@ -1124,6 +1150,22 @@ final class Modal_Checkout {
 		return $option_value;
 	}
 
+	/**
+	 * Get user from email.
+	 *
+	 * @return false|int User ID if found by email address, false otherwise.
+	 */
+	private static function get_user_id_from_email() {
+		$billing_email = filter_input( INPUT_POST, 'billing_email', FILTER_SANITIZE_EMAIL );
+		if ( $billing_email ) {
+			$customer = \get_user_by( 'email', $billing_email );
+			if ( $customer ) {
+				return $customer->ID;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * If a reader tries to make a purchase with an email address that
 	 * has been previously registered, automatically associate the transaction
@@ -1137,12 +1179,9 @@ final class Modal_Checkout {
 		if ( ! self::is_modal_checkout() ) {
 			return $customer_id;
 		}
-		$billing_email = filter_input( INPUT_POST, 'billing_email', FILTER_SANITIZE_EMAIL );
-		if ( $billing_email ) {
-			$customer = \get_user_by( 'email', $billing_email );
-			if ( $customer ) {
-				$customer_id = $customer->ID;
-			}
+		$id_from_email = self::get_user_id_from_email();
+		if ( $id_from_email ) {
+			return $id_from_email;
 		}
 		return $customer_id;
 	}
@@ -1191,5 +1230,26 @@ final class Modal_Checkout {
 		}
 		return $modules;
 	}
+
+	/**
+	 * Trigger the subscriptions-limiting logic, using the user gleaned from the email address.
+	 *
+	 * @param bool           $is_limited_for_user If the subscription should be limited.
+	 * @param int|WC_Product $product A WC_Product object or the ID of a product.
+	 * @param int            $user_id The user ID.
+	 */
+	public static function subscriptions_product_limited_for_user( $is_limited_for_user, $product, $user_id ) {
+		if ( $user_id !== 0 ) {
+			return $is_limited_for_user;
+		}
+		$id_from_email = self::get_user_id_from_email();
+		if ( $id_from_email ) {
+			$is_limited_for_user = wcs_is_product_limited_for_user( $product, $id_from_email );
+			if ( $is_limited_for_user ) {
+				add_filter( 'woocommerce_cart_item_removed_message', [ __CLASS__, 'get_subscription_limited_message' ], 10, 2 );
+			}
+		}
+		return $is_limited_for_user;
+	}
 }
 Modal_Checkout::init();

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         3.6.0
+ * Version:         3.6.1
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '3.6.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '3.6.1' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "3.6.0",
+	"version": "3.6.1",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.3",

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit561a3c3ccf297ba8c6b0b3c8c8ae1a81::getLoader();
+return ComposerAutoloaderInit5a66c0d203d139c8911f8f5d70bdba40::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit561a3c3ccf297ba8c6b0b3c8c8ae1a81
+class ComposerAutoloaderInit5a66c0d203d139c8911f8f5d70bdba40
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit561a3c3ccf297ba8c6b0b3c8c8ae1a81
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit561a3c3ccf297ba8c6b0b3c8c8ae1a81', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit5a66c0d203d139c8911f8f5d70bdba40', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit561a3c3ccf297ba8c6b0b3c8c8ae1a81', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit5a66c0d203d139c8911f8f5d70bdba40', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit561a3c3ccf297ba8c6b0b3c8c8ae1a81::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit5a66c0d203d139c8911f8f5d70bdba40::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit561a3c3ccf297ba8c6b0b3c8c8ae1a81
+class ComposerStaticInit5a66c0d203d139c8911f8f5d70bdba40
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInit561a3c3ccf297ba8c6b0b3c8c8ae1a81
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit561a3c3ccf297ba8c6b0b3c8c8ae1a81::$classMap;
+            $loader->classMap = ComposerStaticInit5a66c0d203d139c8911f8f5d70bdba40::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => 'e3f1a1bfc530a1e0280124c6cb5c22475cc4dd01',
+        'reference' => 'd85a8188515cf1e90256b7ecb2b3dbdb5e83ec10',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => 'e3f1a1bfc530a1e0280124c6cb5c22475cc4dd01',
+            'reference' => 'd85a8188515cf1e90256b7ecb2b3dbdb5e83ec10',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),