From 7dca67abf76a429aba8a853754c354c52fd2152c Mon Sep 17 00:00:00 2001 From: wxa Date: Wed, 18 Dec 2019 08:55:44 +0300 Subject: [PATCH] Link to MSS signup with prefilled email address [MAILPOET-2484] --- lib/AdminPages/Pages/Newsletters.php | 2 +- lib/AdminPages/Pages/Premium.php | 8 +++++++- lib/AdminPages/Pages/SubscribersAPIKeyInvalid.php | 8 +++++++- lib/AdminPages/Pages/WelcomeWizard.php | 3 ++- views/invalidkey.html | 2 +- views/newsletters.html | 4 ++-- views/premium.html | 12 ++++++------ views/welcome_wizard.html | 4 ++-- 8 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/AdminPages/Pages/Newsletters.php b/lib/AdminPages/Pages/Newsletters.php index de1898f383..2790666c33 100644 --- a/lib/AdminPages/Pages/Newsletters.php +++ b/lib/AdminPages/Pages/Newsletters.php @@ -113,7 +113,7 @@ class Newsletters { $data['premium_plugin_active'] = License::getLicense(); $data['is_woocommerce_active'] = $this->woocommerce_helper->isWooCommerceActive(); $data['is_mailpoet_update_available'] = array_key_exists(Env::$plugin_path, $this->wp->getPluginUpdates()); - $data['subscribers_count'] = Subscriber::getTotalSubscribers(); + $data['subscriber_count'] = Subscriber::getTotalSubscribers(); $data['mailpoet_feature_flags'] = $this->features_controller->getAllFlags(); if (!$data['premium_plugin_active']) { diff --git a/lib/AdminPages/Pages/Premium.php b/lib/AdminPages/Pages/Premium.php index 9d3e43f67b..f7e69aa4f4 100644 --- a/lib/AdminPages/Pages/Premium.php +++ b/lib/AdminPages/Pages/Premium.php @@ -4,17 +4,23 @@ namespace MailPoet\AdminPages\Pages; use MailPoet\AdminPages\PageRenderer; use MailPoet\Models\Subscriber; +use MailPoet\WP\Functions as WPFunctions; class Premium { /** @var PageRenderer */ private $page_renderer; - function __construct(PageRenderer $page_renderer) { + /** @var WPFunctions */ + private $wp; + + function __construct(PageRenderer $page_renderer, WPFunctions $wp) { $this->page_renderer = $page_renderer; + $this->wp = $wp; } function render() { $data = [ + 'current_wp_user' => $this->wp->wpGetCurrentUser()->to_array(), 'subscriber_count' => Subscriber::getTotalSubscribers(), ]; $this->page_renderer->displayPage('premium.html', $data); diff --git a/lib/AdminPages/Pages/SubscribersAPIKeyInvalid.php b/lib/AdminPages/Pages/SubscribersAPIKeyInvalid.php index e8b9bcd789..0abb84ef26 100644 --- a/lib/AdminPages/Pages/SubscribersAPIKeyInvalid.php +++ b/lib/AdminPages/Pages/SubscribersAPIKeyInvalid.php @@ -4,17 +4,23 @@ namespace MailPoet\AdminPages\Pages; use MailPoet\AdminPages\PageRenderer; use MailPoet\Models\Subscriber; +use MailPoet\WP\Functions as WPFunctions; class SubscribersAPIKeyInvalid { /** @var PageRenderer */ private $page_renderer; - function __construct(PageRenderer $page_renderer) { + /** @var WPFunctions */ + private $wp; + + function __construct(PageRenderer $page_renderer, WPFunctions $wp) { $this->page_renderer = $page_renderer; + $this->wp = $wp; } function render() { $this->page_renderer->displayPage('invalidkey.html', [ + 'current_wp_user' => $this->wp->wpGetCurrentUser()->to_array(), 'subscriber_count' => Subscriber::getTotalSubscribers(), ]); } diff --git a/lib/AdminPages/Pages/WelcomeWizard.php b/lib/AdminPages/Pages/WelcomeWizard.php index e68e5a858b..44187e3560 100644 --- a/lib/AdminPages/Pages/WelcomeWizard.php +++ b/lib/AdminPages/Pages/WelcomeWizard.php @@ -50,7 +50,8 @@ class WelcomeWizard { 'finish_wizard_url' => $this->wp->adminUrl('admin.php?page=' . Menu::MAIN_PAGE_SLUG), 'sender' => $this->settings->get('sender'), 'admin_email' => $this->wp->getOption('admin_email'), - 'subscribers_count' => Subscriber::getTotalSubscribers(), + 'current_wp_user' => $this->wp->wpGetCurrentUser()->to_array(), + 'subscriber_count' => Subscriber::getTotalSubscribers(), 'has_mss_key_specified' => Bridge::isMSSKeySpecified(), ]; $data['mailpoet_feature_flags'] = $this->features_controller->getAllFlags(); diff --git a/views/invalidkey.html b/views/invalidkey.html index d435b278cf..a86e4957c3 100644 --- a/views/invalidkey.html +++ b/views/invalidkey.html @@ -10,7 +10,7 @@

- <%= __('Visit MailPoet.com to purchase a key') %> + <%= __('Visit MailPoet.com to purchase a key') %>

<% endblock %> diff --git a/views/newsletters.html b/views/newsletters.html index 57d6c9e244..252394bb57 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -29,7 +29,7 @@ var has_mss_key_specified = <%= json_encode(has_mss_key_specified) %>; var MSS_pitch_illustration_url = '<%= cdn_url('welcome-wizard/illu-pitch-mss.20190912.png') %>'; - 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=" ~ subscriber_count ~ "&email=" ~ current_wp_user.user_email) | escape('js') %>'; var mailpoet_feature_flags = <%= json_encode(mailpoet_feature_flags) %>; var mailpoet_woocommerce_active = <%= json_encode(is_woocommerce_active) %>; @@ -49,7 +49,7 @@ var mailpoet_mss_active = <%= json_encode(mss_active) %>; var mailpoet_mta_method = '<%= settings.mta.method %>'; var mailpoet_editor_javascript_url = '<%= getJavascriptScriptUrl("newsletter_editor.js") %>'; - var mailpoet_subscribers_count = <%= subscribers_count %>; + var mailpoet_subscribers_count = <%= subscriber_count %>; <% if not(premium_plugin_active) %> var mailpoet_free_premium_subscribers_limit = <%= free_premium_subscribers_limit %>; diff --git a/views/premium.html b/views/premium.html index 1fb9acb154..e39465ad3a 100644 --- a/views/premium.html +++ b/views/premium.html @@ -18,7 +18,7 @@
<%= _x('Upgrade', 'This text resides in the Premium page: /wp-admin/admin.php?page=mailpoet-premium') %> @@ -37,7 +37,7 @@ <%= _x('Sign up for free', 'This text resides in the Premium page: /wp-admin/admin.php?page=mailpoet-premium') %> @@ -143,7 +143,7 @@
<%= _x('Get started', 'This text resides in the Premium page: /wp-admin/admin.php?page=mailpoet-premium') %> @@ -164,7 +164,7 @@
<%= _x('Get started', 'This text resides in the Premium page: /wp-admin/admin.php?page=mailpoet-premium') %> @@ -192,7 +192,7 @@ <%= _x('Buy Now (currently 33% discount)', 'This text resides in the Premium page: /wp-admin/admin.php?page=mailpoet-premium') %> @@ -274,7 +274,7 @@ <%= _x('Upgrade now', 'This text resides in the Premium page: /wp-admin/admin.php?page=mailpoet-premium') %> diff --git a/views/welcome_wizard.html b/views/welcome_wizard.html index da533a8bc2..984c4d1f2b 100644 --- a/views/welcome_wizard.html +++ b/views/welcome_wizard.html @@ -15,8 +15,8 @@ var sender_data = <%= json_encode(sender) %>; var admin_email = <%= json_encode(admin_email) %>; 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 subscribers_count = <%= subscriber_count %>; + var mailpoet_account_url = '<%= add_referral_id("https://account.mailpoet.com/?s=" ~ subscriber_count ~ "&email=" ~ current_wp_user.user_email) | escape('js') %>'; var has_mss_key_specified = <%= json_encode(has_mss_key_specified) %>; var mailpoet_feature_flags = <%= json_encode(mailpoet_feature_flags) %>;