Updates to 6.0.31

Author: Woo

automatewoo.php

@@ -3,7 +3,7 @@
  * Plugin Name: AutomateWoo
  * Plugin URI: https://automatewoo.com
  * Description: Powerful marketing automation for your WooCommerce store.
- * Version: 6.0.30
+ * Version: 6.0.31
  * Author: WooCommerce
  * Author URI: https://woocommerce.com
  * License: GPLv3
@@ -37,7 +37,7 @@
 defined( 'ABSPATH' ) || exit;
 
 define( 'AUTOMATEWOO_SLUG', 'automatewoo' );
-define( 'AUTOMATEWOO_VERSION', '6.0.30' ); // WRCS: DEFINED_VERSION.
+define( 'AUTOMATEWOO_VERSION', '6.0.31' ); // WRCS: DEFINED_VERSION.
 define( 'AUTOMATEWOO_FILE', __FILE__ );
 define( 'AUTOMATEWOO_PATH', __DIR__ );
 define( 'AUTOMATEWOO_MIN_PHP_VER', '7.4.0' );

changelog.txt

@@ -1,5 +1,9 @@
 *** AutomateWoo Changelog ***
 
+2024-08-06 - version 6.0.31
+* Dev - Fix false positive warning in QIT.
+* Fix - Add Active Campaign Pagination for tags.
+
 2024-07-24 - version 6.0.30
 * Dev - Upgrade to use Node.js 20 and bump npm dependencies.
 * Fix - HTML formatting in the Workflows timing column.

includes/Actions/Send_Email_Raw.php

@@ -71,7 +71,7 @@ public function get_preview() {
 		// no user should be logged in
 		// When the user_id value is 0, it's a session for a logged-out user
 		// see https://wordpress.org/support/topic/sessions-with-user-id-0/
-		// phpcs:ignore Generic.PHP.ForbiddenFunctions.Found
+		// phpcs:ignore Generic.PHP.ForbiddenFunctions
 		wp_set_current_user( 0 );
 
 		return $this->get_workflow_email_object( $current_user->get( 'user_email' ), $html )

includes/Integrations/ActiveCampaign.php

@@ -63,11 +63,11 @@ public function is_enabled(): bool {
 	 *
 	 * @see https://developers.activecampaign.com/reference/create-a-new-contact
 	 *
-	 * @param string $email      Email address for the contact
+	 * @param string $email Email address for the contact
 	 * @param string $first_name First name for the contact
-	 * @param string $last_name  Last name for the contact
-	 * @param string $phone      Phone number for the contact
-	 * @param string $company    Company for the contact
+	 * @param string $last_name Last name for the contact
+	 * @param string $phone Phone number for the contact
+	 * @param string $company Company for the contact
 	 *
 	 * @return bool|array An array containing contact details or false if unsuccessful
 	 */
@@ -110,9 +110,9 @@ public function sync_contact( $email, $first_name = false, $last_name = false, $
 	 *
 	 * @see https://developers.activecampaign.com/reference/create-an-account-1
 	 *
-	 * @param string $contact_id         ID of the contact to sync company data for
+	 * @param string $contact_id ID of the contact to sync company data for
 	 * @param string $current_company_id ID of the company currently associated with the contact ("0" = none)
-	 * @param string $company_name       Name of the company to sync
+	 * @param string $company_name Name of the company to sync
 	 *
 	 * @return bool
 	 */
@@ -128,6 +128,7 @@ public function sync_company( $contact_id, $current_company_id, $company_name ):
 			if ( $current_company_id !== '0' ) {
 				if ( ! $this->delete_account_association( $contact_id ) ) {
 					$this->log( esc_html__( 'There was an error when attempting to delete an association', 'automatewoo' ) );
+
 					return false;
 				}
 			}
@@ -154,7 +155,7 @@ public function sync_company( $contact_id, $current_company_id, $company_name ):
 	 *
 	 * @see https://developers.activecampaign.com/reference/list-all-accounts
 	 *
-	 * @param string $account_name           Name of the account to search for
+	 * @param string $account_name Name of the account to search for
 	 * @param bool   $create_missing_account If true then the account will be created if not found
 	 *
 	 * @return bool|array
@@ -227,6 +228,7 @@ public function get_lists(): array {
 
 		if ( ! isset( $response['lists'] ) ) {
 			$this->log( __( 'Unexpected response when trying to retrieve all lists', 'automatewoo' ) );
+
 			return [];
 		}
 
@@ -246,7 +248,7 @@ public function get_lists(): array {
 	 * @see https://developers.activecampaign.com/reference/update-list-status-for-contact
 	 *
 	 * @param string $contact ID of the contact to add to a list
-	 * @param string $list    ID of the list to add the contact to
+	 * @param string $list ID of the list to add the contact to
 	 *
 	 * @return bool
 	 */
@@ -297,6 +299,7 @@ public function is_contact( $email ) {
 	public function get_contact( $email ) {
 		if ( ! is_email( $email ) ) {
 			$this->log( __( 'Invalid email was supplied when checking if contact exists in ActiveCampaign', 'automatewoo' ) );
+
 			return false;
 		}
 
@@ -334,6 +337,7 @@ public function get_contact_custom_fields(): array {
 
 		if ( ! isset( $response['fields'] ) ) {
 			$this->log( __( 'Unexpected response when trying to retrieve all custom fields', 'automatewoo' ) );
+
 			return [];
 		}
 
@@ -351,9 +355,9 @@ public function get_contact_custom_fields(): array {
 	/**
 	 * Get a tag ID by its name
 	 *
-	 * @param string $tag                Name of the tag to get the ID for
+	 * @param string $tag Name of the tag to get the ID for
 	 * @param bool   $create_missing_tag If true then the tag will be created if not found
-	 * @param bool   $retry_on_error     Whether to retry if an error occurs when creating a tag. It will clear the cache and try again.
+	 * @param bool   $retry_on_error Whether to retry if an error occurs when creating a tag. It will clear the cache and try again.
 	 *
 	 * @return string|bool
 	 */
@@ -365,7 +369,7 @@ public function get_tag_id( $tag, $create_missing_tag = false, $retry_on_error =
 			if ( $cache ) {
 				$this->active_tags = $cache;
 			} else {
-				$response          = $this->request( 'tags' )->get_body();
+				$response          = $this->paginated_request( 'tags' );
 				$this->active_tags = $response['tags'];
 
 				Cache::set_transient( $transient, $this->active_tags, 0.15 );
@@ -395,10 +399,12 @@ public function get_tag_id( $tag, $create_missing_tag = false, $retry_on_error =
 					// Somehow the tag was created by another process in the meantime or externally so we clear the cache and try again.
 					Cache::delete_transient( $transient );
 					$this->active_tags = [];
+
 					return $this->get_tag_id( $tag, $create_missing_tag, false );
 				}
 				// phpcs:disable WordPress.PHP.DevelopmentFunctions
 				$this->log( 'Unexpected response when attempting to create a tag. Response: ' . print_r( $response, true ) . 'Tags: ' . print_r( $this->active_tags, true ) );
+
 				// phpcs:enable
 				return false;
 			}
@@ -417,7 +423,7 @@ public function get_tag_id( $tag, $create_missing_tag = false, $retry_on_error =
 	 * Add tags to an existing contact
 	 *
 	 * @param string $contact ID of the contact to add tags to
-	 * @param array  $tags    An array of tags to add
+	 * @param array  $tags An array of tags to add
 	 *
 	 * @return bool
 	 */
@@ -453,8 +459,8 @@ public function add_tags( $contact, $tags ) {
 	 *
 	 * @see https://developers.activecampaign.com/reference/overview
 	 *
-	 * @param string $path   Path to the API endpoint
-	 * @param array  $data   Data to include with the request
+	 * @param string $path Path to the API endpoint
+	 * @param array  $data Data to include with the request
 	 * @param string $method The HTTP method for this request
 	 *
 	 * @return \ActiveCampaign|false
@@ -497,11 +503,43 @@ public function request( $path, $data = [], $method = 'GET' ) {
 		return $response;
 	}
 
-
 	/**
-	 * @deprecated
+	 * Send a request to the ActiveCampaign API with pagination
 	 *
+	 * @see https://developers.activecampaign.com/reference/pagination
+	 *
+	 * @param string $path Path to the API endpoint
+	 * @param array  $data Data to include with the request
+	 * @param string $method The HTTP method for this request
+	 * @param int    $page The page to fetch.
+	 * @param array  $results Accumulated results for all the pages.
+	 *
+	 * @return array
+	 */
+	public function paginated_request( $path, $data = [], $method = 'GET', $page = 0, $results = [] ) {
+
+		// Set offset based on the $page and the api_pagination_limit
+		$data['limit']  = $this->get_api_pagination_limit();
+		$data['offset'] = $page * $this->get_api_pagination_limit();
+
+		// Get elements for the current page and add them to the results.
+		$request = $this->request( $path, $data, $method )->get_body();
+		$results = array_merge( $results, $request[ $path ] );
+
+		// If there are more elements left. Fetch again with the next page.
+		if ( $request['meta']['total'] > count( $results ) ) {
+			return $this->paginated_request( $path, $data, $method, ++$page, $results );
+		}
+
+		return [
+			$path  => $results,
+			'meta' => [ 'total' => $request['meta']['total'] ],
+		];
+	}
+
+	/**
 	 * @return void
+	 * @deprecated
 	 */
 	protected function get_sdk() {
 		wc_deprecated_function( __METHOD__, '6.1.0', 'request' );
@@ -518,4 +556,21 @@ public function clear_cache_data() {
 		Cache::delete_transient( 'ac_tags' );
 		Cache::delete_transient( 'ac_contact_fields' );
 	}
+
+
+	/**
+	 * Get the pagination limit.
+	 *
+	 * @return int
+	 */
+	public function get_api_pagination_limit() {
+
+		/**
+		 * Filter the pagination limit for Active Campaign REST API.
+		 *
+		 * @since 6.0.31
+		 * @filter automatewoo/integrations/active_campaign/pagination
+		 */
+		return apply_filters( 'automatewoo/integrations/active_campaign/pagination', 100 );
+	}
 }

languages/automatewoo.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the GPLv3.
 msgid ""
 msgstr ""
-"Project-Id-Version: AutomateWoo 6.0.30\n"
+"Project-Id-Version: AutomateWoo 6.0.31\n"
 "Report-Msgid-Bugs-To: https://woocommerce.com/my-account/contact-support/\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-24T17:39:46+00:00\n"
+"POT-Creation-Date: 2024-08-06T09:37:14+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: automatewoo\n"
@@ -3692,15 +3692,15 @@ msgstr ""
 msgid "There was an error when attempting to delete an association"
 msgstr ""
 
-#: includes/Integrations/ActiveCampaign.php:229
+#: includes/Integrations/ActiveCampaign.php:230
 msgid "Unexpected response when trying to retrieve all lists"
 msgstr ""
 
-#: includes/Integrations/ActiveCampaign.php:299
+#: includes/Integrations/ActiveCampaign.php:301
 msgid "Invalid email was supplied when checking if contact exists in ActiveCampaign"
 msgstr ""
 
-#: includes/Integrations/ActiveCampaign.php:336
+#: includes/Integrations/ActiveCampaign.php:339
 msgid "Unexpected response when trying to retrieve all custom fields"
 msgstr ""
 

vendor/composer/installed.php

@@ -1,19 +1,19 @@
 <?php return array(
     'root' => array(
         'name' => 'woocommerce/automatewoo',
-        'pretty_version' => 'dev-release/6.0.30',
-        'version' => 'dev-release/6.0.30',
-        'reference' => '53d89547a569c204123bd55e57e66c3bbec509ce',
+        'pretty_version' => 'dev-release/6.0.31',
+        'version' => 'dev-release/6.0.31',
+        'reference' => '3197bfafc261bf7a043c22c8c3028f560abfff12',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
         'dev' => false,
     ),
     'versions' => array(
         'woocommerce/automatewoo' => array(
-            'pretty_version' => 'dev-release/6.0.30',
-            'version' => 'dev-release/6.0.30',
-            'reference' => '53d89547a569c204123bd55e57e66c3bbec509ce',
+            'pretty_version' => 'dev-release/6.0.31',
+            'version' => 'dev-release/6.0.31',
+            'reference' => '3197bfafc261bf7a043c22c8c3028f560abfff12',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),