@automattic/newspack-blocks 4.18.0-alpha.2 → 4.18.0

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-# [4.18.0-alpha.2](https://github.com/Automattic/newspack-blocks/compare/v4.18.0-alpha.1...v4.18.0-alpha.2) (2025-11-17)
+# [4.18.0](https://github.com/Automattic/newspack-blocks/compare/v4.17.6...v4.18.0) (2025-11-24)
 
 
 ### Bug Fixes
@@ -8,7 +8,28 @@
 
 ### Features
 
+* **content-loop:** setting labels more generic ([#2246](https://github.com/Automattic/newspack-blocks/issues/2246)) ([9a635e9](https://github.com/Automattic/newspack-blocks/commit/9a635e9ffd86fd558365df1fec08d7943e08941c))
 * **donate-block:** default frequency for tiered layout ([#2248](https://github.com/Automattic/newspack-blocks/issues/2248)) ([2d07c11](https://github.com/Automattic/newspack-blocks/commit/2d07c111cd678138ad09cec2b768fc7c98e1d35b))
+* **modal-checkout:** processing payment screen ([#2247](https://github.com/Automattic/newspack-blocks/issues/2247)) ([8beea1e](https://github.com/Automattic/newspack-blocks/commit/8beea1e4fc67b150fc06b5a3b46c827a7d908f1c))
+
+
+### Reverts
+
+* Revert "fix: render modal checkout with filtered supported gateways ([#2240](https://github.com/Automattic/newspack-blocks/issues/2240))" ([#2243](https://github.com/Automattic/newspack-blocks/issues/2243)) ([200412b](https://github.com/Automattic/newspack-blocks/commit/200412bf969fc825090ffbe9b567886827e8eac4))
+
+## [4.17.6](https://github.com/Automattic/newspack-blocks/compare/v4.17.5...v4.17.6) (2025-11-19)
+
+
+### Bug Fixes
+
+* don’t show trial info in modal checkout if not applicable ([#2245](https://github.com/Automattic/newspack-blocks/issues/2245)) ([26de0b9](https://github.com/Automattic/newspack-blocks/commit/26de0b9cf223dd3e5c5d4ee56ba6a8a915554baf))
+
+## [4.17.5](https://github.com/Automattic/newspack-blocks/compare/v4.17.4...v4.17.5) (2025-11-18)
+
+
+### Bug Fixes
+
+* **modal-checkout:** check product type to get recurrence data ([#2259](https://github.com/Automattic/newspack-blocks/issues/2259)) ([0c2ed81](https://github.com/Automattic/newspack-blocks/commit/0c2ed81a0ec2f68ae1aff3eb98633ed52def3218))
 
 ## [4.17.4](https://github.com/Automattic/newspack-blocks/compare/v4.17.3...v4.17.4) (2025-11-13)
 

package/includes/class-modal-checkout.php

@@ -1830,7 +1830,7 @@ final class Modal_Checkout {
 	 *
 	 * @return false|int User ID if found by email address, false otherwise.
 	 */
-	private static function get_user_id_from_email() {
+	public 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 );

package/includes/modal-checkout/class-checkout-data.php

@@ -26,7 +26,7 @@ final class Checkout_Data {
 			$price = '0';
 		}
 
-		if ( function_exists( 'wcs_price_string' ) && function_exists( 'wc_price' ) ) {
+		if ( function_exists( 'wcs_price_string' ) && function_exists( 'wc_price' ) && function_exists( 'wc_get_product' ) && class_exists( 'WC_Subscriptions_Product' ) ) {
 			if ( $frequency && $frequency !== 'once' ) {
 				// Get additional subscription details if product_id is provided.
 				$subscription_interval = 1;
@@ -35,10 +35,11 @@ final class Checkout_Data {
 				$initial_amount        = 0;
 
 				if ( $product_id ) {
-					$subscription_interval = get_post_meta( $product_id, '_subscription_period_interval', true );
-					$trial_length = get_post_meta( $product_id, '_subscription_trial_length', true );
-					$trial_period = get_post_meta( $product_id, '_subscription_trial_period', true );
-					$initial_amount = get_post_meta( $product_id, '_subscription_sign_up_fee', true );
+					$product = wc_get_product( $product_id );
+					$subscription_interval = \WC_Subscriptions_Product::get_interval( $product );
+					$trial_length = \WC_Subscriptions_Product::get_trial_length( $product );
+					$trial_period = \WC_Subscriptions_Product::get_trial_period( $product );
+					$initial_amount = \WC_Subscriptions_Product::get_sign_up_fee( $product );
 
 					if ( empty( $subscription_interval ) ) {
 						$subscription_interval = 1;
@@ -81,13 +82,21 @@ final class Checkout_Data {
 	 * Returns whether a product is a one time purchase, or recurring and when.
 	 *
 	 * @param string $product_id Product's ID.
+	 *
+	 * @return string The purchase recurrence.
 	 */
 	public static function get_purchase_recurrence( $product_id ) {
-		$recurrence = get_post_meta( $product_id, '_subscription_period', true );
-		if ( empty( $recurrence ) ) {
-			$recurrence = 'once';
+		if ( ! function_exists( 'wc_get_product' ) ) {
+			return 'once';
+		}
+		$product = \wc_get_product( $product_id );
+		if ( $product && ( $product->is_type( 'subscription' ) || $product->is_type( 'subscription_variation' ) ) ) {
+			$recurrence = get_post_meta( $product_id, '_subscription_period', true );
+			if ( ! empty( $recurrence ) ) {
+				return $recurrence;
+			}
 		}
-		return $recurrence;
+		return 'once';
 	}
 
 	/**

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.18.0-alpha.2
+ * Version:         4.18.0
  *
  * @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', '4.18.0-alpha.2' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.18.0' );
 
 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": "4.18.0-alpha.2",
+	"version": "4.18.0",
 	"author": "Automattic",
 	"description": "=== Newspack Blocks === Contributors: (this should be a list of wordpress.org userid's) Donate link: https://example.com/ Tags: comments, spam Requires at least: 4.5 Tested up to: 5.1.1 Stable tag: 0.1.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html",
 	"repository": {

package/vendor/composer/installed.php

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