Fix TOS and GA in Setup Guide

Author: cssjoe

SetupGuide_Plugin_Admin.php

@@ -889,13 +889,14 @@ public function config_imageservice() {
 	 * @since  2.0.0
 	 * @access private
 	 *
+	 * @see Util_Environment::is_w3tc_pro()
 	 * @see Licensing_Core::get_tos_choice()
 	 *
 	 * @return bool
 	 */
 	private function maybe_ask_tos() {
 		$config = new Config();
-		if ( Util_Environment::is_pro_constant( $config ) ) {
+		if ( Util_Environment::is_w3tc_pro( $config ) ) {
 			return false;
 		}
 
@@ -960,6 +961,11 @@ private function get_config() {
 							'w3tc_install_date' => get_option( 'w3tc_install_date' ),
 							'w3tc_edition'      => esc_attr( Util_Environment::w3tc_edition( $config ) ),
 							'list_widgets'      => esc_attr( Util_Widget::list_widgets() ),
+							'w3tc_pro'          => Util_Environment::is_w3tc_pro( $config ),
+							'w3tc_has_key'      => $config->get_string( 'plugin.license_key' ),
+							'w3tc_pro_c'        => defined( 'W3TC_PRO' ) && W3TC_PRO,
+							'w3tc_enterprise_c' => defined( 'W3TC_ENTERPRISE' ) && W3TC_ENTERPRISE,
+							'w3tc_plugin_type'  => esc_attr( $config->get_string( 'plugin.type' ) ),
 							'ga_profile'        => ( defined( 'W3TC_DEVELOPER' ) && W3TC_DEVELOPER ) ? 'G-Q3CHQJWERM' : 'G-5TFS8M5TTY',
 							'tos_choice'        => Licensing_Core::get_tos_choice(),
 							'track_usage'       => $config->get_boolean( 'common.track_usage' ),

pub/js/setup-guide.js

@@ -70,30 +70,42 @@ jQuery(function() {
 
 				window.dataLayer = window.dataLayer || [];
 
-				const w3tc_ga = function() { dataLayer.push( arguments ); }
-
-				if (window.w3tc_ga) {
-					w3tc_enable_ga = true;
-
-					w3tc_ga( 'js', new Date() );
-
-					w3tc_ga( 'config', W3TC_SetupGuide.ga_profile, {
-						'user_properties': {
-							'plugin': 'w3-total-cache',
-							'w3tc_version': W3TC_SetupGuide.w3tc_version,
-							'wp_version': W3TC_SetupGuide.wp_version,
-							'php_version': W3TC_SetupGuide.php_version,
-							'server_software': W3TC_SetupGuide.server_software,
-							'wpdb_version': W3TC_SetupGuide.db_version,
-							'home_url': W3TC_SetupGuide.home_url_host,
-							'w3tc_install_version': W3TC_SetupGuide.install_version,
-							'w3tc_edition': W3TC_SetupGuide.w3tc_edition,
-							'w3tc_widgets': W3TC_SetupGuide.list_widgets,
-							'page': W3TC_SetupGuide.page,
-							'w3tc_install_date': W3TC_SetupGuide.w3tc_install_date,
-						}
-					});
-				}
+				window.w3tc_ga = function() { dataLayer.push( arguments ); }
+
+				w3tc_enable_ga = true;
+
+				w3tc_ga( 'js', new Date() );
+
+				w3tc_ga( 'config', W3TC_SetupGuide.ga_profile, {
+					'user_properties': {
+						'plugin': 'w3-total-cache',
+						'w3tc_version': W3TC_SetupGuide.w3tc_version,
+						'wp_version': W3TC_SetupGuide.wp_version,
+						'php_version': W3TC_SetupGuide.php_version,
+						'server_software': W3TC_SetupGuide.server_software,
+						'wpdb_version': W3TC_SetupGuide.db_version,
+						'home_url': W3TC_SetupGuide.home_url_host,
+						'w3tc_install_version': W3TC_SetupGuide.install_version,
+						'w3tc_edition': W3TC_SetupGuide.w3tc_edition,
+						'w3tc_widgets': W3TC_SetupGuide.list_widgets,
+						'page': W3TC_SetupGuide.page,
+						'w3tc_install_date': W3TC_SetupGuide.w3tc_install_date,
+						'w3tc_pro': W3TC_SetupGuide.w3tc_pro,
+						'w3tc_has_key': W3TC_SetupGuide.w3tc_has_key,
+						'w3tc_pro_c': W3TC_SetupGuide.w3tc_pro_c,
+						'w3tc_enterprise_c': W3TC_SetupGuide.w3tc_enterprise_c,
+						'w3tc_plugin_type': W3TC_SetupGuide.plugin_type,
+					}
+				});
+
+				w3tc_ga(
+					'event',
+					'button',
+					{
+						eventCategory: 'w3tc_setup_guide',
+						eventLabel: 'w3tc-wizard-step-welcome'
+					}
+				);
 			}
 		});
 	}