Skip to content

Commit

Permalink
Merge pull request #2434 from woocommerce/release/2.7.3
Browse files Browse the repository at this point in the history
Release 2.7.3
  • Loading branch information
puntope authored Jun 18, 2024
2 parents 174c15e + 308b36f commit a6eed8a
Show file tree
Hide file tree
Showing 30 changed files with 352 additions and 331 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at support@woo.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at support@woocommerce.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Please see [SECURITY.md](./SECURITY.md).

## Feature Requests

Feature requests can be submitted to our [feature requests page](https://woo.com/feature-requests/google-listings-and-ads/). Be sure to include a good description of the expected behavior and use case, and before submitting a request, please search for similar ones.
Feature requests can be submitted to our [feature requests page](https://woocommerce.com/feature-requests/google-listings-and-ads/). Be sure to include a good description of the expected behavior and use case, and before submitting a request, please search for similar ones.

## Getting started

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

A native integration with Google offering free listings and Performance Max ads to WooCommerce merchants.

- [Woo.com product page](https://woo.com/products/google-listings-and-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://woo.com/document/google-listings-and-ads/)
- [Feature requests](https://woo.com/feature-requests/google-listings-and-ads/)
- [User documentation](https://woocommerce.com/document/google-listings-and-ads/)
- [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://woo.com/document/google-listings-and-ads/).
For self help, start with our [user documentation](https://woocommerce.com/document/google-listings-and-ads/).

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

If you have a Woo.com account, you can [start a chat or open a ticket on Woo.com](https://woo.com/my-account/contact-support/).
If you have a WooCommerce.com account, you can [start a chat or open a ticket on WooCommerce.com](https://woocommerce.com/my-account/contact-support/).

## Prerequisites

Expand Down Expand Up @@ -197,6 +197,6 @@ Going forward, Google will always add the prefix "legacy-" for the branch suppor

<p align="center">
<br/><br/>
Made with 💜 by <a href="https://woo.com/">Woo</a>.<br/>
<a href="https://woo.com/careers/">We're hiring</a>! Come work with us!
Made with 💜 by <a href="https://woocommerce.com/">Woo</a>.<br/>
<a href="https://woocommerce.com/careers/">We're hiring</a>! Come work with us!
</p>
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*** WooCommerce Google Listings and Ads Changelog ***

= 2.7.3 - 2024-06-18 =
* Fix - Fatal error when loading campaign in the marketing overview section.
* Tweak - Replace woo.com references with woocommerce.com.

= 2.7.2 - 2024-06-10 =
* Add - Google Ads account invitation acceptance step to the connection process.
* Fix - Show tracking snapshots in WPCLI.
Expand Down
2 changes: 1 addition & 1 deletion docs/gtag-consent-mode.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Googla Analytics (gtag) Consent Mode

Unless you're running the [Google Analytics for WooCommerce](https://woo.com/products/woocommerce-google-analytics/) extension for a more sophisticated configuration, Google Listings and Ads will add Google's `gtag` to help you track some customer behavior.
Unless you're running the [Google Analytics for WooCommerce](https://woocommerce.com/products/woocommerce-google-analytics/) extension for a more sophisticated configuration, Google Listings and Ads will add Google's `gtag` to help you track some customer behavior.

To respect your customers' privacy, we set up the default state of [consent mode](https://support.google.com/analytics/answer/9976101). We set it to deny all the parameters for visitors from the EEA region. You can add an extension or CMP that delivers a banner or any other UI to let visitors update their consent in runtime.

Expand Down
6 changes: 3 additions & 3 deletions google-listings-and-ads.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Plugin Name: Google Listings and Ads
* Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
* Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
* Version: 2.7.2
* Version: 2.7.3
* Author: WooCommerce
* Author URI: https://woo.com/
* Author URI: https://woocommerce.com/
* Text Domain: google-listings-and-ads
* Requires at least: 5.9
* Tested up to: 6.5
Expand All @@ -30,7 +30,7 @@

defined( 'ABSPATH' ) || exit;

define( 'WC_GLA_VERSION', '2.7.2' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_VERSION', '2.7.3' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_MIN_PHP_VER', '7.4' );
define( 'WC_GLA_MIN_WC_VER', '6.9' );

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://woo.com/document/google-listings-and-ads/#contact-information';
'https://woocommerce.com/document/google-listings-and-ads/#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://woo.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://woo.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://woo.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-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' }`
*/
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://woo.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-listings-and-ads/#required-google-permissions' }`
*/
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://woo.com/document/google-listings-and-ads/#required-google-permissions"
href="https://woocommerce.com/document/google-listings-and-ads/#required-google-permissions"
/>
);

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://woo.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-listings-and-ads/#required-google-permissions' }`
*/
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://woo.com/document/google-listings-and-ads/"
href="https://woocommerce.com/document/google-listings-and-ads/"
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://woo.com/document/google-listings-and-ads/#general-requirements"
href="https://woocommerce.com/document/google-listings-and-ads/#general-requirements"
/>
),
}
Expand Down Expand Up @@ -96,7 +96,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="google-merchant-center-requirements"
href="https://woo.com/document/google-listings-and-ads/#google-merchant-center-requirements"
href="https://woocommerce.com/document/google-listings-and-ads/#google-merchant-center-requirements"
/>
),
}
Expand All @@ -122,7 +122,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="performance-max"
href="https://woo.com/document/google-listings-and-ads/#google-performance-max-campaigns"
href="https://woocommerce.com/document/google-listings-and-ads/#google-performance-max-campaigns"
/>
),
}
Expand All @@ -145,7 +145,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="free-listings"
href="https://woo.com/document/google-listings-and-ads/#free-listings-on-google"
href="https://woocommerce.com/document/google-listings-and-ads/#free-listings-on-google"
/>
),
}
Expand All @@ -172,7 +172,7 @@ const faqItems = [
<AppDocumentationLink
context="faqs"
linkId="campaign-analytics"
href="https://woo.com/document/google-listings-and-ads/#getting-started-with-campaign-analytics"
href="https://woocommerce.com/document/google-listings-and-ads/#getting-started-with-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://woo.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-listings-and-ads/#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://woo.com/document/google-listings-and-ads/#google-merchant-center-requirements' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'performance-max', href: 'https://woo.com/document/google-listings-and-ads/#google-performance-max-campaigns' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'free-listings', href: 'https://woo.com/document/google-listings-and-ads/#free-listings-on-google' }`.
* @fires gla_documentation_link_click with `{ context: 'faqs', linkId: 'campaign-analytics', href: 'https://woo.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-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: '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://woo.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://woo.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://woo.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-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' }`.
*/
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://woo.com/document/google-listings-and-ads/#free-listings-on-google"
href="https://woocommerce.com/document/google-listings-and-ads/#free-listings-on-google"
/>
</FlexBlock>
<FlexBlock>
Expand Down Expand Up @@ -129,7 +129,7 @@ const FeaturesCard = () => {
</Text>
<LearnMoreLink
linkId="get-started-features-google-ads-learn-more"
href="https://woo.com/document/google-listings-and-ads/#google-performance-max-campaigns"
href="https://woocommerce.com/document/google-listings-and-ads/#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://woo.com/document/google-listings-and-ads/#getting-started-with-campaign-analytics"
href="https://woocommerce.com/document/google-listings-and-ads/#getting-started-with-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://woo.com/document/google-listings-and-ads/#contact-information';
'https://woocommerce.com/document/google-listings-and-ads/#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://woo.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-listings-and-ads/#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://woo.com/document/google-listings-and-ads/#contact-information';
'https://woocommerce.com/document/google-listings-and-ads/#contact-information';

/**
* 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://woo.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-listings-and-ads/#contact-information" }`
*/
const EditStoreAddress = () => {
useLayout( 'full-content' );
Expand Down
Loading

0 comments on commit a6eed8a

Please sign in to comment.