Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update doc links references to google-for-woocommerce #2486

Merged
merged 10 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ A native integration with Google offering free listings and Performance Max ads

- [WooCommerce.com product page](https://woocommerce.com/products/google-listings-and-ads/)
- [WordPress.org plugin page](https://wordpress.org/plugins/google-listings-and-ads/)
- [User documentation](https://woocommerce.com/document/google-listings-and-ads/)
- [User documentation](https://woocommerce.com/document/google-for-woocommerce/)
- [Feature requests](https://woocommerce.com/feature-requests/google-listings-and-ads/)

## Support

This repository is not suitable for support. Please don't use our issue tracker for support requests.

For self help, start with our [user documentation](https://woocommerce.com/document/google-listings-and-ads/).
For self help, start with our [user documentation](https://woocommerce.com/document/google-for-woocommerce/).

The best place to get support is the [WordPress.org Google for WooCommerce forum](https://wordpress.org/support/plugin/google-listings-and-ads/).

Expand Down
8 changes: 4 additions & 4 deletions js/src/components/contact-information/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import usePhoneNumberCheckTrackEventEffect from './usePhoneNumberCheckTrackEvent

const learnMoreLinkId = 'contact-information-read-more';
const learnMoreUrl =
'https://woocommerce.com/document/google-listings-and-ads/#contact-information';
'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information';

const description = (
<>
Expand Down Expand Up @@ -84,9 +84,9 @@ export function ContactInformationPreview() {
*
* @param {Object} props React props.
* @param {Function} [props.onPhoneNumberVerified] Called when the phone number is verified or has been verified.
* @fires gla_documentation_link_click with `{ context: 'setup-mc-contact-information', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-listings-and-ads/#contact-information' }`
* @fires gla_documentation_link_click with `{ context: 'settings-no-phone-number-notice', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-listings-and-ads/#contact-information' }`
* @fires gla_documentation_link_click with `{ context: 'settings-no-store-address-notice', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-listings-and-ads/#contact-information' }`
* @fires gla_documentation_link_click with `{ context: 'setup-mc-contact-information', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information' }`
* @fires gla_documentation_link_click with `{ context: 'settings-no-phone-number-notice', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information' }`
* @fires gla_documentation_link_click with `{ context: 'settings-no-store-address-notice', link_id: 'contact-information-read-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information' }`
*/
const ContactInformation = ( { onPhoneNumberVerified } ) => {
const { adapter } = useAdaptiveFormContext();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import useGoogleConnectFlow from './use-google-connect-flow';
* @param {boolean} props.disabled
* @fires gla_google_account_connect_button_click with `{ action: 'authorization', context: 'reconnect' }`
* @fires gla_google_account_connect_button_click with `{ action: 'authorization', context: 'setup-mc' }`
* @fires gla_documentation_link_click with `{ context: 'setup-mc-accounts', link_id: 'required-google-permissions', href: 'https://woocommerce.com/document/google-listings-and-ads/#required-google-permissions' }`
* @fires gla_documentation_link_click with `{ context: 'setup-mc-accounts', link_id: 'required-google-permissions', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#general-requirements' }`
*/
const ConnectGoogleAccountCard = ( { disabled } ) => {
const pageName = glaData.mcSetupComplete ? 'reconnect' : 'setup-mc';
Expand Down
2 changes: 1 addition & 1 deletion js/src/components/google-account-card/read-more-link.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const readMoreLink = (
<AppDocumentationLink
context="setup-mc-accounts"
linkId="required-google-permissions"
href="https://woocommerce.com/document/google-listings-and-ads/#required-google-permissions"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#general-requirements"
/>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import './request-full-access-google-account-card.scss';
* @param {string} props.additionalScopeEmail Specify the email to be requested additional permission scopes to Google.
* @fires gla_google_account_connect_button_click with `{ action: 'scope', context: 'reconnect' }`
* @fires gla_google_account_connect_button_click with `{ action: 'scope', context: 'setup-mc' }`
* @fires gla_documentation_link_click with `{ context: 'setup-mc-accounts', link_id: 'required-google-permissions', href: 'https://woocommerce.com/document/google-listings-and-ads/#required-google-permissions' }`
* @fires gla_documentation_link_click with `{ context: 'setup-mc-accounts', link_id: 'required-google-permissions', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#general-requirements' }`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sending them to the right link here when they haven't accessed all scopes?

What about using https://woocommerce.com/document/google-for-woocommerce/get-started/setup-and-configuration/#required-google-permissions

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. Changed here 679db10

*/
const RequestFullAccessGoogleAccountCard = ( { additionalScopeEmail } ) => {
const pageName = glaData.mcSetupComplete ? 'reconnect' : 'setup-mc';
Expand Down
2 changes: 1 addition & 1 deletion js/src/components/help-icon-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const HelpIconButton = ( props ) => {
<AppIconButton
icon={ <GridiconHelpOutline /> }
text={ __( 'Help', 'google-listings-and-ads' ) }
href="https://woocommerce.com/document/google-listings-and-ads/"
href="https://woocommerce.com/document/google-for-woocommerce/"
target="_blank"
eventName="gla_help_click"
eventProps={ {
Expand Down
20 changes: 10 additions & 10 deletions js/src/get-started-page/faqs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="general-requirements"
href="https://woocommerce.com/document/google-listings-and-ads/#general-requirements"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#general-requirements"
/>
),
}
Expand Down Expand Up @@ -96,7 +96,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="google-merchant-center-requirements"
href="https://woocommerce.com/document/google-listings-and-ads/#google-merchant-center-requirements"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#google-merchant-center-requirements"
/>
),
}
Expand All @@ -122,7 +122,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="performance-max"
href="https://woocommerce.com/document/google-listings-and-ads/#google-performance-max-campaigns"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/google-performance-max-campaigns"
/>
),
}
Expand All @@ -145,7 +145,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="free-listings"
href="https://woocommerce.com/document/google-listings-and-ads/#free-listings-on-google"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/product-feed-information-and-free-listings/#section-1"
/>
),
}
Expand All @@ -172,7 +172,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="campaign-analytics"
href="https://woocommerce.com/document/google-listings-and-ads/#getting-started-with-campaign-analytics"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/campaign-analytics"
/>
),
}
Expand Down Expand Up @@ -265,12 +265,12 @@ const faqItems = [
* @fires gla_faq with `{ context: 'get-started', id: 'can-i-run-both-shopping-ads-and-free-listings-campaigns', action: 'collapse' }`.
* @fires gla_faq with `{ context: 'get-started', id: 'how-can-i-get-the-ad-credit-offer', action: 'expand' }`.
* @fires gla_faq with `{ context: 'get-started', id: 'how-can-i-get-the-ad-credit-offer', action: 'collapse' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'general-requirements', href: 'https://woocommerce.com/document/google-listings-and-ads/#general-requirements' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'general-requirements', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#general-requirements' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'claiming-urls', href: 'https://support.google.com/merchants/answer/7527436' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'google-merchant-center-requirements', href: 'https://woocommerce.com/document/google-listings-and-ads/#google-merchant-center-requirements' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'performance-max', href: 'https://woocommerce.com/document/google-listings-and-ads/#google-performance-max-campaigns' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'free-listings', href: 'https://woocommerce.com/document/google-listings-and-ads/#free-listings-on-google' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'campaign-analytics', href: 'https://woocommerce.com/document/google-listings-and-ads/#getting-started-with-campaign-analytics' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'google-merchant-center-requirements', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#google-merchant-center-requirements' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'performance-max', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/google-performance-max-campaigns' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'free-listings', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/product-feed-information-and-free-listings/#section-1' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'campaign-analytics', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/campaign-analytics' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'terms-and-conditions-of-google-ads-coupons', href: 'https://www.google.com/ads/coupons/terms/' }`.
*/
const Faqs = () => {
Expand Down
12 changes: 6 additions & 6 deletions js/src/get-started-page/features-card/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ const LearnMoreLink = ( { linkId, href } ) => {
};

/*
* @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'get-started-features-free-listing-learn-more', href: 'https://woocommerce.com/document/google-listings-and-ads/#free-listings-on-google' }`.
* @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'get-started-features-google-ads-learn-more', href: 'https://woocommerce.com/document/google-listings-and-ads/#google-performance-max-campaigns' }`.
* @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'get-started-features-dashboard-learn-more', href: 'https://woocommerce.com/document/google-listings-and-ads/#getting-started-with-campaign-analytics' }`.
* @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'get-started-features-free-listing-learn-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/product-feed-information-and-free-listings/#section-1' }`.
* @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'get-started-features-google-ads-learn-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/google-performance-max-campaigns' }`.
* @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'get-started-features-dashboard-learn-more', href: 'https://woocommerce.com/document/google-for-woocommerce/get-started/campaign-analytics' }`.
*/
const FeaturesCard = () => {
return (
Expand Down Expand Up @@ -96,7 +96,7 @@ const FeaturesCard = () => {
</Text>
<LearnMoreLink
linkId="get-started-features-free-listing-learn-more"
href="https://woocommerce.com/document/google-listings-and-ads/#free-listings-on-google"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/product-feed-information-and-free-listings/#section-1"
/>
</FlexBlock>
<FlexBlock>
Expand Down Expand Up @@ -129,7 +129,7 @@ const FeaturesCard = () => {
</Text>
<LearnMoreLink
linkId="get-started-features-google-ads-learn-more"
href="https://woocommerce.com/document/google-listings-and-ads/#google-performance-max-campaigns"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/google-performance-max-campaigns"
/>
</FlexBlock>
<FlexBlock>
Expand Down Expand Up @@ -162,7 +162,7 @@ const FeaturesCard = () => {
</Text>
<LearnMoreLink
linkId="get-started-features-dashboard-learn-more"
href="https://woocommerce.com/document/google-listings-and-ads/#getting-started-with-campaign-analytics"
href="https://woocommerce.com/document/google-for-woocommerce/get-started/campaign-analytics"
/>
</FlexBlock>
</Flex>
Expand Down
4 changes: 2 additions & 2 deletions js/src/settings/edit-phone-number.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import usePhoneNumberCheckTrackEventEffect from '.~/components/contact-informati

const learnMoreLinkId = 'contact-information-read-more';
const learnMoreUrl =
'https://woocommerce.com/document/google-listings-and-ads/#contact-information';
'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information';

/**
* Renders the phone number settings page.
*
* @see PhoneNumberCard
* @fires gla_documentation_link_click with `{ context: "settings-phone-number", link_id: "contact-information-read-more", href: "https://woocommerce.com/document/google-listings-and-ads/#contact-information" }`
* @fires gla_documentation_link_click with `{ context: "settings-phone-number", link_id: "contact-information-read-more", href: "https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information" }`
*/
const EditPhoneNumber = () => {
const phone = useGoogleMCPhoneNumber();
Expand Down
4 changes: 2 additions & 2 deletions js/src/settings/edit-store-address.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import StoreAddressCard from '.~/components/contact-information/store-address-ca

const learnMoreLinkId = 'contact-information-read-more';
const learnMoreUrl =
'https://woocommerce.com/document/google-listings-and-ads/#contact-information';
'https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how valid this link is for the store address. This also adds the store address to the Merchant Account, but isn't made public. This also doesn't fulfil the public contact information requirement.
I think we need to either separate the contact information section into two parts or include a mention about the contact address and phone number being added to the Merchant Center account.

The two separate parts would be:

  1. Contact information synced with Merchant account (phone + store address)
  2. Requirement to have at least one type of public contact information on your site (contact us page)

Should the second part be on the compliance policy page: https://woocommerce.com/document/google-for-woocommerce/compliance-policy-2

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @mikkamp Not sure if I fully understand this. Can you elaborate?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant because it's mixing both contact details that should be on your site and public and then also contact details which should be sent to Merchant Center it's a bit confusing what part belongs to this learnMore link. But reading it again, it does still provide the required information so maybe we can just leave it for now.


/**
* Triggered when the save button in contact information page is clicked.
Expand All @@ -36,7 +36,7 @@ const learnMoreUrl =
*
* @see StoreAddressCard
* @fires gla_contact_information_save_button_click
* @fires gla_documentation_link_click with `{ context: "settings-store-address", link_id: "contact-information-read-more", href: "https://woocommerce.com/document/google-listings-and-ads/#contact-information" }`
* @fires gla_documentation_link_click with `{ context: "settings-store-address", link_id: "contact-information-read-more", href: "https://woocommerce.com/document/google-for-woocommerce/get-started/requirements/#contact-information" }`
*/
const EditStoreAddress = () => {
useLayout( 'full-content' );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const PreLaunchChecklist = () => {
<AppDocumentationLink
context="setup-mc-checklist"
linkId="checklist-requirements"
href="https://woocommerce.com/document/google-listings-and-ads/compliance-policy"
href="https://woocommerce.com/document/google-for-woocommerce/compliance-policy-2"
>
{ __(
'Read Google Merchant Center requirements',
Expand Down Expand Up @@ -72,7 +72,7 @@ const PreLaunchChecklist = () => {
context="setup-mc-checklist"
linkId="check-website-is-live"
type="external"
href="https://woocommerce.com/document/google-listings-and-ads/compliance-policy/#store-is-live"
href="https://woocommerce.com/document/google-for-woocommerce/compliance-policy-2/#store-is-live"
>
{ __(
'Learn more about common landing page issues and how to fix them',
Expand All @@ -99,7 +99,7 @@ const PreLaunchChecklist = () => {
context="setup-mc-checklist"
linkId="check-payment-methods-visible"
type="external"
href="https://woocommerce.com/document/google-listings-and-ads/compliance-policy/#complete-checkout"
href="https://woocommerce.com/document/google-for-woocommerce/compliance-policy-2/#complete-checkout"
>
{ __(
"Learn more about Google's checkout requirements & best practices",
Expand Down Expand Up @@ -131,7 +131,7 @@ const PreLaunchChecklist = () => {
context="setup-mc-checklist"
linkId="check-checkout-process-secure"
type="external"
href="https://woocommerce.com/document/google-listings-and-ads/compliance-policy/#complete-checkout"
href="https://woocommerce.com/document/google-for-woocommerce/compliance-policy-2/#complete-checkout"
>
{ __(
'Learn to set up SSL on your website',
Expand All @@ -158,7 +158,7 @@ const PreLaunchChecklist = () => {
context="setup-mc-checklist"
linkId="check-refund-tos-visible"
type="external"
href="https://woocommerce.com/document/google-listings-and-ads/compliance-policy/#refund-and-terms"
href="https://woocommerce.com/document/google-for-woocommerce/compliance-policy-2/#refund-and-terms"
>
{ __(
"Learn more about Google's refund policy requirements",
Expand Down
2 changes: 1 addition & 1 deletion src/MerchantCenter/MerchantStatuses.php
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@
*/
if ( 'home_page_issue' === $issue['code'] ) {
$issue['issue'] = 'Website claim is lost, need to re verify and claim your website. Please reference the support link';
$issue['action_url'] = 'https://woocommerce.com/document/google-listings-and-ads-faqs/#reverify-website';
$issue['action_url'] = 'https://woocommerce.com/document/google-for-woocommerce/faq/#reverify-website';

Check warning on line 1043 in src/MerchantCenter/MerchantStatuses.php

View check run for this annotation

Codecov / codecov/patch

src/MerchantCenter/MerchantStatuses.php#L1043

Added line #L1043 was not covered by tests
}

return $issue;
Expand Down
2 changes: 1 addition & 1 deletion src/Notes/SetupCampaign.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
$note->add_action(
'setup-campaign-learn-more',
__( 'Learn more', 'google-listings-and-ads' ),
'https://woocommerce.com/document/google-listings-and-ads/#google-performance-max-campaigns'
'https://woocommerce.com/document/google-for-woocommerce/get-started/google-performance-max-campaigns'

Check warning on line 82 in src/Notes/SetupCampaign.php

View check run for this annotation

Codecov / codecov/patch

src/Notes/SetupCampaign.php#L82

Added line #L82 was not covered by tests
);
}
}
2 changes: 1 addition & 1 deletion src/PluginHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
* @return string
*/
protected function get_documentation_url(): string {
return 'https://woocommerce.com/document/google-listings-and-ads/?utm_source=wordpress&utm_medium=all-plugins-page&utm_campaign=doc-link&utm_content=google-listings-and-ads';
return 'https://woocommerce.com/document/google-for-woocommerce/?utm_source=wordpress&utm_medium=all-plugins-page&utm_campaign=doc-link&utm_content=google-listings-and-ads';

Check warning on line 155 in src/PluginHelper.php

View check run for this annotation

Codecov / codecov/patch

src/PluginHelper.php#L155

Added line #L155 was not covered by tests
}

/**
Expand Down
Loading