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

Use the updated component in subscriber and segment listings [MAILPOET-2917]

Browse Source
This commit is contained in:
wxa
2020-06-01 10:46:17 +03:00
committed by Veljko V
parent 48a96459f8
commit 4039ac873a
8 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,9 @@ use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\ServicesChecker;
use MailPoet\Listing\PageLimit;
use MailPoet\Models\Newsletter;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Services\Bridge;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\WP\Functions as WPFunctions;
@ -50,10 +52,23 @@ class Segments {
$data = [];
$data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('segments');
$data['mss_active'] = Bridge::isMPSendingServiceEnabled();
$data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit();
$data['subscribers_limit_reached'] = $this->subscribersFeature->check();
$data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
$data['subscriber_count'] = Subscriber::getTotalSubscribers();
$data['premium_subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport();
$data['wp_users_count'] = false;
if (!$data['has_premium_support']) {
$wpSegment = Segment::getWPSegment()->withSubscribersCount();
$subscribersCount = $wpSegment->subscribersCount;
$data['wp_users_count'] = $subscribersCount[Subscriber::STATUS_SUBSCRIBED]
+ $subscribersCount[Subscriber::STATUS_UNCONFIRMED]
+ $subscribersCount[Subscriber::STATUS_INACTIVE];
}
$data['mss_key_invalid'] = ($this->servicesChecker->isMailPoetAPIKeyValid() === false);

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

@ -89,6 +89,17 @@ class Subscribers {
$data['subscribers_limit_reached'] = $this->subscribersFeature->check();
$data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
$data['subscriber_count'] = Subscriber::getTotalSubscribers();
$data['premium_subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport();
$data['wp_users_count'] = false;
if (!$data['has_premium_support']) {
$wpSegment = Segment::getWPSegment()->withSubscribersCount();
$subscribersCount = $wpSegment->subscribersCount;
$data['wp_users_count'] = $subscribersCount[Subscriber::STATUS_SUBSCRIBED]
+ $subscribersCount[Subscriber::STATUS_UNCONFIRMED]
+ $subscribersCount[Subscriber::STATUS_INACTIVE];
}
$this->pageRenderer->displayPage('subscribers/subscribers.html', $data);
}