Merge pull request #2738 from woocommerce/release/3.2.1

Release/3.2.1

.github/CODE_OF_CONDUCT.md

@@ -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.
 

.github/ISSUE_TEMPLATE/1-Bug-report.md

@@ -26,7 +26,7 @@ assignees: ''
 <!-- Describe what should happen instead of what is currently happening. -->
 
 ## 🗃 Logs
-<!-- Please include logs, details about your WordPress environment (from [**WooCommerce Status Report**](https://woo.com/document/understanding-the-woocommerce-system-status-report/)), and any other relevant information about your site. -->
+<!-- Please include logs, details about your WordPress environment (from [**WooCommerce Status Report**](https://woocommerce.com/document/understanding-the-woocommerce-system-status-report/)), and any other relevant information about your site. -->
 
 <details>
 	<!-- paste WooCommerce Status Report or logs here -->

.github/ISSUE_TEMPLATE/2-Support-question.md

@@ -11,12 +11,12 @@ We’re happy to help with this question! Our support team works in our help des
 
 ## 📖 Read documentation
 
-The [Facebook for WooCommerce documentation](https://woo.com/document/facebook-for-woocommerce/) will help you set up the extension, use its features, and answer frequently asked questions. 
+The [Facebook for WooCommerce documentation](https://woocommerce.com/document/facebook-for-woocommerce/) will help you set up the extension, use its features, and answer frequently asked questions. 
 
 ## 👩‍💻 Check forums
 
 The [Facebook for WooCommerce forums](https://wordpress.org/support/plugin/facebook-for-woocommerce/) let you review other user questions and issues and learn what worked for them. 
 
 ## 🗣 Contact support
 
-Our support team would be happy to help answer your questions! [Click here to get in touch with support.](https://woo.com/my-account/contact-support/)
+Our support team would be happy to help answer your questions! [Click here to get in touch with support.](https://woocommerce.com/my-account/contact-support/)

.github/ISSUE_TEMPLATE/3-Feedback-idea.md

@@ -9,9 +9,9 @@ assignees: ''
 
 ## Feature requests
 
-If you have an idea for how we could improve Facebook for WooCommerce, please let us know by [contacting our support team](https://woo.com/my-account/contact-support/)! We'd love to learn more about the problem you're facing and how Facebook for WooCommerce could help solve it.
+If you have an idea for how we could improve Facebook for WooCommerce, please let us know by [contacting our support team](https://woocommerce.com/my-account/contact-support/)! We'd love to learn more about the problem you're facing and how Facebook for WooCommerce could help solve it.
 
-Check the [Facebook for WooCommerce feature requests](https://woo.com/feature-requests/facebook/) to see and vote on ideas.
+Check the [Facebook for WooCommerce feature requests](https://woocommerce.com/feature-requests/facebook/) to see and vote on ideas.
 
 ## Developers
 

.github/workflows/prepare-release.yml

@@ -47,5 +47,5 @@ jobs:
                     1. [ ] Wait for a while, and the zip file should be able to download from: [https://downloads.wordpress.org/plugin/facebook-for-woocommerce.x.x.x.zip](https://downloads.wordpress.org/plugin/facebook-for-woocommerce.x.x.x.zip)
             1. [ ] Close the release milestone.
             1. [ ] Publish any documentation updates relating to the release:
-               - [ ] [User documentation](https://woo.com/document/facebook-for-woocommerce)
-               - [ ] [Any changes to privacy/tracking](https://woo.com/usage-tracking/)
+               - [ ] [User documentation](https://woocommerce.com/document/facebook-for-woocommerce)
+               - [ ] [Any changes to privacy/tracking](https://woocommerce.com/usage-tracking/)

README.md

@@ -4,14 +4,14 @@
 
 This is the development repository for the Facebook for WooCommerce plugin.
 
-- [Woo.com product page](https://woo.com/products/facebook)
+- [WooCommerce.com product page](https://woocommerce.com/products/facebook/)
 - [WordPress.org plugin page](https://wordpress.org/plugins/facebook-for-woocommerce/)
-- [User documentation](https://woo.com/document/facebook-for-woocommerce)
+- [User documentation](https://woocommerce.com/document/facebook-for-woocommerce/)
 
 ## Support
 The best place to get support is the [WordPress.org Facebook for WooCommerce forum](https://wordpress.org/support/plugin/facebook-for-woocommerce/).
 
-If you have a Woo.com account, you can [search for help or submit a help request on Woo.com](https://woo.com/my-account/contact-support/).
+If you have a WooCommerce.com account, you can [search for help or submit a help request on WooCommerce.com](https://woocommerce.com/my-account/contact-support/).
 
 ### Logging
 The plugin offers logging that can help debug various problems. You can enable debug mode in the main plugin settings panel under the `Enable debug mode` section.

changelog.txt

@@ -1,5 +1,11 @@
 *** Facebook for WooCommerce Changelog ***
 
+= 3.2.1 - 2024-05-07 =
+* Fix - Defer only AddToCart events if applicable.
+* Fix - Direct upgrade path from < 3.1.13 to ≥ 3.2.0.
+* Tweak - Adds WooCommerce as a dependency to the plugin header.
+* Tweak - Revert to WooCommerce.com domain.
+
 = 3.2.0 - 2024-05-01 =
 * Tweak - PHP8.3 to GitHub PHPCS and Unit Tests workflows.
 * Update - Remove the sunsetted Messenger Chat feature.

class-wc-facebookcommerce.php

@@ -709,7 +709,7 @@ public function get_settings_url( $plugin_id = null ) {
 	 * @return string
 	 */
 	public function get_documentation_url() {
-		return 'https://woo.com/document/facebook-for-woocommerce/';
+		return 'https://woocommerce.com/document/facebook-for-woocommerce/';
 	}
 
 
@@ -733,7 +733,7 @@ public function get_support_url() {
 	 * @return string
 	 */
 	public function get_sales_page_url() {
-		return 'https://woo.com/products/facebook/';
+		return 'https://woocommerce.com/products/facebook/';
 	}
 
 

facebook-commerce-pixel-event.php

@@ -283,11 +283,13 @@ public function get_event_script( $event_name, $params, $method = 'track' ) {
 		 * @param string $method     Name of the pixel's fbq() function to call.
 		 */
 		public function inject_event( $event_name, $params, $method = 'track' ) {
-			// If we have add to cart redirect enabled, we must defer the events to render them the next page load.
-			$should_defer = 'yes' === get_option( 'woocommerce_cart_redirect_after_add', 'no' );
 			if ( WC_Facebookcommerce_Utils::isWoocommerceIntegration() ) {
 				$code = $this->get_event_code( $event_name, self::build_params( $params, $event_name ), $method );
-				if ( $should_defer ) {
+
+				// If we have add to cart redirect enabled, we must defer the AddToCart events to render them the next page load.
+				$is_redirect    = 'yes' === get_option( 'woocommerce_cart_redirect_after_add', 'no' );
+				$is_add_to_cart = 'AddToCart' === $event_name;
+				if ( $is_redirect && $is_add_to_cart ) {
 					WC_Facebookcommerce_Utils::add_deferred_event( $code );
 				} else {
 					WC_Facebookcommerce_Utils::wc_enqueue_js( $code );

facebook-for-woocommerce.php

@@ -11,9 +11,10 @@
  * Description: Grow your business on Facebook! Use this official plugin to help sell more of your products using Facebook. After completing the setup, you'll be ready to create ads that promote your products and you can also create a shop section on your Page where customers can browse your products on Facebook.
  * Author: Facebook
  * Author URI: https://www.facebook.com/
- * Version: 3.2.0
+ * Version: 3.2.1
  * Requires at least: 5.6
  * Text Domain: facebook-for-woocommerce
+ * Requires Plugins: woocommerce
  * Tested up to: 6.5
  * WC requires at least: 6.4
  * WC tested up to: 8.8
@@ -44,7 +45,7 @@ class WC_Facebook_Loader {
 	/**
 	 * @var string the plugin version. This must be in the main plugin file to be automatically bumped by Woorelease.
 	 */
-	const PLUGIN_VERSION = '3.2.0'; // WRCS: DEFINED_VERSION.
+	const PLUGIN_VERSION = '3.2.1'; // WRCS: DEFINED_VERSION.
 
 	// Minimum PHP version required by this plugin.
 	const MINIMUM_PHP_VERSION = '7.4.0';

includes/Lifecycle.php

@@ -41,7 +41,6 @@ public function __construct( Framework\Plugin $plugin ) {
 			'2.0.4',
 			'2.4.0',
 			'2.5.0',
-			'3.1.13',
 			'3.2.0'
 		);
 	}
@@ -310,22 +309,9 @@ protected function upgrade_to_2_5_0() {
 		as_unschedule_all_actions( Products\Feed::GENERATE_FEED_ACTION );
 	}
 
-	protected function upgrade_to_3_1_13() {
-		$notice_slug          = 'facebook_messenger_deprecation_warning';
-		$is_messenger_enabled = get_option( \WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER, 'no' ) === 'yes';
-
-		// Add Messenger deprecation notice.
-		if ( $is_messenger_enabled && class_exists( 'WC_Admin_Notices' ) ) {
-			\WC_Admin_Notices::add_custom_notice(
-				$notice_slug,
-				Admin\Settings_Screens\Messenger::get_deprecation_message()
-			);
-
-		}
-	}
-
 	/**
-	 * Removes the messenger deprecation notice on upgrade to 3.2.0.
+	 * Removes the messenger settings and deprecation notice on upgrade to 3.2.0.
+	 * Note: deprecation notice upgrade step removed in 3.2.1.
 	 *
 	 * @since 3.2.0
 	 */

includes/Utilities/Tracker.php

@@ -15,7 +15,7 @@
 /**
  * Class for adding diagnostic info to WooCommerce Tracker snapshot.
  *
- * See https://woo.com/usage-tracking/ for more information.
+ * See https://woocommerce.com/usage-tracking/ for more information.
  *
  * @since 2.3.4
  */

package.json

@@ -1,8 +1,8 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "author": "Facebook",
-  "homepage": "https://woo.com/products/facebook/",
+  "homepage": "https://woocommerce.com/products/facebook/",
   "license": "GPL-2.0",
   "repository": {
     "type": "git",

readme.txt

@@ -3,7 +3,7 @@ Contributors: facebook, automattic, woothemes
 Tags: facebook, woocommerce, marketing, product catalog feed, pixel
 Requires at least: 4.4
 Tested up to: 6.5
-Stable tag: 3.2.0
+Stable tag: 3.2.1
 Requires PHP: 5.6 or greater
 MySQL: 5.6 or greater
 License: GPLv2 or later
@@ -40,6 +40,12 @@ When opening a bug on GitHub, please give us as many details as possible.
 
 == Changelog ==
 
+= 3.2.1 - 2024-05-07 =
+* Fix - Defer only AddToCart events if applicable.
+* Fix - Direct upgrade path from < 3.1.13 to ≥ 3.2.0.
+* Tweak - Adds WooCommerce as a dependency to the plugin header.
+* Tweak - Revert to WooCommerce.com domain.
+
 = 3.2.0 - 2024-05-01 =
 * Tweak - PHP8.3 to GitHub PHPCS and Unit Tests workflows.
 * Update - Remove the sunsetted Messenger Chat feature.