diff --git a/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx b/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx index f4555253dd..8dcd5491a1 100644 --- a/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx +++ b/mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx @@ -18,7 +18,7 @@ function SkipDisplayingDetailedStats() {
{MailPoet.I18n.t('premiumBannerDescription')} {' '} - + {MailPoet.I18n.t('learnMore')} . diff --git a/mailpoet/assets/js/src/subscribers/list.jsx b/mailpoet/assets/js/src/subscribers/list.jsx index 362eaac023..7057382967 100644 --- a/mailpoet/assets/js/src/subscribers/list.jsx +++ b/mailpoet/assets/js/src/subscribers/list.jsx @@ -100,7 +100,7 @@ const messages = {
{MailPoet.I18n.t('bouncedSubscribersHelp')}
- + {MailPoet.I18n.t('bouncedSubscribersPremiumButtonText')}
diff --git a/mailpoet/lib/AdminPages/Pages/Segments.php b/mailpoet/lib/AdminPages/Pages/Segments.php index 22993e6663..ab7ca17cc1 100644 --- a/mailpoet/lib/AdminPages/Pages/Segments.php +++ b/mailpoet/lib/AdminPages/Pages/Segments.php @@ -108,7 +108,7 @@ class Segments { $data['has_valid_premium_key'] = $this->subscribersFeature->hasValidPremiumKey(); $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount(); $data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport(); - $data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-premium'); + $data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-upgrade'); $data['mss_key_invalid'] = ($this->servicesChecker->isMailPoetAPIKeyValid() === false); $data['premium_plugin_active'] = $this->servicesChecker->isPremiumPluginActive(); diff --git a/mailpoet/lib/AdminPages/Pages/Subscribers.php b/mailpoet/lib/AdminPages/Pages/Subscribers.php index 304d02cfad..cb58e02683 100644 --- a/mailpoet/lib/AdminPages/Pages/Subscribers.php +++ b/mailpoet/lib/AdminPages/Pages/Subscribers.php @@ -107,7 +107,7 @@ class Subscribers { $data['has_valid_premium_key'] = $this->subscribersFeature->hasValidPremiumKey(); $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount(); $data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport(); - $data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-premium'); + $data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-upgrade'); $data['tracking_config'] = $this->trackingConfig->getConfig(); $data['premium_plugin_installed'] = $data['premium_plugin_active'] || Installer::isPluginInstalled(Installer::PREMIUM_PLUGIN_SLUG); diff --git a/mailpoet/lib/AdminPages/Pages/Premium.php b/mailpoet/lib/AdminPages/Pages/Upgrade.php similarity index 91% rename from mailpoet/lib/AdminPages/Pages/Premium.php rename to mailpoet/lib/AdminPages/Pages/Upgrade.php index 1137ad5c19..812a05e9e3 100644 --- a/mailpoet/lib/AdminPages/Pages/Premium.php +++ b/mailpoet/lib/AdminPages/Pages/Upgrade.php @@ -6,7 +6,7 @@ use MailPoet\AdminPages\PageRenderer; use MailPoet\Util\License\Features\Subscribers as SubscribersFeature; use MailPoet\WP\Functions as WPFunctions; -class Premium { +class Upgrade { /** @var PageRenderer */ private $pageRenderer; @@ -31,6 +31,6 @@ class Premium { 'current_wp_user' => $this->wp->wpGetCurrentUser()->to_array(), 'subscriber_count' => $this->subscribersFeature->getSubscribersCount(), ]; - $this->pageRenderer->displayPage('premium.html', $data); + $this->pageRenderer->displayPage('upgrade.html', $data); } } diff --git a/mailpoet/lib/Config/Menu.php b/mailpoet/lib/Config/Menu.php index e9a1ea9132..a8b2733fd1 100644 --- a/mailpoet/lib/Config/Menu.php +++ b/mailpoet/lib/Config/Menu.php @@ -11,12 +11,12 @@ use MailPoet\AdminPages\Pages\Logs; use MailPoet\AdminPages\Pages\MP2Migration; use MailPoet\AdminPages\Pages\NewsletterEditor; use MailPoet\AdminPages\Pages\Newsletters; -use MailPoet\AdminPages\Pages\Premium; use MailPoet\AdminPages\Pages\Segments; use MailPoet\AdminPages\Pages\Settings; use MailPoet\AdminPages\Pages\Subscribers; use MailPoet\AdminPages\Pages\SubscribersExport; use MailPoet\AdminPages\Pages\SubscribersImport; +use MailPoet\AdminPages\Pages\Upgrade; use MailPoet\AdminPages\Pages\WelcomeWizard; use MailPoet\AdminPages\Pages\WooCommerceSetup; use MailPoet\DI\ContainerWrapper; @@ -325,17 +325,17 @@ class Menu { ] ); - // Premium page + // Upgrade page // Only show this page in menu if the Premium plugin is not activated $this->wp->addSubmenuPage( License::getLicense() ? true : self::MAIN_PAGE_SLUG, - $this->setPageTitle(__('Premium', 'mailpoet')), - $this->wp->__('Premium', 'mailpoet'), + $this->setPageTitle(__('Upgrade', 'mailpoet')), + $this->wp->__('Upgrade', 'mailpoet'), AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN, - 'mailpoet-premium', + 'mailpoet-upgrade', [ $this, - 'premium', + 'upgrade', ] ); @@ -428,8 +428,8 @@ class Menu { $this->container->get(WooCommerceSetup::class)->render(); } - public function premium() { - $this->container->get(Premium::class)->render(); + public function upgrade() { + $this->container->get(Upgrade::class)->render(); } public function settings() { diff --git a/mailpoet/lib/Config/ServicesChecker.php b/mailpoet/lib/Config/ServicesChecker.php index e07faac9bf..e2f578f5c5 100644 --- a/mailpoet/lib/Config/ServicesChecker.php +++ b/mailpoet/lib/Config/ServicesChecker.php @@ -102,7 +102,7 @@ class ServicesChecker { ); $error = Helpers::replaceLinkTags( $error, - 'admin.php?page=mailpoet-premium', + 'admin.php?page=mailpoet-upgrade', [], 'link2' ); diff --git a/mailpoet/lib/DI/ContainerConfigurator.php b/mailpoet/lib/DI/ContainerConfigurator.php index b0acfc7d28..e716ff6b0f 100644 --- a/mailpoet/lib/DI/ContainerConfigurator.php +++ b/mailpoet/lib/DI/ContainerConfigurator.php @@ -39,7 +39,7 @@ class ContainerConfigurator implements IContainerConfigurator { $container->autowire(\MailPoet\AdminPages\Pages\NewsletterEditor::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Newsletters::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\MP2Migration::class)->setPublic(true); - $container->autowire(\MailPoet\AdminPages\Pages\Premium::class)->setPublic(true); + $container->autowire(\MailPoet\AdminPages\Pages\Upgrade::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Segments::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Settings::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Subscribers::class)->setPublic(true); diff --git a/mailpoet/lib/Subscribers/NewSubscriberNotificationMailer.php b/mailpoet/lib/Subscribers/NewSubscriberNotificationMailer.php index fd39d41cf3..cab4b9eedc 100644 --- a/mailpoet/lib/Subscribers/NewSubscriberNotificationMailer.php +++ b/mailpoet/lib/Subscribers/NewSubscriberNotificationMailer.php @@ -89,7 +89,7 @@ class NewSubscriberNotificationMailer { 'subscriber_email' => $subscriber->get('email'), 'segments_names' => $segmentNames, 'link_settings' => WPFunctions::get()->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-settings'), - 'link_premium' => WPFunctions::get()->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-premium'), + 'link_premium' => WPFunctions::get()->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-upgrade'), ]; return [ 'subject' => sprintf(__('New subscriber to %s', 'mailpoet'), $segmentNames), diff --git a/mailpoet/views/premium.html b/mailpoet/views/upgrade.html similarity index 100% rename from mailpoet/views/premium.html rename to mailpoet/views/upgrade.html