@automattic/newspack-blocks 2.5.0-alpha.1 → 2.5.0

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [2.5.0](https://github.com/Automattic/newspack-blocks/compare/v2.4.0...v2.5.0) (2024-01-08)
+
+
+### Bug Fixes
+
+* avoid duplicity with linked guest authors ([#1632](https://github.com/Automattic/newspack-blocks/issues/1632)) ([608979c](https://github.com/Automattic/newspack-blocks/commit/608979c1e9cb63a7098da27c69c337ec233b7429))
+* **modal-checkout:** show order details table with fees ([#1633](https://github.com/Automattic/newspack-blocks/issues/1633)) ([07c0642](https://github.com/Automattic/newspack-blocks/commit/07c0642e77a075750c6f436f12af99cd3e2ef360))
+
+
+### Features
+
+* accessibility improvements to the donate block tabs ([#1622](https://github.com/Automattic/newspack-blocks/issues/1622)) ([115e9fb](https://github.com/Automattic/newspack-blocks/commit/115e9fb95c78a13f1d87f4d086e767311dc7007d))
+* **donate:** support empty value for "other" tier ([#1604](https://github.com/Automattic/newspack-blocks/issues/1604)) ([61ffdbc](https://github.com/Automattic/newspack-blocks/commit/61ffdbc57e6fda320766d4de99f097edac9e58f7))
+* **modal-checkout:** allow anonymous purchase for registered email ([#1615](https://github.com/Automattic/newspack-blocks/issues/1615)) ([a0040b4](https://github.com/Automattic/newspack-blocks/commit/a0040b43a3f97c889e5bb5b5b96f07777b52a670))
+
+# [2.5.0-alpha.2](https://github.com/Automattic/newspack-blocks/compare/v2.5.0-alpha.1...v2.5.0-alpha.2) (2023-12-22)
+
+
+### Bug Fixes
+
+* avoid duplicity with linked guest authors ([#1632](https://github.com/Automattic/newspack-blocks/issues/1632)) ([608979c](https://github.com/Automattic/newspack-blocks/commit/608979c1e9cb63a7098da27c69c337ec233b7429))
+* **modal-checkout:** show order details table with fees ([#1633](https://github.com/Automattic/newspack-blocks/issues/1633)) ([07c0642](https://github.com/Automattic/newspack-blocks/commit/07c0642e77a075750c6f436f12af99cd3e2ef360))
+
+
+### Features
+
+* **modal-checkout:** allow anonymous purchase for registered email ([#1615](https://github.com/Automattic/newspack-blocks/issues/1615)) ([a0040b4](https://github.com/Automattic/newspack-blocks/commit/a0040b43a3f97c889e5bb5b5b96f07777b52a670))
+
 # [2.5.0-alpha.1](https://github.com/Automattic/newspack-blocks/compare/v2.4.0...v2.5.0-alpha.1) (2023-12-15)
 
 

package/includes/class-modal-checkout.php

@@ -52,6 +52,10 @@ final class Modal_Checkout {
 		add_filter( 'woocommerce_order_button_text', [ __CLASS__, 'order_button_text' ] );
 		add_filter( 'option_woocommerce_subscriptions_order_button_text', [ __CLASS__, 'order_button_text' ] );
 
+		/** Custom handling for registered users. */
+		add_filter( 'woocommerce_checkout_customer_id', [ __CLASS__, 'associate_existing_user' ] );
+		add_filter( 'woocommerce_checkout_posted_data', [ __CLASS__, 'skip_account_creation' ], 11 );
+
 		// Remove some stuff from the modal checkout page. It's displayed in an iframe, so it should not be treated as a separate page.
 		add_action( 'wp_enqueue_scripts', [ __CLASS__, 'dequeue_scripts' ], 11 );
 		add_filter( 'newspack_reader_activation_should_render_auth', [ __CLASS__, 'is_not_modal_checkout_filter' ] );
@@ -697,6 +701,9 @@ final class Modal_Checkout {
 		if ( 1 < $cart->get_cart_contents_count() ) {
 			return true;
 		}
+		if ( ! empty( $cart->get_fees() ) ) {
+			return true;
+		}
 		return false;
 	}
 
@@ -973,6 +980,50 @@ final class Modal_Checkout {
 		return $text;
 	}
 
+	/**
+	 * If a reader tries to make a purchase with an email address that
+	 * has been previously registered, automatically associate the transaction
+	 * with the user.
+	 *
+	 * @param int $customer_id Current customer ID.
+	 *
+	 * @return int Modified $customer_id
+	 */
+	public static function associate_existing_user( $customer_id ) {
+		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;
+			}
+		}
+		return $customer_id;
+	}
+
+	/**
+	 * Don't force account registration/login on Woo purchases for existing users.
+	 *
+	 * @param array $data Array of Woo checkout data.
+	 *
+	 * @return array Modified $data.
+	 */
+	public static function skip_account_creation( $data ) {
+		if ( ! self::is_modal_checkout() ) {
+			return $data;
+		}
+		$email    = $data['billing_email'];
+		$customer = \get_user_by( 'email', $email );
+		if ( $customer ) {
+			$data['createaccount'] = 0;
+			\add_filter( 'woocommerce_checkout_registration_required', '__return_false', 9999 );
+		}
+
+		return $data;
+	}
+
 	/**
 	 * Filter the a value dependent on the page not being modal checkout.
 	 *

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         2.5.0-alpha.1
+ * Version:         2.5.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', '2.5.0-alpha.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '2.5.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": "2.5.0-alpha.1",
+	"version": "2.5.0",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.5.1",

package/src/blocks/author-profile/class-wp-rest-newspack-authors-controller.php

@@ -84,6 +84,8 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 		// Total number of users and guest authors.
 		$guest_author_total = 0;
 		$user_total         = 0;
+		$guest_authors = [];
+		$linked_guest_authors = [];
 
 		// Get Co-authors guest authors.
 		if ( $is_guest_author ) {
@@ -108,6 +110,14 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 			$guest_author_total = count( $guest_authors );
 		}
 
+		foreach ( $guest_authors as $ga ) {
+			$linked_guest_author = get_post_meta( $ga->ID, 'cap-linked_account', true );
+
+			if ( $linked_guest_author ) {
+				$linked_guest_authors[] = $linked_guest_author;
+			}
+		}
+
 		$users = [];
 
 		// If passed an author ID.
@@ -187,8 +197,14 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 			),
 			array_reduce(
 				$users,
-				function( $acc, $user ) use ( $fields, $avatar_hide_default ) {
+				function( $acc, $user ) use ( $fields, $avatar_hide_default, $linked_guest_authors ) {
 					if ( $user ) {
+
+						// This user is linked to a guest author already returned in the query, so skip it.
+						if ( in_array( $user->data->user_login, $linked_guest_authors, true ) ) {
+							return $acc;
+						}
+
 						$user_data = [
 							'id'         => intval( $user->data->ID ),
 							'registered' => $user->data->user_registered,

package/vendor/autoload.php

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

package/vendor/composer/autoload_real.php

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

package/vendor/composer/autoload_static.php

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

package/vendor/composer/installed.php

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