From e1e6fb266dfbff99ecb99b577a1fb4274f768906 Mon Sep 17 00:00:00 2001
From: Chris Runnells <chris.runnells@automattic.com>
Date: Thu, 31 Aug 2023 13:45:42 -1000
Subject: [PATCH 1/4] Remove references to the Purchase task

---
 plugins/woocommerce-admin/client/task-lists/fills/index.ts      | 1 -
 .../src/Admin/Features/OnboardingTasks/TaskLists.php            | 2 --
 2 files changed, 3 deletions(-)

diff --git a/plugins/woocommerce-admin/client/task-lists/fills/index.ts b/plugins/woocommerce-admin/client/task-lists/fills/index.ts
index d2805bb7b1e..bae3bf48a5f 100644
--- a/plugins/woocommerce-admin/client/task-lists/fills/index.ts
+++ b/plugins/woocommerce-admin/client/task-lists/fills/index.ts
@@ -8,7 +8,6 @@ import './Marketing';
 import './appearance';
 import './tax';
 import './woocommerce-payments';
-import './purchase';
 import './deprecated-tasks';
 
 const possiblyImportProductTask = async () => {
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php
index 8f4fdec80c5..361d8dee1d7 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php
@@ -44,7 +44,6 @@ class TaskLists {
 	 */
 	const DEFAULT_TASKS = array(
 		'StoreDetails',
-		'Purchase',
 		'Products',
 		'WooCommercePayments',
 		'Payments',
@@ -112,7 +111,6 @@ class TaskLists {
 		$tasks = array(
 			'CustomizeStore',
 			'StoreDetails',
-			'Purchase',
 			'Products',
 			'WooCommercePayments',
 			'Payments',

From 0f799159813565ef58a782cbec5e3af147b9ff2b Mon Sep 17 00:00:00 2001
From: Chris Runnells <chris.runnells@automattic.com>
Date: Thu, 31 Aug 2023 13:45:59 -1000
Subject: [PATCH 2/4] Remove Purchase files

---
 .../client/task-lists/fills/purchase.tsx      |  91 --------
 .../OnboardingTasks/Tasks/Purchase.php        | 203 ------------------
 2 files changed, 294 deletions(-)
 delete mode 100644 plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
 delete mode 100644 plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php

diff --git a/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx b/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
deleted file mode 100644
index 316a82327b5..00000000000
--- a/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * External dependencies
- */
-import React from 'react';
-import { registerPlugin } from '@wordpress/plugins';
-import { WooOnboardingTaskListItem } from '@woocommerce/onboarding';
-import { useState, useCallback } from '@wordpress/element';
-import { recordEvent } from '@woocommerce/tracks';
-import { useSelect } from '@wordpress/data';
-import { ONBOARDING_STORE_NAME, PLUGINS_STORE_NAME } from '@woocommerce/data';
-
-/**
- * Internal dependencies
- */
-import CartModal from '../../dashboard/components/cart-modal';
-import { getCategorizedOnboardingProducts } from '../../dashboard/utils';
-
-type PurchaseTaskItemProps = {
-	defaultTaskItem: React.ComponentType< {
-		onClick: () => void;
-	} >;
-};
-
-const PurchaseTaskItem = ( { defaultTaskItem }: PurchaseTaskItemProps ) => {
-	const [ cartModalOpen, setCartModalOpen ] = useState( false );
-
-	const { installedPlugins, productTypes, profileItems } = useSelect(
-		( select ) => {
-			const { getProductTypes, getProfileItems } = select(
-				ONBOARDING_STORE_NAME
-			);
-			const { getInstalledPlugins } = select( PLUGINS_STORE_NAME );
-
-			return {
-				installedPlugins: getInstalledPlugins(),
-				productTypes: getProductTypes(),
-				profileItems: getProfileItems(),
-			};
-		}
-	);
-
-	const toggleCartModal = useCallback( () => {
-		if ( ! cartModalOpen ) {
-			recordEvent( 'tasklist_purchase_extensions' );
-		}
-
-		setCartModalOpen( ! cartModalOpen );
-	}, [ cartModalOpen ] );
-
-	const groupedProducts = getCategorizedOnboardingProducts(
-		productTypes,
-		profileItems,
-		installedPlugins
-	);
-	const { remainingProducts } = groupedProducts;
-	const DefaultTaskItem = defaultTaskItem;
-
-	return (
-		<>
-			<DefaultTaskItem
-				onClick={ () => {
-					if ( remainingProducts.length ) {
-						toggleCartModal();
-					}
-				} }
-			/>
-			{ cartModalOpen && (
-				<CartModal
-					onClose={ () => toggleCartModal() }
-					onClickPurchaseLater={ () => toggleCartModal() }
-				/>
-			) }
-		</>
-	);
-};
-
-const PurchaseTaskItemFill = () => {
-	return (
-		<WooOnboardingTaskListItem id="purchase">
-			{ ( { defaultTaskItem }: PurchaseTaskItemProps ) => (
-				<PurchaseTaskItem defaultTaskItem={ defaultTaskItem } />
-			) }
-		</WooOnboardingTaskListItem>
-	);
-};
-
-registerPlugin( 'woocommerce-admin-task-purchase', {
-	// @ts-expect-error 'scope' does exist. @types/wordpress__plugins is outdated.
-	scope: 'woocommerce-tasks',
-	render: PurchaseTaskItemFill,
-} );
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php
deleted file mode 100644
index 2c9383f4a60..00000000000
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-namespace Automattic\WooCommerce\Admin\Features\OnboardingTasks\Tasks;
-
-use Automattic\WooCommerce\Internal\Admin\Onboarding\OnboardingProducts;
-use Automattic\WooCommerce\Internal\Admin\Onboarding\OnboardingThemes;
-use Automattic\WooCommerce\Internal\Admin\Onboarding\OnboardingProfile;
-use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
-
-/**
- * Purchase Task
- */
-class Purchase extends Task {
-	/**
-	 * Constructor
-	 *
-	 * @param TaskList $task_list Parent task list.
-	 */
-	public function __construct( $task_list ) {
-		parent::__construct( $task_list );
-		add_action( 'update_option_woocommerce_onboarding_profile', array( $this, 'clear_dismissal' ), 10, 2 );
-	}
-
-	/**
-	 * Clear dismissal on onboarding product type changes.
-	 *
-	 * @param array $old_value Old value.
-	 * @param array $new_value New value.
-	 */
-	public function clear_dismissal( $old_value, $new_value ) {
-		$product_types          = isset( $new_value['product_types'] ) ? (array) $new_value['product_types'] : array();
-		$previous_product_types = isset( $old_value['product_types'] ) ? (array) $old_value['product_types'] : array();
-
-		if ( empty( array_diff( $product_types, $previous_product_types ) ) ) {
-			return;
-		}
-
-		$this->undo_dismiss();
-	}
-
-	/**
-	 * Get the task arguments.
-	 * ID.
-	 *
-	 * @return string
-	 */
-	public function get_id() {
-		return 'purchase';
-	}
-
-	/**
-	 * Title.
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-		$products   = $this->get_paid_products_and_themes();
-		$first_product    = count( $products['purchaseable'] ) >= 1 ? $products['purchaseable'][0] : false;
-
-		if ( ! $first_product ) {
-			return null;
-		}
-
-		$product_label    = isset( $first_product['label'] ) ? $first_product['label'] : $first_product['title'];
-		$additional_count = count( $products['purchaseable'] ) - 1;
-
-		if ( $this->get_parent_option( 'use_completed_title' ) && $this->is_complete() ) {
-			return count( $products['purchaseable'] ) === 1
-				? sprintf(
-					/* translators: %1$s: a purchased product name */
-					__(
-						'You added %1$s',
-						'woocommerce'
-					),
-					$product_label
-				)
-				: sprintf(
-					/* translators: %1$s: a purchased product name, %2$d the number of other products purchased */
-					_n(
-						'You added %1$s and %2$d other product',
-						'You added %1$s and %2$d other products',
-						$additional_count,
-						'woocommerce'
-					),
-					$product_label,
-					$additional_count
-				);
-		}
-
-		return count( $products['purchaseable'] ) === 1
-			? sprintf(
-				/* translators: %1$s: a purchaseable product name */
-				__(
-					'Add %s to my store',
-					'woocommerce'
-				),
-				$product_label
-			)
-			: sprintf(
-				/* translators: %1$s: a purchaseable product name, %2$d the number of other products to purchase */
-				_n(
-					'Add %1$s and %2$d more product to my store',
-					'Add %1$s and %2$d more products to my store',
-					$additional_count,
-					'woocommerce'
-				),
-				$product_label,
-				$additional_count
-			);
-	}
-
-	/**
-	 * Content.
-	 *
-	 * @return string
-	 */
-	public function get_content() {
-		$products = $this->get_paid_products_and_themes();
-
-		if ( count( $products['remaining'] ) === 1 ) {
-			return isset( $products['purchaseable'][0]['description'] ) ? $products['purchaseable'][0]['description'] : $products['purchaseable'][0]['excerpt'];
-		}
-		return sprintf(
-		/* translators: %1$s: list of product names comma separated, %2%s the last product name */
-			__(
-				'Good choice! You chose to add %1$s and %2$s to your store.',
-				'woocommerce'
-			),
-			implode( ', ', array_slice( $products['remaining'], 0, -1 ) ) . ( count( $products['remaining'] ) > 2 ? ',' : '' ),
-			end( $products['remaining'] )
-		);
-	}
-
-	/**
-	 * Action label.
-	 *
-	 * @return string
-	 */
-	public function get_action_label() {
-		return __( 'Purchase & install now', 'woocommerce' );
-	}
-
-
-	/**
-	 * Time.
-	 *
-	 * @return string
-	 */
-	public function get_time() {
-		return __( '2 minutes', 'woocommerce' );
-	}
-
-	/**
-	 * Task completion.
-	 *
-	 * @return bool
-	 */
-	public function is_complete() {
-		$products = $this->get_paid_products_and_themes();
-		return count( $products['remaining'] ) === 0;
-	}
-
-	/**
-	 * Dismissable.
-	 *
-	 * @return bool
-	 */
-	public function is_dismissable() {
-		return true;
-	}
-
-	/**
-	 * Task visibility.
-	 *
-	 * @return bool
-	 */
-	public function can_view() {
-		$products = $this->get_paid_products_and_themes();
-		return count( $products['purchaseable'] ) > 0;
-	}
-
-	/**
-	 * Get purchaseable and remaining products.
-	 *
-	 * @return array purchaseable and remaining products and themes.
-	 */
-	public static function get_paid_products_and_themes() {
-		$relevant_products = OnboardingProducts::get_relevant_products();
-
-		$profiler_data = get_option( OnboardingProfile::DATA_OPTION, array() );
-		$theme         = isset( $profiler_data['theme'] ) ? $profiler_data['theme'] : null;
-		$paid_theme    = $theme ? OnboardingThemes::get_paid_theme_by_slug( $theme ) : null;
-		if ( $paid_theme ) {
-
-			$relevant_products['purchaseable'][] = $paid_theme;
-
-			if ( isset( $paid_theme['is_installed'] ) && false === $paid_theme['is_installed'] ) {
-				$relevant_products['remaining'][] = $paid_theme['title'];
-			}
-		}
-		return $relevant_products;
-	}
-}

From 3f5844004cab524e8c8b5f0c7e10c621716da31e Mon Sep 17 00:00:00 2001
From: Chris Runnells <chris.runnells@automattic.com>
Date: Thu, 7 Sep 2023 14:28:05 -1000
Subject: [PATCH 3/4] Revert "Remove Purchase files"

This reverts commit 0f799159813565ef58a782cbec5e3af147b9ff2b.
---
 .../client/task-lists/fills/purchase.tsx      |  91 ++++++++
 .../OnboardingTasks/Tasks/Purchase.php        | 203 ++++++++++++++++++
 2 files changed, 294 insertions(+)
 create mode 100644 plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
 create mode 100644 plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php

diff --git a/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx b/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
new file mode 100644
index 00000000000..316a82327b5
--- /dev/null
+++ b/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
@@ -0,0 +1,91 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { registerPlugin } from '@wordpress/plugins';
+import { WooOnboardingTaskListItem } from '@woocommerce/onboarding';
+import { useState, useCallback } from '@wordpress/element';
+import { recordEvent } from '@woocommerce/tracks';
+import { useSelect } from '@wordpress/data';
+import { ONBOARDING_STORE_NAME, PLUGINS_STORE_NAME } from '@woocommerce/data';
+
+/**
+ * Internal dependencies
+ */
+import CartModal from '../../dashboard/components/cart-modal';
+import { getCategorizedOnboardingProducts } from '../../dashboard/utils';
+
+type PurchaseTaskItemProps = {
+	defaultTaskItem: React.ComponentType< {
+		onClick: () => void;
+	} >;
+};
+
+const PurchaseTaskItem = ( { defaultTaskItem }: PurchaseTaskItemProps ) => {
+	const [ cartModalOpen, setCartModalOpen ] = useState( false );
+
+	const { installedPlugins, productTypes, profileItems } = useSelect(
+		( select ) => {
+			const { getProductTypes, getProfileItems } = select(
+				ONBOARDING_STORE_NAME
+			);
+			const { getInstalledPlugins } = select( PLUGINS_STORE_NAME );
+
+			return {
+				installedPlugins: getInstalledPlugins(),
+				productTypes: getProductTypes(),
+				profileItems: getProfileItems(),
+			};
+		}
+	);
+
+	const toggleCartModal = useCallback( () => {
+		if ( ! cartModalOpen ) {
+			recordEvent( 'tasklist_purchase_extensions' );
+		}
+
+		setCartModalOpen( ! cartModalOpen );
+	}, [ cartModalOpen ] );
+
+	const groupedProducts = getCategorizedOnboardingProducts(
+		productTypes,
+		profileItems,
+		installedPlugins
+	);
+	const { remainingProducts } = groupedProducts;
+	const DefaultTaskItem = defaultTaskItem;
+
+	return (
+		<>
+			<DefaultTaskItem
+				onClick={ () => {
+					if ( remainingProducts.length ) {
+						toggleCartModal();
+					}
+				} }
+			/>
+			{ cartModalOpen && (
+				<CartModal
+					onClose={ () => toggleCartModal() }
+					onClickPurchaseLater={ () => toggleCartModal() }
+				/>
+			) }
+		</>
+	);
+};
+
+const PurchaseTaskItemFill = () => {
+	return (
+		<WooOnboardingTaskListItem id="purchase">
+			{ ( { defaultTaskItem }: PurchaseTaskItemProps ) => (
+				<PurchaseTaskItem defaultTaskItem={ defaultTaskItem } />
+			) }
+		</WooOnboardingTaskListItem>
+	);
+};
+
+registerPlugin( 'woocommerce-admin-task-purchase', {
+	// @ts-expect-error 'scope' does exist. @types/wordpress__plugins is outdated.
+	scope: 'woocommerce-tasks',
+	render: PurchaseTaskItemFill,
+} );
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php
new file mode 100644
index 00000000000..2c9383f4a60
--- /dev/null
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Purchase.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Automattic\WooCommerce\Admin\Features\OnboardingTasks\Tasks;
+
+use Automattic\WooCommerce\Internal\Admin\Onboarding\OnboardingProducts;
+use Automattic\WooCommerce\Internal\Admin\Onboarding\OnboardingThemes;
+use Automattic\WooCommerce\Internal\Admin\Onboarding\OnboardingProfile;
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
+
+/**
+ * Purchase Task
+ */
+class Purchase extends Task {
+	/**
+	 * Constructor
+	 *
+	 * @param TaskList $task_list Parent task list.
+	 */
+	public function __construct( $task_list ) {
+		parent::__construct( $task_list );
+		add_action( 'update_option_woocommerce_onboarding_profile', array( $this, 'clear_dismissal' ), 10, 2 );
+	}
+
+	/**
+	 * Clear dismissal on onboarding product type changes.
+	 *
+	 * @param array $old_value Old value.
+	 * @param array $new_value New value.
+	 */
+	public function clear_dismissal( $old_value, $new_value ) {
+		$product_types          = isset( $new_value['product_types'] ) ? (array) $new_value['product_types'] : array();
+		$previous_product_types = isset( $old_value['product_types'] ) ? (array) $old_value['product_types'] : array();
+
+		if ( empty( array_diff( $product_types, $previous_product_types ) ) ) {
+			return;
+		}
+
+		$this->undo_dismiss();
+	}
+
+	/**
+	 * Get the task arguments.
+	 * ID.
+	 *
+	 * @return string
+	 */
+	public function get_id() {
+		return 'purchase';
+	}
+
+	/**
+	 * Title.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		$products   = $this->get_paid_products_and_themes();
+		$first_product    = count( $products['purchaseable'] ) >= 1 ? $products['purchaseable'][0] : false;
+
+		if ( ! $first_product ) {
+			return null;
+		}
+
+		$product_label    = isset( $first_product['label'] ) ? $first_product['label'] : $first_product['title'];
+		$additional_count = count( $products['purchaseable'] ) - 1;
+
+		if ( $this->get_parent_option( 'use_completed_title' ) && $this->is_complete() ) {
+			return count( $products['purchaseable'] ) === 1
+				? sprintf(
+					/* translators: %1$s: a purchased product name */
+					__(
+						'You added %1$s',
+						'woocommerce'
+					),
+					$product_label
+				)
+				: sprintf(
+					/* translators: %1$s: a purchased product name, %2$d the number of other products purchased */
+					_n(
+						'You added %1$s and %2$d other product',
+						'You added %1$s and %2$d other products',
+						$additional_count,
+						'woocommerce'
+					),
+					$product_label,
+					$additional_count
+				);
+		}
+
+		return count( $products['purchaseable'] ) === 1
+			? sprintf(
+				/* translators: %1$s: a purchaseable product name */
+				__(
+					'Add %s to my store',
+					'woocommerce'
+				),
+				$product_label
+			)
+			: sprintf(
+				/* translators: %1$s: a purchaseable product name, %2$d the number of other products to purchase */
+				_n(
+					'Add %1$s and %2$d more product to my store',
+					'Add %1$s and %2$d more products to my store',
+					$additional_count,
+					'woocommerce'
+				),
+				$product_label,
+				$additional_count
+			);
+	}
+
+	/**
+	 * Content.
+	 *
+	 * @return string
+	 */
+	public function get_content() {
+		$products = $this->get_paid_products_and_themes();
+
+		if ( count( $products['remaining'] ) === 1 ) {
+			return isset( $products['purchaseable'][0]['description'] ) ? $products['purchaseable'][0]['description'] : $products['purchaseable'][0]['excerpt'];
+		}
+		return sprintf(
+		/* translators: %1$s: list of product names comma separated, %2%s the last product name */
+			__(
+				'Good choice! You chose to add %1$s and %2$s to your store.',
+				'woocommerce'
+			),
+			implode( ', ', array_slice( $products['remaining'], 0, -1 ) ) . ( count( $products['remaining'] ) > 2 ? ',' : '' ),
+			end( $products['remaining'] )
+		);
+	}
+
+	/**
+	 * Action label.
+	 *
+	 * @return string
+	 */
+	public function get_action_label() {
+		return __( 'Purchase & install now', 'woocommerce' );
+	}
+
+
+	/**
+	 * Time.
+	 *
+	 * @return string
+	 */
+	public function get_time() {
+		return __( '2 minutes', 'woocommerce' );
+	}
+
+	/**
+	 * Task completion.
+	 *
+	 * @return bool
+	 */
+	public function is_complete() {
+		$products = $this->get_paid_products_and_themes();
+		return count( $products['remaining'] ) === 0;
+	}
+
+	/**
+	 * Dismissable.
+	 *
+	 * @return bool
+	 */
+	public function is_dismissable() {
+		return true;
+	}
+
+	/**
+	 * Task visibility.
+	 *
+	 * @return bool
+	 */
+	public function can_view() {
+		$products = $this->get_paid_products_and_themes();
+		return count( $products['purchaseable'] ) > 0;
+	}
+
+	/**
+	 * Get purchaseable and remaining products.
+	 *
+	 * @return array purchaseable and remaining products and themes.
+	 */
+	public static function get_paid_products_and_themes() {
+		$relevant_products = OnboardingProducts::get_relevant_products();
+
+		$profiler_data = get_option( OnboardingProfile::DATA_OPTION, array() );
+		$theme         = isset( $profiler_data['theme'] ) ? $profiler_data['theme'] : null;
+		$paid_theme    = $theme ? OnboardingThemes::get_paid_theme_by_slug( $theme ) : null;
+		if ( $paid_theme ) {
+
+			$relevant_products['purchaseable'][] = $paid_theme;
+
+			if ( isset( $paid_theme['is_installed'] ) && false === $paid_theme['is_installed'] ) {
+				$relevant_products['remaining'][] = $paid_theme['title'];
+			}
+		}
+		return $relevant_products;
+	}
+}

From ccd01e591371e88d5bd323d7850ac84fcd81579b Mon Sep 17 00:00:00 2001
From: Chris Runnells <chris.runnells@automattic.com>
Date: Mon, 11 Sep 2023 12:55:22 -1000
Subject: [PATCH 4/4] Add changelog entry

---
 plugins/woocommerce/changelog/remove-onboarding-purchase-task | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/woocommerce/changelog/remove-onboarding-purchase-task

diff --git a/plugins/woocommerce/changelog/remove-onboarding-purchase-task b/plugins/woocommerce/changelog/remove-onboarding-purchase-task
new file mode 100644
index 00000000000..22d19ea136e
--- /dev/null
+++ b/plugins/woocommerce/changelog/remove-onboarding-purchase-task
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Removed references to the un-used Purchase task item in the onboarding task list.