[APP-1107] add check for is_active

Author: DinetsV

modules/analytics/module.php

@@ -4,6 +4,7 @@
 
 use EA11y\Classes\Module_Base;
 use EA11y\Modules\Analytics\Database\Analytics_Table;
+use EA11y\Modules\Settings\Classes\Settings;
 use EA11y\Modules\Settings\Module as SettingsModule;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -39,11 +40,13 @@ public static function routes_list() : array {
 		];
 	}
 
-	public function __construct() {
-		if ( ! SettingsModule::is_analytics_enabled() ) {
-			return;
-		}
+	public static function is_active(): bool {
+		$plan_data = Settings::get( Settings::PLAN_DATA );
+		$is_analytics_enabled = Settings::get( Settings::ANALYTICS_SETTINGS );
+		return 'Free Trial' !== $plan_data->plan->name && $is_analytics_enabled;
+	}
 
+	public function __construct() {
 		$this->register_components();
 		$this->register_routes();
 

modules/settings/module.php

@@ -442,12 +442,6 @@ public static function get_plan_data_refresh_transient(): bool {
 		return get_transient( Settings::PLAN_DATA . '_refresh' );
 	}
 
-	public static function is_analytics_enabled(): bool {
-		$plan_data = Settings::get( Settings::PLAN_DATA );
-		$is_analytics_enabled = Settings::get( Settings::ANALYTICS_SETTINGS );
-		return 'Free Trial' !== $plan_data->plan->name && $is_analytics_enabled;
-	}
-
 	/**
 	 * Module constructor.
 	 */

modules/widget/module.php

@@ -5,6 +5,7 @@
 use EA11y\Classes\Module_Base;
 use EA11y\Modules\Connect\Module as Connect;
 use EA11y\Modules\Settings\Module as SettingsModule;
+use EA11y\Modules\Analytics\Module as AnalyticsModule;
 use EA11y\Modules\Settings\Classes\Settings;
 use Exception;
 
@@ -43,7 +44,7 @@ public function enqueue_accessibility_widget() : void {
 			true
 		);
 
-		$is_analytics_enabled = SettingsModule::is_analytics_enabled();
+		$is_analytics_enabled = AnalyticsModule::is_active();
 
 		wp_localize_script(
 			'ea11y-widget',