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

Use javascript notice

Browse Source 
[MAILPOET-2643]
This commit is contained in:
Pavel Dohnal
2020-04-07 16:41:16 +02:00
committed by Veljko V
parent f6c602d474
commit 47a9586aa7
17 changed files with 107 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/AdminPages/Pages/Newsletters.php
View File

@@ -146,6 +146,7 @@ class Newsletters {
$lastAnnouncementSeen < $lastAnnouncementDate
);
$data['last_announcement_seen'] = $lastAnnouncementSeen;
$data['mss_key_invalid'] = ($this->servicesChecker->isMailPoetAPIKeyValid() === false);
$data['automatic_emails'] = [
[

14
lib/AdminPages/Pages/Segments.php
View File

@@ -3,6 +3,7 @@
namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\ServicesChecker;
use MailPoet\Listing\PageLimit;
use MailPoet\Models\Subscriber;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
@@ -17,10 +18,19 @@ class Segments {
/** @var SubscribersFeature */
private $subscribersFeature;
public function __construct(PageRenderer $pageRenderer, PageLimit $listingPageLimit, SubscribersFeature $subscribersFeature) {
/** @var ServicesChecker */
private $servicesChecker;
public function __construct(
PageRenderer $pageRenderer,
PageLimit $listingPageLimit,
ServicesChecker $servicesChecker,
SubscribersFeature $subscribersFeature
) {
$this->pageRenderer = $pageRenderer;
$this->listingPageLimit = $listingPageLimit;
$this->subscribersFeature = $subscribersFeature;
$this->servicesChecker = $servicesChecker;
}
public function render() {
@@ -32,6 +42,8 @@ class Segments {
$data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
$data['subscriber_count'] = Subscriber::getTotalSubscribers();
$data['mss_key_invalid'] = ($this->servicesChecker->isMailPoetAPIKeyValid() === false);
$this->pageRenderer->displayPage('segments.html', $data);
}
}

8
lib/AdminPages/Pages/Subscribers.php
View File

@@ -3,6 +3,7 @@
namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\ServicesChecker;
use MailPoet\Form\Block;
use MailPoet\Listing\PageLimit;
use MailPoet\Models\CustomField;
@@ -30,11 +31,15 @@ class Subscribers {
/** @var Block\Date */
private $dateBlock;
/** @var ServicesChecker */
private $servicesChecker;
public function __construct(
PageRenderer $pageRenderer,
PageLimit $listingPageLimit,
SubscribersFeature $subscribersFeature,
WPFunctions $wp,
ServicesChecker $servicesChecker,
Block\Date $dateBlock
) {
$this->pageRenderer = $pageRenderer;
@@ -42,6 +47,7 @@ class Subscribers {
$this->subscribersFeature = $subscribersFeature;
$this->wp = $wp;
$this->dateBlock = $dateBlock;
$this->servicesChecker = $servicesChecker;
}
public function render() {
@@ -75,6 +81,8 @@ class Subscribers {
$data['premium_plugin_active'] = License::getLicense();
$data['mss_active'] = Bridge::isMPSendingServiceEnabled();
$data['mss_key_invalid'] = ($this->servicesChecker->isMailPoetAPIKeyValid() === false);
$data['max_confirmation_emails'] = ConfirmationEmailMailer::MAX_CONFIRMATION_EMAILS;
$data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit();