diff --git a/assets/js/src/newsletters/send/congratulate/success.jsx b/assets/js/src/newsletters/send/congratulate/success.jsx index e78004cb64..b3b350c611 100644 --- a/assets/js/src/newsletters/send/congratulate/success.jsx +++ b/assets/js/src/newsletters/send/congratulate/success.jsx @@ -18,7 +18,7 @@ function renderHeader(newsletter) { return MailPoet.I18n.t('congratulationsSendSuccessHeader'); } -function Success(props) { +function MSSUserSuccess(props) { const showSuccessDeliveryPoll = ( props.newsletter.type === 'standard' && props.newsletter.status !== 'scheduled' @@ -46,6 +46,38 @@ function Success(props) { ); } +MSSUserSuccess.propTypes = { + successClicked: PropTypes.func.isRequired, + illustrationImageUrl: PropTypes.string.isRequired, + newsletter: PropTypes.shape({ + status: PropTypes.string.isRequired, + type: PropTypes.string.isRequired, + }).isRequired, +}; + +function PitchMss() { + return ( +
+ DISPLAY MSS PITCH HERE +
+ ); +} + +function Success(props) { + if (!window.has_premium_key) { + return ( + + ); + } + return ( + + ); +} + Success.propTypes = { successClicked: PropTypes.func.isRequired, illustrationImageUrl: PropTypes.string.isRequired, diff --git a/lib/AdminPages/Pages/Newsletters.php b/lib/AdminPages/Pages/Newsletters.php index 195419000b..d0533696ca 100644 --- a/lib/AdminPages/Pages/Newsletters.php +++ b/lib/AdminPages/Pages/Newsletters.php @@ -72,6 +72,7 @@ class Newsletters { $data['segments'] = $segments; $data['settings'] = $this->settings->getAll(); $data['mss_active'] = Bridge::isMPSendingServiceEnabled(); + $data['has_premium_key'] = Bridge::isMSSKeySpecified(); $data['current_wp_user'] = $this->wp->wpGetCurrentUser()->to_array(); $data['current_wp_user_firstname'] = $this->wp->wpGetCurrentUser()->user_firstname; $data['site_url'] = $this->wp->siteUrl(); diff --git a/lib/AdminPages/Pages/WelcomeWizard.php b/lib/AdminPages/Pages/WelcomeWizard.php index a2a9ed1bad..f36cf89d9d 100644 --- a/lib/AdminPages/Pages/WelcomeWizard.php +++ b/lib/AdminPages/Pages/WelcomeWizard.php @@ -5,8 +5,8 @@ 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\Services\Bridge; use MailPoet\Settings\SettingsController; use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WP\Functions as WPFunctions; @@ -24,21 +24,16 @@ class WelcomeWizard { /** @var WPFunctions */ private $wp; - /** @var ServicesChecker */ - private $services_checker; - function __construct( PageRenderer $page_renderer, SettingsController $settings, WooCommerceHelper $woocommerce_helper, - WPFunctions $wp, - ServicesChecker $services_checker + WPFunctions $wp ) { $this->page_renderer = $page_renderer; $this->settings = $settings; $this->woocommerce_helper = $woocommerce_helper; $this->wp = $wp; - $this->services_checker = $services_checker; } function render() { @@ -50,7 +45,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(), + 'has_premium_key' => Bridge::isMSSKeySpecified(), ]; $this->page_renderer->displayPage('welcome_wizard.html', $data); } diff --git a/views/newsletters.html b/views/newsletters.html index 2cc0c28f87..7363d4cc59 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -24,6 +24,7 @@ var mailpoet_date_storage_format = "Y-m-d"; var mailpoet_tracking_enabled = <%= json_encode(tracking_enabled) %>; var mailpoet_premium_active = <%= json_encode(premium_plugin_active) %>; + var has_premium_key = <%= json_encode(has_premium_key) %>; var mailpoet_woocommerce_active = <%= json_encode(is_woocommerce_active) %>; var mailpoet_automatic_emails = <%= json_encode(automatic_emails) %>; var mailpoet_feature_announcement_has_news = <%= json_encode(feature_announcement_has_news) %>;