diff --git a/src/Integrations.php b/src/Integrations.php index 247c29d..e54a640 100644 --- a/src/Integrations.php +++ b/src/Integrations.php @@ -27,17 +27,17 @@ 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(); } // Form Plugins - if ( self::is_form_submit_active() ) { + if ( Helpers::is_enhanced_measurement_enabled( 'form-completions' ) ) { new Integrations\FormSubmit(); } } @@ -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,15 +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' ) ); - } - - /** - * 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' ) ); + return apply_filters( 'plausible_analytics_integrations_edd', function_exists( 'EDD' ) ); } /** @@ -71,6 +63,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' ) ); } } diff --git a/src/Plugin.php b/src/Plugin.php index bcd28af..5a893d4 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -42,17 +42,18 @@ public function setup() { * @return void */ public function register_services() { + if ( is_admin() ) { + add_action( 'init', [ $this, 'load_settings' ] ); + add_action( 'init', [ $this, 'load_provisioning' ] ); + new Admin\Upgrades(); - new Admin\Settings\Page(); 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(); @@ -60,6 +61,40 @@ public function register_services() { new Proxy(); } + /** + * Load @see Admin\Settings\Page() + * + * @return void + * + * @codeCoverageIgnore + */ + public function load_settings() { + new Admin\Settings\Page(); + } + + /** + * Load @see Admin\Provisioning() + * + * @return void + * + * @codeCoverageIgnore + */ + public function load_provisioning() { + new Admin\Provisioning(); + new Admin\Provisioning\Integrations(); + } + + /** + * Load @see Integrations() + * + * @return void + * + * @codeCoverageIgnore + */ + public function load_integrations() { + new Integrations(); + } + /** * Loads the plugin's translated strings. * diff --git a/tests/integration/IntegrationsTest.php b/tests/integration/IntegrationsTest.php index 6873e23..22b4bb8 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' ); - } }