From 732b4634878b30a1607fc5ea50b25164e7d03cab Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 6 Mar 2025 15:28:20 +0100
Subject: [PATCH 01/44] Fixed: translation loaded too early in some
 configurations.

---
 src/Plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 2bbaa97e..865eb31a 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -20,7 +20,7 @@ public function register() {
 		add_action( 'plugins_loaded', [ $this, 'register_services' ], 9 );
 
 		// Load text domain.
-		add_action( 'init', [ $this, 'load_plugin_textdomain' ] );
+		add_action( 'init', [ $this, 'load_plugin_textdomain' ], 1000 );
 	}
 
 	/**

From 2861484f26d768cd44fb5508ac0f530f13bf2127 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 7 Mar 2025 11:45:48 +0100
Subject: [PATCH 02/44] Updated tested with tag.

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index adfe0a11..a111499a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: plausible, DaanvandenBergh
 Donate link: https://plausible.io/
 Tags: analytics, google analytics, web analytics, stats, privacy
 Requires at least: 5.9
-Tested up to: 6.6
+Tested up to: 6.7
 Requires PHP: 7.0
 Stable tag: 2.3.0
 License: Massachusetts Institute of Technology (MIT) license

From 9cfa9778ba580c344aab3b43a5675836a9714905 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 7 Mar 2025 11:47:11 +0100
Subject: [PATCH 03/44] Updated Tested Up To and Requires PHP tag.

---
 README.md  | 74 ++++++++++++++++++++++++++++++++++++------------------
 readme.txt |  2 +-
 2 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 5f7f40a0..3fa2171b 100644
--- a/README.md
+++ b/README.md
@@ -4,37 +4,45 @@
 
 [![Github CI](https://github.com/plausible/wordpress/actions/workflows/push.yml/badge.svg)](https://github.com/plausible/wordpress/actions/workflows/push.yml) ![WordPress version](https://img.shields.io/wordpress/plugin/v/plausible-analytics.svg) ![WordPress Rating](https://img.shields.io/wordpress/plugin/r/plausible-analytics.svg) ![WordPress Downloads](https://img.shields.io/wordpress/plugin/dt/plausible-analytics.svg)
 
-Welcome to the Plausible Analytics WordPress Plugin GitHub repository. This is the code source and the center of active development. Here you can
+Welcome to the Plausible Analytics WordPress Plugin GitHub repository. This is the code source and the center of active
+development. Here you can
 browse the source, look at open issues, and contribute to the project.
 
 ## Getting Started
 
 If you're looking to contribute or actively develop on Plausible Analytics then skip ahead to
-the [Local Development](https://github.com/plausible/wordpress/#local-development) section below. The following is if you're looking to actively use
+the [Local Development](https://github.com/plausible/wordpress/#local-development) section below. The following is if
+you're looking to actively use
 the plugin on your WordPress site.
 
 ### Minimum Requirements
 
-* WordPress 5.3 or greater
+* WordPress 5.9 or greater
 * PHP version 7.4 or greater
 * MySQL version 5.5 or greater
 
 ### Automatic installation
 
-Automatic installation is the easiest option as WordPress handles the file transfers itself, and you don't need to leave your web browser. To do an
-automatic installation of Plausible Analytics, log in to your WordPress dashboard, navigate to the Plugins menu and click "Add New".
+Automatic installation is the easiest option as WordPress handles the file transfers itself, and you don't need to leave
+your web browser. To do an
+automatic installation of Plausible Analytics, log in to your WordPress dashboard, navigate to the Plugins menu and
+click "Add New".
 
-In the search field type "Plausible Analytics" and click Search Plugins. Once you have found the plugin you can view details about it such as the
+In the search field type "Plausible Analytics" and click Search Plugins. Once you have found the plugin you can view
+details about it such as the
 point release, rating and description. Most importantly of course, you can install it by simply clicking "Install Now".
 
 ### Manual installation
 
-The manual installation method involves downloading our plugin and uploading it to your server via your favorite FTP application. The
-WordPress codex contains [instructions on how to do this](https://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).
+The manual installation method involves downloading our plugin and uploading it to your server via your favorite FTP
+application. The
+WordPress codex
+contains [instructions on how to do this](https://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).
 
 ### Support
 
-This repository is not suitable for support. Please don't use GitHub issues for support requests. To get support please use the following channels:
+This repository is not suitable for support. Please don't use GitHub issues for support requests. To get support please
+use the following channels:
 
 * [WP.org Support Forums](https://wordpress.org/support/plugin/plausible-analytics) - for all users
 
@@ -45,25 +53,33 @@ This repository is not suitable for support. Please don't use GitHub issues for
 - `plausible_analytics_settings`: Allows you to modify and/or force values for each of the plugin's settings.
 - `plausible_load_js_in_footer`: Allows you to load the JS code snippet in the footer.
 - `plausible_analytics_script_params`: Allows you to modify the `script` element, loading the Plausible JS library.
-  - Example: using this filter and the `file-types` attribute will allow you to track downloads of certain file types when File Downloads tracking is
+  - Example: using this filter and the `file-types` attribute will allow you to track downloads of certain file types
+    when File Downloads tracking is
     enabled.
-- `plausible_analytics_pageview_properties`: Allows you to add custom pageview properties when the Pageview Properties option is enabled under
-  Enhanced Measurements. For examples, read the [documentation on Pageview Properties](https://plausible.io/docs/custom-props/for-pageviews).
+- `plausible_analytics_pageview_properties`: Allows you to add custom pageview properties when the Pageview Properties
+  option is enabled under
+  Enhanced Measurements. For examples, read
+  the [documentation on Pageview Properties](https://plausible.io/docs/custom-props/for-pageviews).
 
 ### Actions
 
 - `plausible_analytics_settings_saved`: Trigger additional tasks directly after settings are saved.
-- `plausible_analytics_after_register_assets`: This action allows you to trigger additional tasks or add custom JS (e.g. events) to the tracking code.
+- `plausible_analytics_after_register_assets`: This action allows you to trigger additional tasks or add custom JS (e.g.
+  events) to the tracking code.
 
 ### Toggles
 
-Using constants, you can modify the behavior of the plugin. `wp-config.php` is the best place to define constants. If you're using a custom plugin,
+Using constants, you can modify the behavior of the plugin. `wp-config.php` is the best place to define constants. If
+you're using a custom plugin,
 make sure its code is loaded before this plugin.
 
-- `PLAUSIBLE_SELF_HOSTED_DOMAIN`: Especially useful for Multisite instances using the self-hosted version of Plausible, this constant allows you to
-  specify the Self-Hosted Domain for all subsites at once. **IMPORTANT**: this constant takes precedence over the plugin's setting. So, if this
+- `PLAUSIBLE_SELF_HOSTED_DOMAIN`: Especially useful for Multisite instances using the self-hosted version of Plausible,
+  this constant allows you to
+  specify the Self-Hosted Domain for all subsites at once. **IMPORTANT**: this constant takes precedence over the
+  plugin's setting. So, if this
   constant is defined, changing the setting won't have any effect.
-- `plausible_proxy`: Appending this `GET`-parameter will force enable the proxy on the page you\'re calling it. This will allow you to test your proxy
+- `plausible_proxy`: Appending this `GET`-parameter will force enable the proxy on the page you\'re calling it. This
+  will allow you to test your proxy
   in the frontend, before enabling the option.
 
 ## Local Development
@@ -83,7 +99,8 @@ That's it. You're now ready to start development.
 
 Plausible Analytics relies on several npm commands to get you started:
 
-* `npm run watch` - Live reloads JS and SASS files. Typically, you'll run this command before you start development. It's necessary to build the
+* `npm run watch` - Live reloads JS and SASS files. Typically, you'll run this command before you start development.
+  It's necessary to build the
   JS/CSS
   however if you're working strictly within PHP it may not be necessary to run.
 * `npm run dev` - Runs a one time build for development. No production files are created.
@@ -91,7 +108,8 @@ Plausible Analytics relies on several npm commands to get you started:
 
 ### Development Notes
 
-* Ensure that you have `SCRIPT_DEBUG` enabled within your wp-config.php file. Here's a good example of wp-config.php for debugging:
+* Ensure that you have `SCRIPT_DEBUG` enabled within your wp-config.php file. Here's a good example of wp-config.php for
+  debugging:
     ```
      // Enable WP_DEBUG mode
     define( 'WP_DEBUG', true );
@@ -103,21 +121,27 @@ Plausible Analytics relies on several npm commands to get you started:
     define( 'SCRIPT_DEBUG', true );
     ```
 * Commit the `package.lock` file. Read more about why [here](https://docs.npmjs.com/files/package-lock.json).
-* Your editor should recognize the `.eslintrc` and `.editorconfig` files within the Repo's root directory. Please only submit PRs following those
+* Your editor should recognize the `.eslintrc` and `.editorconfig` files within the Repo's root directory. Please only
+  submit PRs following those
   coding style rulesets.
 
 ### Regenerating the OpenAPI PHP Client
 
-This plugin uses a OpenAPI PHP Client which is autogenerated by the OpenAPI generator to reduce contract violations, etc. to a minimum. But, since
-this is a WordPress plugin, some manual modifications need to be done to make sure it doesn't conflict with other plugins:
+This plugin uses a OpenAPI PHP Client which is autogenerated by the OpenAPI generator to reduce contract violations,
+etc. to a minimum. But, since
+this is a WordPress plugin, some manual modifications need to be done to make sure it doesn't conflict with other
+plugins:
 
-- (Re)generate the PHP client using the following command (trigger it from the Plugin's root dir as output will be saved to `src/Client`):
+- (Re)generate the PHP client using the following command (trigger it from the Plugin's root dir as output will be saved
+  to `src/Client`):
   `openapi-generator-cli generate -i https://plausible.io/api/plugins/spec/openapi -g php -o src/Client --additional-properties=identifierNamingConvention=snake_case,invokerPackage="Plausible\\Analytics\\WP\\Client" --global-property=apis,models,supportingFiles,modelDocs=false,modelTests=false,apiDocs=false,apiTests=false`
 - (When regenerating the PHP client this step can be skipped) Navigate to the `src/Client` director and install Composer
   dependencies: `composer install --no-dev`
-- (When regenerating the PHP client this step can be skipped) Run `mozart compose` from the `src/Client` directory (Make sure Mozart is installed
+- (When regenerating the PHP client this step can be skipped) Run `mozart compose` from the `src/Client` directory (Make
+  sure Mozart is installed
   globally)
-- In the `src/Client/lib` directory, replace all occurrences of ` GuzzleHttp` (mind the space) with ` Plausible\Analytics\WP\Client\Lib\GuzzleHttp` (
+- In the `src/Client/lib` directory, replace all occurrences of ` GuzzleHttp` (mind the space) with
+  ` Plausible\Analytics\WP\Client\Lib\GuzzleHttp` (
   again, mind the space at the beginning)
 - In the same directory, replace all occurrences of ` \GuzzleHttp` (mind the space and backslash)
   with ` \Plausible\Analytics\WP\Client\Lib\GuzzleHttp`.
diff --git a/readme.txt b/readme.txt
index a111499a..3c02a3ae 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://plausible.io/
 Tags: analytics, google analytics, web analytics, stats, privacy
 Requires at least: 5.9
 Tested up to: 6.7
-Requires PHP: 7.0
+Requires PHP: 7.2
 Stable tag: 2.3.0
 License: Massachusetts Institute of Technology (MIT) license
 License URI: https://opensource.org/licenses/MIT

From a418ecccb694670e822859d60d9763096ca97538 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:19:02 +0100
Subject: [PATCH 04/44] Added: support for add to cart tracking through direct
 links.

---
 src/Integrations/WooCommerce.php | 47 ++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/Integrations/WooCommerce.php b/src/Integrations/WooCommerce.php
index eac2f576..2cae684a 100644
--- a/src/Integrations/WooCommerce.php
+++ b/src/Integrations/WooCommerce.php
@@ -69,8 +69,10 @@ private function init( $init ) {
 		 */
 		add_action( 'woocommerce_before_add_to_cart_quantity', [ $this, 'add_cart_form_hidden_input' ] );
 		add_action( 'woocommerce_after_add_to_cart_form', [ $this, 'track_add_to_cart_on_product_page' ] );
-		add_filter( 'woocommerce_store_api_validate_add_to_cart', [ $this, 'track_add_to_cart' ], 10, 2 );
-		add_filter( 'woocommerce_ajax_added_to_cart', [ $this, 'track_ajax_add_to_cart' ] );
+		add_action( 'woocommerce_store_api_validate_add_to_cart', [ $this, 'track_add_to_cart' ], 10, 2 );
+		add_action( 'woocommerce_ajax_added_to_cart', [ $this, 'track_ajax_add_to_cart' ] );
+		/** @see \WC_Form_Handler::add_to_cart_action() runs on priority 20. */
+		add_action( 'wp_loaded', [ $this, 'track_direct_add_to_cart' ], 21 );
 		add_action( 'woocommerce_remove_cart_item', [ $this, 'track_remove_cart_item' ], 10, 2 );
 		add_action( 'wp_head', [ $this, 'track_entered_checkout' ] );
 		add_action( 'woocommerce_thankyou', [ $this, 'track_purchase' ] );
@@ -173,22 +175,20 @@ public function track_add_to_cart_on_product_page() {
 	}
 
 	/**
-	 * Track (non-Interactivity API, i.e. AJAX) add to cart events.
-	 *
-	 * @param string|int $product_id ID of the product added to the cart.
+	 * Track add to cart actions by direct link, e.g. ?product_type=download&add-to-cart=1&quantity=1
 	 *
 	 * @return void
-	 *
-	 * @codeCoverageIgnore Because we can't test XHR requests here.
 	 */
-	public function track_ajax_add_to_cart( $product_id ) {
-		$product          = wc_get_product( $product_id );
-		$add_to_cart_data = [
-			'id'       => $product_id,
-			'quantity' => $_POST[ 'quantity' ] ?? 1,
-		];
+	public function track_direct_add_to_cart() {
+		if ( ! isset( $_REQUEST[ 'add-to-cart' ] ) || ! is_numeric( wp_unslash( $_REQUEST[ 'add-to-cart' ] ) ) ) {
+			return;
+		}
 
-		$this->track_add_to_cart( $product, $add_to_cart_data );
+		$product_id = absint( wp_unslash( $_REQUEST[ 'add-to-cart' ] ) );
+		$product    = wc_get_product( $product_id );
+		$quantity   = isset( $_REQUEST[ 'quantity' ] ) ? absint( wp_unslash( $_REQUEST[ 'quantity' ] ) ) : 1;
+
+		$this->track_add_to_cart( $product, [ 'id' => $product_id, 'quantity' => $quantity ] );
 	}
 
 	/**
@@ -241,6 +241,25 @@ private function clean_data( $product ) {
 		return $product;
 	}
 
+	/**
+	 * Track (non-Interactivity API, i.e. AJAX) add to cart events.
+	 *
+	 * @param string|int $product_id ID of the product added to the cart.
+	 *
+	 * @return void
+	 *
+	 * @codeCoverageIgnore Because we can't test XHR requests here.
+	 */
+	public function track_ajax_add_to_cart( $product_id ) {
+		$product          = wc_get_product( $product_id );
+		$add_to_cart_data = [
+			'id'       => $product_id,
+			'quantity' => $_POST[ 'quantity' ] ?? 1,
+		];
+
+		$this->track_add_to_cart( $product, $add_to_cart_data );
+	}
+
 	/**
 	 * Track Remove from cart events.
 	 *

From 44f3dea0a47790864a3d3a6b3e456e0c24bdc161 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:19:24 +0100
Subject: [PATCH 05/44] Improved: if $url isn't set, and no referer is found,
 attempt to fallback to REQUEST_URI.

---
 src/Proxy.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Proxy.php b/src/Proxy.php
index dd1c7dde..175f21dc 100644
--- a/src/Proxy.php
+++ b/src/Proxy.php
@@ -112,6 +112,16 @@ public function do_request( $name = 'pageview', $domain = '', $url = '', $props
 			'u' => $url ?: wp_get_referer(),
 		];
 
+		// URL is required, so if no $url was set and no referer was found, attempt to create it from the REQUEST_URI server variable.
+		if ( empty( $body[ 'u' ] ) ) {
+			$parts          = parse_url( $_SERVER[ 'REQUEST_URI' ] );
+			$home_url_parts = parse_url( get_home_url() );
+
+			if ( isset( $home_url_parts[ 'scheme' ] ) && isset( $home_url_parts[ 'host' ] ) && isset( $parts[ 'path' ] ) ) {
+				$body[ 'u' ] = $home_url_parts[ 'scheme' ] . '://' . $home_url_parts [ 'host' ] . $parts[ 'path' ];
+			}
+		}
+
 		// Revenue events use a different approach.
 		if ( isset( $props[ 'revenue' ] ) ) {
 			$body[ 'revenue' ] = reset( $props ); // @codeCoverageIgnore

From 6ceaf40b2d68eacf365b6288495a343d76e5d882 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 13:18:53 +0100
Subject: [PATCH 06/44] Minor re-factor to Cron label.

---
 src/Cron.php  |  7 +++++++
 src/Setup.php | 17 +++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Cron.php b/src/Cron.php
index 42120b90..8fb12269 100644
--- a/src/Cron.php
+++ b/src/Cron.php
@@ -13,6 +13,13 @@
 use Exception;
 
 class Cron {
+	/**
+	 * Cron job handle
+	 *
+	 * @var string
+	 */
+	const TASK_NAME = 'plausible_analytics_update_js';
+
 	/**
 	 * Build class
 	 *
diff --git a/src/Setup.php b/src/Setup.php
index 45122b18..dd1f293a 100644
--- a/src/Setup.php
+++ b/src/Setup.php
@@ -10,13 +10,6 @@
 namespace Plausible\Analytics\WP;
 
 class Setup {
-	/**
-	 * Cron job handle
-	 *
-	 * @var string
-	 */
-	private $cron = 'plausible_analytics_update_js';
-
 	/**
 	 * Filters and Hooks.
 	 *
@@ -28,7 +21,7 @@ public function __construct() {
 		register_deactivation_hook( PLAUSIBLE_ANALYTICS_PLUGIN_FILE, [ $this, 'deactivate_cron' ] );
 
 		// Attach the cron script to the cron action.
-		add_action( $this->cron, [ $this, 'load_cron_script' ] );
+		add_action( Cron::TASK_NAME, [ $this, 'load_cron_script' ] );
 
 		// This assures that the local file is downloaded/updated when settings are saved.
 		add_action( 'plausible_analytics_settings_saved', [ $this, 'load_cron_script' ] );
@@ -51,8 +44,8 @@ public function create_cache_dir() {
 	 * @codeCoverageIgnore
 	 */
 	public function activate_cron() {
-		if ( ! wp_next_scheduled( $this->cron ) ) {
-			wp_schedule_event( time(), 'daily', $this->cron );
+		if ( ! wp_next_scheduled( Cron::TASK_NAME ) ) {
+			wp_schedule_event( time(), 'daily', Cron::TASK_NAME );
 		}
 	}
 
@@ -62,8 +55,8 @@ public function activate_cron() {
 	 * @codeCoverageIgnore
 	 */
 	public function deactivate_cron() {
-		if ( wp_next_scheduled( $this->cron ) ) {
-			wp_clear_scheduled_hook( $this->cron );
+		if ( wp_next_scheduled( Cron::TASK_NAME ) ) {
+			wp_clear_scheduled_hook( Cron::TASK_NAME );
 		}
 	}
 

From 30e5769894c2757cbf852c7d427ae3639b2ad919 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 13:37:13 +0100
Subject: [PATCH 07/44] Fixed: cron is now registered properly upon plugin
 activation.

---
 src/Plugin.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 865eb31a..0d696488 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -16,6 +16,8 @@ final class Plugin {
 	 * @return void
 	 */
 	public function register() {
+		$this->setup();
+
 		// Register services used throughout the plugin. (WP Rocket runs at priority 10)
 		add_action( 'plugins_loaded', [ $this, 'register_services' ], 9 );
 
@@ -23,6 +25,10 @@ public function register() {
 		add_action( 'init', [ $this, 'load_plugin_textdomain' ], 1000 );
 	}
 
+	public function setup() {
+		new Setup();
+	}
+
 	/**
 	 * Registers the individual services of the plugin.
 	 *
@@ -47,7 +53,6 @@ public function register_services() {
 		new Compatibility();
 		new Filters();
 		new Proxy();
-		new Setup();
 	}
 
 	/**

From 18888d0d972606b2e2a73704171cc1493f7edb4a Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 13:50:47 +0100
Subject: [PATCH 08/44] PHPDoc.

---
 src/Plugin.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Plugin.php b/src/Plugin.php
index 0d696488..bcd28afd 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -25,6 +25,11 @@ public function register() {
 		add_action( 'init', [ $this, 'load_plugin_textdomain' ], 1000 );
 	}
 
+	/**
+	 * Register plugin (de)activation hooks and cron job.
+	 *
+	 * @return void
+	 */
 	public function setup() {
 		new Setup();
 	}

From 8eb13c92b5bbfba960d4ac7bf4e6e940e0c7c15a Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 14:26:11 +0100
Subject: [PATCH 09/44] Ignore this function, because we can't test XHR
 requests here.

---
 src/Integrations/WooCommerce.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Integrations/WooCommerce.php b/src/Integrations/WooCommerce.php
index 2cae684a..962983d6 100644
--- a/src/Integrations/WooCommerce.php
+++ b/src/Integrations/WooCommerce.php
@@ -178,6 +178,8 @@ public function track_add_to_cart_on_product_page() {
 	 * Track add to cart actions by direct link, e.g. ?product_type=download&add-to-cart=1&quantity=1
 	 *
 	 * @return void
+	 *
+	 * @codeCoverageIgnore Because we can't test XHR here.
 	 */
 	public function track_direct_add_to_cart() {
 		if ( ! isset( $_REQUEST[ 'add-to-cart' ] ) || ! is_numeric( wp_unslash( $_REQUEST[ 'add-to-cart' ] ) ) ) {

From 5701c27f62ba11970da8755f733c2edf5878e513 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 14:41:37 +0100
Subject: [PATCH 10/44] Added testGenerateEventUrl and refactored code for
 readability.

---
 src/Proxy.php                   | 24 ++++++++++++++++++------
 tests/integration/ProxyTest.php | 29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 tests/integration/ProxyTest.php

diff --git a/src/Proxy.php b/src/Proxy.php
index 175f21dc..1012cbde 100644
--- a/src/Proxy.php
+++ b/src/Proxy.php
@@ -114,12 +114,7 @@ public function do_request( $name = 'pageview', $domain = '', $url = '', $props
 
 		// URL is required, so if no $url was set and no referer was found, attempt to create it from the REQUEST_URI server variable.
 		if ( empty( $body[ 'u' ] ) ) {
-			$parts          = parse_url( $_SERVER[ 'REQUEST_URI' ] );
-			$home_url_parts = parse_url( get_home_url() );
-
-			if ( isset( $home_url_parts[ 'scheme' ] ) && isset( $home_url_parts[ 'host' ] ) && isset( $parts[ 'path' ] ) ) {
-				$body[ 'u' ] = $home_url_parts[ 'scheme' ] . '://' . $home_url_parts [ 'host' ] . $parts[ 'path' ];
-			}
+			$body[ 'u' ] = $this->generate_event_url(); // @codeCoverageIgnore
 		}
 
 		// Revenue events use a different approach.
@@ -134,6 +129,23 @@ public function do_request( $name = 'pageview', $domain = '', $url = '', $props
 		return $this->send_event( $request );
 	}
 
+	/**
+	 * Attempts to generate the Event URL from available resources.
+	 *
+	 * @return string
+	 */
+	public function generate_event_url() {
+		$url            = '';
+		$parts          = parse_url( $_SERVER[ 'REQUEST_URI' ] );
+		$home_url_parts = parse_url( get_home_url() );
+
+		if ( isset( $home_url_parts[ 'scheme' ] ) && isset( $home_url_parts[ 'host' ] ) && isset( $parts[ 'path' ] ) ) {
+			$url = $home_url_parts[ 'scheme' ] . '://' . $home_url_parts [ 'host' ] . $parts[ 'path' ];
+		}
+
+		return $url;
+	}
+
 	/**
 	 * Formats and sends $request to the Plausible API.
 	 *
diff --git a/tests/integration/ProxyTest.php b/tests/integration/ProxyTest.php
new file mode 100644
index 00000000..b955368b
--- /dev/null
+++ b/tests/integration/ProxyTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package Plausible Analytics Unit Tests - ClientFactory
+ */
+
+namespace Plausible\Analytics\Tests\Integration;
+
+use Plausible\Analytics\Tests\TestCase;
+use Plausible\Analytics\WP\Proxy;
+
+class ProxyTest extends TestCase {
+	/**
+	 * @see Proxy::generate_event_url()
+	 * @return void
+	 */
+	public function testGenerateEventUrl() {
+		$proxy = new Proxy( false );
+
+		$url = $proxy->generate_event_url();
+
+		$this->assertEquals( 'http://example.org', $url );
+
+		$_SERVER[ 'REQUEST_URI' ] = '/test';
+
+		$url = $proxy->generate_event_url();
+
+		$this->assertEquals( 'http://example.org/test', $url );
+	}
+}

From 1b86992071f0bffee45ffd661d0bd010d36f19c1 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 14:43:07 +0100
Subject: [PATCH 11/44] Moved ClientFactoryTest to Integration tests and
 removed Unit tests dir.

---
 tests/{unit => integration}/ClientFactoryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/{unit => integration}/ClientFactoryTest.php (92%)

diff --git a/tests/unit/ClientFactoryTest.php b/tests/integration/ClientFactoryTest.php
similarity index 92%
rename from tests/unit/ClientFactoryTest.php
rename to tests/integration/ClientFactoryTest.php
index 74486046..01413679 100644
--- a/tests/unit/ClientFactoryTest.php
+++ b/tests/integration/ClientFactoryTest.php
@@ -3,7 +3,7 @@
  * @package Plausible Analytics Unit Tests - ClientFactory
  */
 
-namespace Plausible\Analytics\Tests\Unit;
+namespace Plausible\Analytics\Tests\Integration;
 
 use Plausible\Analytics\Tests\TestCase;
 use Plausible\Analytics\WP\Client;

From 56e7b495a55c3554296c064eb0569480345e60d3 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 15:44:21 +0100
Subject: [PATCH 12/44] Improved: added Gravity Forms compatibility for Form
 Completions.

---
 src/Integrations/FormSubmit.php | 52 ++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/Integrations/FormSubmit.php b/src/Integrations/FormSubmit.php
index b74d0561..89a9a99a 100644
--- a/src/Integrations/FormSubmit.php
+++ b/src/Integrations/FormSubmit.php
@@ -33,6 +33,10 @@ private function init() {
 		 * Contact Form 7 doesn't respect JS checkValidity() function, so this is a custom compatibility fix.
 		 */
 		add_filter( 'wpcf7_validate', [ $this, 'maybe_track_submission' ], 10, 2 );
+		/**
+		 * Gravity Forms contains its own form submission handler, so this is a custom compatibility fix.
+		 */
+		add_action( 'gform_after_submission', [ $this, 'track_gravity_forms_submission' ], 10 );
 	}
 
 	/**
@@ -60,10 +64,13 @@ public function add_js() {
 	/**
 	 * Tracks the form submission if CF7 says it's valid.
 	 *
+	 * @filter             wpcf7_validate
+	 *
 	 * @param \WPCF7_Validation $result Form submission result object containing validation results.
 	 * @param array             $tags   Array of tags associated with the form fields.
 	 *
 	 * @return \WPCF7_Validation
+	 *
 	 * @codeCoverageIgnore because we can't test XHR requests here.
 	 */
 	public function maybe_track_submission( $result, $tags ) {
@@ -73,15 +80,46 @@ public function maybe_track_submission( $result, $tags ) {
 			$post = get_post( $_POST[ '_wpcf7_container_post' ] );
 			$uri  = '/' . $post->post_name . '/';
 
-			$proxy = new Proxy( false );
-			$proxy->do_request(
-				__( 'WP Form Completions', 'plausible-analytics' ),
-				null,
-				null,
-				[ 'path' => $uri ]
-			);
+			$this->track_submission( $uri );
 		}
 
 		return $result;
 	}
+
+	/**
+	 * Track submission using the Proxy.
+	 *
+	 * @param $uri
+	 *
+	 * @return void
+	 */
+	private function track_submission( $uri ) {
+		$proxy = new Proxy( false );
+		$proxy->do_request(
+			__( 'WP Form Completions', 'plausible-analytics' ),
+			null,
+			null,
+			[ 'path' => $uri ]
+		);
+	}
+
+	/**
+	 * Compatibility fix for Gravity Forms.
+	 *
+	 * @action gform_after_submission
+	 *
+	 * @param $form
+	 * @param $entry
+	 *
+	 * @return void
+	 */
+	public function track_gravity_forms_submission( $form ) {
+		$uri = str_replace( home_url(), '', $form[ 'source_url' ] ) ?? '';
+
+		if ( empty( $uri ) ) {
+			return;
+		}
+
+		$this->track_submission( $uri );
+	}
 }

From 8a8d705164554b86c5128dfe9209b91045098866 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 15:46:29 +0100
Subject: [PATCH 13/44] Ignore code.

---
 src/Integrations/FormSubmit.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Integrations/FormSubmit.php b/src/Integrations/FormSubmit.php
index 89a9a99a..1bc8d821 100644
--- a/src/Integrations/FormSubmit.php
+++ b/src/Integrations/FormSubmit.php
@@ -13,6 +13,7 @@
 class FormSubmit {
 	/**
 	 * Build class.
+	 *
 	 * @codeCoverageIgnore
 	 */
 	public function __construct() {
@@ -21,7 +22,9 @@ public function __construct() {
 
 	/**
 	 * Init
+	 *
 	 * @return void
+	 *
 	 * @codeCoverageIgnore
 	 */
 	private function init() {
@@ -42,6 +45,7 @@ private function init() {
 	/**
 	 * Enqueues the required JavaScript for form submissions integration.
 	 * @return void
+	 *
 	 * @codeCoverageIgnore because there's nothing to test here.
 	 */
 	public function add_js() {
@@ -92,9 +96,12 @@ public function maybe_track_submission( $result, $tags ) {
 	 * @param $uri
 	 *
 	 * @return void
+	 *
+	 * @codeCoverageIgnore because we can't test XHR requests here.
 	 */
 	private function track_submission( $uri ) {
 		$proxy = new Proxy( false );
+
 		$proxy->do_request(
 			__( 'WP Form Completions', 'plausible-analytics' ),
 			null,
@@ -106,12 +113,14 @@ private function track_submission( $uri ) {
 	/**
 	 * Compatibility fix for Gravity Forms.
 	 *
-	 * @action gform_after_submission
+	 * @action             gform_after_submission
 	 *
 	 * @param $form
 	 * @param $entry
 	 *
 	 * @return void
+	 *
+	 * @codeCoverageIgnore because we can't test XHR requests here.
 	 */
 	public function track_gravity_forms_submission( $form ) {
 		$uri = str_replace( home_url(), '', $form[ 'source_url' ] ) ?? '';

From 64d505e8f7b2c0579634e90791bd4dec3f956b38 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:39:54 +0100
Subject: [PATCH 14/44] Added: upgrade script for 2.3.1 and tests.

---
 src/Admin/Upgrades.php                   | 18 ++++++++++++++++++
 tests/integration/Admin/UpgradesTest.php | 12 ++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/Admin/Upgrades.php b/src/Admin/Upgrades.php
index 5639cf76..6df274f5 100644
--- a/src/Admin/Upgrades.php
+++ b/src/Admin/Upgrades.php
@@ -13,6 +13,7 @@
 use Plausible\Analytics\WP\Admin\Provisioning\Integrations;
 use Plausible\Analytics\WP\Client;
 use Plausible\Analytics\WP\Helpers;
+use Plausible\Analytics\WP\Setup;
 
 /**
  * Class Upgrades
@@ -83,6 +84,10 @@ public function run() {
 			$this->upgrade_to_230();
 		}
 
+		if ( version_compare( $plausible_analytics_version, '2.3.1', '<' ) ) {
+			$this->upgrade_to_231();
+		}
+
 		// Add required upgrade routines for future versions here.
 	}
 
@@ -304,4 +309,17 @@ public function upgrade_to_230() {
 
 		update_option( 'plausible_analytics_version', '2.3.0' );
 	}
+
+	/**
+	 * Make sure the cron event is scheduled. If it's already scheduled or the Proxy isn't enabled, it'll bail.
+	 *
+	 * @return void
+	 */
+	public function upgrade_to_231() {
+		$setup = new Setup();
+
+		$setup->activate_cron();
+
+		update_option( 'plausible_analytics_version', '2.3.1' );
+	}
 }
diff --git a/tests/integration/Admin/UpgradesTest.php b/tests/integration/Admin/UpgradesTest.php
index 183cee27..4227c976 100644
--- a/tests/integration/Admin/UpgradesTest.php
+++ b/tests/integration/Admin/UpgradesTest.php
@@ -7,6 +7,7 @@
 
 use Plausible\Analytics\Tests\TestCase;
 use Plausible\Analytics\WP\Admin\Upgrades;
+use Plausible\Analytics\WP\Cron;
 use Plausible\Analytics\WP\Helpers;
 
 class UpgradesTest extends TestCase {
@@ -27,4 +28,15 @@ public function testUpgradeTo210() {
 
 		$this->assertIsArray( $enhanced_measurements );
 	}
+
+	/**
+	 * @see Upgrades::upgrade_to_231()
+	 * @return void
+	 */
+	public function testUpgradeTo231() {
+		$class = new Upgrades();
+		$class->upgrade_to_231();
+
+		$this->assertNotEmpty( wp_next_scheduled( Cron::TASK_NAME ) );
+	}
 }

From e1b25a1a45874a84e354fd89ef203a4553c747ab Mon Sep 17 00:00:00 2001
From: Marko Saric <34340819+metmarkosaric@users.noreply.github.com>
Date: Fri, 14 Mar 2025 10:23:07 +0100
Subject: [PATCH 15/44] Update readme.txt

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 3c02a3ae..781e602e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -29,7 +29,7 @@ We're completely independent, self-funded, bootstrapped and debt-free. We're not
 
 Google Analytics is frustrating to use, difficult to understand, slow to load and privacy-invasive. That's why we built Plausible Analytics, a simple but powerful, lightweight, open source and privacy-friendly alternative. 
 
-Here's what makes Plausible a great Google Analytics alternative and why over 14,000 paying subscribers trust us with their website and business insights:
+Here's what makes Plausible a great Google Analytics alternative and why over 15,000 paying subscribers trust us with their website and business insights:
 
 ### Smooth transition from Google Analytics
 
@@ -49,7 +49,7 @@ Plausible is privacy-friendly analytics. All the site measurement is carried out
 
 ### Track events and marketing campaigns
 
-Plausible is useful. Segment your audience by any metric you click on. Answer the important questions about your visitors, content and referral sources. Analyze paid campaigns using UTM parameters. Track site search terms, outbound link clicks, file downloads, form completions, 404 error pages, post authors, post categories and custom taxonomies without manually configuring anything or writing any code.
+Plausible is useful. Segment your audience by any metric you click on. Answer the important questions about your visitors, content and referral sources. Analyze paid campaigns using UTM parameters. Track scroll depth, site search terms, outbound link clicks, file downloads, form completions, 404 error pages, post authors, post categories and custom taxonomies without manually configuring anything or writing any code.
 
 ### Built-in WooCommerce and Easy Digital Downloads analytics
 

From 4adfa527936b012a6f167b2c39b2fbe56818ddb4 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:26:45 +0100
Subject: [PATCH 16/44] Fixed: run track_direct_add_to_cart before WC's add to
 cart action in case it triggers a redirect.

---
 src/Integrations/WooCommerce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Integrations/WooCommerce.php b/src/Integrations/WooCommerce.php
index 962983d6..9eec455b 100644
--- a/src/Integrations/WooCommerce.php
+++ b/src/Integrations/WooCommerce.php
@@ -71,8 +71,8 @@ private function init( $init ) {
 		add_action( 'woocommerce_after_add_to_cart_form', [ $this, 'track_add_to_cart_on_product_page' ] );
 		add_action( 'woocommerce_store_api_validate_add_to_cart', [ $this, 'track_add_to_cart' ], 10, 2 );
 		add_action( 'woocommerce_ajax_added_to_cart', [ $this, 'track_ajax_add_to_cart' ] );
-		/** @see \WC_Form_Handler::add_to_cart_action() runs on priority 20. */
-		add_action( 'wp_loaded', [ $this, 'track_direct_add_to_cart' ], 21 );
+		/** @see \WC_Form_Handler::add_to_cart_action() runs on priority 20. We need to run before that, in case redirect is enabled. */
+		add_action( 'wp_loaded', [ $this, 'track_direct_add_to_cart' ], 19 );
 		add_action( 'woocommerce_remove_cart_item', [ $this, 'track_remove_cart_item' ], 10, 2 );
 		add_action( 'wp_head', [ $this, 'track_entered_checkout' ] );
 		add_action( 'woocommerce_thankyou', [ $this, 'track_purchase' ] );

From ca23f2f76b341afa06e4a8a6473f6ce9894e1a05 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:36:56 +0100
Subject: [PATCH 17/44] Only change JS ID if IE compatibility is enabled.

---
 src/Filters.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Filters.php b/src/Filters.php
index 8255123e..ac79eb29 100644
--- a/src/Filters.php
+++ b/src/Filters.php
@@ -51,8 +51,11 @@ public function add_plausible_attributes( $tag, $handle ) {
 		$api_url     = Helpers::get_data_api_url();
 		$domain_name = Helpers::get_domain();
 
-		// We need the correct id attribute for IE compatibility.
-		$tag = preg_replace( "/\sid=(['\"])plausible-analytics-js(['\"])/", " id=$1plausible$2", $tag );
+		if ( Helpers::is_enhanced_measurement_enabled( 'compat' ) ) {
+			// We need the correct id attribute for IE compatibility.
+			$tag = preg_replace( "/\sid=(['\"])plausible-analytics-js(['\"])/", " id=$1plausible$2", $tag );
+		}
+
 		/**
 		 * the data-cfasync ensures this script isn't processed by CF Rocket Loader @see https://developers.cloudflare.com/speed/optimization/content/rocket-loader/ignore-javascripts/
 		 */

From 08f583a2876a43177ccbee3bd45a08ac76f89fc7 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:46:24 +0100
Subject: [PATCH 18/44] Updated FiltersTest

---
 tests/TestCase.php                | 13 +++++++++++++
 tests/integration/FiltersTest.php |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 084027d1..83cf3c26 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -36,6 +36,19 @@ public function enableRevenue( $settings ) {
 		return $settings;
 	}
 
+	/**
+	 * Enable Enhanced Measurements > IE Compatibility
+	 *
+	 * @param $settings
+	 *
+	 * @return mixed
+	 */
+	public function enableCompat( $settings ) {
+		$settings[ 'enhanced_measurements' ] = [ 'compat' ];
+
+		return $settings;
+	}
+
 	/**
 	 * Enable form completions by modifying the settings array.
 	 *
diff --git a/tests/integration/FiltersTest.php b/tests/integration/FiltersTest.php
index ac99f5c4..e448126b 100644
--- a/tests/integration/FiltersTest.php
+++ b/tests/integration/FiltersTest.php
@@ -18,6 +18,15 @@ public function testAddPlausibleAttributes() {
 
 		$this->assertStringContainsString( 'example.org', $tag );
 		$this->assertStringContainsString( 'plausible.io/api/event', $tag );
+		$this->assertStringContainsString( 'plausible-analytics-js', $tag );
+
+		add_filter( 'plausible_analytics_settings', [ $this, 'enableCompat' ] );
+
+		$class = new Filters();
+		$tag   = $class->add_plausible_attributes( '<script id="plausible-analytics-js" src="test.js">', 'plausible-analytics' );
+
+		remove_filter( 'plausible_analytics_settings', [ $this, 'enableCompat' ] );
+
 		$this->assertStringNotContainsString( 'plausible-analytics-js', $tag );
 	}
 }

From c4e0839fba0abf26e21fcb6cf868290e1a88baf7 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:29:25 +0100
Subject: [PATCH 19/44] Removed unused code.

---
 src/Admin/Provisioning.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Admin/Provisioning.php b/src/Admin/Provisioning.php
index f988d40f..6b522c32 100644
--- a/src/Admin/Provisioning.php
+++ b/src/Admin/Provisioning.php
@@ -16,7 +16,6 @@
 use Plausible\Analytics\WP\ClientFactory;
 use Plausible\Analytics\WP\Helpers;
 use Plausible\Analytics\WP\Integrations;
-use Plausible\Analytics\WP\Integrations\WooCommerce;
 
 class Provisioning {
 	const CUSTOM_PROPERTIES = [

From e8c614f3aef9d9534057c24190a162da39fe7186 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:34:57 +0100
Subject: [PATCH 20/44] Improved: Enhanced Measurements of which the required
 capabilities are not in the plan are now disabled.

---
 src/Admin/Settings/Page.php | 107 +++++++++++++++++++++---------------
 src/Ajax.php                |  35 ++++++++++++
 src/Client.php              |   2 +-
 3 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/src/Admin/Settings/Page.php b/src/Admin/Settings/Page.php
index 742e570c..2914191e 100644
--- a/src/Admin/Settings/Page.php
+++ b/src/Admin/Settings/Page.php
@@ -54,6 +54,14 @@ class Page extends API {
 		'hook_type' => 'success',
 	];
 
+	const CAP_GOALS                                 = 'goals';
+
+	const CAP_PROPS                                 = 'props';
+
+	const CAP_FUNNELS                               = 'funnels';
+
+	const CAP_REVENUE                               = 'revenue';
+
 	/**
 	 * @var array|array[] $fields
 	 */
@@ -117,15 +125,11 @@ public function __construct() {
 							'value' => $settings[ 'api_token' ],
 						],
 						[
-							'label'    => empty( $settings[ 'domain_name' ] ) || empty( $settings[ 'api_token' ] ) ?
-								esc_html__( 'Connect', 'plausible-analytics' ) :
+							'label'    => empty( $settings[ 'domain_name' ] ) || empty( $settings[ 'api_token' ] ) ? esc_html__( 'Connect', 'plausible-analytics' ) :
 								esc_html__( 'Connected', 'plausible-analytics' ),
 							'slug'     => 'connect_plausible_analytics',
 							'type'     => 'button',
-							'disabled' => empty( $settings[ 'domain_name' ] ) ||
-								empty( $settings[ 'api_token' ] ) ||
-								! $this->client instanceof Client ||
-								$this->client->is_api_token_valid(),
+							'disabled' => empty( $settings[ 'domain_name' ] ) || empty( $settings[ 'api_token' ] ) || ! $this->client instanceof Client || $this->client->is_api_token_valid(),
 						],
 					],
 				],
@@ -145,6 +149,7 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => '404',
+							'caps'  => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
 						],
 						'outbound-links'   => [
 							'label' => esc_html__( 'Outbound links', 'plausible-analytics' ),
@@ -152,27 +157,31 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => 'outbound-links',
+							'caps'  => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
 						],
 						'file-downloads'   => [
-							'label' => esc_html__( 'File downloads', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-file-downloads',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => 'file-downloads',
+							'label'    => esc_html__( 'File downloads', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-file-downloads',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => 'file-downloads',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
 						],
 						'search'           => [
-							'label' => esc_html__( 'Search queries', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-enable-site-search-tracking',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => 'search',
+							'label'    => esc_html__( 'Search queries', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-enable-site-search-tracking',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => 'search',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
 						],
 						'tagged-events'    => [
-							'label' => esc_html__( 'Custom events', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-setup-custom-events-to-track-goal-conversions',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => 'tagged-events',
+							'label'    => esc_html__( 'Custom events', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-setup-custom-events-to-track-goal-conversions',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => 'tagged-events',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
 						],
 						'revenue'          => [
 							'label'    => esc_html__( 'Ecommerce revenue', 'plausible-analytics' ),
@@ -180,21 +189,23 @@ public function __construct() {
 							'slug'     => 'enhanced_measurements',
 							'type'     => 'checkbox',
 							'value'    => 'revenue',
-							'disabled' => ! empty( $settings[ 'self_hosted_domain' ] ),
+							'disabled' => ! empty( $settings[ 'self_hosted_domain' ] ) || ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_FUNNELS, self::CAP_PROPS, self::CAP_REVENUE ] ),
 						],
 						'pageview-props'   => [
-							'label' => esc_html__( 'Authors and categories', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-send-custom-properties',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => 'pageview-props',
+							'label'    => esc_html__( 'Authors and categories', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-send-custom-properties',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => 'pageview-props',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_PROPS ] ),
 						],
 						'form-completions' => [
-							'label' => esc_html__( 'Form completions', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-form-completions',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => 'form-completions',
+							'label'    => esc_html__( 'Form completions', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-form-completions',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => 'form-completions',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
 						],
 						'hash'             => [
 							'label' => esc_html__( 'Hash-based routing', 'plausible-analytics' ),
@@ -227,8 +238,7 @@ public function __construct() {
 						get_site_url( null, rest_get_url_prefix() ),
 						empty(
 						Helpers::get_settings()[ 'proxy_enabled' ]
-						) ? 'a random directory/file for storing the JS file' :
-							'a JS file, called <code>' . str_replace(
+						) ? 'a random directory/file for storing the JS file' : 'a JS file, called <code>' . str_replace(
 								ABSPATH,
 								'',
 								Helpers::get_proxy_resource( 'cache_dir' ) . Helpers::get_proxy_resource(
@@ -263,8 +273,7 @@ public function __construct() {
 							'slug'     => 'enable_analytics_dashboard',
 							'type'     => 'checkbox',
 							'value'    => 'on',
-							'disabled' => empty( Helpers::get_settings()[ 'api_token' ] ) &&
-								empty( Helpers::get_settings()[ 'self_hosted_domain' ] ),
+							'disabled' => empty( Helpers::get_settings()[ 'api_token' ] ) && empty( Helpers::get_settings()[ 'self_hosted_domain' ] ),
 						],
 					],
 				],
@@ -367,8 +376,7 @@ public function __construct() {
 							'label'       => esc_html__( 'Domain name', 'plausible-analytics' ),
 							'slug'        => 'self_hosted_domain',
 							'type'        => 'text',
-							'value'       => defined( 'PLAUSIBLE_SELF_HOSTED_DOMAIN' ) ? PLAUSIBLE_SELF_HOSTED_DOMAIN :
-								$settings[ 'self_hosted_domain' ],
+							'value'       => defined( 'PLAUSIBLE_SELF_HOSTED_DOMAIN' ) ? PLAUSIBLE_SELF_HOSTED_DOMAIN : $settings[ 'self_hosted_domain' ],
 							'placeholder' => 'e.g. ' . Helpers::get_domain(),
 							'disabled'    => Helpers::proxy_enabled(),
 						],
@@ -478,6 +486,22 @@ private function init() {
 		new Hooks();
 	}
 
+	private function token_has_cap( $caps ) {
+		static $stored_caps = [];
+
+		if ( empty( $stored_caps ) ) {
+			$stored_caps = get_option( 'plausible_analytics_api_token_caps', [] );
+		}
+
+		foreach ( $caps as $cap ) {
+			if ( empty( $stored_caps[ $cap ] ) ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * Load all available user roles as a list (sorted alphabetically) of checkboxes to be processed by the Settings
 	 * API.
@@ -552,8 +576,7 @@ public function register_menu() {
 		/**
 		 * Don't show the Analytics dashboard, if View Stats is disabled.
 		 */
-		if ( ! empty( $settings[ 'enable_analytics_dashboard' ] ) ||
-			( ! empty( $settings[ 'self_hosted_domain' ] ) && ! empty( $settings[ 'self_hosted_shared_link' ] ) ) ) {
+		if ( ! empty( $settings[ 'enable_analytics_dashboard' ] ) || ( ! empty( $settings[ 'self_hosted_domain' ] ) && ! empty( $settings[ 'self_hosted_shared_link' ] ) ) ) {
 			// Setup `Analytics` page under Dashboard.
 			add_dashboard_page(
 				esc_html__( 'Analytics', 'plausible-analytics' ),
@@ -649,9 +672,7 @@ public function render_analytics_dashboard() {
 		 * For regular users, the shared link is provisioned by the API, so it shouldn't be empty.
 		 * @since v2.0.3
 		 */
-		if ( ( ! $self_hosted && ! empty( $analytics_enabled ) && ! empty( $shared_link ) ) ||
-			( $self_hosted && ! empty( $shared_link ) ) ||
-			strpos( $shared_link, 'XXXXXX' ) !== false ) {
+		if ( ( ! $self_hosted && ! empty( $analytics_enabled ) && ! empty( $shared_link ) ) || ( $self_hosted && ! empty( $shared_link ) ) || strpos( $shared_link, 'XXXXXX' ) !== false ) {
 			$page_url = isset( $_GET[ 'page-url' ] ) ? esc_url( $_GET[ 'page-url' ] ) : '';
 
 			// Append individual page URL if it exists.
diff --git a/src/Ajax.php b/src/Ajax.php
index dc41a717..bb9c68a9 100644
--- a/src/Ajax.php
+++ b/src/Ajax.php
@@ -290,6 +290,7 @@ public function save_options() {
 			// Validate Plugin Token, if this is the Plugin Token field.
 			if ( $option->name === 'api_token' ) {
 				$this->validate_api_token( $option->value );
+				$this->store_capabilities( $option->value );
 
 				$additional = $this->maybe_render_additional_message( $option->name, $option->value );
 
@@ -334,4 +335,38 @@ private function validate_api_token( $token = '' ) {
 			wp_send_json_error( 'invalid_api_token', 400 );
 		}
 	}
+
+	/**
+	 * Stores the capabilities for the currently entered API token in the DB for later use.
+	 *
+	 * @param $token
+	 *
+	 * @return void
+	 */
+	private function store_capabilities( $token = '' ) {
+		$client_factory = new ClientFactory( $token );
+		/** @var Client $client */
+		$client = $client_factory->build();
+
+		if ( ! $client instanceof Client ) {
+			return;
+		}
+
+		/** @var Client\Model\CapabilitiesFeatures $features */
+		$features = $client->get_features();
+
+		if ( ! $features ) {
+			return;
+		}
+
+		$caps = [
+			'funnels' => $features->getFunnels(),
+			'goals'   => $features->getGoals(),
+			'props'   => $features->getProps(),
+			'revenue' => $features->getRevenueGoals(),
+			'stats'   => $features->getStatsApi(),
+		];
+
+		update_option( 'plausible_analytics_api_token_caps', $caps );
+	}
 }
diff --git a/src/Client.php b/src/Client.php
index b9f7e26e..a972d028 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -87,7 +87,7 @@ public function is_api_token_valid() {
 	 *
 	 * @return false|Client\Model\CapabilitiesFeatures
 	 */
-	private function get_features() {
+	public function get_features() {
 		$capabilities = $this->get_capabilities();
 
 		if ( $capabilities instanceof Capabilities ) {

From f13c0880d731ed6c398a55ec2e030099fef2e083 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 15:45:52 +0100
Subject: [PATCH 21/44] Improved: capabilities are refreshed when clicking
 "Connect" and options are refreshed accordingly.

---
 assets/src/js/admin/main.js     |  41 ++++++-
 assets/src/js/admin/main.min.js |   2 +-
 src/Admin/Settings/API.php      | 183 ++++++++++++++++----------------
 src/Admin/Settings/Page.php     |  34 +++---
 src/Ajax.php                    |  16 ++-
 5 files changed, 163 insertions(+), 113 deletions(-)

diff --git a/assets/src/js/admin/main.js b/assets/src/js/admin/main.js
index 0b830f90..ab5fc65e 100644
--- a/assets/src/js/admin/main.js
+++ b/assets/src/js/admin/main.js
@@ -109,11 +109,13 @@ document.addEventListener('DOMContentLoaded', () => {
 				// Toggle: off
 				button.classList.replace('bg-indigo-600', 'bg-gray-200');
 				toggle.classList.replace('translate-x-5', 'translate-x-0');
+				button.dataset.status = 'off';
 				toggleStatus = '';
 			} else {
 				// Toggle: on
 				button.classList.replace('bg-gray-200', 'bg-indigo-600');
 				toggle.classList.replace('translate-x-0', 'translate-x-5');
+				button.dataset.status = 'on';
 				toggleStatus = 'on';
 			}
 
@@ -134,7 +136,7 @@ document.addEventListener('DOMContentLoaded', () => {
 		 *
 		 * @param e
 		 */
-		saveOption: function (e) {
+		saveOption: async function (e) {
 			const button = e.target;
 			const section = button.closest('.plausible-analytics-section');
 			const inputs = section.querySelectorAll('input, textarea');
@@ -157,7 +159,42 @@ document.addEventListener('DOMContentLoaded', () => {
 
 			button.setAttribute('disabled', 'disabled');
 
-			plausible.ajax(form, button);
+			let data = await plausible.ajax(form, button);
+
+			if (data.capabilities === undefined) {
+				return;
+			}
+
+			plausible.maybeDisableOptions(data.capabilities);
+		},
+
+		/**
+		 * Disable options based on the capabilities retrieved from the API.
+		 *
+		 * @param capabilities
+		 */
+		maybeDisableOptions: function (capabilities) {
+			let options = document.querySelectorAll('button[data-caps]');
+
+			options.forEach(function (option) {
+				let caps = option.dataset.caps.split(',');
+				let disabled = false;
+				option.removeAttribute('disabled');
+
+				caps.forEach(function (cap) {
+					if (capabilities[cap] === false) {
+						disabled = true;
+					}
+				});
+
+				if (disabled === true) {
+					option.setAttribute('disabled', 'disabled');
+					// Trigger a click to make sure the option is disabled.
+					if (option.dataset.status === 'on') {
+						option.dispatchEvent(new Event('click', {bubbles: true}));
+					}
+				}
+			});
 		},
 
 		/**
diff --git a/assets/src/js/admin/main.min.js b/assets/src/js/admin/main.min.js
index b9929c61..fa779f31 100644
--- a/assets/src/js/admin/main.min.js
+++ b/assets/src/js/admin/main.min.js
@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",()=>{if(!document.location.href.includes("plausible_analytics")){return}let plausible={nonceElem:document.getElementById("_wpnonce"),nonce:"",showWizardElem:document.getElementById("show_wizard"),domainNameElem:document.getElementById("domain_name"),apiTokenElem:document.getElementById("api_token"),createAPITokenElems:document.getElementsByClassName("plausible-create-api-token"),buttonElems:document.getElementsByClassName("plausible-analytics-button"),stepElems:document.getElementsByClassName("plausible-analytics-wizard-next-step"),init:function(){if(document.location.hash===""&&document.getElementById("plausible-analytics-wizard")!==null){document.location.hash="#welcome_slide"}if(this.nonceElem!==null){this.nonce=this.nonceElem.value}this.toggleWizardStep();window.addEventListener("hashchange",this.toggleWizardStep);if(this.showWizardElem!==null){this.showWizardElem.addEventListener("click",this.showWizard)}if(this.domainNameElem!==null){this.domainNameElem.addEventListener("keyup",this.disableConnectButton)}if(this.apiTokenElem!==null){this.apiTokenElem.addEventListener("keyup",this.disableConnectButton)}if(this.createAPITokenElems.length>0){for(let i=0;i<this.createAPITokenElems.length;i++){this.createAPITokenElems[i].addEventListener("click",this.createAPIToken)}}if(this.buttonElems.length>0){for(let i=0;i<this.buttonElems.length;i++){this.buttonElems[i].addEventListener("click",this.saveOption)}}document.addEventListener("click",this.toggleOption);if(this.stepElems.length>0){for(let i=0;i<this.stepElems.length;i++){this.stepElems[i].addEventListener("click",this.saveOptionOnNext)}}this.showMessages()},toggleOption:function(e){if(e.target.classList===null||!e.target.classList.contains("plausible-analytics-toggle")){return}const button=e.target.closest("button");let toggle;if(e.target.type==="submit"){toggle=button.querySelector("span")}else{toggle=e.target.closest("span")}let toggleStatus;if(button.classList.contains("bg-indigo-600")){button.classList.replace("bg-indigo-600","bg-gray-200");toggle.classList.replace("translate-x-5","translate-x-0");toggleStatus=""}else{button.classList.replace("bg-gray-200","bg-indigo-600");toggle.classList.replace("translate-x-0","translate-x-5");toggleStatus="on"}const form=new FormData;form.append("action","plausible_analytics_toggle_option");form.append("option_name",button.name);form.append("option_value",button.value);form.append("option_label",button.nextElementSibling.innerHTML);form.append("toggle_status",toggleStatus);form.append("is_list",button.dataset.list);form.append("_nonce",plausible.nonce);plausible.ajax(form)},saveOption:function(e){const button=e.target;const section=button.closest(".plausible-analytics-section");const inputs=section.querySelectorAll("input, textarea");const form=new FormData;const options=[];inputs.forEach(function(input){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})});form.append("action","plausible_analytics_save_options");form.append("options",JSON.stringify(options));form.append("_nonce",plausible.nonce);if(button.children.length>0){button.children[0].classList.remove("hidden")}button.setAttribute("disabled","disabled");plausible.ajax(form,button)},validateInput:function(input){if(input.name==="domain_name"&&input.value.match(/^(https?:\/\/)?(www.)?/).length>0){input.value=input.value.replace(/^(https?:\/\/)?(www.)?/,"")}return input},saveOptionOnNext:function(e){let hash=document.location.hash.replace("#","");if(hash!=="api_token_slide"&&hash!=="domain_name_slide"){return}let form=e.target.closest(".plausible-analytics-wizard-step-section");let inputs=form.getElementsByTagName("INPUT");let options=[];for(let input of inputs){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})}let data=new FormData;data.append("action","plausible_analytics_save_options");data.append("options",JSON.stringify(options));data.append("_nonce",plausible.nonce);plausible.ajax(data).then(response=>{if(hash==="api_token_slide"&&response.success===true){let stats_button=document.getElementById("enable_analytics_dashboard_view_stats_in_wordpress");stats_button.removeAttribute("disabled")}})},disableConnectButton:function(e){let target=e.target;let button=document.getElementById("connect_plausible_analytics");let buttonIsHref=false;if(button===null){let slide_id=document.location.hash;button=document.querySelector(slide_id+" .plausible-analytics-wizard-next-step");buttonIsHref=true}if(button===null){return}if(target.value!==""){if(!buttonIsHref){button.disabled=false}else{button.classList.remove("pointer-events-none");button.classList.replace("bg-gray-200","bg-indigo-600")}return}if(!buttonIsHref){button.disabled=true;button.innerHTML=button.innerHTML.replace("Connected","Connect")}else{button.classList+=" pointer-events-none";button.classList.replace("bg-indigo-600","bg-gray-200")}},createAPIToken:function(e){e.preventDefault();let domain=document.getElementById("domain_name").value;domain=domain.replaceAll("/","%2F");window.open(`${plausible_analytics_hosted_domain}/${domain}/settings/integrations?new_token=WordPress`,"_blank","location=yes,height=768,width=1024,scrollbars=yes,status=no")},showWizard:function(e){let data=new FormData;data.append("action","plausible_analytics_show_wizard");data.append("_nonce",e.target.dataset.nonce);plausible.ajax(data)},toggleWizardStep:function(){if(document.getElementById("plausible-analytics-wizard")===null){return}const hash=document.location.hash.substring(1).replace("_slide","");let allSteps=document.querySelectorAll(".plausible-analytics-wizard-step");let activeSteps=document.querySelectorAll(".plausible-analytics-wizard-active-step");let completedSteps=document.querySelectorAll(".plausible-analytics-wizard-completed-step");for(let i=0;i<allSteps.length;i++){allSteps[i].classList.remove("hidden")}for(let i=0;i<activeSteps.length;i++){activeSteps[i].classList+=" hidden"}for(let i=0;i<completedSteps.length;i++){completedSteps[i].classList+=" hidden"}let currentStep=document.getElementById("active-step-"+hash);let inactiveCurrentStep=document.getElementById("step-"+hash);currentStep.classList.remove("hidden");inactiveCurrentStep.classList+=" hidden";let currentlyCompletedSteps=currentStep.dataset.completedSteps.split(",");currentlyCompletedSteps=currentlyCompletedSteps.filter(n=>n);if(currentlyCompletedSteps.length<1){return}currentlyCompletedSteps.forEach(function(step){let completedStep=document.getElementById("completed-step-"+step);let inactiveStep=document.getElementById("step-"+step);completedStep.classList.remove("hidden");inactiveStep.classList+=" hidden"})},ajax:function(data,button=null,showMessages=true){return fetch(ajaxurl,{method:"POST",body:data}).then(response=>{if(button){if(button.children.length>0){button.children[0].classList+=" hidden"}if(button.id==="connect_plausible_analytics"&&response.status===200){button.innerText=plausible_analytics_i18n.connected}else{button.removeAttribute("disabled")}}if(response.status===200){return response.json()}return false}).then(response=>{if(showMessages===true){plausible.showMessages()}let event=new CustomEvent("plausibleAjaxDone",{detail:response});document.dispatchEvent(event);if(response.data!==undefined){return response.data}else{return response}})},showMessages:function(){let messages=plausible.fetchMessages();messages.then(function(messages){if(messages.error!==false){plausible.showMessage(messages.error,"error")}else if(messages.notice!==false){plausible.showMessage(messages.notice,"notice")}else if(messages.success!==false){plausible.showMessage(messages.success,"success")}if(messages.additional.length===0||document.getElementById("plausible-analytics-wizard")!==null){return}if(messages.additional.id!==undefined&&messages.additional.message){plausible.showAdditionalMessage(messages.additional.message,messages.additional.id)}else if(messages.additional.id!==undefined&&messages.additional.message===""){plausible.removeAdditionalMessage(messages.additional.id)}})},fetchMessages:function(){let data=new FormData;data.append("action","plausible_analytics_messages");let result=plausible.ajax(data,null,false);return result.then(function(response){return response})},showMessage:function(message,type="success"){if(type==="error"){document.getElementById("icon-error").classList.remove("hidden");document.getElementById("icon-success").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}else if(type==="notice"){document.getElementById("icon-notice").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-success").classList.add("hidden")}else{document.getElementById("icon-success").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}let notice=document.getElementById("plausible-analytics-notice");document.getElementById("plausible-analytics-notice-text").innerHTML=message;notice.classList.remove("hidden");setTimeout(function(){notice.classList.replace("opacity-0","opacity-100")},200);if(type!=="error"){setTimeout(function(){notice.classList.replace("opacity-100","opacity-0");setTimeout(function(){notice.classList+=" hidden"},200)},2e3)}},showAdditionalMessage:function(html,target){let targetElem=document.querySelector(`[name='${target}']`);let container=targetElem.closest(".plausible-analytics-group");if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].id.includes(target)){return}}}container.innerHTML+=html},removeAdditionalMessage:function(target){let targetElem=document.querySelector(`[name="${target}"]`);let container=targetElem.closest(".plausible-analytics-group");let additionalMessage;if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].classList.contains("plausible-analytics-hook")){additionalMessage=container.children[i];break}}}if(additionalMessage!==undefined&&!additionalMessage.classList.contains("plausible-analytics-persist")){container.removeChild(additionalMessage)}}};plausible.init()});
\ No newline at end of file
+document.addEventListener("DOMContentLoaded",()=>{if(!document.location.href.includes("plausible_analytics")){return}let plausible={nonceElem:document.getElementById("_wpnonce"),nonce:"",showWizardElem:document.getElementById("show_wizard"),domainNameElem:document.getElementById("domain_name"),apiTokenElem:document.getElementById("api_token"),createAPITokenElems:document.getElementsByClassName("plausible-create-api-token"),buttonElems:document.getElementsByClassName("plausible-analytics-button"),stepElems:document.getElementsByClassName("plausible-analytics-wizard-next-step"),init:function(){if(document.location.hash===""&&document.getElementById("plausible-analytics-wizard")!==null){document.location.hash="#welcome_slide"}if(this.nonceElem!==null){this.nonce=this.nonceElem.value}this.toggleWizardStep();window.addEventListener("hashchange",this.toggleWizardStep);if(this.showWizardElem!==null){this.showWizardElem.addEventListener("click",this.showWizard)}if(this.domainNameElem!==null){this.domainNameElem.addEventListener("keyup",this.disableConnectButton)}if(this.apiTokenElem!==null){this.apiTokenElem.addEventListener("keyup",this.disableConnectButton)}if(this.createAPITokenElems.length>0){for(let i=0;i<this.createAPITokenElems.length;i++){this.createAPITokenElems[i].addEventListener("click",this.createAPIToken)}}if(this.buttonElems.length>0){for(let i=0;i<this.buttonElems.length;i++){this.buttonElems[i].addEventListener("click",this.saveOption)}}document.addEventListener("click",this.toggleOption);if(this.stepElems.length>0){for(let i=0;i<this.stepElems.length;i++){this.stepElems[i].addEventListener("click",this.saveOptionOnNext)}}this.showMessages()},toggleOption:function(e){if(e.target.classList===null||!e.target.classList.contains("plausible-analytics-toggle")){return}const button=e.target.closest("button");let toggle;if(e.target.type==="submit"){toggle=button.querySelector("span")}else{toggle=e.target.closest("span")}let toggleStatus;if(button.classList.contains("bg-indigo-600")){button.classList.replace("bg-indigo-600","bg-gray-200");toggle.classList.replace("translate-x-5","translate-x-0");button.dataset.status="off";toggleStatus=""}else{button.classList.replace("bg-gray-200","bg-indigo-600");toggle.classList.replace("translate-x-0","translate-x-5");button.dataset.status="on";toggleStatus="on"}const form=new FormData;form.append("action","plausible_analytics_toggle_option");form.append("option_name",button.name);form.append("option_value",button.value);form.append("option_label",button.nextElementSibling.innerHTML);form.append("toggle_status",toggleStatus);form.append("is_list",button.dataset.list);form.append("_nonce",plausible.nonce);plausible.ajax(form)},saveOption:async function(e){const button=e.target;const section=button.closest(".plausible-analytics-section");const inputs=section.querySelectorAll("input, textarea");const form=new FormData;const options=[];inputs.forEach(function(input){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})});form.append("action","plausible_analytics_save_options");form.append("options",JSON.stringify(options));form.append("_nonce",plausible.nonce);if(button.children.length>0){button.children[0].classList.remove("hidden")}button.setAttribute("disabled","disabled");let data=await plausible.ajax(form,button);if(data.capabilities===undefined){return}plausible.maybeDisableOptions(data.capabilities)},maybeDisableOptions:function(capabilities){let options=document.querySelectorAll("button[data-caps]");options.forEach(function(option){let caps=option.dataset.caps.split(",");let disabled=false;option.removeAttribute("disabled");caps.forEach(function(cap){if(capabilities[cap]===false){disabled=true}});if(disabled===true){option.setAttribute("disabled","disabled");if(option.dataset.status==="on"){option.dispatchEvent(new Event("click",{bubbles:true}))}}})},validateInput:function(input){if(input.name==="domain_name"&&input.value.match(/^(https?:\/\/)?(www.)?/).length>0){input.value=input.value.replace(/^(https?:\/\/)?(www.)?/,"")}return input},saveOptionOnNext:function(e){let hash=document.location.hash.replace("#","");if(hash!=="api_token_slide"&&hash!=="domain_name_slide"){return}let form=e.target.closest(".plausible-analytics-wizard-step-section");let inputs=form.getElementsByTagName("INPUT");let options=[];for(let input of inputs){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})}let data=new FormData;data.append("action","plausible_analytics_save_options");data.append("options",JSON.stringify(options));data.append("_nonce",plausible.nonce);plausible.ajax(data).then(response=>{if(hash==="api_token_slide"&&response.success===true){let stats_button=document.getElementById("enable_analytics_dashboard_view_stats_in_wordpress");stats_button.removeAttribute("disabled")}})},disableConnectButton:function(e){let target=e.target;let button=document.getElementById("connect_plausible_analytics");let buttonIsHref=false;if(button===null){let slide_id=document.location.hash;button=document.querySelector(slide_id+" .plausible-analytics-wizard-next-step");buttonIsHref=true}if(button===null){return}if(target.value!==""){if(!buttonIsHref){button.disabled=false}else{button.classList.remove("pointer-events-none");button.classList.replace("bg-gray-200","bg-indigo-600")}return}if(!buttonIsHref){button.disabled=true;button.innerHTML=button.innerHTML.replace("Connected","Connect")}else{button.classList+=" pointer-events-none";button.classList.replace("bg-indigo-600","bg-gray-200")}},createAPIToken:function(e){e.preventDefault();let domain=document.getElementById("domain_name").value;domain=domain.replaceAll("/","%2F");window.open(`${plausible_analytics_hosted_domain}/${domain}/settings/integrations?new_token=WordPress`,"_blank","location=yes,height=768,width=1024,scrollbars=yes,status=no")},showWizard:function(e){let data=new FormData;data.append("action","plausible_analytics_show_wizard");data.append("_nonce",e.target.dataset.nonce);plausible.ajax(data)},toggleWizardStep:function(){if(document.getElementById("plausible-analytics-wizard")===null){return}const hash=document.location.hash.substring(1).replace("_slide","");let allSteps=document.querySelectorAll(".plausible-analytics-wizard-step");let activeSteps=document.querySelectorAll(".plausible-analytics-wizard-active-step");let completedSteps=document.querySelectorAll(".plausible-analytics-wizard-completed-step");for(let i=0;i<allSteps.length;i++){allSteps[i].classList.remove("hidden")}for(let i=0;i<activeSteps.length;i++){activeSteps[i].classList+=" hidden"}for(let i=0;i<completedSteps.length;i++){completedSteps[i].classList+=" hidden"}let currentStep=document.getElementById("active-step-"+hash);let inactiveCurrentStep=document.getElementById("step-"+hash);currentStep.classList.remove("hidden");inactiveCurrentStep.classList+=" hidden";let currentlyCompletedSteps=currentStep.dataset.completedSteps.split(",");currentlyCompletedSteps=currentlyCompletedSteps.filter(n=>n);if(currentlyCompletedSteps.length<1){return}currentlyCompletedSteps.forEach(function(step){let completedStep=document.getElementById("completed-step-"+step);let inactiveStep=document.getElementById("step-"+step);completedStep.classList.remove("hidden");inactiveStep.classList+=" hidden"})},ajax:function(data,button=null,showMessages=true){return fetch(ajaxurl,{method:"POST",body:data}).then(response=>{if(button){if(button.children.length>0){button.children[0].classList+=" hidden"}if(button.id==="connect_plausible_analytics"&&response.status===200){button.innerText=plausible_analytics_i18n.connected}else{button.removeAttribute("disabled")}}if(response.status===200){return response.json()}return false}).then(response=>{if(showMessages===true){plausible.showMessages()}let event=new CustomEvent("plausibleAjaxDone",{detail:response});document.dispatchEvent(event);if(response.data!==undefined){return response.data}else{return response}})},showMessages:function(){let messages=plausible.fetchMessages();messages.then(function(messages){if(messages.error!==false){plausible.showMessage(messages.error,"error")}else if(messages.notice!==false){plausible.showMessage(messages.notice,"notice")}else if(messages.success!==false){plausible.showMessage(messages.success,"success")}if(messages.additional.length===0||document.getElementById("plausible-analytics-wizard")!==null){return}if(messages.additional.id!==undefined&&messages.additional.message){plausible.showAdditionalMessage(messages.additional.message,messages.additional.id)}else if(messages.additional.id!==undefined&&messages.additional.message===""){plausible.removeAdditionalMessage(messages.additional.id)}})},fetchMessages:function(){let data=new FormData;data.append("action","plausible_analytics_messages");let result=plausible.ajax(data,null,false);return result.then(function(response){return response})},showMessage:function(message,type="success"){if(type==="error"){document.getElementById("icon-error").classList.remove("hidden");document.getElementById("icon-success").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}else if(type==="notice"){document.getElementById("icon-notice").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-success").classList.add("hidden")}else{document.getElementById("icon-success").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}let notice=document.getElementById("plausible-analytics-notice");document.getElementById("plausible-analytics-notice-text").innerHTML=message;notice.classList.remove("hidden");setTimeout(function(){notice.classList.replace("opacity-0","opacity-100")},200);if(type!=="error"){setTimeout(function(){notice.classList.replace("opacity-100","opacity-0");setTimeout(function(){notice.classList+=" hidden"},200)},2e3)}},showAdditionalMessage:function(html,target){let targetElem=document.querySelector(`[name='${target}']`);let container=targetElem.closest(".plausible-analytics-group");if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].id.includes(target)){return}}}container.innerHTML+=html},removeAdditionalMessage:function(target){let targetElem=document.querySelector(`[name="${target}"]`);let container=targetElem.closest(".plausible-analytics-group");let additionalMessage;if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].classList.contains("plausible-analytics-hook")){additionalMessage=container.children[i];break}}}if(additionalMessage!==undefined&&!additionalMessage.classList.contains("plausible-analytics-persist")){container.removeChild(additionalMessage)}}};plausible.init()});
\ No newline at end of file
diff --git a/src/Admin/Settings/API.php b/src/Admin/Settings/API.php
index 75f2a274..56dc1cee 100644
--- a/src/Admin/Settings/API.php
+++ b/src/Admin/Settings/API.php
@@ -45,15 +45,15 @@ class API {
 	/**
 	 * Render Fields.
 	 *
-	 * @return void
 	 * @since  1.3.0
 	 * @access public
+	 * @return void
 	 */
 	public function settings_page() {
 		wp_nonce_field( 'plausible_analytics_toggle_option' );
 
 		$settings        = Helpers::get_settings();
-		$followed_wizard = get_option( 'plausible_analytics_wizard_done' ) || ! empty( $settings['self_hosted_domain'] );
+		$followed_wizard = get_option( 'plausible_analytics_wizard_done' ) || ! empty( $settings[ 'self_hosted_domain' ] );
 
 		/**
 		 * On-boarding wizard.
@@ -100,23 +100,19 @@ public function settings_page() {
 						'plausible-analytics'
 					),
 					admin_url( 'index.php?page=plausible_analytics_statistics' ),
-					admin_url( 'admin-ajax.php?action=plausible_analytics_quit_wizard&_nonce=' ) .
-					wp_create_nonce( 'plausible_analytics_quit_wizard' ) .
-					'&redirect=tracked_user_roles',
+					admin_url( 'admin-ajax.php?action=plausible_analytics_quit_wizard&_nonce=' ) . wp_create_nonce( 'plausible_analytics_quit_wizard' ) . '&redirect=tracked_user_roles',
 					'https://plausible.io/docs?utm_source=WordPress&utm_medium=Referral&utm_campaign=WordPress+plugin',
 					'https://plausible.io/contact?utm_source=WordPress&utm_medium=Referral&utm_campaign=WordPress+plugin'
 				),
 			];
 
-			if ( empty( $settings['enable_analytics_dashboard'] ) ) {
-				$this->slides_description['success'] = sprintf(
+			if ( empty( $settings[ 'enable_analytics_dashboard' ] ) ) {
+				$this->slides_description[ 'success' ] = sprintf(
 					__(
 						'<p>Congrats! Your traffic is now being counted without compromising the user experience and privacy of your visitors.</p><p>Note that visits from logged in users aren\'t tracked. If you want to track visits for certain user roles, then please specify them in the <a href="%s">plugin\'s settings</a>.</p><p>Need help? <a href="%s" target="_blank">Our documentation</a> is the best place to find most answers right away.</p><p>Still haven\'t found the answer you\'re looking for? We\'re here to help. Please <a href="%s" target="_blank">contact our support</a>.</p>',
 						'plausible-analytics'
 					),
-					admin_url( 'admin-ajax.php?action=plausible_analytics_quit_wizard&_nonce=' ) .
-					wp_create_nonce( 'plausible_analytics_quit_wizard' ) .
-					'&redirect=tracked_user_roles',
+					admin_url( 'admin-ajax.php?action=plausible_analytics_quit_wizard&_nonce=' ) . wp_create_nonce( 'plausible_analytics_quit_wizard' ) . '&redirect=tracked_user_roles',
 					'https://plausible.io/docs?utm_source=WordPress&utm_medium=Referral&utm_campaign=WordPress+plugin',
 					'https://plausible.io/contact?utm_source=WordPress&utm_medium=Referral&utm_campaign=WordPress+plugin'
 				);
@@ -130,7 +126,7 @@ public function settings_page() {
 		/**
 		 * Settings screen
 		 */
-		$current_tab = ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'general';
+		$current_tab = ! empty( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : 'general';
 		?>
 		<div class="h-full">
 			<!-- body -->
@@ -157,7 +153,7 @@ public function settings_page() {
 								<?php foreach ( $this->fields[ $current_tab ] as $tab => $field ): ?>
 									<div class="plausible-analytics-section shadow sm:rounded-md sm:overflow-hidden">
 										<?php
-										$type = $field['type'] ?? '';
+										$type = $field[ 'type' ] ?? '';
 
 										if ( $type ) {
 											echo call_user_func( [ $this, "render_{$type}_field" ], $field );
@@ -224,12 +220,16 @@ private function show_wizard() {
 										$field = $this->get_wizard_option_properties( $id );
 
 										if ( ! empty( $field ) ) {
-											$hide_header = $field['type'] === 'group';
-
-											echo call_user_func( [
-												$this,
-												"render_{$field['type']}_field"
-											], $field, $hide_header );
+											$hide_header = $field[ 'type' ] === 'group';
+
+											echo call_user_func(
+												[
+													$this,
+													"render_{$field['type']}_field",
+												],
+												$field,
+												$hide_header
+											);
 										}
 										?>
 										<?php ++ $i; ?>
@@ -423,13 +423,13 @@ class="mt-1 text-sm leading-5 text-gray-500 dark:text-gray-200"></p>
 	 * @return array|mixed
 	 */
 	private function get_wizard_option_properties( $slug ) {
-		foreach ( $this->fields['general'] as $group ) {
-			if ( $group['slug'] === $slug ) {
+		foreach ( $this->fields[ 'general' ] as $group ) {
+			if ( $group[ 'slug' ] === $slug ) {
 				return $group;
 			}
 
-			foreach ( $group['fields'] as $field ) {
-				if ( $field['slug'] === $slug ) {
+			foreach ( $group[ 'fields' ] as $field ) {
+				if ( $field[ 'slug' ] === $slug ) {
 					return $field;
 				}
 			}
@@ -441,9 +441,9 @@ private function get_wizard_option_properties( $slug ) {
 	/**
 	 * Render Header Navigation.
 	 *
-	 * @return void
 	 * @since  1.3.0
 	 * @access public
+	 * @return void
 	 */
 	public function render_navigation() {
 		$screen = get_current_screen();
@@ -453,7 +453,7 @@ public function render_navigation() {
 			return;
 		}
 
-		$current_tab = ! empty( $_GET['tab'] ) ? $_GET['tab'] : '';
+		$current_tab = ! empty( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : '';
 		$tabs        = apply_filters(
 			'plausible_analytics_settings_navigation_tabs',
 			[
@@ -474,9 +474,9 @@ public function render_navigation() {
 		foreach ( $tabs as $tab ) {
 			printf(
 				'<a href="%1$s" class="no-underline text-sm leading-6 text-gray-900 %2$s">%3$s</a>',
-				esc_url( $tab['url'] ),
-				esc_attr( $tab['class'] ),
-				esc_html( $tab['name'] )
+				esc_url( $tab[ 'url' ] ),
+				esc_attr( $tab[ 'class' ] ),
+				esc_html( $tab[ 'name' ] )
 			);
 		}
 		?>
@@ -486,8 +486,8 @@ public function render_navigation() {
 	/**
 	 * Render Quick Actions
 	 *
-	 * @return string
 	 * @since  1.3.0
+	 * @return string
 	 */
 	private function render_quick_actions() {
 		ob_start();
@@ -495,13 +495,13 @@ private function render_quick_actions() {
 		?>
 		<?php if ( ! empty( $quick_actions ) && count( $quick_actions ) > 0 ) : ?>
 			<?php foreach ( $quick_actions as $quick_action ) : ?>
-				<?php if ( ! empty( $quick_action['disabled'] ) && $quick_action['disabled'] === true ) : ?>
+				<?php if ( ! empty( $quick_action[ 'disabled' ] ) && $quick_action[ 'disabled' ] === true ) : ?>
 					<?php continue; ?>
 				<?php endif; ?>
-				<a id="<?php echo $quick_action['id']; ?>" class="no-underline text-sm leading-6 text-gray-900"
-				   target="<?php echo $quick_action['target']; ?>" href="<?php echo $quick_action['url']; ?>"
-				   title="<?php echo $quick_action['label']; ?>">
-					<?php echo $quick_action['label']; ?>
+				<a id="<?php echo $quick_action[ 'id' ]; ?>" class="no-underline text-sm leading-6 text-gray-900"
+				   target="<?php echo $quick_action[ 'target' ]; ?>" href="<?php echo $quick_action[ 'url' ]; ?>"
+				   title="<?php echo $quick_action[ 'label' ]; ?>">
+					<?php echo $quick_action[ 'label' ]; ?>
 				</a>
 			<?php endforeach; ?>
 		<?php endif; ?>
@@ -512,8 +512,8 @@ private function render_quick_actions() {
 	/**
 	 * Get Quick Actions.
 	 *
-	 * @return array
 	 * @since  1.3.0
+	 * @return array
 	 */
 	private function get_quick_actions() {
 		$settings = Helpers::get_settings();
@@ -525,7 +525,7 @@ private function get_quick_actions() {
 				'url'      => admin_url( "admin-ajax.php?action=plausible_analytics_show_wizard&_nonce=$nonce&redirect=1" ),
 				'id'       => 'show_wizard',
 				'target'   => '_self',
-				'disabled' => ! empty( $settings['self_hosted_domain'] ),
+				'disabled' => ! empty( $settings[ 'self_hosted_domain' ] ),
 			],
 			'view-docs'       => [
 				'label'  => esc_html__( 'Documentation', 'plausible-analytics' ),
@@ -545,13 +545,13 @@ private function get_quick_actions() {
 	/**
 	 * Render Group Field.
 	 *
-	 * @return string
 	 * @since  1.3.0
 	 * @access public
+	 * @return string
 	 */
 	public function render_group_field( array $group, $hide_header = false ) {
-		$toggle = $group['toggle'] ?? [];
-		$fields = $group['fields'];
+		$toggle = $group[ 'toggle' ] ?? [];
+		$fields = $group[ 'fields' ];
 		ob_start();
 		?>
 		<div
@@ -559,13 +559,13 @@ class="<?php echo $hide_header ? '' : 'plausible-analytics-group py-6 px-4 space
 			<?php if ( ! $hide_header ) : ?>
 				<header class="relative">
 					<h3 class="text-lg mt-0 leading-6 font-medium text-gray-900 dark:text-gray-100"
-						id="<?php echo $group['slug']; ?>"><?php echo $group['label']; ?></h3>
+						id="<?php echo $group[ 'slug' ]; ?>"><?php echo $group[ 'label' ]; ?></h3>
 					<div class="mt-1 text-sm leading-5 !text-gray-500 !dark:text-gray-200">
-						<?php echo wp_kses_post( $group['desc'] ); ?>
+						<?php echo wp_kses_post( $group[ 'desc' ] ); ?>
 					</div>
 					<?php if ( ! empty( $toggle ) && is_array( $toggle ) ) : ?>
-						<a target="_blank" class="plausible-analytics-link" href="<?php echo $toggle['anchor']; ?>">
-							<?php echo $toggle['label']; ?>
+						<a target="_blank" class="plausible-analytics-link" href="<?php echo $toggle[ 'anchor' ]; ?>">
+							<?php echo $toggle[ 'label' ]; ?>
 						</a>
 					<?php endif; ?>
 				</header>
@@ -578,7 +578,7 @@ class="<?php echo $hide_header ? '' : 'plausible-analytics-group py-6 px-4 space
 				$is_list = array_filter(
 					$fields,
 					function ( $field ) {
-						return $field['type'] === 'checkbox';
+						return $field[ 'type' ] === 'checkbox';
 					}
 				);
 
@@ -595,25 +595,25 @@ function ( $field ) {
 	/**
 	 * Render Text Field.
 	 *
-	 * @return string
 	 * @since  1.3.0
 	 * @access public
+	 * @return string
 	 */
 	public function render_text_field( array $field ) {
 		ob_start();
-		$value       = ! empty( $field['value'] ) ? $field['value'] : '';
-		$placeholder = ! empty( $field['placeholder'] ) ? $field['placeholder'] : '';
-		$disabled    = ! empty( $field['disabled'] ) ? 'disabled' : '';
+		$value       = ! empty( $field[ 'value' ] ) ? $field[ 'value' ] : '';
+		$placeholder = ! empty( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : '';
+		$disabled    = ! empty( $field[ 'disabled' ] ) ? 'disabled' : '';
 		?>
 		<div class="mt-4">
 			<label class="block text-sm font-medium leading-5 !text-gray-700 !dark:text-gray-300"
-				   for="<?php echo $field['slug']; ?>"><?php echo $field['label']; ?></label>
+				   for="<?php echo $field[ 'slug' ]; ?>"><?php echo $field[ 'label' ]; ?></label>
 			<div class="mt-1">
 				<input
 					class="block w-full !border-gray-300 !dark:border-gray-700 !rounded-md focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm dark:bg-gray-900 dark:text-gray-300 py-2 px-3"
-					id="<?php echo $field['slug']; ?>" placeholder="<?php echo $placeholder; ?>" autocomplete="off"
+					id="<?php echo $field[ 'slug' ]; ?>" placeholder="<?php echo $placeholder; ?>" autocomplete="off"
 					type="text"
-					name="<?php echo $field['slug']; ?>"
+					name="<?php echo $field[ 'slug' ]; ?>"
 					value="<?php echo $value; ?>" <?php echo $disabled; ?> />
 			</div>
 		</div>
@@ -630,12 +630,12 @@ class="block w-full !border-gray-300 !dark:border-gray-700 !rounded-md focus:rin
 	 */
 	public function render_button_field( array $field ) {
 		ob_start();
-		$disabled = isset( $field['disabled'] ) && $field['disabled'] === true;
+		$disabled = isset( $field[ 'disabled' ] ) && $field[ 'disabled' ] === true;
 		?>
 		<div>
 			<button
 				class="plausible-analytics-button border-0 hover:cursor-pointer inline-flex items-center justify-center !gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400 dark:disabled:bg-gray-800 ease-in-out transition-all"
-				id="<?php esc_attr_e( $field['slug'], 'plausible-analytics' ); ?>"
+				id="<?php esc_attr_e( $field[ 'slug' ], 'plausible-analytics' ); ?>"
 				type="submit" <?php echo $disabled ? 'disabled' : ''; ?>>
 				<svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-white hidden" xmlns="http://www.w3.org/2000/svg"
 					 fill="none" viewBox="0 0 24 24">
@@ -643,7 +643,7 @@ class="plausible-analytics-button border-0 hover:cursor-pointer inline-flex item
 					<path class="opacity-75" fill="currentColor"
 						  d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
 				</svg>
-				<?php esc_attr_e( $field['label'], 'plausible-analytics' ); ?>
+				<?php esc_attr_e( $field[ 'label' ], 'plausible-analytics' ); ?>
 			</button>
 		</div>
 		<?php
@@ -653,42 +653,37 @@ class="plausible-analytics-button border-0 hover:cursor-pointer inline-flex item
 	/**
 	 * Render Checkbox Field.
 	 *
-	 * @return string
 	 * @since  1.3.0
 	 * @access public
+	 * @return string
 	 */
 	public function render_checkbox_field( array $field, $is_list = false ) {
 		ob_start();
-		$value    = ! empty( $field['value'] ) ? $field['value'] : 'on';
+		$value    = ! empty( $field[ 'value' ] ) ? $field[ 'value' ] : 'on';
 		$settings = Helpers::get_settings();
-		$slug     = ! empty( $settings[ $field['slug'] ] ) ? $settings[ $field['slug'] ] : '';
-		$id       = $field['slug'] . '_' . str_replace( '-', '_', sanitize_title( $field['label'] ) );
-		$checked  =
-			! empty( $field['checked'] ) ? 'checked="checked"' :
-				( is_array( $slug ) ? checked( $value, in_array( $value, $slug, false ) ? $value : false, false ) : checked( $value, $slug, false ) );
-		$disabled = ! empty( $field['disabled'] ) ? 'disabled' : '';
+		$slug     = ! empty( $settings[ $field[ 'slug' ] ] ) ? $settings[ $field[ 'slug' ] ] : '';
+		$id       = $field[ 'slug' ] . '_' . str_replace( '-', '_', sanitize_title( $field[ 'label' ] ) );
+		$checked  = ! empty( $field[ 'checked' ] ) ? 'checked="checked"' : ( is_array( $slug ) ? checked( $value, in_array( $value, $slug, false ) ? $value : false, false ) : checked( $value, $slug, false ) );
+		$disabled = ! empty( $field[ 'disabled' ] ) ? 'disabled' : '';
+		$caps     = ! empty( $field[ 'caps' ] ) ? $field[ 'caps' ] : [];
 		?>
 		<div class="toggle-container flex items-center mt-4 space-x-3">
-			<button
-				class="plausible-analytics-toggle <?php echo $checked && ! $disabled ? 'bg-indigo-600' :
-					'bg-gray-200'; ?> dark:bg-gray-700 relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring"
-				id="<?php /** @noinspection PhpUnnecessaryLocalVariableInspection */
-				echo $id; ?>" type="checkbox" data-list="<?php echo $is_list ? '1' : ''; ?>"
-				name="<?php echo esc_attr( $field['slug'] ); ?>"
-				value="<?php echo esc_html( $value ); ?>" <?php echo $disabled; ?>>
+			<button class="plausible-analytics-toggle <?php echo $checked && ! $disabled ? 'bg-indigo-600' :
+				'bg-gray-200'; ?> dark:bg-gray-700 relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring"
+					id="<?php /** @noinspection PhpUnnecessaryLocalVariableInspection */
+					echo $id; ?>" type="checkbox" data-status="<?php echo $checked ? 'on' : 'off'; ?>" data-list="<?php echo $is_list ? '1' :
+				''; ?>" <?php if ( ! empty( $caps ) ): ?>data-caps="<?php echo implode(
+				',',
+				$caps
+			); ?>"<?php endif; ?> name="<?php echo esc_attr( $field[ 'slug' ] ); ?>" value="<?php echo esc_html( $value ); ?>" <?php echo $disabled; ?>>
 				<span class="plausible-analytics-toggle <?php echo $checked ? 'translate-x-5' :
 					'translate-x-0'; ?> inline-block h-5 w-5 rounded-full bg-white dark:bg-gray-800 shadow transform transition-translate ease-in-out duration-200"></span>
 			</button>
-			<span class="ml-2 dark:text-gray-100 text-lg"><?php echo $field['label']; ?></span>
-			<?php if ( isset( $field['docs'] ) ): ?>
-				<a class="leading-none" href="<?php echo esc_url( $field['docs'] ); ?>" rel="noreferrer"
-				   target="_blank">
-					<svg xmlns="http://www.w3.org/2000/svg" class="text-gray-400 w-6 h-6 leading-none"
-						 stroke="currentColor"
-						 aria-hidden="true"
-						 fill="none" viewBox="0 0 24 24" stroke-width="1.5">
-						<path stroke-linecap="round" stroke-linejoin="round"
-							  d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z"></path>
+			<span class="ml-2 dark:text-gray-100 text-lg"><?php echo $field[ 'label' ]; ?></span>
+			<?php if ( isset( $field[ 'docs' ] ) ): ?>
+				<a class="leading-none" href="<?php echo esc_url( $field[ 'docs' ] ); ?>" rel="noreferrer" target="_blank">
+					<svg xmlns="http://www.w3.org/2000/svg" class="text-gray-400 w-6 h-6 leading-none" stroke="currentColor" aria-hidden="true" fill="none" viewBox="0 0 24 24" stroke-width="1.5">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z"></path>
 					</svg>
 				</a>
 			<?php endif; ?>
@@ -700,29 +695,29 @@ class="plausible-analytics-toggle <?php echo $checked && ! $disabled ? 'bg-indig
 	/**
 	 * Render textarea field.
 	 *
-	 * @param array $field
-	 *
-	 * @return string|false
 	 * @since  1.2.5
 	 * @access public
 	 *
+	 * @param array $field
+	 *
+	 * @return string|false
 	 */
 	public function render_textarea_field( array $field ) {
 		ob_start();
-		$value       = ! empty( $field['value'] ) ? $field['value'] : '';
-		$placeholder = ! empty( $field['placeholder'] ) ? $field['placeholder'] : '';
+		$value       = ! empty( $field[ 'value' ] ) ? $field[ 'value' ] : '';
+		$placeholder = ! empty( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : '';
 		?>
 		<div class="mt-4">
 			<label class="block text-sm font-medium text-gray-700 dark:text-gray-300"
-				   for="<?php echo esc_attr( $field['slug'] ); ?>">
-				<?php echo esc_attr( $field['label'] ); ?>
+				   for="<?php echo esc_attr( $field[ 'slug' ] ); ?>">
+				<?php echo esc_attr( $field[ 'label' ] ); ?>
 			</label>
 			<div class="relative mt-1">
 			<textarea
 				class="block w-full max-w-xl border-gray-300 dark:border-gray-700 resize-none shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:bg-gray-900 dark:text-gray-300"
-				rows="5" id="<?php echo esc_attr( $field['slug'] ); ?>"
+				rows="5" id="<?php echo esc_attr( $field[ 'slug' ] ); ?>"
 				placeholder="<?php echo esc_attr( $placeholder ); ?>"
-				name="<?php echo esc_attr( $field['slug'] ); ?>"><?php echo $value; ?></textarea>
+				name="<?php echo esc_attr( $field[ 'slug' ] ); ?>"><?php echo $value; ?></textarea>
 			</div>
 		</div>
 		<?php
@@ -732,14 +727,14 @@ class="block w-full max-w-xl border-gray-300 dark:border-gray-700 resize-none sh
 	/**
 	 * Render just the label, and allow insertion of anything using the hook beside it.
 	 *
+	 * @since 1.3.0
+	 *
 	 * @param array $field
 	 *
 	 * @return string|false
-	 * @since 1.3.0
-	 *
 	 */
 	public function render_hook_field( array $field ) {
-		$hook_type       = $field['hook_type'] ?? 'warning';
+		$hook_type       = $field[ 'hook_type' ] ?? 'warning';
 		$box_class       = 'bg-yellow-50 dark:bg-yellow-100';
 		$text_class      = 'text-yellow-700 dark:text-yellow-800';
 		$persist_message = '';
@@ -749,13 +744,13 @@ public function render_hook_field( array $field ) {
 			$text_class = 'text-green-700 dark:text-green-800';
 		}
 
-		if ( ! empty( $field['slug'] ) && ( $field['slug'] === 'option_not_available_in_ce' || $field['slug'] === 'option_disabled_by_missing_api_token' ) ) {
+		if ( ! empty( $field[ 'slug' ] ) && ( $field[ 'slug' ] === 'option_not_available_in_ce' || $field[ 'slug' ] === 'option_disabled_by_missing_api_token' ) ) {
 			$persist_message = 'plausible-analytics-persist';
 		}
 
 		ob_start();
 		?>
-		<div id="plausible-analytics-hook-<?php echo $field['slug']; ?>"
+		<div id="plausible-analytics-hook-<?php echo $field[ 'slug' ]; ?>"
 			 class="plausible-analytics-hook <?php echo $persist_message; ?> transition-opacity transition-300">
 			<div class="rounded-md p-4 mt-4 relative <?php echo esc_attr( $box_class ); ?> rounded-t-md rounded-b-none">
 				<div class="flex">
@@ -776,9 +771,9 @@ class="w-5 h-12 text-yellow-400">
 							</svg>
 						<?php endif; ?>
 					</div>
-					<div class="w-full ml-3 <?php echo esc_attr( str_replace( '_', '-', $field['slug'] ) ); ?>">
+					<div class="w-full ml-3 <?php echo esc_attr( str_replace( '_', '-', $field[ 'slug' ] ) ); ?>">
 						<div class="text-sm <?php echo $text_class; ?>>">
-							<p><?php do_action( 'plausible_analytics_settings_' . $field['slug'], $field['slug'] ); ?></p>
+							<p><?php do_action( 'plausible_analytics_settings_' . $field[ 'slug' ], $field[ 'slug' ] ); ?></p>
 						</div>
 					</div>
 				</div>
diff --git a/src/Admin/Settings/Page.php b/src/Admin/Settings/Page.php
index 2914191e..a1ebe0b1 100644
--- a/src/Admin/Settings/Page.php
+++ b/src/Admin/Settings/Page.php
@@ -144,20 +144,22 @@ public function __construct() {
 					),
 					'fields' => [
 						'404'              => [
-							'label' => esc_html__( '404 error pages', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-404-error-pages',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => '404',
-							'caps'  => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
+							'label'    => esc_html__( '404 error pages', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-404-error-pages',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => '404',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
+							'caps'     => [ self::CAP_GOALS ],
 						],
 						'outbound-links'   => [
-							'label' => esc_html__( 'Outbound links', 'plausible-analytics' ),
-							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-external-link-clicks',
-							'slug'  => 'enhanced_measurements',
-							'type'  => 'checkbox',
-							'value' => 'outbound-links',
-							'caps'  => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
+							'label'    => esc_html__( 'Outbound links', 'plausible-analytics' ),
+							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-external-link-clicks',
+							'slug'     => 'enhanced_measurements',
+							'type'     => 'checkbox',
+							'value'    => 'outbound-links',
+							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
+							'caps'     => [ self::CAP_GOALS ],
 						],
 						'file-downloads'   => [
 							'label'    => esc_html__( 'File downloads', 'plausible-analytics' ),
@@ -166,6 +168,7 @@ public function __construct() {
 							'type'     => 'checkbox',
 							'value'    => 'file-downloads',
 							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
+							'caps'     => [ self::CAP_GOALS ],
 						],
 						'search'           => [
 							'label'    => esc_html__( 'Search queries', 'plausible-analytics' ),
@@ -174,6 +177,7 @@ public function __construct() {
 							'type'     => 'checkbox',
 							'value'    => 'search',
 							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
+							'caps'     => [ self::CAP_GOALS, self::CAP_PROPS ],
 						],
 						'tagged-events'    => [
 							'label'    => esc_html__( 'Custom events', 'plausible-analytics' ),
@@ -182,6 +186,7 @@ public function __construct() {
 							'type'     => 'checkbox',
 							'value'    => 'tagged-events',
 							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
+							'caps'     => [ self::CAP_GOALS, self::CAP_PROPS ],
 						],
 						'revenue'          => [
 							'label'    => esc_html__( 'Ecommerce revenue', 'plausible-analytics' ),
@@ -190,6 +195,7 @@ public function __construct() {
 							'type'     => 'checkbox',
 							'value'    => 'revenue',
 							'disabled' => ! empty( $settings[ 'self_hosted_domain' ] ) || ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_FUNNELS, self::CAP_PROPS, self::CAP_REVENUE ] ),
+							'caps'     => [ self::CAP_GOALS, self::CAP_FUNNELS, self::CAP_PROPS, self::CAP_REVENUE ],
 						],
 						'pageview-props'   => [
 							'label'    => esc_html__( 'Authors and categories', 'plausible-analytics' ),
@@ -198,6 +204,7 @@ public function __construct() {
 							'type'     => 'checkbox',
 							'value'    => 'pageview-props',
 							'disabled' => ! $this->token_has_cap( [ self::CAP_PROPS ] ),
+							'caps'     => [ self::CAP_PROPS ],
 						],
 						'form-completions' => [
 							'label'    => esc_html__( 'Form completions', 'plausible-analytics' ),
@@ -206,6 +213,7 @@ public function __construct() {
 							'type'     => 'checkbox',
 							'value'    => 'form-completions',
 							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
+							'caps'     => [ self::CAP_GOALS, self::CAP_PROPS ],
 						],
 						'hash'             => [
 							'label' => esc_html__( 'Hash-based routing', 'plausible-analytics' ),
@@ -213,6 +221,7 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => 'hash',
+							'caps'  => [],
 						],
 						'compat'           => [
 							'label' => esc_html__( 'IE compatibility', 'plausible-analytics' ),
@@ -220,6 +229,7 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => 'compat',
+							'caps'  => [],
 						],
 					],
 				],
diff --git a/src/Ajax.php b/src/Ajax.php
index bb9c68a9..b6275239 100644
--- a/src/Ajax.php
+++ b/src/Ajax.php
@@ -283,6 +283,8 @@ public function save_options() {
 			wp_send_json_error( null, 400 );
 		}
 
+		$caps = [];
+
 		foreach ( $options as $option ) {
 			// Clean spaces
 			$settings[ $option->name ] = trim( $option->value );
@@ -290,7 +292,7 @@ public function save_options() {
 			// Validate Plugin Token, if this is the Plugin Token field.
 			if ( $option->name === 'api_token' ) {
 				$this->validate_api_token( $option->value );
-				$this->store_capabilities( $option->value );
+				$caps = $this->store_capabilities( $option->value );
 
 				$additional = $this->maybe_render_additional_message( $option->name, $option->value );
 
@@ -302,6 +304,10 @@ public function save_options() {
 
 		Messages::set_success( __( 'Settings saved.', 'plausible-analytics' ) );
 
+		if ( ! empty( $caps ) ) {
+			wp_send_json_success( [ 'capabilities' => $caps ], 200 );
+		}
+
 		wp_send_json_success( null, 200 );
 	}
 
@@ -341,7 +347,7 @@ private function validate_api_token( $token = '' ) {
 	 *
 	 * @param $token
 	 *
-	 * @return void
+	 * @return false|array
 	 */
 	private function store_capabilities( $token = '' ) {
 		$client_factory = new ClientFactory( $token );
@@ -349,14 +355,14 @@ private function store_capabilities( $token = '' ) {
 		$client = $client_factory->build();
 
 		if ( ! $client instanceof Client ) {
-			return;
+			return false;
 		}
 
 		/** @var Client\Model\CapabilitiesFeatures $features */
 		$features = $client->get_features();
 
 		if ( ! $features ) {
-			return;
+			return false;
 		}
 
 		$caps = [
@@ -368,5 +374,7 @@ private function store_capabilities( $token = '' ) {
 		];
 
 		update_option( 'plausible_analytics_api_token_caps', $caps );
+
+		return $caps;
 	}
 }

From fa8c0ecf798d57694b280dbb959dd9f40798f4eb Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 16:36:49 +0100
Subject: [PATCH 22/44] Added: auto-enable customer user role for EDD/WC.

---
 src/Admin/Provisioning.php | 29 +++++++++++++++++++++++++++++
 src/Integrations.php       |  8 ++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/Admin/Provisioning.php b/src/Admin/Provisioning.php
index f988d40f..04c7dd07 100644
--- a/src/Admin/Provisioning.php
+++ b/src/Admin/Provisioning.php
@@ -110,6 +110,7 @@ private function init() {
 		add_action( 'update_option_plausible_analytics_settings', [ $this, 'maybe_create_goals' ], 10, 2 );
 		add_action( 'update_option_plausible_analytics_settings', [ $this, 'maybe_delete_goals' ], 11, 2 );
 		add_action( 'update_option_plausible_analytics_settings', [ $this, 'maybe_create_custom_properties' ], 11, 2 );
+		add_filter( 'pre_update_option_plausible_analytics_settings', [ $this, 'maybe_enable_customer_user_roles' ] );
 	}
 
 	/**
@@ -373,4 +374,32 @@ public function maybe_create_custom_properties( $old_settings, $settings ) {
 
 		$this->client->enable_custom_property( $create_request );
 	}
+
+	/**
+	 * Auto-enables tracking of the 'Customer' user role for WC, 'Subscriber' user role for EDD and 'EDD_Subscriber' user role for EDD Recurring
+	 * if Revenue tracking and one of these plugins is enabled.
+	 *
+	 * @param $settings
+	 *
+	 * @return array
+	 */
+	public function maybe_enable_customer_user_roles( $settings ) {
+		$enhanced_measurements = $settings[ 'enhanced_measurements' ];
+
+		if ( Helpers::is_enhanced_measurement_enabled( 'revenue', $enhanced_measurements ) ) {
+			if ( Integrations::is_wc_active() && ! in_array( 'customer', $settings[ 'tracked_user_roles' ] ) ) {
+				$settings[ 'tracked_user_roles' ][] = 'customer';
+			}
+
+			if ( Integrations::is_edd_active() && ! in_array( 'subscriber', $settings[ 'tracked_user_roles' ] ) ) {
+				$settings[ 'tracked_user_roles' ][] = 'subscriber';
+			}
+
+			if ( Integrations::is_edd_recurring_active() && ! in_array( 'edd_subscriber', $settings[ 'tracked_user_roles' ] ) ) {
+				$settings[ 'tracked_user_roles' ][] = 'edd_subscriber';
+			}
+		}
+
+		return $settings;
+	}
 }
diff --git a/src/Integrations.php b/src/Integrations.php
index bcda6410..247c29db 100644
--- a/src/Integrations.php
+++ b/src/Integrations.php
@@ -65,4 +65,12 @@ public static function is_edd_active() {
 	public static function is_form_submit_active() {
 		return apply_filters( 'plausible_analytics_integrations_form_submit', Helpers::is_enhanced_measurement_enabled( 'form-completions' ) );
 	}
+
+	/**
+	 * Checks if EDD Recurring is installed and activated.
+	 * @return mixed|null
+	 */
+	public static function is_edd_recurring_active() {
+		return apply_filters( 'plausible_analytics_integrations_edd_recurring', function_exists( 'EDD_Recurring' ) && Helpers::is_enhanced_measurement_enabled( 'revenue' ) );
+	}
 }

From 330b66da52d1fb8a1336120c2cb2a477c47ffd9a Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 16:39:25 +0100
Subject: [PATCH 23/44] Added: auto-enable customer user role for EDD/WC.

---
 src/Admin/Provisioning.php | 29 +++++++++++++++++++++++++++++
 src/Integrations.php       |  8 ++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/Admin/Provisioning.php b/src/Admin/Provisioning.php
index f988d40f..04c7dd07 100644
--- a/src/Admin/Provisioning.php
+++ b/src/Admin/Provisioning.php
@@ -110,6 +110,7 @@ private function init() {
 		add_action( 'update_option_plausible_analytics_settings', [ $this, 'maybe_create_goals' ], 10, 2 );
 		add_action( 'update_option_plausible_analytics_settings', [ $this, 'maybe_delete_goals' ], 11, 2 );
 		add_action( 'update_option_plausible_analytics_settings', [ $this, 'maybe_create_custom_properties' ], 11, 2 );
+		add_filter( 'pre_update_option_plausible_analytics_settings', [ $this, 'maybe_enable_customer_user_roles' ] );
 	}
 
 	/**
@@ -373,4 +374,32 @@ public function maybe_create_custom_properties( $old_settings, $settings ) {
 
 		$this->client->enable_custom_property( $create_request );
 	}
+
+	/**
+	 * Auto-enables tracking of the 'Customer' user role for WC, 'Subscriber' user role for EDD and 'EDD_Subscriber' user role for EDD Recurring
+	 * if Revenue tracking and one of these plugins is enabled.
+	 *
+	 * @param $settings
+	 *
+	 * @return array
+	 */
+	public function maybe_enable_customer_user_roles( $settings ) {
+		$enhanced_measurements = $settings[ 'enhanced_measurements' ];
+
+		if ( Helpers::is_enhanced_measurement_enabled( 'revenue', $enhanced_measurements ) ) {
+			if ( Integrations::is_wc_active() && ! in_array( 'customer', $settings[ 'tracked_user_roles' ] ) ) {
+				$settings[ 'tracked_user_roles' ][] = 'customer';
+			}
+
+			if ( Integrations::is_edd_active() && ! in_array( 'subscriber', $settings[ 'tracked_user_roles' ] ) ) {
+				$settings[ 'tracked_user_roles' ][] = 'subscriber';
+			}
+
+			if ( Integrations::is_edd_recurring_active() && ! in_array( 'edd_subscriber', $settings[ 'tracked_user_roles' ] ) ) {
+				$settings[ 'tracked_user_roles' ][] = 'edd_subscriber';
+			}
+		}
+
+		return $settings;
+	}
 }
diff --git a/src/Integrations.php b/src/Integrations.php
index bcda6410..247c29db 100644
--- a/src/Integrations.php
+++ b/src/Integrations.php
@@ -65,4 +65,12 @@ public static function is_edd_active() {
 	public static function is_form_submit_active() {
 		return apply_filters( 'plausible_analytics_integrations_form_submit', Helpers::is_enhanced_measurement_enabled( 'form-completions' ) );
 	}
+
+	/**
+	 * Checks if EDD Recurring is installed and activated.
+	 * @return mixed|null
+	 */
+	public static function is_edd_recurring_active() {
+		return apply_filters( 'plausible_analytics_integrations_edd_recurring', function_exists( 'EDD_Recurring' ) && Helpers::is_enhanced_measurement_enabled( 'revenue' ) );
+	}
 }

From 9536e4f63ca082f65fd73aacdbd74432e30585eb Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 16:59:06 +0100
Subject: [PATCH 24/44] Added: tests

---
 tests/integration/Admin/ProvisioningTest.php | 35 ++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/integration/Admin/ProvisioningTest.php b/tests/integration/Admin/ProvisioningTest.php
index aeed673b..71db0c2a 100644
--- a/tests/integration/Admin/ProvisioningTest.php
+++ b/tests/integration/Admin/ProvisioningTest.php
@@ -123,4 +123,39 @@ public function testCreateGoalRequest() {
 
 		$this->assertInstanceOf( 'Plausible\Analytics\WP\Client\Model\GoalCreateRequestCustomEvent', $custom_event );
 	}
+
+	/**
+	 * @see Provisioning::maybe_enable_customer_user_roles()
+	 * @return void
+	 */
+	public function testMaybeEnableCustomerUserRole() {
+		$class                               = new Provisioning( false );
+		$settings                            = [];
+		$settings[ 'enhanced_measurements' ] = [ 'revenue' ];
+		$settings[ 'tracked_user_roles' ]    = [];
+
+		add_filter( 'plausible_analytics_integrations_woocommerce', '__return_true' );
+
+		$new_settings = $class->maybe_enable_customer_user_roles( $settings );
+
+		remove_filter( 'plausible_analytics_integrations_woocommerce', '__return_true' );
+
+		$this->assertTrue( in_array( 'customer', $new_settings[ 'tracked_user_roles' ] ) );
+
+		add_filter( 'plausible_analytics_integrations_edd', '__return_true' );
+
+		$new_settings = $class->maybe_enable_customer_user_roles( $settings );
+
+		remove_filter( 'plausible_analytics_integrations_edd', '__return_true' );
+
+		$this->assertTrue( in_array( 'subscriber', $new_settings[ 'tracked_user_roles' ] ) );
+
+		add_filter( 'plausible_analytics_integrations_edd_recurring', '__return_true' );
+
+		$new_settings = $class->maybe_enable_customer_user_roles( $settings );
+
+		remove_filter( 'plausible_analytics_integrations_edd_recurring', '__return_true' );
+
+		$this->assertTrue( in_array( 'edd_subscriber', $new_settings[ 'tracked_user_roles' ] ) );
+	}
 }

From fe05b8316301943051f2e6e338abfdcdcb99bf89 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 19:27:39 +0100
Subject: [PATCH 25/44] Improved: capabilities are now updated when an option
 is toggled.

---
 assets/src/js/admin/main.js     |  32 ++++----
 assets/src/js/admin/main.min.js |   2 +-
 src/Admin/Settings/Page.php     | 136 +++++++++++++++-----------------
 src/Ajax.php                    |  45 +----------
 src/Client.php                  |  40 +++++++++-
 5 files changed, 122 insertions(+), 133 deletions(-)

diff --git a/assets/src/js/admin/main.js b/assets/src/js/admin/main.js
index ab5fc65e..f3f36ab0 100644
--- a/assets/src/js/admin/main.js
+++ b/assets/src/js/admin/main.js
@@ -84,7 +84,7 @@ document.addEventListener('DOMContentLoaded', () => {
 		 *
 		 * @param e
 		 */
-		toggleOption: function (e) {
+		toggleOption: async function (e) {
 			/**
 			 * Make sure event target is a toggle.
 			 */
@@ -128,7 +128,13 @@ document.addEventListener('DOMContentLoaded', () => {
 			form.append('is_list', button.dataset.list);
 			form.append('_nonce', plausible.nonce);
 
-			plausible.ajax(form);
+			let data = await plausible.ajax(form);
+
+			if (data.capabilities === undefined) {
+				return;
+			}
+
+			plausible.maybeDisableOptions(data.capabilities);
 		},
 
 		/**
@@ -136,7 +142,7 @@ document.addEventListener('DOMContentLoaded', () => {
 		 *
 		 * @param e
 		 */
-		saveOption: async function (e) {
+		saveOption: function (e) {
 			const button = e.target;
 			const section = button.closest('.plausible-analytics-section');
 			const inputs = section.querySelectorAll('input, textarea');
@@ -159,13 +165,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
 			button.setAttribute('disabled', 'disabled');
 
-			let data = await plausible.ajax(form, button);
-
-			if (data.capabilities === undefined) {
-				return;
-			}
-
-			plausible.maybeDisableOptions(data.capabilities);
+			plausible.ajax(form, button);
 		},
 
 		/**
@@ -178,17 +178,15 @@ document.addEventListener('DOMContentLoaded', () => {
 
 			options.forEach(function (option) {
 				let caps = option.dataset.caps.split(',');
-				let disabled = false;
-				option.removeAttribute('disabled');
+				let disable = false;
 
 				caps.forEach(function (cap) {
 					if (capabilities[cap] === false) {
-						disabled = true;
+						disable = true;
 					}
 				});
 
-				if (disabled === true) {
-					option.setAttribute('disabled', 'disabled');
+				if (disable === true) {
 					// Trigger a click to make sure the option is disabled.
 					if (option.dataset.status === 'on') {
 						option.dispatchEvent(new Event('click', {bubbles: true}));
@@ -412,7 +410,8 @@ document.addEventListener('DOMContentLoaded', () => {
 					}
 				}
 
-				if (response.status === 200) {
+				// We still want the data, if it's a Payment Required error.
+				if (response.status === 200 || response.status === 402) {
 					return response.json();
 				}
 
@@ -515,6 +514,7 @@ document.addEventListener('DOMContentLoaded', () => {
 				}, 2000);
 			}
 		},
+
 		/**
 		 * Renders a HTML box containing additional information about the enabled option.
 		 *
diff --git a/assets/src/js/admin/main.min.js b/assets/src/js/admin/main.min.js
index fa779f31..79eb2d3e 100644
--- a/assets/src/js/admin/main.min.js
+++ b/assets/src/js/admin/main.min.js
@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",()=>{if(!document.location.href.includes("plausible_analytics")){return}let plausible={nonceElem:document.getElementById("_wpnonce"),nonce:"",showWizardElem:document.getElementById("show_wizard"),domainNameElem:document.getElementById("domain_name"),apiTokenElem:document.getElementById("api_token"),createAPITokenElems:document.getElementsByClassName("plausible-create-api-token"),buttonElems:document.getElementsByClassName("plausible-analytics-button"),stepElems:document.getElementsByClassName("plausible-analytics-wizard-next-step"),init:function(){if(document.location.hash===""&&document.getElementById("plausible-analytics-wizard")!==null){document.location.hash="#welcome_slide"}if(this.nonceElem!==null){this.nonce=this.nonceElem.value}this.toggleWizardStep();window.addEventListener("hashchange",this.toggleWizardStep);if(this.showWizardElem!==null){this.showWizardElem.addEventListener("click",this.showWizard)}if(this.domainNameElem!==null){this.domainNameElem.addEventListener("keyup",this.disableConnectButton)}if(this.apiTokenElem!==null){this.apiTokenElem.addEventListener("keyup",this.disableConnectButton)}if(this.createAPITokenElems.length>0){for(let i=0;i<this.createAPITokenElems.length;i++){this.createAPITokenElems[i].addEventListener("click",this.createAPIToken)}}if(this.buttonElems.length>0){for(let i=0;i<this.buttonElems.length;i++){this.buttonElems[i].addEventListener("click",this.saveOption)}}document.addEventListener("click",this.toggleOption);if(this.stepElems.length>0){for(let i=0;i<this.stepElems.length;i++){this.stepElems[i].addEventListener("click",this.saveOptionOnNext)}}this.showMessages()},toggleOption:function(e){if(e.target.classList===null||!e.target.classList.contains("plausible-analytics-toggle")){return}const button=e.target.closest("button");let toggle;if(e.target.type==="submit"){toggle=button.querySelector("span")}else{toggle=e.target.closest("span")}let toggleStatus;if(button.classList.contains("bg-indigo-600")){button.classList.replace("bg-indigo-600","bg-gray-200");toggle.classList.replace("translate-x-5","translate-x-0");button.dataset.status="off";toggleStatus=""}else{button.classList.replace("bg-gray-200","bg-indigo-600");toggle.classList.replace("translate-x-0","translate-x-5");button.dataset.status="on";toggleStatus="on"}const form=new FormData;form.append("action","plausible_analytics_toggle_option");form.append("option_name",button.name);form.append("option_value",button.value);form.append("option_label",button.nextElementSibling.innerHTML);form.append("toggle_status",toggleStatus);form.append("is_list",button.dataset.list);form.append("_nonce",plausible.nonce);plausible.ajax(form)},saveOption:async function(e){const button=e.target;const section=button.closest(".plausible-analytics-section");const inputs=section.querySelectorAll("input, textarea");const form=new FormData;const options=[];inputs.forEach(function(input){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})});form.append("action","plausible_analytics_save_options");form.append("options",JSON.stringify(options));form.append("_nonce",plausible.nonce);if(button.children.length>0){button.children[0].classList.remove("hidden")}button.setAttribute("disabled","disabled");let data=await plausible.ajax(form,button);if(data.capabilities===undefined){return}plausible.maybeDisableOptions(data.capabilities)},maybeDisableOptions:function(capabilities){let options=document.querySelectorAll("button[data-caps]");options.forEach(function(option){let caps=option.dataset.caps.split(",");let disabled=false;option.removeAttribute("disabled");caps.forEach(function(cap){if(capabilities[cap]===false){disabled=true}});if(disabled===true){option.setAttribute("disabled","disabled");if(option.dataset.status==="on"){option.dispatchEvent(new Event("click",{bubbles:true}))}}})},validateInput:function(input){if(input.name==="domain_name"&&input.value.match(/^(https?:\/\/)?(www.)?/).length>0){input.value=input.value.replace(/^(https?:\/\/)?(www.)?/,"")}return input},saveOptionOnNext:function(e){let hash=document.location.hash.replace("#","");if(hash!=="api_token_slide"&&hash!=="domain_name_slide"){return}let form=e.target.closest(".plausible-analytics-wizard-step-section");let inputs=form.getElementsByTagName("INPUT");let options=[];for(let input of inputs){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})}let data=new FormData;data.append("action","plausible_analytics_save_options");data.append("options",JSON.stringify(options));data.append("_nonce",plausible.nonce);plausible.ajax(data).then(response=>{if(hash==="api_token_slide"&&response.success===true){let stats_button=document.getElementById("enable_analytics_dashboard_view_stats_in_wordpress");stats_button.removeAttribute("disabled")}})},disableConnectButton:function(e){let target=e.target;let button=document.getElementById("connect_plausible_analytics");let buttonIsHref=false;if(button===null){let slide_id=document.location.hash;button=document.querySelector(slide_id+" .plausible-analytics-wizard-next-step");buttonIsHref=true}if(button===null){return}if(target.value!==""){if(!buttonIsHref){button.disabled=false}else{button.classList.remove("pointer-events-none");button.classList.replace("bg-gray-200","bg-indigo-600")}return}if(!buttonIsHref){button.disabled=true;button.innerHTML=button.innerHTML.replace("Connected","Connect")}else{button.classList+=" pointer-events-none";button.classList.replace("bg-indigo-600","bg-gray-200")}},createAPIToken:function(e){e.preventDefault();let domain=document.getElementById("domain_name").value;domain=domain.replaceAll("/","%2F");window.open(`${plausible_analytics_hosted_domain}/${domain}/settings/integrations?new_token=WordPress`,"_blank","location=yes,height=768,width=1024,scrollbars=yes,status=no")},showWizard:function(e){let data=new FormData;data.append("action","plausible_analytics_show_wizard");data.append("_nonce",e.target.dataset.nonce);plausible.ajax(data)},toggleWizardStep:function(){if(document.getElementById("plausible-analytics-wizard")===null){return}const hash=document.location.hash.substring(1).replace("_slide","");let allSteps=document.querySelectorAll(".plausible-analytics-wizard-step");let activeSteps=document.querySelectorAll(".plausible-analytics-wizard-active-step");let completedSteps=document.querySelectorAll(".plausible-analytics-wizard-completed-step");for(let i=0;i<allSteps.length;i++){allSteps[i].classList.remove("hidden")}for(let i=0;i<activeSteps.length;i++){activeSteps[i].classList+=" hidden"}for(let i=0;i<completedSteps.length;i++){completedSteps[i].classList+=" hidden"}let currentStep=document.getElementById("active-step-"+hash);let inactiveCurrentStep=document.getElementById("step-"+hash);currentStep.classList.remove("hidden");inactiveCurrentStep.classList+=" hidden";let currentlyCompletedSteps=currentStep.dataset.completedSteps.split(",");currentlyCompletedSteps=currentlyCompletedSteps.filter(n=>n);if(currentlyCompletedSteps.length<1){return}currentlyCompletedSteps.forEach(function(step){let completedStep=document.getElementById("completed-step-"+step);let inactiveStep=document.getElementById("step-"+step);completedStep.classList.remove("hidden");inactiveStep.classList+=" hidden"})},ajax:function(data,button=null,showMessages=true){return fetch(ajaxurl,{method:"POST",body:data}).then(response=>{if(button){if(button.children.length>0){button.children[0].classList+=" hidden"}if(button.id==="connect_plausible_analytics"&&response.status===200){button.innerText=plausible_analytics_i18n.connected}else{button.removeAttribute("disabled")}}if(response.status===200){return response.json()}return false}).then(response=>{if(showMessages===true){plausible.showMessages()}let event=new CustomEvent("plausibleAjaxDone",{detail:response});document.dispatchEvent(event);if(response.data!==undefined){return response.data}else{return response}})},showMessages:function(){let messages=plausible.fetchMessages();messages.then(function(messages){if(messages.error!==false){plausible.showMessage(messages.error,"error")}else if(messages.notice!==false){plausible.showMessage(messages.notice,"notice")}else if(messages.success!==false){plausible.showMessage(messages.success,"success")}if(messages.additional.length===0||document.getElementById("plausible-analytics-wizard")!==null){return}if(messages.additional.id!==undefined&&messages.additional.message){plausible.showAdditionalMessage(messages.additional.message,messages.additional.id)}else if(messages.additional.id!==undefined&&messages.additional.message===""){plausible.removeAdditionalMessage(messages.additional.id)}})},fetchMessages:function(){let data=new FormData;data.append("action","plausible_analytics_messages");let result=plausible.ajax(data,null,false);return result.then(function(response){return response})},showMessage:function(message,type="success"){if(type==="error"){document.getElementById("icon-error").classList.remove("hidden");document.getElementById("icon-success").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}else if(type==="notice"){document.getElementById("icon-notice").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-success").classList.add("hidden")}else{document.getElementById("icon-success").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}let notice=document.getElementById("plausible-analytics-notice");document.getElementById("plausible-analytics-notice-text").innerHTML=message;notice.classList.remove("hidden");setTimeout(function(){notice.classList.replace("opacity-0","opacity-100")},200);if(type!=="error"){setTimeout(function(){notice.classList.replace("opacity-100","opacity-0");setTimeout(function(){notice.classList+=" hidden"},200)},2e3)}},showAdditionalMessage:function(html,target){let targetElem=document.querySelector(`[name='${target}']`);let container=targetElem.closest(".plausible-analytics-group");if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].id.includes(target)){return}}}container.innerHTML+=html},removeAdditionalMessage:function(target){let targetElem=document.querySelector(`[name="${target}"]`);let container=targetElem.closest(".plausible-analytics-group");let additionalMessage;if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].classList.contains("plausible-analytics-hook")){additionalMessage=container.children[i];break}}}if(additionalMessage!==undefined&&!additionalMessage.classList.contains("plausible-analytics-persist")){container.removeChild(additionalMessage)}}};plausible.init()});
\ No newline at end of file
+document.addEventListener("DOMContentLoaded",()=>{if(!document.location.href.includes("plausible_analytics")){return}let plausible={nonceElem:document.getElementById("_wpnonce"),nonce:"",showWizardElem:document.getElementById("show_wizard"),domainNameElem:document.getElementById("domain_name"),apiTokenElem:document.getElementById("api_token"),createAPITokenElems:document.getElementsByClassName("plausible-create-api-token"),buttonElems:document.getElementsByClassName("plausible-analytics-button"),stepElems:document.getElementsByClassName("plausible-analytics-wizard-next-step"),init:function(){if(document.location.hash===""&&document.getElementById("plausible-analytics-wizard")!==null){document.location.hash="#welcome_slide"}if(this.nonceElem!==null){this.nonce=this.nonceElem.value}this.toggleWizardStep();window.addEventListener("hashchange",this.toggleWizardStep);if(this.showWizardElem!==null){this.showWizardElem.addEventListener("click",this.showWizard)}if(this.domainNameElem!==null){this.domainNameElem.addEventListener("keyup",this.disableConnectButton)}if(this.apiTokenElem!==null){this.apiTokenElem.addEventListener("keyup",this.disableConnectButton)}if(this.createAPITokenElems.length>0){for(let i=0;i<this.createAPITokenElems.length;i++){this.createAPITokenElems[i].addEventListener("click",this.createAPIToken)}}if(this.buttonElems.length>0){for(let i=0;i<this.buttonElems.length;i++){this.buttonElems[i].addEventListener("click",this.saveOption)}}document.addEventListener("click",this.toggleOption);if(this.stepElems.length>0){for(let i=0;i<this.stepElems.length;i++){this.stepElems[i].addEventListener("click",this.saveOptionOnNext)}}this.showMessages()},toggleOption:async function(e){if(e.target.classList===null||!e.target.classList.contains("plausible-analytics-toggle")){return}const button=e.target.closest("button");let toggle;if(e.target.type==="submit"){toggle=button.querySelector("span")}else{toggle=e.target.closest("span")}let toggleStatus;if(button.classList.contains("bg-indigo-600")){button.classList.replace("bg-indigo-600","bg-gray-200");toggle.classList.replace("translate-x-5","translate-x-0");button.dataset.status="off";toggleStatus=""}else{button.classList.replace("bg-gray-200","bg-indigo-600");toggle.classList.replace("translate-x-0","translate-x-5");button.dataset.status="on";toggleStatus="on"}const form=new FormData;form.append("action","plausible_analytics_toggle_option");form.append("option_name",button.name);form.append("option_value",button.value);form.append("option_label",button.nextElementSibling.innerHTML);form.append("toggle_status",toggleStatus);form.append("is_list",button.dataset.list);form.append("_nonce",plausible.nonce);let data=await plausible.ajax(form);if(data.capabilities===undefined){return}plausible.maybeDisableOptions(data.capabilities)},saveOption:function(e){const button=e.target;const section=button.closest(".plausible-analytics-section");const inputs=section.querySelectorAll("input, textarea");const form=new FormData;const options=[];inputs.forEach(function(input){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})});form.append("action","plausible_analytics_save_options");form.append("options",JSON.stringify(options));form.append("_nonce",plausible.nonce);if(button.children.length>0){button.children[0].classList.remove("hidden")}button.setAttribute("disabled","disabled");plausible.ajax(form,button)},maybeDisableOptions:function(capabilities){let options=document.querySelectorAll("button[data-caps]");options.forEach(function(option){let caps=option.dataset.caps.split(",");let disable=false;caps.forEach(function(cap){if(capabilities[cap]===false){disable=true}});if(disable===true){if(option.dataset.status==="on"){option.dispatchEvent(new Event("click",{bubbles:true}))}}})},validateInput:function(input){if(input.name==="domain_name"&&input.value.match(/^(https?:\/\/)?(www.)?/).length>0){input.value=input.value.replace(/^(https?:\/\/)?(www.)?/,"")}return input},saveOptionOnNext:function(e){let hash=document.location.hash.replace("#","");if(hash!=="api_token_slide"&&hash!=="domain_name_slide"){return}let form=e.target.closest(".plausible-analytics-wizard-step-section");let inputs=form.getElementsByTagName("INPUT");let options=[];for(let input of inputs){input=plausible.validateInput(input);options.push({name:input.name,value:input.value})}let data=new FormData;data.append("action","plausible_analytics_save_options");data.append("options",JSON.stringify(options));data.append("_nonce",plausible.nonce);plausible.ajax(data).then(response=>{if(hash==="api_token_slide"&&response.success===true){let stats_button=document.getElementById("enable_analytics_dashboard_view_stats_in_wordpress");stats_button.removeAttribute("disabled")}})},disableConnectButton:function(e){let target=e.target;let button=document.getElementById("connect_plausible_analytics");let buttonIsHref=false;if(button===null){let slide_id=document.location.hash;button=document.querySelector(slide_id+" .plausible-analytics-wizard-next-step");buttonIsHref=true}if(button===null){return}if(target.value!==""){if(!buttonIsHref){button.disabled=false}else{button.classList.remove("pointer-events-none");button.classList.replace("bg-gray-200","bg-indigo-600")}return}if(!buttonIsHref){button.disabled=true;button.innerHTML=button.innerHTML.replace("Connected","Connect")}else{button.classList+=" pointer-events-none";button.classList.replace("bg-indigo-600","bg-gray-200")}},createAPIToken:function(e){e.preventDefault();let domain=document.getElementById("domain_name").value;domain=domain.replaceAll("/","%2F");window.open(`${plausible_analytics_hosted_domain}/${domain}/settings/integrations?new_token=WordPress`,"_blank","location=yes,height=768,width=1024,scrollbars=yes,status=no")},showWizard:function(e){let data=new FormData;data.append("action","plausible_analytics_show_wizard");data.append("_nonce",e.target.dataset.nonce);plausible.ajax(data)},toggleWizardStep:function(){if(document.getElementById("plausible-analytics-wizard")===null){return}const hash=document.location.hash.substring(1).replace("_slide","");let allSteps=document.querySelectorAll(".plausible-analytics-wizard-step");let activeSteps=document.querySelectorAll(".plausible-analytics-wizard-active-step");let completedSteps=document.querySelectorAll(".plausible-analytics-wizard-completed-step");for(let i=0;i<allSteps.length;i++){allSteps[i].classList.remove("hidden")}for(let i=0;i<activeSteps.length;i++){activeSteps[i].classList+=" hidden"}for(let i=0;i<completedSteps.length;i++){completedSteps[i].classList+=" hidden"}let currentStep=document.getElementById("active-step-"+hash);let inactiveCurrentStep=document.getElementById("step-"+hash);currentStep.classList.remove("hidden");inactiveCurrentStep.classList+=" hidden";let currentlyCompletedSteps=currentStep.dataset.completedSteps.split(",");currentlyCompletedSteps=currentlyCompletedSteps.filter(n=>n);if(currentlyCompletedSteps.length<1){return}currentlyCompletedSteps.forEach(function(step){let completedStep=document.getElementById("completed-step-"+step);let inactiveStep=document.getElementById("step-"+step);completedStep.classList.remove("hidden");inactiveStep.classList+=" hidden"})},ajax:function(data,button=null,showMessages=true){return fetch(ajaxurl,{method:"POST",body:data}).then(response=>{if(button){if(button.children.length>0){button.children[0].classList+=" hidden"}if(button.id==="connect_plausible_analytics"&&response.status===200){button.innerText=plausible_analytics_i18n.connected}else{button.removeAttribute("disabled")}}if(response.status===200||response.status===402){return response.json()}return false}).then(response=>{if(showMessages===true){plausible.showMessages()}let event=new CustomEvent("plausibleAjaxDone",{detail:response});document.dispatchEvent(event);if(response.data!==undefined){return response.data}else{return response}})},showMessages:function(){let messages=plausible.fetchMessages();messages.then(function(messages){if(messages.error!==false){plausible.showMessage(messages.error,"error")}else if(messages.notice!==false){plausible.showMessage(messages.notice,"notice")}else if(messages.success!==false){plausible.showMessage(messages.success,"success")}if(messages.additional.length===0||document.getElementById("plausible-analytics-wizard")!==null){return}if(messages.additional.id!==undefined&&messages.additional.message){plausible.showAdditionalMessage(messages.additional.message,messages.additional.id)}else if(messages.additional.id!==undefined&&messages.additional.message===""){plausible.removeAdditionalMessage(messages.additional.id)}})},fetchMessages:function(){let data=new FormData;data.append("action","plausible_analytics_messages");let result=plausible.ajax(data,null,false);return result.then(function(response){return response})},showMessage:function(message,type="success"){if(type==="error"){document.getElementById("icon-error").classList.remove("hidden");document.getElementById("icon-success").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}else if(type==="notice"){document.getElementById("icon-notice").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-success").classList.add("hidden")}else{document.getElementById("icon-success").classList.remove("hidden");document.getElementById("icon-error").classList.add("hidden");document.getElementById("icon-notice").classList.add("hidden")}let notice=document.getElementById("plausible-analytics-notice");document.getElementById("plausible-analytics-notice-text").innerHTML=message;notice.classList.remove("hidden");setTimeout(function(){notice.classList.replace("opacity-0","opacity-100")},200);if(type!=="error"){setTimeout(function(){notice.classList.replace("opacity-100","opacity-0");setTimeout(function(){notice.classList+=" hidden"},200)},2e3)}},showAdditionalMessage:function(html,target){let targetElem=document.querySelector(`[name='${target}']`);let container=targetElem.closest(".plausible-analytics-group");if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].id.includes(target)){return}}}container.innerHTML+=html},removeAdditionalMessage:function(target){let targetElem=document.querySelector(`[name="${target}"]`);let container=targetElem.closest(".plausible-analytics-group");let additionalMessage;if(container.children.length>0){for(let i=0;i<container.children.length;i++){if(container.children[i].classList.contains("plausible-analytics-hook")){additionalMessage=container.children[i];break}}}if(additionalMessage!==undefined&&!additionalMessage.classList.contains("plausible-analytics-persist")){container.removeChild(additionalMessage)}}};plausible.init()});
\ No newline at end of file
diff --git a/src/Admin/Settings/Page.php b/src/Admin/Settings/Page.php
index a1ebe0b1..7116d7ec 100644
--- a/src/Admin/Settings/Page.php
+++ b/src/Admin/Settings/Page.php
@@ -144,76 +144,68 @@ public function __construct() {
 					),
 					'fields' => [
 						'404'              => [
-							'label'    => esc_html__( '404 error pages', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-404-error-pages',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => '404',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
-							'caps'     => [ self::CAP_GOALS ],
+							'label' => esc_html__( '404 error pages', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-404-error-pages',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => '404',
+							'caps'  => [ self::CAP_GOALS ],
 						],
 						'outbound-links'   => [
-							'label'    => esc_html__( 'Outbound links', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-external-link-clicks',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'outbound-links',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
-							'caps'     => [ self::CAP_GOALS ],
+							'label' => esc_html__( 'Outbound links', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-external-link-clicks',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'outbound-links',
+							'caps'  => [ self::CAP_GOALS ],
 						],
 						'file-downloads'   => [
-							'label'    => esc_html__( 'File downloads', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-file-downloads',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'file-downloads',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS ] ),
-							'caps'     => [ self::CAP_GOALS ],
+							'label' => esc_html__( 'File downloads', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-file-downloads',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'file-downloads',
+							'caps'  => [ self::CAP_GOALS ],
 						],
 						'search'           => [
-							'label'    => esc_html__( 'Search queries', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-enable-site-search-tracking',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'search',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
-							'caps'     => [ self::CAP_GOALS, self::CAP_PROPS ],
+							'label' => esc_html__( 'Search queries', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-enable-site-search-tracking',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'search',
+							'caps'  => [ self::CAP_GOALS, self::CAP_PROPS ],
 						],
 						'tagged-events'    => [
-							'label'    => esc_html__( 'Custom events', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-setup-custom-events-to-track-goal-conversions',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'tagged-events',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
-							'caps'     => [ self::CAP_GOALS, self::CAP_PROPS ],
+							'label' => esc_html__( 'Custom events', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-setup-custom-events-to-track-goal-conversions',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'tagged-events',
+							'caps'  => [ self::CAP_GOALS, self::CAP_PROPS ],
 						],
 						'revenue'          => [
-							'label'    => esc_html__( 'Ecommerce revenue', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-ecommerce-revenue',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'revenue',
-							'disabled' => ! empty( $settings[ 'self_hosted_domain' ] ) || ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_FUNNELS, self::CAP_PROPS, self::CAP_REVENUE ] ),
-							'caps'     => [ self::CAP_GOALS, self::CAP_FUNNELS, self::CAP_PROPS, self::CAP_REVENUE ],
+							'label' => esc_html__( 'Ecommerce revenue', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-ecommerce-revenue',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'revenue',
+							'caps'  => [ self::CAP_GOALS, self::CAP_FUNNELS, self::CAP_PROPS, self::CAP_REVENUE ],
 						],
 						'pageview-props'   => [
-							'label'    => esc_html__( 'Authors and categories', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-send-custom-properties',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'pageview-props',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_PROPS ] ),
-							'caps'     => [ self::CAP_PROPS ],
+							'label' => esc_html__( 'Authors and categories', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-send-custom-properties',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'pageview-props',
+							'caps'  => [ self::CAP_PROPS ],
 						],
 						'form-completions' => [
-							'label'    => esc_html__( 'Form completions', 'plausible-analytics' ),
-							'docs'     => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-form-completions',
-							'slug'     => 'enhanced_measurements',
-							'type'     => 'checkbox',
-							'value'    => 'form-completions',
-							'disabled' => ! $this->token_has_cap( [ self::CAP_GOALS, self::CAP_PROPS ] ),
-							'caps'     => [ self::CAP_GOALS, self::CAP_PROPS ],
+							'label' => esc_html__( 'Form completions', 'plausible-analytics' ),
+							'docs'  => 'https://plausible.io/wordpress-analytics-plugin#how-to-track-form-completions',
+							'slug'  => 'enhanced_measurements',
+							'type'  => 'checkbox',
+							'value' => 'form-completions',
+							'caps'  => [ self::CAP_GOALS, self::CAP_PROPS ],
 						],
 						'hash'             => [
 							'label' => esc_html__( 'Hash-based routing', 'plausible-analytics' ),
@@ -496,22 +488,6 @@ private function init() {
 		new Hooks();
 	}
 
-	private function token_has_cap( $caps ) {
-		static $stored_caps = [];
-
-		if ( empty( $stored_caps ) ) {
-			$stored_caps = get_option( 'plausible_analytics_api_token_caps', [] );
-		}
-
-		foreach ( $caps as $cap ) {
-			if ( empty( $stored_caps[ $cap ] ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	 * Load all available user roles as a list (sorted alphabetically) of checkboxes to be processed by the Settings
 	 * API.
@@ -751,4 +727,20 @@ public function render_analytics_dashboard() {
 			<?php
 		}
 	}
+
+	private function token_has_cap( $caps ) {
+		static $stored_caps = [];
+
+		if ( empty( $stored_caps ) ) {
+			$stored_caps = get_option( 'plausible_analytics_api_token_caps', [] );
+		}
+
+		foreach ( $caps as $cap ) {
+			if ( empty( $stored_caps[ $cap ] ) ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
 }
diff --git a/src/Ajax.php b/src/Ajax.php
index b6275239..2e059408 100644
--- a/src/Ajax.php
+++ b/src/Ajax.php
@@ -190,10 +190,12 @@ public function toggle_option() {
 			 * Toggle lists.
 			 */
 			if ( $post_data[ 'toggle_status' ] === 'on' ) {
+				// If toggle is on, store the value under a new key.
 				if ( ! in_array( $post_data[ 'option_value' ], $settings[ $post_data[ 'option_name' ] ] ) ) {
 					$settings[ $post_data[ 'option_name' ] ][] = $post_data[ 'option_value' ];
 				}
 			} else {
+				// If toggle is off, find the key by its value and unset it.
 				if ( ( $key = array_search( $post_data[ 'option_value' ], $settings[ $post_data[ 'option_name' ] ] ) ) !== false ) {
 					unset( $settings[ $post_data[ 'option_name' ] ][ $key ] );
 				}
@@ -283,8 +285,6 @@ public function save_options() {
 			wp_send_json_error( null, 400 );
 		}
 
-		$caps = [];
-
 		foreach ( $options as $option ) {
 			// Clean spaces
 			$settings[ $option->name ] = trim( $option->value );
@@ -292,7 +292,6 @@ public function save_options() {
 			// Validate Plugin Token, if this is the Plugin Token field.
 			if ( $option->name === 'api_token' ) {
 				$this->validate_api_token( $option->value );
-				$caps = $this->store_capabilities( $option->value );
 
 				$additional = $this->maybe_render_additional_message( $option->name, $option->value );
 
@@ -304,10 +303,6 @@ public function save_options() {
 
 		Messages::set_success( __( 'Settings saved.', 'plausible-analytics' ) );
 
-		if ( ! empty( $caps ) ) {
-			wp_send_json_success( [ 'capabilities' => $caps ], 200 );
-		}
-
 		wp_send_json_success( null, 200 );
 	}
 
@@ -341,40 +336,4 @@ private function validate_api_token( $token = '' ) {
 			wp_send_json_error( 'invalid_api_token', 400 );
 		}
 	}
-
-	/**
-	 * Stores the capabilities for the currently entered API token in the DB for later use.
-	 *
-	 * @param $token
-	 *
-	 * @return false|array
-	 */
-	private function store_capabilities( $token = '' ) {
-		$client_factory = new ClientFactory( $token );
-		/** @var Client $client */
-		$client = $client_factory->build();
-
-		if ( ! $client instanceof Client ) {
-			return false;
-		}
-
-		/** @var Client\Model\CapabilitiesFeatures $features */
-		$features = $client->get_features();
-
-		if ( ! $features ) {
-			return false;
-		}
-
-		$caps = [
-			'funnels' => $features->getFunnels(),
-			'goals'   => $features->getGoals(),
-			'props'   => $features->getProps(),
-			'revenue' => $features->getRevenueGoals(),
-			'stats'   => $features->getStatsApi(),
-		];
-
-		update_option( 'plausible_analytics_api_token_caps', $caps );
-
-		return $caps;
-	}
 }
diff --git a/src/Client.php b/src/Client.php
index a972d028..ae623a56 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -212,7 +212,45 @@ private function send_json_error( $e, $error_message ) {
 
 		Messages::set_error( sprintf( $error_message, $message ) );
 
-		wp_send_json_error( null, $code );
+		$caps = $this->store_capabilities();
+
+		wp_send_json_error( [ 'capabilities' => $caps ], $code );
+	}
+
+	/**
+	 * Stores the capabilities for the currently entered API token in the DB for later use.
+	 *
+	 * @param $token
+	 *
+	 * @return false|array
+	 */
+	private function store_capabilities( $token = '' ) {
+		$client_factory = new ClientFactory( $token );
+		/** @var Client $client */
+		$client = $client_factory->build();
+
+		if ( ! $client instanceof Client ) {
+			return false;
+		}
+
+		/** @var Client\Model\CapabilitiesFeatures $features */
+		$features = $client->get_features();
+
+		if ( ! $features ) {
+			return false;
+		}
+
+		$caps = [
+			'funnels' => $features->getFunnels(),
+			'goals'   => $features->getGoals(),
+			'props'   => $features->getProps(),
+			'revenue' => $features->getRevenueGoals(),
+			'stats'   => $features->getStatsApi(),
+		];
+
+		update_option( 'plausible_analytics_api_token_caps', $caps );
+
+		return $caps;
 	}
 
 	/**

From 274f79f30b9e2c23fb2c89f1e8b4653f4a79cf9e Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 19:33:13 +0100
Subject: [PATCH 26/44] Fixed: capabilities of Form completions and Custom
 Events.

---
 src/Admin/Settings/Page.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Admin/Settings/Page.php b/src/Admin/Settings/Page.php
index 7116d7ec..f87c60a0 100644
--- a/src/Admin/Settings/Page.php
+++ b/src/Admin/Settings/Page.php
@@ -181,7 +181,7 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => 'tagged-events',
-							'caps'  => [ self::CAP_GOALS, self::CAP_PROPS ],
+							'caps'  => [ self::CAP_GOALS ],
 						],
 						'revenue'          => [
 							'label' => esc_html__( 'Ecommerce revenue', 'plausible-analytics' ),
@@ -205,7 +205,7 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => 'form-completions',
-							'caps'  => [ self::CAP_GOALS, self::CAP_PROPS ],
+							'caps'  => [ self::CAP_GOALS ],
 						],
 						'hash'             => [
 							'label' => esc_html__( 'Hash-based routing', 'plausible-analytics' ),

From b216a31237c75538e28b787884cd4dcdef39211c Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 21:33:45 +0100
Subject: [PATCH 27/44] Minor refactor.

---
 src/Client.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Client.php b/src/Client.php
index ae623a56..e6e4406a 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -212,7 +212,7 @@ private function send_json_error( $e, $error_message ) {
 
 		Messages::set_error( sprintf( $error_message, $message ) );
 
-		$caps = $this->store_capabilities();
+		$caps = $this->update_capabilities();
 
 		wp_send_json_error( [ 'capabilities' => $caps ], $code );
 	}
@@ -224,7 +224,7 @@ private function send_json_error( $e, $error_message ) {
 	 *
 	 * @return false|array
 	 */
-	private function store_capabilities( $token = '' ) {
+	private function update_capabilities( $token = '' ) {
 		$client_factory = new ClientFactory( $token );
 		/** @var Client $client */
 		$client = $client_factory->build();

From 83711d960a6ba8f05ea97d065eafdc4d6fb82ea4 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 21:44:55 +0100
Subject: [PATCH 28/44] Nothing to test here.

---
 src/Client.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Client.php b/src/Client.php
index e6e4406a..8a704536 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -223,6 +223,8 @@ private function send_json_error( $e, $error_message ) {
 	 * @param $token
 	 *
 	 * @return false|array
+	 *
+	 * @codeCoverageIgnore
 	 */
 	private function update_capabilities( $token = '' ) {
 		$client_factory = new ClientFactory( $token );

From 005e849303e04c998224c1ef008983340c432a65 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 20 Mar 2025 11:25:53 +0100
Subject: [PATCH 29/44] 2.3.1

---
 plausible-analytics.php |  4 ++--
 readme.txt              | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/plausible-analytics.php b/plausible-analytics.php
index b4ec8636..23c560e1 100644
--- a/plausible-analytics.php
+++ b/plausible-analytics.php
@@ -5,7 +5,7 @@
  * Description: Simple and privacy-friendly alternative to Google Analytics.
  * Author: Plausible.io
  * Author URI: https://plausible.io
- * Version: 2.3.0
+ * Version: 2.3.1
  * Text Domain: plausible-analytics
  * Domain Path: /languages
  */
@@ -18,7 +18,7 @@
 }
 
 // Define plugin version here for convenience.
-define( 'PLAUSIBLE_ANALYTICS_VERSION', '2.3.0' );
+define( 'PLAUSIBLE_ANALYTICS_VERSION', '2.3.1' );
 define( 'PLAUSIBLE_ANALYTICS_PLUGIN_FILE', __FILE__ );
 define( 'PLAUSIBLE_ANALYTICS_PLUGIN_BASENAME', plugin_basename( PLAUSIBLE_ANALYTICS_PLUGIN_FILE ) );
 define( 'PLAUSIBLE_ANALYTICS_PLUGIN_DIR', plugin_dir_path( PLAUSIBLE_ANALYTICS_PLUGIN_FILE ) );
diff --git a/readme.txt b/readme.txt
index 781e602e..34e755b6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: analytics, google analytics, web analytics, stats, privacy
 Requires at least: 5.9
 Tested up to: 6.7
 Requires PHP: 7.2
-Stable tag: 2.3.0
+Stable tag: 2.3.1
 License: Massachusetts Institute of Technology (MIT) license
 License URI: https://opensource.org/licenses/MIT
 
@@ -155,6 +155,14 @@ Please make sure you make a backup of your database before updating any version
 
 == Changelog ==
 
+= 2.3.1 | March 20th, 2025 =
+* Fixed: cronjob which updated JS library when Proxy enabled, didn't register properly.
+* Added: support for add to cart tracking through direct links, e.g. yourdomain.com?add-to-cart=1
+* Improved: added Gravity Forms compatibility to Form Completions enhanced measurement.
+* Improved: only rewrite JS script's ID attribute if IE compatibility is enabled.
+* Added: auto-enable customer user role tracking if EDD/WC is installed and Revenue tracking is enabled.
+* Added: features not available in plan are now disabled accordingly.
+
 = 2.3.0 | March 5th, 2025 =
 * Improved: Domain Name is now validated before it's stored in the database.
 * Added: Easy Digital Downloads integration, which will automatically be enabled when Ecommerce Revenue is enabled.

From 7465e3ba24535537643924f6440ec3d3752d411b Mon Sep 17 00:00:00 2001
From: Paul Phillips <paul@ukclimbing.com>
Date: Thu, 27 Mar 2025 10:18:46 +0000
Subject: [PATCH 30/44] Update WooCommerce.php

Getting 500 errors in Google Search console from old links to `site.com/?add-to-cart=832` where that product ID isn't for sale anymore.

Don't track if product not available anymore.
---
 src/Integrations/WooCommerce.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Integrations/WooCommerce.php b/src/Integrations/WooCommerce.php
index 9eec455b..e582d8ca 100644
--- a/src/Integrations/WooCommerce.php
+++ b/src/Integrations/WooCommerce.php
@@ -204,6 +204,9 @@ public function track_direct_add_to_cart() {
 	 * @codeCoverageIgnore Because we can't test XHR requests here.
 	 */
 	public function track_add_to_cart( $product, $add_to_cart_data ) {
+		if ( !$product ) {
+			return;
+		}
 		$product_data  = $this->clean_data( $product->get_data() );
 		$added_to_cart = $this->clean_data( $add_to_cart_data );
 		$cart          = WC()->cart;

From 086b4ab70cdcc3c785059d93d1d8d01c71cd604e Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 4 Apr 2025 13:53:58 +0200
Subject: [PATCH 31/44] Fixed: Call to a member function get_data on bool.

---
 src/Integrations/WooCommerce.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Integrations/WooCommerce.php b/src/Integrations/WooCommerce.php
index 9eec455b..45d1cd4d 100644
--- a/src/Integrations/WooCommerce.php
+++ b/src/Integrations/WooCommerce.php
@@ -204,6 +204,10 @@ public function track_direct_add_to_cart() {
 	 * @codeCoverageIgnore Because we can't test XHR requests here.
 	 */
 	public function track_add_to_cart( $product, $add_to_cart_data ) {
+		if ( ! $product ) {
+			return;
+		}
+
 		$product_data  = $this->clean_data( $product->get_data() );
 		$added_to_cart = $this->clean_data( $add_to_cart_data );
 		$cart          = WC()->cart;

From f91546fc0fe24d33364423a8a467365aab482c6b Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 16 Apr 2025 14:51:33 +0200
Subject: [PATCH 32/44] Tested with WP 6.8

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 34e755b6..253973ca 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: plausible, DaanvandenBergh
 Donate link: https://plausible.io/
 Tags: analytics, google analytics, web analytics, stats, privacy
 Requires at least: 5.9
-Tested up to: 6.7
+Tested up to: 6.8
 Requires PHP: 7.2
 Stable tag: 2.3.1
 License: Massachusetts Institute of Technology (MIT) license

From 1140b07767c8c7fb6c83e94561f488149d0bce33 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 16 Apr 2025 16:22:16 +0200
Subject: [PATCH 33/44] Improved: store token caps in DB during validation.

---
 src/Client.php | 86 ++++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/Client.php b/src/Client.php
index 8a704536..8093231e 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -11,7 +11,9 @@
 use Plausible\Analytics\WP\Client\Model\Capabilities;
 use Plausible\Analytics\WP\Client\Model\CapabilitiesFeatures;
 use Plausible\Analytics\WP\Client\Model\CustomPropEnableRequestBulkEnable;
+use Plausible\Analytics\WP\Client\Model\FunnelCreateRequest;
 use Plausible\Analytics\WP\Client\Model\GoalCreateRequestBulkGetOrCreate;
+use Plausible\Analytics\WP\Client\Model\GoalListResponse;
 use Plausible\Analytics\WP\Client\Model\PaymentRequiredError;
 use Plausible\Analytics\WP\Client\Model\SharedLink;
 use Plausible\Analytics\WP\Client\Model\UnauthorizedError;
@@ -58,13 +60,15 @@ public function validate_api_token() {
 
 		$data_domain = $this->get_data_domain();
 		$token       = $this->api_instance->getConfig()->getPassword();
-		$is_valid    = strpos( $token, 'plausible-plugin' ) !== false && ! empty( $features->getGoals() ) && $data_domain === Helpers::get_domain();
+		$is_valid    = str_contains( $token, 'plausible-plugin' ) && ! empty( $features->getGoals() ) && $data_domain === Helpers::get_domain();
 
 		/**
 		 * Don't cache invalid API tokens.
 		 */
 		if ( $is_valid ) {
 			set_transient( 'plausible_analytics_valid_token', [ $token => true ], 86400 ); // @codeCoverageIgnore
+
+			$this->update_capabilities( $token );
 		}
 
 		return $is_valid;
@@ -129,6 +133,44 @@ private function get_data_domain() {
 		return false;
 	}
 
+	/**
+	 * Stores the capabilities for the currently entered API token in the DB for later use.
+	 *
+	 * @param $token
+	 *
+	 * @return false|array
+	 *
+	 * @codeCoverageIgnore
+	 */
+	private function update_capabilities( $token = '' ) {
+		$client_factory = new ClientFactory( $token );
+		/** @var Client $client */
+		$client = $client_factory->build();
+
+		if ( ! $client instanceof Client ) {
+			return false;
+		}
+
+		/** @var Client\Model\CapabilitiesFeatures $features */
+		$features = $client->get_features();
+
+		if ( ! $features ) {
+			return false;
+		}
+
+		$caps = [
+			'funnels' => $features->getFunnels(),
+			'goals'   => $features->getGoals(),
+			'props'   => $features->getProps(),
+			'revenue' => $features->getRevenueGoals(),
+			'stats'   => $features->getStatsApi(),
+		];
+
+		update_option( 'plausible_analytics_api_token_caps', $caps );
+
+		return $caps;
+	}
+
 	/**
 	 * Create Shared Link in Plausible Dashboard.
 	 *
@@ -217,50 +259,12 @@ private function send_json_error( $e, $error_message ) {
 		wp_send_json_error( [ 'capabilities' => $caps ], $code );
 	}
 
-	/**
-	 * Stores the capabilities for the currently entered API token in the DB for later use.
-	 *
-	 * @param $token
-	 *
-	 * @return false|array
-	 *
-	 * @codeCoverageIgnore
-	 */
-	private function update_capabilities( $token = '' ) {
-		$client_factory = new ClientFactory( $token );
-		/** @var Client $client */
-		$client = $client_factory->build();
-
-		if ( ! $client instanceof Client ) {
-			return false;
-		}
-
-		/** @var Client\Model\CapabilitiesFeatures $features */
-		$features = $client->get_features();
-
-		if ( ! $features ) {
-			return false;
-		}
-
-		$caps = [
-			'funnels' => $features->getFunnels(),
-			'goals'   => $features->getGoals(),
-			'props'   => $features->getProps(),
-			'revenue' => $features->getRevenueGoals(),
-			'stats'   => $features->getStatsApi(),
-		];
-
-		update_option( 'plausible_analytics_api_token_caps', $caps );
-
-		return $caps;
-	}
-
 	/**
 	 * Allows creating Custom Event Goals in bulk.
 	 *
 	 * @param GoalCreateRequestBulkGetOrCreate $goals
 	 *
-	 * @return Client\Model\PaymentRequiredError|Client\Model\PlausibleWebPluginsAPIControllersGoalsCreate201Response|Client\Model\UnauthorizedError|Client\Model\UnprocessableEntityError|null
+	 * @return GoalListResponse|PaymentRequiredError|UnauthorizedError|UnprocessableEntityError|void
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -275,7 +279,7 @@ public function create_goals( $goals ) {
 	/**
 	 * Allows creating Funnels in bulk.
 	 *
-	 * @param \Plausible\Analytics\WP\Client\Model\FunnelCreateRequest $funnel
+	 * @param FunnelCreateRequest $funnel
 	 *
 	 * @return Client\Model\Funnel|PaymentRequiredError|UnauthorizedError|UnprocessableEntityError|void
 	 *

From a901c6e6c2fee9cc72b8e11c8c7526cb7502ad9e Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 16 Apr 2025 16:23:04 +0200
Subject: [PATCH 34/44] Added: Search queries can now be enabled for Growth
 plans.

---
 src/Admin/Provisioning.php  | 6 ++++++
 src/Admin/Settings/Page.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Admin/Provisioning.php b/src/Admin/Provisioning.php
index 0b417f1e..787741f5 100644
--- a/src/Admin/Provisioning.php
+++ b/src/Admin/Provisioning.php
@@ -360,7 +360,13 @@ public function maybe_create_custom_properties( $old_settings, $settings ) {
 		 * Create Custom Properties for Search Queries option.
 		 */
 		if ( Helpers::is_enhanced_measurement_enabled( 'search', $enhanced_measurements ) ) {
+			$caps = get_option( 'plausible_analytics_api_token_caps', [] );
+
 			foreach ( $this->custom_search_properties as $property ) {
+				if ( empty( $caps[ 'props' ] ) && $property === 'result_count' ) {
+					continue;
+				}
+
 				$properties[] = new Client\Model\CustomProp( [ 'custom_prop' => [ 'key' => $property ] ] );
 			}
 		}
diff --git a/src/Admin/Settings/Page.php b/src/Admin/Settings/Page.php
index f87c60a0..416d3367 100644
--- a/src/Admin/Settings/Page.php
+++ b/src/Admin/Settings/Page.php
@@ -173,7 +173,7 @@ public function __construct() {
 							'slug'  => 'enhanced_measurements',
 							'type'  => 'checkbox',
 							'value' => 'search',
-							'caps'  => [ self::CAP_GOALS, self::CAP_PROPS ],
+							'caps'  => [ self::CAP_GOALS ],
 						],
 						'tagged-events'    => [
 							'label' => esc_html__( 'Custom events', 'plausible-analytics' ),

From fbc934c1bbbdf8578f0b61b5a1b97df38a68f876 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Wed, 16 Apr 2025 16:45:36 +0200
Subject: [PATCH 35/44] Ignore this line.

---
 src/Client.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Client.php b/src/Client.php
index 8093231e..4b1f3415 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -68,7 +68,7 @@ public function validate_api_token() {
 		if ( $is_valid ) {
 			set_transient( 'plausible_analytics_valid_token', [ $token => true ], 86400 ); // @codeCoverageIgnore
 
-			$this->update_capabilities( $token );
+			$this->update_capabilities( $token ); // @codeCoverageIgnore
 		}
 
 		return $is_valid;

From df661b96f27e215c13e137210cc583d648159b79 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:58:12 +0200
Subject: [PATCH 36/44] Fixed: Function _load_textdomain_just_in_time was
 called incorrectly in WP 6.8

---
 src/Plugin.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index bcd28afd..1e79e69b 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -42,9 +42,11 @@ public function setup() {
 	 * @return void
 	 */
 	public function register_services() {
+
 		if ( is_admin() ) {
+			add_action( 'init', [ $this, 'load_settings' ] );
+			
 			new Admin\Upgrades();
-			new Admin\Settings\Page();
 			new Admin\Filters();
 			new Admin\Actions();
 			new Admin\Module();
@@ -60,6 +62,10 @@ public function register_services() {
 		new Proxy();
 	}
 
+	public function load_settings() {
+		new Admin\Settings\Page();
+	}
+
 	/**
 	 * Loads the plugin's translated strings.
 	 *

From 999eab3333c2305b04d2801e089826554724e338 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 18 Apr 2025 17:10:05 +0200
Subject: [PATCH 37/44] Improved: is_wc_active and is_edd_active methods did
 too much.

---
 src/Integrations.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Integrations.php b/src/Integrations.php
index 247c29db..51683004 100644
--- a/src/Integrations.php
+++ b/src/Integrations.php
@@ -27,12 +27,12 @@ public function __construct() {
 	 */
 	private function init() {
 		// WooCommerce
-		if ( self::is_wc_active() ) {
+		if ( self::is_wc_active() && Helpers::is_enhanced_measurement_enabled( 'revenue' ) ) {
 			new Integrations\WooCommerce();
 		}
 
 		// Easy Digital Downloads
-		if ( self::is_edd_active() ) {
+		if ( self::is_edd_active() && Helpers::is_enhanced_measurement_enabled( 'revenue' ) ) {
 			new Integrations\EDD();
 		}
 
@@ -47,7 +47,7 @@ private function init() {
 	 * @return bool
 	 */
 	public static function is_wc_active() {
-		return apply_filters( 'plausible_analytics_integrations_woocommerce', function_exists( 'WC' ) && Helpers::is_enhanced_measurement_enabled( 'revenue' ) );
+		return apply_filters( 'plausible_analytics_integrations_woocommerce', function_exists( 'WC' ) );
 	}
 
 	/**
@@ -55,7 +55,7 @@ public static function is_wc_active() {
 	 * @return bool
 	 */
 	public static function is_edd_active() {
-		return apply_filters( 'plausible_analytics_integrations_edd', function_exists( 'EDD' ) && Helpers::is_enhanced_measurement_enabled( 'revenue' ) );
+		return apply_filters( 'plausible_analytics_integrations_edd', function_exists( 'EDD' ) );
 	}
 
 	/**

From 3183e2b8ff9ff499e7a6b552172f021867451222 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 18 Apr 2025 17:11:57 +0200
Subject: [PATCH 38/44] Fixed: Translation loading for the plausible-analytics
 domain was triggered too early.

---
 src/Plugin.php | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 1e79e69b..3c2c0627 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -45,16 +45,16 @@ public function register_services() {
 
 		if ( is_admin() ) {
 			add_action( 'init', [ $this, 'load_settings' ] );
-			
+			add_action( 'init', [ $this, 'load_provisioning' ] );
+			add_action( 'init', [ $this, 'load_integrations_provisioning' ] );
+
 			new Admin\Upgrades();
 			new Admin\Filters();
 			new Admin\Actions();
 			new Admin\Module();
-			new Admin\Provisioning();
-			new Admin\Provisioning\Integrations();
 		}
 
-		new Integrations();
+		add_action( 'init', [ $this, 'load_integrations' ] );
 		new Actions();
 		new Ajax();
 		new Compatibility();
@@ -66,6 +66,33 @@ public function load_settings() {
 		new Admin\Settings\Page();
 	}
 
+	/**
+	 * Load @see Admin\Provisioning()
+	 *
+	 * @return void
+	 */
+	public function load_provisioning() {
+		new Admin\Provisioning();
+	}
+
+	/**
+	 * Load @see Admin\Provisioning\Integrations()
+	 *
+	 * @return void
+	 */
+	public function load_integrations_provisioning() {
+		new Admin\Provisioning\Integrations();
+	}
+
+	/**
+	 * Load @see Integrations()
+	 *
+	 * @return void
+	 */
+	public function load_integrations() {
+		new Integrations();
+	}
+
 	/**
 	 * Loads the plugin's translated strings.
 	 *

From b9329b15820c5085c1d43fdce161ad7b07dfc010 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 18 Apr 2025 20:29:29 +0200
Subject: [PATCH 39/44] Ignore this code, because there's nothing to test.

---
 src/Plugin.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 3c2c0627..5a893d4e 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -46,7 +46,6 @@ public function register_services() {
 		if ( is_admin() ) {
 			add_action( 'init', [ $this, 'load_settings' ] );
 			add_action( 'init', [ $this, 'load_provisioning' ] );
-			add_action( 'init', [ $this, 'load_integrations_provisioning' ] );
 
 			new Admin\Upgrades();
 			new Admin\Filters();
@@ -62,6 +61,13 @@ public function register_services() {
 		new Proxy();
 	}
 
+	/**
+	 * Load @see Admin\Settings\Page()
+	 *
+	 * @return void
+	 *
+	 * @codeCoverageIgnore
+	 */
 	public function load_settings() {
 		new Admin\Settings\Page();
 	}
@@ -70,17 +76,11 @@ public function load_settings() {
 	 * Load @see Admin\Provisioning()
 	 *
 	 * @return void
+	 *
+	 * @codeCoverageIgnore
 	 */
 	public function load_provisioning() {
 		new Admin\Provisioning();
-	}
-
-	/**
-	 * Load @see Admin\Provisioning\Integrations()
-	 *
-	 * @return void
-	 */
-	public function load_integrations_provisioning() {
 		new Admin\Provisioning\Integrations();
 	}
 
@@ -88,6 +88,8 @@ public function load_integrations_provisioning() {
 	 * Load @see Integrations()
 	 *
 	 * @return void
+	 *
+	 * @codeCoverageIgnore
 	 */
 	public function load_integrations() {
 		new Integrations();

From 84e23406b128a8366e46ed499085c19cec80783b Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 18 Apr 2025 20:31:59 +0200
Subject: [PATCH 40/44] is_edd_recurring_active did too much.

---
 src/Integrations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Integrations.php b/src/Integrations.php
index 51683004..3a71a995 100644
--- a/src/Integrations.php
+++ b/src/Integrations.php
@@ -71,6 +71,6 @@ public static function is_form_submit_active() {
 	 * @return mixed|null
 	 */
 	public static function is_edd_recurring_active() {
-		return apply_filters( 'plausible_analytics_integrations_edd_recurring', function_exists( 'EDD_Recurring' ) && Helpers::is_enhanced_measurement_enabled( 'revenue' ) );
+		return apply_filters( 'plausible_analytics_integrations_edd_recurring', function_exists( 'EDD_Recurring' ) );
 	}
 }

From f423fcf33000a64d6f75ee9d1688e2ab75d9acee Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Fri, 18 Apr 2025 20:34:08 +0200
Subject: [PATCH 41/44] Minor refactor.

---
 src/Integrations.php                   | 10 +---------
 tests/integration/IntegrationsTest.php | 11 -----------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/Integrations.php b/src/Integrations.php
index 3a71a995..e54a6406 100644
--- a/src/Integrations.php
+++ b/src/Integrations.php
@@ -37,7 +37,7 @@ private function init() {
 		}
 
 		// Form Plugins
-		if ( self::is_form_submit_active() ) {
+		if ( Helpers::is_enhanced_measurement_enabled( 'form-completions' ) ) {
 			new Integrations\FormSubmit();
 		}
 	}
@@ -58,14 +58,6 @@ public static function is_edd_active() {
 		return apply_filters( 'plausible_analytics_integrations_edd', function_exists( 'EDD' ) );
 	}
 
-	/**
-	 * Check if Form Submissions option is enabled in Enhanced Measurements.
-	 * @return mixed|null
-	 */
-	public static function is_form_submit_active() {
-		return apply_filters( 'plausible_analytics_integrations_form_submit', Helpers::is_enhanced_measurement_enabled( 'form-completions' ) );
-	}
-
 	/**
 	 * Checks if EDD Recurring is installed and activated.
 	 * @return mixed|null
diff --git a/tests/integration/IntegrationsTest.php b/tests/integration/IntegrationsTest.php
index 6873e23b..22b4bb8a 100644
--- a/tests/integration/IntegrationsTest.php
+++ b/tests/integration/IntegrationsTest.php
@@ -50,15 +50,4 @@ public function testIsEddActive() {
 
 		remove_filter( 'plausible_analytics_integrations_edd', '__return_true' );
 	}
-
-	/**
-	 * Determines if the form submission functionality is currently active.
-	 */
-	public function isFormSubmitActive() {
-		add_filter( 'plausible_analytics_integrations_form_submit', '__return_true' );
-
-		$this->assertTrue( Integrations::is_form_submit_active() );
-
-		remove_filter( 'plausible_analytics_integrations_form_submit', '__return_true' );
-	}
 }

From ac593a3a2e75ec02db12c8577f33b3fa2a75980f Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Tue, 22 Apr 2025 20:27:26 +0200
Subject: [PATCH 42/44] v2.3.2

---
 plausible-analytics.php | 2 +-
 readme.txt              | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plausible-analytics.php b/plausible-analytics.php
index 23c560e1..19403ede 100644
--- a/plausible-analytics.php
+++ b/plausible-analytics.php
@@ -5,7 +5,7 @@
  * Description: Simple and privacy-friendly alternative to Google Analytics.
  * Author: Plausible.io
  * Author URI: https://plausible.io
- * Version: 2.3.1
+ * Version: 2.3.2
  * Text Domain: plausible-analytics
  * Domain Path: /languages
  */
diff --git a/readme.txt b/readme.txt
index 253973ca..818d236f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: analytics, google analytics, web analytics, stats, privacy
 Requires at least: 5.9
 Tested up to: 6.8
 Requires PHP: 7.2
-Stable tag: 2.3.1
+Stable tag: 2.3.2
 License: Massachusetts Institute of Technology (MIT) license
 License URI: https://opensource.org/licenses/MIT
 
@@ -155,6 +155,10 @@ Please make sure you make a backup of your database before updating any version
 
 == Changelog ==
 
+= 2.3.2 | April 22nd, 2025 =
+* Tested with WP 6.8.
+* Added: Search Queries can now be enabled for Growth plans.
+
 = 2.3.1 | March 20th, 2025 =
 * Fixed: cronjob which updated JS library when Proxy enabled, didn't register properly.
 * Added: support for add to cart tracking through direct links, e.g. yourdomain.com?add-to-cart=1

From b1a3f72b828317311fd9f23c6d62a471e81c7b0d Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 24 Apr 2025 14:13:22 +0200
Subject: [PATCH 43/44] Fixed: exclude our loaded JS from WP Rocket's delay JS
 setting.

---
 src/Compatibility.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Compatibility.php b/src/Compatibility.php
index a3045cdd..6dc837a5 100644
--- a/src/Compatibility.php
+++ b/src/Compatibility.php
@@ -59,6 +59,7 @@ public function __construct() {
 			add_filter( 'rocket_exclude_js', [ $this, 'exclude_plausible_js' ] );
 			add_filter( 'rocket_minify_excluded_external_js', [ $this, 'exclude_plausible_js' ] );
 			add_filter( 'rocket_delay_js_exclusions', [ $this, 'exclude_plausible_inline_js' ] );
+			add_filter( 'rocket_delay_js_exclusions', [ $this, 'exclude_by_proxy_endpoint' ] );
 			add_filter( 'rocket_exclude_defer_js', [ $this, 'exclude_plausible_js_by_relative_url' ] );
 		}
 	}
@@ -126,6 +127,20 @@ public function exclude_plausible_js_by_relative_url( $excluded_js ) {
 		return $excluded_js;
 	}
 
+	/**
+	 * Dear WP Rocket/SG Optimizer/Etc. don't minify/combine/delay our API endpoint, please.
+	 *
+	 * @param $excluded_js
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function exclude_by_proxy_endpoint( $excluded_js ) {
+		$excluded_js[] = Helpers::get_rest_endpoint( false );
+
+		return $excluded_js;
+	}
+
 	/**
 	 * Dear WP Rocket/SG Optimizer/Etc., don't minify/combine/delay our external JS, please.
 	 *

From a4ddc1d284c121c1f9870451016f823e1c14946a Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Thu, 24 Apr 2025 14:46:13 +0200
Subject: [PATCH 44/44] Added: W3 Total Cache compatibility

---
 src/Compatibility.php | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/Compatibility.php b/src/Compatibility.php
index 6dc837a5..5a5a1252 100644
--- a/src/Compatibility.php
+++ b/src/Compatibility.php
@@ -43,6 +43,11 @@ public function __construct() {
 			add_filter( 'sgo_javascript_combine_excluded_external_paths', [ $this, 'exclude_plausible_js' ] );
 		}
 
+		// W3 Total Cache
+		if ( defined( 'W3TC_VERSION' ) ) {
+			add_filter( 'w3tc_minify_js_script_tags', [ $this, 'unset_plausible_js' ] );
+		}
+
 		// WPML
 		if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
 			add_filter( 'rest_url', [ $this, 'wpml_compatibility' ], 10, 1 );
@@ -110,6 +115,26 @@ public function exclude_plausible_js( $excluded_js ) {
 		return $excluded_js;
 	}
 
+	/**
+	 * Remove Plausible.js (or the local file, when proxy is enabled) of the list of JS files to minify.
+	 *
+	 * @filter w3tc_minify_js_script_tags
+	 * @since  2.4.0
+	 *
+	 * @param $script_tags
+	 *
+	 * @return array
+	 * @throws Exception
+	 */
+	public function unset_plausible_js( $script_tags ) {
+		return array_filter(
+			$script_tags,
+			function ( $tag ) {
+				return str_contains( $tag, Helpers::get_js_url( true ) ) === false;
+			}
+		);
+	}
+
 	/**
 	 * Dear WP Rocket/SG Optimizer/Etc., don't minify/combine/delay our external JS, please.
 	 *
@@ -128,7 +153,11 @@ public function exclude_plausible_js_by_relative_url( $excluded_js ) {
 	}
 
 	/**
-	 * Dear WP Rocket/SG Optimizer/Etc. don't minify/combine/delay our API endpoint, please.
+	 * Some optimization plugins (WP Rocket) replace the JS src URL with their own URL, before being able to exclude it.
+	 * So, when the proxy is enabled, exclusion fails. That's why we exclude again by proxy endpoint.
+	 *
+	 * @filter rocket_delay_js_exclusions
+	 * @since  2.4.0
 	 *
 	 * @param $excluded_js
 	 *