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

Remove the subscribers limit page

Browse Source 
[MAILPOET-2394]
This commit is contained in:
Amine Ben hammou
2019-11-26 00:40:58 +01:00
committed by Jack Kitterhing
parent 042557aafa
commit daf2b0bffb
4 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/AdminPages/Pages/SubscribersLimitExceeded.php
View File

@ -1,21 +0,0 @@
<?php
namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
class SubscribersLimitExceeded {
/** @var PageRenderer */
private $page_renderer;
function __construct(PageRenderer $page_renderer) {
$this->page_renderer = $page_renderer;
}
function render() {
$this->page_renderer->displayPage('limit.html', [
'limit' => SubscribersFeature::SUBSCRIBERS_LIMIT,
]);
}
}

14
lib/Config/Menu.php
View File

@ -18,14 +18,11 @@ use MailPoet\AdminPages\Pages\Subscribers;
use MailPoet\AdminPages\Pages\SubscribersAPIKeyInvalid; use MailPoet\AdminPages\Pages\SubscribersAPIKeyInvalid;
use MailPoet\AdminPages\Pages\SubscribersExport; use MailPoet\AdminPages\Pages\SubscribersExport;
use MailPoet\AdminPages\Pages\SubscribersImport; use MailPoet\AdminPages\Pages\SubscribersImport;
use MailPoet\AdminPages\Pages\SubscribersLimitExceeded;
use MailPoet\AdminPages\Pages\Update; use MailPoet\AdminPages\Pages\Update;
use MailPoet\AdminPages\Pages\WelcomeWizard; use MailPoet\AdminPages\Pages\WelcomeWizard;
use MailPoet\AdminPages\Pages\WooCommerceListImport; use MailPoet\AdminPages\Pages\WooCommerceListImport;
use MailPoet\DI\ContainerWrapper; use MailPoet\DI\ContainerWrapper;
use MailPoet\Features\FeaturesController; use MailPoet\Features\FeaturesController;
use MailPoet\Settings\SettingsController;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
use MailPoet\Util\License\License; use MailPoet\Util\License\License;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -50,8 +47,6 @@ class Menu {
/** @var FeaturesController */ /** @var FeaturesController */
private $features_controller; private $features_controller;
private $subscribers_over_limit;
function __construct( function __construct(
AccessControl $access_control, AccessControl $access_control,
WPFunctions $wp, WPFunctions $wp,
@ -67,8 +62,6 @@ class Menu {
} }
function init() { function init() {
$subscribers_feature = new SubscribersFeature($this->container->get(SettingsController::class));
$this->subscribers_over_limit = $subscribers_feature->check();
$this->checkMailPoetAPIKey(); $this->checkMailPoetAPIKey();
$this->checkPremiumKey(); $this->checkPremiumKey();
@ -473,12 +466,10 @@ class Menu {
} }
function forms() { function forms() {
if ($this->subscribers_over_limit) return $this->displaySubscriberLimitExceeded();
$this->container->get(Forms::class)->render(); $this->container->get(Forms::class)->render();
} }
function newsletters() { function newsletters() {
if ($this->subscribers_over_limit) return $this->displaySubscriberLimitExceeded();
if (isset($this->mp_api_key_valid) && $this->mp_api_key_valid === false) { if (isset($this->mp_api_key_valid) && $this->mp_api_key_valid === false) {
return $this->displayMailPoetAPIKeyInvalid(); return $this->displayMailPoetAPIKeyInvalid();
} }
@ -501,11 +492,6 @@ class Menu {
$this->container->get(FormEditor::class)->render(); $this->container->get(FormEditor::class)->render();
} }
private function displaySubscriberLimitExceeded() {
$this->container->get(SubscribersLimitExceeded::class)->render();
exit;
}
private function displayMailPoetAPIKeyInvalid() { private function displayMailPoetAPIKeyInvalid() {
$this->container->get(SubscribersAPIKeyInvalid::class)->render(); $this->container->get(SubscribersAPIKeyInvalid::class)->render();
exit; exit;

1
lib/DI/ContainerConfigurator.php
View File

@ -51,7 +51,6 @@ class ContainerConfigurator implements IContainerConfigurator {
$container->autowire(\MailPoet\AdminPages\Pages\SubscribersAPIKeyInvalid::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\SubscribersAPIKeyInvalid::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\SubscribersExport::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\SubscribersExport::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\SubscribersImport::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\SubscribersImport::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\SubscribersLimitExceeded::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\Update::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Update::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\WelcomeWizard::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\WelcomeWizard::class)->setPublic(true);
$container->autowire(\MailPoet\AdminPages\Pages\WooCommerceListImport::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\WooCommerceListImport::class)->setPublic(true);

33
views/limit.html
View File

@ -1,33 +0,0 @@
<% extends 'layout.html' %>
<% block content %>
<div class="wrap mailpoet-about-wrap">
<h1><%= __("You've reached the %s subscribers limit!") | format(number_format_i18n(limit)) %></h1>
<p class="about-text">
<%= __("Our free version is limited to %s subscribers.") | format(number_format_i18n(limit)) %>
</p>
<img
src="http://i2.wp.com/www.mailpoet.com/wp-content/uploads/2018/09/2000-limit-illustration.png?resize=1050%2C350"
alt="sad-cat"
width="1050"
height="350"
/>
<h3><%= __('Immediately, you can:') %></h3>
<ul class="ul-disc">
<li><%= __('Delete unconfirmed subscribers to have less than %s subscribers.') | format(number_format_i18n(limit)) %></li>
<li><%= __('Install the Premium plugin if you have purchased it.') %></li>
<li>
<a
href="<%= admin_url('admin.php?page=mailpoet-premium') %>"
class="button-primary"
>
<%= __('Check out the Premium')%>
</a>
</li>
</ul>
</div>
<% endblock %>