Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Rename premium page to upgrade page

Browse Source 
[MAILPOET-4164]
This commit is contained in:
Rostislav Wolny
2022-02-25 14:49:20 +01:00
committed by Veljko V
parent a1455c9f46
commit f6a6dc1802
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/assets/js/src/newsletters/campaign_stats/premium_banner.jsx
View File

@@ -18,7 +18,7 @@ function SkipDisplayingDetailedStats() {
<p> <p>
{MailPoet.I18n.t('premiumBannerDescription')} {MailPoet.I18n.t('premiumBannerDescription')}
{' '} {' '}
<a href="admin.php?page=mailpoet-premium"> <a href="admin.php?page=mailpoet-upgrade">
{MailPoet.I18n.t('learnMore')} {MailPoet.I18n.t('learnMore')}
</a> </a>
. .

2
mailpoet/assets/js/src/subscribers/list.jsx
View File

@@ -100,7 +100,7 @@ const messages = {
<div> <div>
<p>{MailPoet.I18n.t('bouncedSubscribersHelp')}</p> <p>{MailPoet.I18n.t('bouncedSubscribersHelp')}</p>
<p> <p>
<a href="admin.php?page=mailpoet-premium" className="button-primary"> <a href="admin.php?page=mailpoet-upgrade" className="button-primary">
{MailPoet.I18n.t('bouncedSubscribersPremiumButtonText')} {MailPoet.I18n.t('bouncedSubscribersPremiumButtonText')}
</a> </a>
</p> </p>

2
mailpoet/lib/AdminPages/Pages/Segments.php
View File

@@ -108,7 +108,7 @@ class Segments {
$data['has_valid_premium_key'] = $this->subscribersFeature->hasValidPremiumKey(); $data['has_valid_premium_key'] = $this->subscribersFeature->hasValidPremiumKey();
$data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount(); $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport(); $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['mss_key_invalid'] = ($this->servicesChecker->isMailPoetAPIKeyValid() === false);
$data['premium_plugin_active'] = $this->servicesChecker->isPremiumPluginActive(); $data['premium_plugin_active'] = $this->servicesChecker->isPremiumPluginActive();

2
mailpoet/lib/AdminPages/Pages/Subscribers.php
View File

@@ -107,7 +107,7 @@ class Subscribers {
$data['has_valid_premium_key'] = $this->subscribersFeature->hasValidPremiumKey(); $data['has_valid_premium_key'] = $this->subscribersFeature->hasValidPremiumKey();
$data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount(); $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport(); $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['tracking_config'] = $this->trackingConfig->getConfig();
$data['premium_plugin_installed'] = $data['premium_plugin_active'] || Installer::isPluginInstalled(Installer::PREMIUM_PLUGIN_SLUG); $data['premium_plugin_installed'] = $data['premium_plugin_active'] || Installer::isPluginInstalled(Installer::PREMIUM_PLUGIN_SLUG);

4
mailpoet/lib/AdminPages/Pages/Premium.php → mailpoet/lib/AdminPages/Pages/Upgrade.php
View File

@@ -6,7 +6,7 @@ use MailPoet\AdminPages\PageRenderer;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature; use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class Premium { class Upgrade {
/** @var PageRenderer */ /** @var PageRenderer */
private $pageRenderer; private $pageRenderer;
@@ -31,6 +31,6 @@ class Premium {
'current_wp_user' => $this->wp->wpGetCurrentUser()->to_array(), 'current_wp_user' => $this->wp->wpGetCurrentUser()->to_array(),
'subscriber_count' => $this->subscribersFeature->getSubscribersCount(), 'subscriber_count' => $this->subscribersFeature->getSubscribersCount(),
]; ];
$this->pageRenderer->displayPage('premium.html', $data); $this->pageRenderer->displayPage('upgrade.html', $data);
} }
} }

16
mailpoet/lib/Config/Menu.php
View File

@@ -11,12 +11,12 @@ use MailPoet\AdminPages\Pages\Logs;
use MailPoet\AdminPages\Pages\MP2Migration; use MailPoet\AdminPages\Pages\MP2Migration;
use MailPoet\AdminPages\Pages\NewsletterEditor; use MailPoet\AdminPages\Pages\NewsletterEditor;
use MailPoet\AdminPages\Pages\Newsletters; use MailPoet\AdminPages\Pages\Newsletters;
use MailPoet\AdminPages\Pages\Premium;
use MailPoet\AdminPages\Pages\Segments; use MailPoet\AdminPages\Pages\Segments;
use MailPoet\AdminPages\Pages\Settings; use MailPoet\AdminPages\Pages\Settings;
use MailPoet\AdminPages\Pages\Subscribers; use MailPoet\AdminPages\Pages\Subscribers;
use MailPoet\AdminPages\Pages\SubscribersExport; use MailPoet\AdminPages\Pages\SubscribersExport;
use MailPoet\AdminPages\Pages\SubscribersImport; use MailPoet\AdminPages\Pages\SubscribersImport;
use MailPoet\AdminPages\Pages\Upgrade;
use MailPoet\AdminPages\Pages\WelcomeWizard; use MailPoet\AdminPages\Pages\WelcomeWizard;
use MailPoet\AdminPages\Pages\WooCommerceSetup; use MailPoet\AdminPages\Pages\WooCommerceSetup;
use MailPoet\DI\ContainerWrapper; 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 // Only show this page in menu if the Premium plugin is not activated
$this->wp->addSubmenuPage( $this->wp->addSubmenuPage(
License::getLicense() ? true : self::MAIN_PAGE_SLUG, License::getLicense() ? true : self::MAIN_PAGE_SLUG,
$this->setPageTitle(__('Premium', 'mailpoet')), $this->setPageTitle(__('Upgrade', 'mailpoet')),
$this->wp->__('Premium', 'mailpoet'), $this->wp->__('Upgrade', 'mailpoet'),
AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN, AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN,
'mailpoet-premium', 'mailpoet-upgrade',
[ [
$this, $this,
'premium', 'upgrade',
] ]
); );
@@ -428,8 +428,8 @@ class Menu {
$this->container->get(WooCommerceSetup::class)->render(); $this->container->get(WooCommerceSetup::class)->render();
} }
public function premium() { public function upgrade() {
$this->container->get(Premium::class)->render(); $this->container->get(Upgrade::class)->render();
} }
public function settings() { public function settings() {

2
mailpoet/lib/Config/ServicesChecker.php
View File

@@ -102,7 +102,7 @@ class ServicesChecker {
); );
$error = Helpers::replaceLinkTags( $error = Helpers::replaceLinkTags(
$error, $error,
'admin.php?page=mailpoet-premium', 'admin.php?page=mailpoet-upgrade',
[], [],
'link2' 'link2'
); );

2
mailpoet/lib/DI/ContainerConfigurator.php
View File

@@ -39,7 +39,7 @@ class ContainerConfigurator implements IContainerConfigurator {
$container->autowire(\MailPoet\AdminPages\Pages\NewsletterEditor::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\NewsletterEditor::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\Newsletters::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\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\Segments::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\Settings::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Settings::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\Subscribers::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Subscribers::class)->setPublic(true);

2
mailpoet/lib/Subscribers/NewSubscriberNotificationMailer.php
View File

@@ -89,7 +89,7 @@ class NewSubscriberNotificationMailer {
'subscriber_email' => $subscriber->get('email'), 'subscriber_email' => $subscriber->get('email'),
'segments_names' => $segmentNames, 'segments_names' => $segmentNames,
'link_settings' => WPFunctions::get()->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-settings'), '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 [ return [
'subject' => sprintf(__('New subscriber to %s', 'mailpoet'), $segmentNames), 'subject' => sprintf(__('New subscriber to %s', 'mailpoet'), $segmentNames),

0
mailpoet/views/premium.html → mailpoet/views/upgrade.html
View File