diff --git a/assets/js/src/wizard/steps_numbers.jsx b/assets/js/src/wizard/steps_numbers.jsx index af73191729..4e665a81c2 100644 --- a/assets/js/src/wizard/steps_numbers.jsx +++ b/assets/js/src/wizard/steps_numbers.jsx @@ -1,9 +1,12 @@ export const getStepsCount = () => { - let stepsCount = 4; + let stepsCount = 3; if (window.is_woocommerce_active) { stepsCount += 1; } + if (!window.has_premium_key) { + stepsCount += 1; + } return stepsCount; }; diff --git a/lib/AdminPages/Pages/WelcomeWizard.php b/lib/AdminPages/Pages/WelcomeWizard.php index 39c91f3beb..a2a9ed1bad 100644 --- a/lib/AdminPages/Pages/WelcomeWizard.php +++ b/lib/AdminPages/Pages/WelcomeWizard.php @@ -5,6 +5,7 @@ namespace MailPoet\AdminPages\Pages; use MailPoet\AdminPages\PageRenderer; use MailPoet\Config\Menu; use MailPoet\Config\MP2Migrator; +use MailPoet\Config\ServicesChecker; use MailPoet\Models\Subscriber; use MailPoet\Settings\SettingsController; use MailPoet\WooCommerce\Helper as WooCommerceHelper; @@ -23,16 +24,21 @@ class WelcomeWizard { /** @var WPFunctions */ private $wp; + /** @var ServicesChecker */ + private $services_checker; + function __construct( PageRenderer $page_renderer, SettingsController $settings, WooCommerceHelper $woocommerce_helper, - WPFunctions $wp + WPFunctions $wp, + ServicesChecker $services_checker ) { $this->page_renderer = $page_renderer; $this->settings = $settings; $this->woocommerce_helper = $woocommerce_helper; $this->wp = $wp; + $this->services_checker = $services_checker; } function render() { @@ -44,6 +50,7 @@ class WelcomeWizard { 'sender' => $this->settings->get('sender'), 'admin_email' => $this->wp->getOption('admin_email'), 'subscribers_count' => Subscriber::count(), + 'has_premium_key' => $this->services_checker->isPremiumKeyValid(), ]; $this->page_renderer->displayPage('welcome_wizard.html', $data); } diff --git a/views/welcome_wizard.html b/views/welcome_wizard.html index 66056367af..bf213371a7 100644 --- a/views/welcome_wizard.html +++ b/views/welcome_wizard.html @@ -17,6 +17,7 @@ var hide_mailpoet_beacon = true; var subscribers_count = <%= subscribers_count %>; var mailpoet_account_url = '<%= add_referral_id("https://account.mailpoet.com/?s=" ~ subscribers_count) %>'; + var has_premium_key = <%= json_encode(has_premium_key) %>;