Show the pitch only if key is not stored

[MAILPOET-2142]
This commit is contained in:
Pavel Dohnal
2019-09-16 14:47:12 +02:00
committed by Jack Kitterhing
parent daabe385c6
commit 9d5f43b411
3 changed files with 13 additions and 2 deletions

View File

@@ -1,9 +1,12 @@
export const getStepsCount = () => { export const getStepsCount = () => {
let stepsCount = 4; let stepsCount = 3;
if (window.is_woocommerce_active) { if (window.is_woocommerce_active) {
stepsCount += 1; stepsCount += 1;
} }
if (!window.has_premium_key) {
stepsCount += 1;
}
return stepsCount; return stepsCount;
}; };

View File

@@ -5,6 +5,7 @@ namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer; use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\Menu; use MailPoet\Config\Menu;
use MailPoet\Config\MP2Migrator; use MailPoet\Config\MP2Migrator;
use MailPoet\Config\ServicesChecker;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WooCommerce\Helper as WooCommerceHelper;
@@ -23,16 +24,21 @@ class WelcomeWizard {
/** @var WPFunctions */ /** @var WPFunctions */
private $wp; private $wp;
/** @var ServicesChecker */
private $services_checker;
function __construct( function __construct(
PageRenderer $page_renderer, PageRenderer $page_renderer,
SettingsController $settings, SettingsController $settings,
WooCommerceHelper $woocommerce_helper, WooCommerceHelper $woocommerce_helper,
WPFunctions $wp WPFunctions $wp,
ServicesChecker $services_checker
) { ) {
$this->page_renderer = $page_renderer; $this->page_renderer = $page_renderer;
$this->settings = $settings; $this->settings = $settings;
$this->woocommerce_helper = $woocommerce_helper; $this->woocommerce_helper = $woocommerce_helper;
$this->wp = $wp; $this->wp = $wp;
$this->services_checker = $services_checker;
} }
function render() { function render() {
@@ -44,6 +50,7 @@ class WelcomeWizard {
'sender' => $this->settings->get('sender'), 'sender' => $this->settings->get('sender'),
'admin_email' => $this->wp->getOption('admin_email'), 'admin_email' => $this->wp->getOption('admin_email'),
'subscribers_count' => Subscriber::count(), 'subscribers_count' => Subscriber::count(),
'has_premium_key' => $this->services_checker->isPremiumKeyValid(),
]; ];
$this->page_renderer->displayPage('welcome_wizard.html', $data); $this->page_renderer->displayPage('welcome_wizard.html', $data);
} }

View File

@@ -17,6 +17,7 @@
var hide_mailpoet_beacon = true; var hide_mailpoet_beacon = true;
var subscribers_count = <%= subscribers_count %>; var subscribers_count = <%= subscribers_count %>;
var mailpoet_account_url = '<%= add_referral_id("https://account.mailpoet.com/?s=" ~ 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) %>;
</script> </script>
<div id="mailpoet_wizard_container"></div> <div id="mailpoet_wizard_container"></div>