Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions src/Integrations.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand All @@ -47,30 +47,22 @@ 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' ) );
}

/**
* Checks if Easy Digital Downloads is installed and activated.
* @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' ) );
}

/**
* 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' ) );
return apply_filters( 'plausible_analytics_integrations_edd_recurring', function_exists( 'EDD_Recurring' ) );
}
}
43 changes: 39 additions & 4 deletions src/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,59 @@ 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();
new Filters();
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.
*
Expand Down
11 changes: 0 additions & 11 deletions tests/integration/IntegrationsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
}
}