Merge branch 'trunk' into fix/articles-infinite-loading

Automattic · Sep 20, 2024 · 153f717 · 153f717
2 parents e706ef9 + 0b0b02c
commit 153f717
Show file tree

Hide file tree

Showing 17 changed files with 272 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [4.1.2](https://github.com/Automattic/newspack-blocks/compare/v4.1.1...v4.1.2) (2024-09-17)
+
+
+### Bug Fixes
+
+* **modal-checkout:** tweak HTML to satisfy Woo Payments field validation ([#1883](https://github.com/Automattic/newspack-blocks/issues/1883)) ([16b5e9d](https://github.com/Automattic/newspack-blocks/commit/16b5e9db840d7dfccd064776285221c66d92e7f2))
+
+## [4.1.1](https://github.com/Automattic/newspack-blocks/compare/v4.1.0...v4.1.1) (2024-09-16)
+
+
+### Bug Fixes
+
+* support new is_my_account() method from main plugin ([#1869](https://github.com/Automattic/newspack-blocks/issues/1869)) ([b9a3aba](https://github.com/Automattic/newspack-blocks/commit/b9a3aba064073f97bca5e08dd96ff450fe287faf))
+
 # [4.1.0](https://github.com/Automattic/newspack-blocks/compare/v4.0.1...v4.1.0) (2024-08-26)
 
 

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
 		"dealerdirect/phpcodesniffer-composer-installer": "*",
 		"phpcompatibility/phpcompatibility-wp": "*",
 		"sirbrillig/phpcs-variable-analysis": "^2.10",
-		"yoast/phpunit-polyfills": "^2.0",
+		"yoast/phpunit-polyfills": "^3.0",
 		"phpunit/phpunit": "^7.0 || ^9.5"
 	},
 	"license": "GPL-3.0-or-later",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-modal-checkout.php b/includes/class-modal-checkout.php
@@ -124,7 +124,7 @@ public static function woocommerce_checkout_create_order_line_item( $item, $cart
 	 * Change the post-transaction return URL.
 	 * This is specifically for non-redirect-based flows, such as Apple Pay.
 	 *
-	 * @param array $result The return payload for a successfull transaction.
+	 * @param array $result The return payload for a successful transaction.
 	 */
 	public static function woocommerce_payment_successful_result( $result ) {
 		$order_id           = $result['order_id'];
@@ -134,24 +134,21 @@ public static function woocommerce_payment_successful_result( $result ) {
 			return $result;
 		}
 
-		$originating_from_modal = ! empty( $order->get_meta( '_newspack_modal_checkout_url' ) );
-		if ( $originating_from_modal ) {
-			$modal_checkout_url_query = \wp_parse_url( $modal_checkout_url, PHP_URL_QUERY );
-			\wp_parse_str( $modal_checkout_url_query, $modal_checkout_url_query_params );
-			$passed_params_names = [ 'modal_checkout', 'after_success_behavior', 'after_success_url', 'after_success_button_label' ];
-			// Pick passed params from the query params.
-			$passed_params = array_intersect_key( $modal_checkout_url_query_params, array_flip( $passed_params_names ) );
-
-			$result['redirect'] = \add_query_arg(
-				array_merge(
-					$passed_params,
-					[
-						'order_id' => $order_id,
-					]
-				),
-				$result['redirect']
-			);
-		}
+		$modal_checkout_url_query = \wp_parse_url( $modal_checkout_url, PHP_URL_QUERY );
+		\wp_parse_str( $modal_checkout_url_query, $modal_checkout_url_query_params );
+		$passed_params_names = [ 'modal_checkout', 'after_success_behavior', 'after_success_url', 'after_success_button_label' ];
+		// Pick passed params from the query params.
+		$passed_params = array_intersect_key( $modal_checkout_url_query_params, array_flip( $passed_params_names ) );
+
+		$result['redirect'] = \add_query_arg(
+			array_merge(
+				$passed_params,
+				[
+					'order_id' => $order_id,
+				]
+			),
+			$result['redirect']
+		);
 		return $result;
 	}
 
@@ -1077,6 +1074,10 @@ public static function hide_expiry_message_shop_link( $message ) {
 	 * Is this request using the modal checkout?
 	 */
 	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.
+		if ( method_exists( 'Newspack\WooCommerce_My_Account', 'is_from_my_account' ) && \Newspack\WooCommerce_My_Account::is_from_my_account() ) {
+			return false;
+		}
 
 		$is_modal_checkout = isset( $_REQUEST['modal_checkout'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		if ( ! $is_modal_checkout && isset( $_REQUEST['post_data'] ) && is_string( $_REQUEST['post_data'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended

diff --git a/includes/class-newspack-blocks-api.php b/includes/class-newspack-blocks-api.php
@@ -296,6 +296,7 @@ public static function posts_endpoint( $request ) {
 				'excerpt'             => [
 					'rendered' => post_password_required( $post ) ? '' : $excerpt,
 				],
+				'full_content'        => get_the_content( $post->ID ),
 				'featured_media'      => (int) get_post_thumbnail_id( $post->ID ),
 				'id'                  => $post->ID,
 				'meta'                => $meta->get_value( $post->ID, $request ),

diff --git a/newspack-blocks.php b/newspack-blocks.php
@@ -7,20 +7,19 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.1.0
+ * Version:         4.1.2
  *
  * @package         Newspack_Blocks
  */
 
 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.1.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.1.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-patterns.php';
-require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-caching.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-modal-checkout.php';
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/plugins/class-the-events-calendar.php';