@automattic/newspack-blocks 4.30.3 → 4.30.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @automattic/newspack-blocks [4.30.4](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.30.3...newspack-blocks@4.30.4) (2026-08-25)
+
+
+### Bug Fixes
+
+* **blocks:** track modal purchases made via the Store API ([#881](https://github.com/Automattic/newspack-workspace/issues/881)) ([06cd0a9](https://github.com/Automattic/newspack-workspace/commit/06cd0a95946703497a8f2bba0ecfd06c69a09718))
+
 ## @automattic/newspack-blocks [4.30.3](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.30.2...newspack-blocks@4.30.3) (2026-08-20)
 
 

package/includes/class-modal-checkout.php

@@ -1621,13 +1621,18 @@ final class Modal_Checkout {
 	/**
 	 * Return URL for modal checkout "thank you" page.
 	 *
+	 * Origin detection covers the referer so that express-wallet (Apple Pay /
+	 * Google Pay) Store API submissions — JSON bodies with no request params —
+	 * get a decorated return URL and land on the modal thank-you, where the
+	 * front-end GA4 purchase event fires.
+	 *
 	 * @param string   $url The URL to redirect to.
 	 * @param WC_Order $order The order related to the transaction.
 	 *
 	 * @return string
 	 */
 	public static function woocommerce_get_return_url( $url, $order ) {
-		if ( ! self::is_modal_checkout() || self::has_unsupported_payment_gateway() ) {
+		if ( ! self::is_modal_checkout_origin() || self::has_unsupported_payment_gateway() ) {
 			return $url;
 		}
 
@@ -1946,7 +1951,7 @@ final class Modal_Checkout {
 	 * @return array
 	 */
 	public static function relax_configured_off_locale_fields( $locale ) {
-		if ( ! self::is_modal_checkout_referer() && ! self::is_modal_checkout() ) {
+		if ( ! self::is_modal_checkout_origin() ) {
 			return $locale;
 		}
 
@@ -2309,6 +2314,11 @@ final class Modal_Checkout {
 
 	/**
 	 * Is this request using the modal checkout?
+	 *
+	 * Detects modal request *data* (request params, serialized post_data, or a
+	 * classic express-checkout submission). For origin detection that also
+	 * covers parameter-less Store API JSON submissions, see
+	 * is_modal_checkout_origin().
 	 */
 	public static function is_modal_checkout() {
 		// Until we use the modal checkout flow from My Account, we don't want to show the modal checkout thank you template for checkouts originating from My Account.
@@ -2328,6 +2338,31 @@ final class Modal_Checkout {
 		return $is_modal_checkout;
 	}
 
+	/**
+	 * Does this request originate from the modal checkout?
+	 *
+	 * Superset of is_modal_checkout(): additionally true for Store API JSON
+	 * submissions (express wallets such as Apple Pay and Google Pay) whose only
+	 * modal signal is the referer query, since JSON bodies carry no request
+	 * params and leave $_POST empty.
+	 *
+	 * The referer is client-controlled, so this gates analytics and
+	 * presentation decisions only — never authorization.
+	 *
+	 * Known edge: a wallet submission from the My Account-origin modal reads as
+	 * modal-origin, because the modal strips the my_account_checkout marker
+	 * from every URL it opens (src/modal-checkout/modal.js). Since #2121 that
+	 * is also how My Account card checkouts behave, so wallet and card flows
+	 * stay in parity; the My Account exclusion inside is_modal_checkout()
+	 * continues to govern the legacy non-modal flows, whose referers never
+	 * carry modal_checkout.
+	 *
+	 * @return bool
+	 */
+	public static function is_modal_checkout_origin() {
+		return self::is_modal_checkout() || self::is_modal_checkout_referer();
+	}
+
 	/**
 	 * Is this transaction using an express checkout method?
 	 */

package/includes/tracking/class-data-events.php

@@ -40,27 +40,81 @@ final class Data_Events {
 		}
 
 		/**
-		 * Modal Checkout Interation: Completed Order.
+		 * Modal Checkout Interaction: Order Processed.
+		 *
+		 * Both hooks fire when the order is created, before payment is
+		 * processed — not when the order reaches the "completed" status.
+		 *
+		 * Both WooCommerce checkout pipelines feed the same Data Events action:
+		 * classic checkout fires woocommerce_checkout_order_processed, while
+		 * Store API checkouts (the transport express wallets such as Apple Pay
+		 * and Google Pay use) fire woocommerce_store_api_checkout_order_processed
+		 * instead. Each hook gets a callback matching its exact argument shape.
 		 */
 		\Newspack\Data_Events::register_listener(
 			'woocommerce_checkout_order_processed',
 			'modal_checkout_interaction',
 			[ __CLASS__, 'order_status_completed' ]
 		);
+		\Newspack\Data_Events::register_listener(
+			'woocommerce_store_api_checkout_order_processed',
+			'modal_checkout_interaction',
+			[ __CLASS__, 'store_api_order_processed' ]
+		);
+	}
+
+	/**
+	 * Classic checkout listener callback.
+	 *
+	 * $posted_data and $order are accepted to match the classic hook's
+	 * signature and are deliberately unused: the payload is built from the
+	 * order ID alone, so both checkout pipelines share one builder.
+	 *
+	 * @param int            $order_id Order's ID.
+	 * @param array|null     $posted_data Posted Data.
+	 * @param \WC_Order|null $order Order object.
+	 *
+	 * @return array|void The event payload; void suppresses the dispatch.
+	 */
+	public static function order_status_completed( $order_id, $posted_data = null, $order = null ) {
+		return self::get_modal_checkout_interaction_data( $order_id );
+	}
+
+	/**
+	 * Store API checkout listener callback.
+	 *
+	 * The Store API hook passes a single \WC_Order, unlike the classic hook's
+	 * three arguments; only a scalar order ID crosses into the shared payload
+	 * builder, so neither callback can misread the other hook's argument list.
+	 *
+	 * @param mixed $order Order object. The hook contract promises a \WC_Order;
+	 *                     anything else is ignored rather than trusted.
+	 *
+	 * @return array|void The event payload; void suppresses the dispatch.
+	 */
+	public static function store_api_order_processed( $order ) {
+		if ( ! is_a( $order, 'WC_Order' ) ) {
+			return;
+		}
+
+		return self::get_modal_checkout_interaction_data( $order->get_id() );
 	}
 
 	/**
-	 * Send data to GA4.
+	 * Build the modal checkout interaction payload for an order, or bail when
+	 * the request is not modal-origin.
+	 *
+	 * Origin detection covers all three modal request shapes: the
+	 * modal_checkout request param (classic card), express_payment_type in
+	 * $_POST (classic express), and the modal referer carried by Store API
+	 * JSON submissions.
+	 *
+	 * @param int $order_id Order's ID.
 	 *
-	 * @param string    $order_id Order's ID.
-	 * @param array     $posted_data Posted Data.
-	 * @param \WC_Order $order Order object.
+	 * @return array|void The event payload; void suppresses the dispatch.
 	 */
-	public static function order_status_completed( $order_id, $posted_data, $order ) {
-		// Check if in a modal checkout; if no, bail.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$is_modal_checkout = ( isset( $_REQUEST['modal_checkout'] ) ? true : false );
-		if ( ! $is_modal_checkout ) {
+	private static function get_modal_checkout_interaction_data( $order_id ) {
+		if ( ! \Newspack_Blocks\Modal_Checkout::is_modal_checkout_origin() ) {
 			return;
 		}
 

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.30.3
+ * Version:         4.30.4
  *
  * @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.30.3' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.30.4' );
 
 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.30.3",
+	"version": "4.30.4",
 	"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-main',
         'version' => 'dev-main',
-        'reference' => '6b239026e4a3dad5118443d9bc384d53248f38fa',
+        'reference' => '06cd0a95946703497a8f2bba0ecfd06c69a09718',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '6b239026e4a3dad5118443d9bc384d53248f38fa',
+            'reference' => '06cd0a95946703497a8f2bba0ecfd06c69a09718',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),