Merge pull request #2645 from woocommerce/revert-2643-release/3.1.0

changelog.txt

@@ -1,8 +1,5 @@
 *** Facebook for WooCommerce Changelog ***
 
-= 3.1.0 - 2023-10-11 =
-* Add - Advantage+ Shoppings Ads support in the Advertise tab.
-
 = 3.0.34 - 2023-10-05 =
 * Add - Filter the size of the Facebook product image.
 * Fix - AddToCart duplication when other plugins clone cart.

class-wc-facebookcommerce.php

@@ -647,7 +647,7 @@ public function get_commerce_handler() {
 	/**
 	 * Gets a campaign handler for the given ASC campaign type
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param string $type The ASC campaign type
 	 * @return WooCommerce\Facebook\AdvertiseASC ASC campaign handler

facebook-commerce.php

@@ -2134,7 +2134,7 @@ private function sync_facebook_products_using_background_processor() {
 	/**
 	 * Updates the DB with the new data for the Advertise ASC entry
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param string $data
 	 * @return bool
@@ -2146,7 +2146,7 @@ public function update_advertise_asc_saved_data( $data ) {
 	/**
 	 * Updates the DB with the new data for the Advertise ASC entry. The input can be an array, which then is transformed to an encoded json string
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param array $data
 	 */
@@ -2158,7 +2158,7 @@ public function update_advertise_asc_information( $data ){
 	/**
 	 * Updates the status for Advertise ASC campaign eligibility.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param array $new_status
 	 */
@@ -2181,7 +2181,7 @@ public function ajax_fb_toggle_visibility() {
 	/**
 	 * Gets the plain Advertise ASC data from the DB.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @return string
 	 */
@@ -2192,7 +2192,7 @@ public function get_advertise_asc_saved_data() {
 	/**
 	 * Gets the saved status for Advertise ASC campaign eligibility.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param array $data
 	 */
@@ -2203,7 +2203,7 @@ public function get_advertise_asc_status() {
 	/**
 	 * Gets the json-decoded array of the Advertise ASC information stored in DB.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @return mixed
 	 */

facebook-for-woocommerce.php

@@ -11,7 +11,7 @@
  * 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.1.0
+ * Version: 3.0.34
  * Requires at least: 5.6
  * Text Domain: facebook-for-woocommerce
  * Tested up to: 6.3
@@ -44,7 +44,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.1.0'; // WRCS: DEFINED_VERSION.
+	const PLUGIN_VERSION = '3.0.34'; // WRCS: DEFINED_VERSION.
 
 	// Minimum PHP version required by this plugin.
 	const MINIMUM_PHP_VERSION = '7.4.0';

includes/AJAX.php

@@ -119,7 +119,7 @@ function( $name, $slug ) use ( $term ) {
 	 * Retrieves the changeset for each campaign type and posts them to the backend.
 	 * Makes sure that there is something to be sent.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @return string
 	 */
@@ -171,7 +171,7 @@ public function update_ad_status() {
 	/**
 	 * Gets the Ad Preview for a given ad in different formats and merges the results.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @return string
 	 */
@@ -206,7 +206,7 @@ public function generate_ad_preview() {
 	/**
 	 * Gets the Ad Preview for an ASC Campaign in different formats and merges the results.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param string $asc_campaign ASC Campaign type.
 	 * @return string
@@ -225,7 +225,7 @@ private function get_previews_and_merge ( $asc_campaign ){
 	/**
 	 * Gets the Ad Preview for an ASC Campaign in a specific format.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param string $asc_campaign ASC Campaign type.
 	 * @param string $ad_format Ad Preview Format.

includes/API/Ad/Create/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Ad Creation request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Ad/Preview/Generation/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Ad Preview request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Ad/Preview/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Ad Preview request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Ad/Response.php

@@ -10,7 +10,7 @@
 /**
  * Generic response object for flows corresponding to Facebook Ad requests.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/AdAccount/Currency/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Ad Account Currency request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Adset/Create/Response.php

@@ -11,7 +11,7 @@
 /**
  * Response object for Facebook Adset Creation request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Adset/Response.php

@@ -10,7 +10,7 @@
 /**
  * Generic response object for Facebook Adset request flows.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Adset/Update/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Adset Update request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Campaign/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Ad Campaign Creation/Update request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/API/Insights/Response.php

@@ -10,7 +10,7 @@
 /**
  * Response object for Facebook Ad Campaign Insights request.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class Response extends ApiResponse {
 

includes/Admin/Settings_Screens/Advertise.php

@@ -76,7 +76,7 @@ private function add_hooks() {
 	/**
 	 * Adds the WP hooks to be able to run the frontend
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 */
 	public function add_frontend_hooks(){
@@ -267,7 +267,7 @@ public function render() {
 	/**
 	 * Renders the ASC Experimental view.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 */
 	private function experimental_view_render() {
@@ -287,7 +287,7 @@ private function experimental_view_render() {
 	/**
 	 * Generates the HTML DOM for a given dashboard.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 * @param string @type. Sets the input type. values: (new-buyers, retargeting)
 	 * @param string @title. The title of the dashboard
 	 * @param string @subtitle_row1. Row1 of the subtitle of the dashboard
@@ -358,7 +358,7 @@ private function render_dashboard( $type, $title, $subtitle_row1, $subtitle_row2
 	/** 
 	 * Checks whether the tool can show the experimental view or not
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @return bool
 	 */
@@ -371,7 +371,7 @@ private function can_try_experimental_view() {
 	/** 
 	 * Creates the translated text including a link
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 * @param string $pretext. Any text before the link text.
 	 * @param string $link. The link url
 	 * @param string $link_text. The text for the link
@@ -387,7 +387,7 @@ private function translate_with_link( $pretext, $link, $link_text, $rest_of_text
 	/**
 	 * Tries to render the experimental view. If something fails, it shows the issue.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @return string
 	 */
@@ -518,7 +518,7 @@ private function try_render_experimental_view() {
 	/** 
 	 * Closes the open html tags in case of an exception.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 * 
 	 */
 	private function remove_rendered_when_exception_happened() {
@@ -536,7 +536,7 @@ private function remove_rendered_when_exception_happened() {
 	/**
 	 * Returns an escaped translation of the input text, in the realm of this plugin
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 * @param string $text
 	 * @returns string
@@ -549,7 +549,7 @@ private function get_escaped_translation( $text ) {
 	/**
 	 * Creates the html elements needed for the LWI-E view.
 	 *
-	 * @since 3.1.0
+	 * @since x.x.x
 	 *
 	 */
 	private function render_lwi_view() {

includes/AdvertiseASC/AscSelector.php

@@ -21,7 +21,7 @@
  * - Retargeting
  * campaigns.
  *
- * @since 3.1.0
+ * @since x.x.x
  */
 class AscSelector {