diff --git a/packages/js/admin-e2e-tests/changelog/update-task-list-copies b/packages/js/admin-e2e-tests/changelog/update-task-list-copies new file mode 100644 index 00000000000..9c7e547f054 --- /dev/null +++ b/packages/js/admin-e2e-tests/changelog/update-task-list-copies @@ -0,0 +1,4 @@ +Significance: patch +Type: fix + +Update tests for new task list copies \ No newline at end of file diff --git a/packages/js/admin-e2e-tests/src/constants/taskTitles.ts b/packages/js/admin-e2e-tests/src/constants/taskTitles.ts index 98968a0743c..88763c939f0 100644 --- a/packages/js/admin-e2e-tests/src/constants/taskTitles.ts +++ b/packages/js/admin-e2e-tests/src/constants/taskTitles.ts @@ -1,10 +1,9 @@ export const TaskTitles = { storeDetails: 'Store details', - addPayments: 'Set up payments', - wooPayments: - 'Set up WooPaymentsBy setting up, you are agreeing to the Terms of Service2 minutes', - addProducts: 'Add my products', - taxSetup: 'Set up tax rates', - setUpShippingCosts: 'Set up shipping', + addPayments: 'Get paid', + wooPayments: 'Get paid with WooPayments', + addProducts: 'Add your products', + taxSetup: 'Collect sales tax', + setUpShippingCosts: 'Get your products shipped', personalizeStore: 'Personalize my store', }; diff --git a/packages/js/admin-e2e-tests/src/pages/PaymentsSetup.ts b/packages/js/admin-e2e-tests/src/pages/PaymentsSetup.ts index 2404ff42000..9ee4faa2f9d 100644 --- a/packages/js/admin-e2e-tests/src/pages/PaymentsSetup.ts +++ b/packages/js/admin-e2e-tests/src/pages/PaymentsSetup.ts @@ -18,7 +18,7 @@ export class PaymentsSetup extends BasePage { url = 'wp-admin/admin.php?page=wc-admin&task=payments'; async isDisplayed(): Promise< void > { - await waitForElementByText( 'h1', 'Set up payments' ); + await waitForElementByText( 'h1', 'Get paid' ); } async possiblyCloseHelpModal(): Promise< void > { diff --git a/packages/js/admin-e2e-tests/src/pages/ProductsSetup.ts b/packages/js/admin-e2e-tests/src/pages/ProductsSetup.ts index 80cfa91ff20..fd831e574a2 100644 --- a/packages/js/admin-e2e-tests/src/pages/ProductsSetup.ts +++ b/packages/js/admin-e2e-tests/src/pages/ProductsSetup.ts @@ -8,7 +8,7 @@ export class ProductsSetup extends BasePage { url = 'wp-admin/admin.php?page=wc-admin&task=products'; async isDisplayed(): Promise< void > { - await waitForElementByText( 'h1', 'Add my products' ); + await waitForElementByText( 'h1', 'Add your products' ); } async isStartWithATemplateDisplayed( diff --git a/packages/js/admin-e2e-tests/src/specs/tasks/payment.ts b/packages/js/admin-e2e-tests/src/specs/tasks/payment.ts index e997db9d9ab..40d9a15bba9 100644 --- a/packages/js/admin-e2e-tests/src/specs/tasks/payment.ts +++ b/packages/js/admin-e2e-tests/src/specs/tasks/payment.ts @@ -44,7 +44,7 @@ export const testAdminPaymentSetupTask = () => { } ); it( 'Can visit the payment setup task from the homescreen if the setup wizard has been skipped', async () => { - await homeScreen.clickOnTaskList( 'Set up payments' ); + await homeScreen.clickOnTaskList( 'Get paid' ); await paymentsSetup.possiblyCloseHelpModal(); await paymentsSetup.isDisplayed(); } ); @@ -71,7 +71,7 @@ export const testAdminPaymentSetupTask = () => { await homeScreen.navigate(); await homeScreen.isDisplayed(); await waitForTimeout( 1000 ); - await homeScreen.clickOnTaskList( 'Set up payments' ); + await homeScreen.clickOnTaskList( 'Get paid' ); await paymentsSetup.possiblyCloseHelpModal(); await paymentsSetup.isDisplayed(); await paymentsSetup.showOtherPaymentMethods(); diff --git a/packages/js/e2e-core-tests/src/specs/activate-and-setup/onboarding-tasklist.test.js b/packages/js/e2e-core-tests/src/specs/activate-and-setup/onboarding-tasklist.test.js index 869092dd3db..236ed6c6130 100644 --- a/packages/js/e2e-core-tests/src/specs/activate-and-setup/onboarding-tasklist.test.js +++ b/packages/js/e2e-core-tests/src/specs/activate-and-setup/onboarding-tasklist.test.js @@ -78,9 +78,9 @@ const runTaskListTest = () => { // Work around for https://github.com/woocommerce/woocommerce-admin/issues/6761 if ( taskListItems.length === 6 ) { - // Click on "Set up shipping" task to move to the next step + // Click on "Get your products shipped" task to move to the next step const [ setupTaskListItem ] = await page.$x( - '//div[contains(text(),"Set up shipping")]' + '//div[contains(text(),"Get your products shipped")]' ); await setupTaskListItem.click(); diff --git a/plugins/woocommerce-admin/client/task-lists/fills/utils.js b/plugins/woocommerce-admin/client/task-lists/fills/utils.js index 6b34265a294..020b923287f 100644 --- a/plugins/woocommerce-admin/client/task-lists/fills/utils.js +++ b/plugins/woocommerce-admin/client/task-lists/fills/utils.js @@ -11,7 +11,7 @@ const onboardingData = getAdminSetting( 'onboarding' ); export const isImportProduct = () => { return ( window?.wcAdminFeatures?.[ 'import-products-task' ] && - onboardingData?.profile?.selling_venues && - onboardingData?.profile?.selling_venues !== 'no' + onboardingData?.profile?.business_choice && + onboardingData?.profile?.business_choice === 'im_already_selling' ); }; diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js index 8cd80b932a5..3de97671f6a 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js @@ -7,7 +7,6 @@ import { Button } from '@wordpress/components'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; import { useAppearanceClick } from '../../../fills/appearance'; @@ -17,7 +16,6 @@ const AppearanceHeader = ( { task } ) => { const taskTitle = task.title; const taskDescription = task.content; const taskCta = task.actionLabel; - const taskTime = task.time; return (
@@ -39,10 +37,6 @@ const AppearanceHeader = ( { task } ) => { > { taskCta } -

- Timer{ ' ' } - { taskTime } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js index 120c95a150d..167299ce8e4 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js @@ -7,7 +7,6 @@ import { __ } from '@wordpress/i18n'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; const MarketingHeader = ( { task, goToTask } ) => { @@ -15,14 +14,14 @@ const MarketingHeader = ( { task, goToTask } ) => {
{
-

{ __( 'Get more sales', 'woocommerce' ) }

+

{ __( 'Reach more customers', 'woocommerce' ) }

{ __( - 'Give your business a boost by enabling social channels such as newsletter, Facebook, Google, in-person selling, and more.', + 'Start growing your business by showcasing your products on social media and Google, boost engagement with email marketing, and more!', 'woocommerce' ) }

@@ -31,12 +30,8 @@ const MarketingHeader = ( { task, goToTask } ) => { isPrimary={ ! task.isComplete } onClick={ goToTask } > - { __( 'Add sales channels', 'woocommerce' ) } + { __( 'Grow your business', 'woocommerce' ) } -

- Timer{ ' ' } - { task.time } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js index 5bd6edeaedd..95fbdaf98cf 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js @@ -7,7 +7,6 @@ import { __ } from '@wordpress/i18n'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; const PaymentsHeader = ( { task, goToTask } ) => { @@ -16,15 +15,15 @@ const PaymentsHeader = ( { task, goToTask } ) => { {
-

{ __( 'Add a way to get paid', 'woocommerce' ) }

+

{ __( 'It’s time to get paid', 'woocommerce' ) }

{ __( - 'Choose from fast & secure online and offline payment methods to make it easy for your customers to pay in your store.', + 'Give your customers an easy and convenient way to pay! Set up one (or more!) of our fast and secure online or in person payment methods.', 'woocommerce' ) }

@@ -33,12 +32,8 @@ const PaymentsHeader = ( { task, goToTask } ) => { isPrimary={ ! task.isComplete } onClick={ goToTask } > - { __( 'View options', 'woocommerce' ) } + { __( 'Get paid', 'woocommerce' ) } -

- Timer{ ' ' } - { task.time } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js index 11b42c4a94b..271dc2ac8bc 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js @@ -7,7 +7,6 @@ import { __ } from '@wordpress/i18n'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; const ProductsHeader = ( { task, goToTask } ) => { @@ -17,15 +16,15 @@ const ProductsHeader = ( { task, goToTask } ) => { alt={ __( 'Products illustration', 'woocommerce' ) } src={ WC_ASSET_URL + - 'images/task_list/sales-section-illustration.png' + 'images/task_list/sales-section-illustration.svg' } className="svg-background" />
-

{ __( 'Add products to sell', 'woocommerce' ) }

+

{ __( 'List your products', 'woocommerce' ) }

{ __( - 'Build your catalog by adding what you want to sell. You can add products manually or import them from a different store.', + 'Start selling by adding products or services to your store. Choose to list products manually, or import them from a different store. ', 'woocommerce' ) }

@@ -36,10 +35,6 @@ const ProductsHeader = ( { task, goToTask } ) => { > { __( 'Add products', 'woocommerce' ) } -

- Timer{ ' ' } - { __( '2 minutes', 'woocommerce' ) } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js index 2cc7eb2726d..0aa80eb7ce8 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js @@ -10,7 +10,6 @@ import { recordEvent } from '@woocommerce/tracks'; * Internal dependencies */ import CartModal from '~/dashboard/components/cart-modal'; -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; const PurchaseHeader = ( { task } ) => { @@ -48,10 +47,6 @@ const PurchaseHeader = ( { task } ) => { > { __( 'Continue', 'woocommerce' ) } -

- Timer{ ' ' } - { task.time } -

{ cartModalOpen && ( { @@ -16,17 +15,15 @@ const ShippingHeader = ( { task, goToTask } ) => { {
-

- { __( 'Set up shipping for your store', 'woocommerce' ) } -

+

{ __( 'Get your products shipped', 'woocommerce' ) }

{ __( - 'Choose where and how you will ship your products, select shipping methods, and add fixed or calculated rates.', + 'Choose where and how you’d like to ship your products, along with any fixed or calculated rates.', 'woocommerce' ) }

@@ -35,12 +32,8 @@ const ShippingHeader = ( { task, goToTask } ) => { isPrimary={ ! task.isComplete } onClick={ goToTask } > - { __( 'Add shipping zones', 'woocommerce' ) } + { __( 'Start shipping', 'woocommerce' ) } -

- Timer{ ' ' } - { task.time } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js index 6ae25d25710..67fc76a2442 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js @@ -7,7 +7,6 @@ import { __ } from '@wordpress/i18n'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; const StoreDetailsHeader = ( { task, goToTask } ) => { @@ -38,10 +37,6 @@ const StoreDetailsHeader = ( { task, goToTask } ) => { > { __( 'Add details', 'woocommerce' ) } -

- Timer{ ' ' } - { __( '2 minutes', 'woocommerce' ) } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js index d624aac0380..3f9d5dee136 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js @@ -7,7 +7,6 @@ import { __ } from '@wordpress/i18n'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL } from '../../../../utils/admin-settings'; const TaxHeader = ( { task, goToTask } ) => { @@ -15,14 +14,14 @@ const TaxHeader = ( { task, goToTask } ) => {
{
-

{ __( 'Add your tax rates', 'woocommerce' ) }

+

{ __( 'Configure your tax settings', 'woocommerce' ) }

{ __( - 'Set up tax rates manually or use WooCommerce Tax to automate your sales tax calculations for you.', + 'Choose to set up your tax rates manually, or use one of our tax automation tools.', 'woocommerce' ) }

@@ -31,12 +30,8 @@ const TaxHeader = ( { task, goToTask } ) => { isPrimary={ ! task.isComplete } onClick={ goToTask } > - { __( 'Yes, please', 'woocommerce' ) } + { __( 'Collect sales tax', 'woocommerce' ) } -

- Timer{ ' ' } - { task.time } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js index 3862d7d792e..a6f21627e19 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js @@ -7,13 +7,10 @@ import apiFetch from '@wordpress/api-fetch'; import { useDispatch } from '@wordpress/data'; import { useState } from '@wordpress/element'; import { WC_ADMIN_NAMESPACE } from '@woocommerce/data'; -import { Link } from '@woocommerce/components'; -import interpolateComponents from '@automattic/interpolate-components'; /** * Internal dependencies */ -import TimerImage from './timer.svg'; import { WC_ASSET_URL, getAdminSetting } from '~/utils/admin-settings'; import sanitizeHTML from '~/lib/sanitize-html'; @@ -52,7 +49,7 @@ const WoocommercePaymentsHeader = ( { task, trackClick } ) => { { @@ -67,29 +64,11 @@ const WoocommercePaymentsHeader = ( { task, trackClick } ) => { ) : (

{ __( - "You're only one step away from getting paid. Verify your business details to start managing transactions with WooPayments.", + 'Power your payments with a simple, all-in-one option. Verify your business details to start managing transactions with WooCommerce Payments.', 'woocommerce' ) }

) } -

- { interpolateComponents( { - mixedString: __( - 'By clicking "Verify Details", you agree to the {{link}}Terms of Service{{/link}}', - 'woocommerce' - ), - components: { - link: ( - - ), - }, - } ) } -

-

- Timer{ ' ' } - { __( '2 minutes', 'woocommerce' ) } -

); diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.scss b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.scss index b9cdccfb659..5a538ec818e 100644 --- a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.scss +++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.scss @@ -26,7 +26,7 @@ $ces-feedback-height: 64px; align-items: center; } -.woocommerce-task-header__contents-container.woocommerce-task-header__customize-store img.svg-background { +.woocommerce-task-header__contents-container img.svg-background { padding-right: 16px; padding-top: 9px; // align with header text } diff --git a/plugins/woocommerce/assets/images/task_list/payment-illustration.png b/plugins/woocommerce/assets/images/task_list/payment-illustration.png deleted file mode 100644 index 712c7c92bb2..00000000000 Binary files a/plugins/woocommerce/assets/images/task_list/payment-illustration.png and /dev/null differ diff --git a/plugins/woocommerce/assets/images/task_list/payment-illustration.svg b/plugins/woocommerce/assets/images/task_list/payment-illustration.svg new file mode 100644 index 00000000000..00753c4d594 --- /dev/null +++ b/plugins/woocommerce/assets/images/task_list/payment-illustration.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plugins/woocommerce/assets/images/task_list/sales-illustration.png b/plugins/woocommerce/assets/images/task_list/sales-illustration.png deleted file mode 100644 index 778b0780009..00000000000 Binary files a/plugins/woocommerce/assets/images/task_list/sales-illustration.png and /dev/null differ diff --git a/plugins/woocommerce/assets/images/task_list/sales-illustration.svg b/plugins/woocommerce/assets/images/task_list/sales-illustration.svg new file mode 100644 index 00000000000..02abb9cd8e1 --- /dev/null +++ b/plugins/woocommerce/assets/images/task_list/sales-illustration.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plugins/woocommerce/assets/images/task_list/sales-section-illustration.png b/plugins/woocommerce/assets/images/task_list/sales-section-illustration.png deleted file mode 100644 index 133800215bc..00000000000 Binary files a/plugins/woocommerce/assets/images/task_list/sales-section-illustration.png and /dev/null differ diff --git a/plugins/woocommerce/assets/images/task_list/sales-section-illustration.svg b/plugins/woocommerce/assets/images/task_list/sales-section-illustration.svg new file mode 100644 index 00000000000..7f1ea0088b1 --- /dev/null +++ b/plugins/woocommerce/assets/images/task_list/sales-section-illustration.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/plugins/woocommerce/assets/images/task_list/shipping-illustration.png b/plugins/woocommerce/assets/images/task_list/shipping-illustration.png deleted file mode 100644 index d43b73f0cef..00000000000 Binary files a/plugins/woocommerce/assets/images/task_list/shipping-illustration.png and /dev/null differ diff --git a/plugins/woocommerce/assets/images/task_list/shipping-illustration.svg b/plugins/woocommerce/assets/images/task_list/shipping-illustration.svg new file mode 100644 index 00000000000..a7ecb96f53c --- /dev/null +++ b/plugins/woocommerce/assets/images/task_list/shipping-illustration.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/plugins/woocommerce/assets/images/task_list/tax-illustration.png b/plugins/woocommerce/assets/images/task_list/tax-illustration.png deleted file mode 100644 index 3da96cf393d..00000000000 Binary files a/plugins/woocommerce/assets/images/task_list/tax-illustration.png and /dev/null differ diff --git a/plugins/woocommerce/assets/images/task_list/tax-illustration.svg b/plugins/woocommerce/assets/images/task_list/tax-illustration.svg new file mode 100644 index 00000000000..7210aff7365 --- /dev/null +++ b/plugins/woocommerce/assets/images/task_list/tax-illustration.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/woocommerce/changelog/add-update-task-list-copy-and-illustrations b/plugins/woocommerce/changelog/add-update-task-list-copy-and-illustrations new file mode 100644 index 00000000000..1afdafc5863 --- /dev/null +++ b/plugins/woocommerce/changelog/add-update-task-list-copy-and-illustrations @@ -0,0 +1,4 @@ +Significance: minor +Type: add + +Updated copies and illustrations for the onboarding task list. \ No newline at end of file diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/ExperimentalShippingRecommendation.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/ExperimentalShippingRecommendation.php index 023b9e3b6b4..a6d77e5e5ae 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/ExperimentalShippingRecommendation.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/ExperimentalShippingRecommendation.php @@ -26,7 +26,7 @@ class ExperimentalShippingRecommendation extends Task { * @return string */ public function get_title() { - return __( 'Set up shipping', 'woocommerce' ); + return __( 'Get your products shipped', 'woocommerce' ); } /** diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Marketing.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Marketing.php index 810fd1ecf4c..d50b387e9ad 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Marketing.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Marketing.php @@ -32,13 +32,7 @@ class Marketing extends Task { * @return string */ public function get_title() { - if ( true === $this->get_parent_option( 'use_completed_title' ) ) { - if ( $this->is_complete() ) { - return __( 'You added sales channels', 'woocommerce' ); - } - return __( 'Get more sales', 'woocommerce' ); - } - return __( 'Set up marketing tools', 'woocommerce' ); + return __( 'Grow your business', 'woocommerce' ); } /** diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Payments.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Payments.php index d12f0846cda..cc337a06217 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Payments.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Payments.php @@ -31,13 +31,7 @@ class Payments extends Task { * @return string */ public function get_title() { - if ( true === $this->get_parent_option( 'use_completed_title' ) ) { - if ( $this->is_complete() ) { - return __( 'You set up payments', 'woocommerce' ); - } - return __( 'Set up payments', 'woocommerce' ); - } - return __( 'Set up payments', 'woocommerce' ); + return __( 'Get paid', 'woocommerce' ); } /** diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Products.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Products.php index ce1f93cad6a..3d0824e4033 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Products.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Products.php @@ -43,13 +43,7 @@ class Products extends Task { * @return string */ public function get_title() { - if ( $this->get_parent_option( 'use_completed_title' ) === true ) { - if ( $this->is_complete() ) { - return __( 'You added products', 'woocommerce' ); - } - return __( 'Add products', 'woocommerce' ); - } - return __( 'Add my products', 'woocommerce' ); + return __( 'Add your products', 'woocommerce' ); } /** diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Shipping.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Shipping.php index 7935ada2e92..8ac9d5246a7 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Shipping.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Shipping.php @@ -45,13 +45,7 @@ class Shipping extends Task { * @return string */ public function get_title() { - if ( true === $this->get_parent_option( 'use_completed_title' ) ) { - if ( $this->is_complete() ) { - return __( 'You added shipping costs', 'woocommerce' ); - } - return __( 'Add shipping costs', 'woocommerce' ); - } - return __( 'Set up shipping', 'woocommerce' ); + return __( 'Get your products shipped', 'woocommerce' ); } /** diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Tax.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Tax.php index 80d8d517598..184aacccc25 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Tax.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Tax.php @@ -62,13 +62,7 @@ class Tax extends Task { * @return string */ public function get_title() { - if ( $this->get_parent_option( 'use_completed_title' ) === true ) { - if ( $this->is_complete() ) { - return __( 'You added tax rates', 'woocommerce' ); - } - return __( 'Add tax rates', 'woocommerce' ); - } - return __( 'Set up tax rates', 'woocommerce' ); + return __( 'Collect sales tax', 'woocommerce' ); } /** diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php index 27112c26f7b..96db431bb88 100644 --- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php +++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php @@ -34,7 +34,7 @@ class WooCommercePayments extends Task { * @return string */ public function get_title() { - return __( 'Set up WooPayments', 'woocommerce' ); + return __( 'Get paid with WooPayments', 'woocommerce' ); } /** @@ -82,18 +82,6 @@ class WooCommercePayments extends Task { return __( 'Finish setup', 'woocommerce' ); } - /** - * Additional info. - * - * @return string - */ - public function get_additional_info() { - return __( - 'Accept credit/debit cards and other popular payment methods with no setup or monthly fees — and manage payments right from your store dashboard.', - 'woocommerce' - ); - } - /** * Task completion. * diff --git a/plugins/woocommerce/tests/e2e-pw/tests/activate-and-setup/core-profiler.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/activate-and-setup/core-profiler.spec.js index 1896bdcde54..d2f01b023d8 100644 --- a/plugins/woocommerce/tests/e2e-pw/tests/activate-and-setup/core-profiler.spec.js +++ b/plugins/woocommerce/tests/e2e-pw/tests/activate-and-setup/core-profiler.spec.js @@ -107,7 +107,7 @@ test.describe( 'Store owner can complete the core profiler', () => { } ) ).toBeVisible(); await expect( - page.getByText( 'Add products to sell' ) + page.getByText( 'List your products' ) ).toBeVisible(); // go to the plugins page to make sure that extensions weren't installed await page.goto( 'wp-admin/plugins.php' ); @@ -258,7 +258,7 @@ test.describe( 'Store owner can complete the core profiler', () => { } ) ).toBeVisible(); await expect( - page.getByText( 'Add products to sell' ) + page.getByText( 'List your products' ) ).toBeVisible(); // go to the plugins page to make sure that extensions were installed await page.goto( 'wp-admin/plugins.php' ); diff --git a/plugins/woocommerce/tests/e2e-pw/tests/admin-tasks/payment.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/admin-tasks/payment.spec.js index 5cdd3a31b77..0b785650200 100644 --- a/plugins/woocommerce/tests/e2e-pw/tests/admin-tasks/payment.spec.js +++ b/plugins/woocommerce/tests/e2e-pw/tests/admin-tasks/payment.spec.js @@ -34,10 +34,10 @@ test.describe( 'Payment setup task', () => { page, } ) => { await page.goto( 'wp-admin/admin.php?page=wc-admin' ); - await page.locator( 'text=Set up payments' ).click(); + await page.locator( 'text=Get paid' ).click(); await expect( page.locator( '.woocommerce-layout__header-wrapper > h1' ) - ).toHaveText( 'Set up payments' ); + ).toHaveText( 'Get paid' ); } ); test( 'Saving valid bank account transfer details enables the payment method', async ( {