Cavemanon/piratepoet
8
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/Util/License/Features/Subscribers.php
View File

@@ -30,14 +30,17 @@ class Subscribers {
public function check() {
$limit = $this->getSubscribersLimit();
if ($limit === false) return false;
if ($this->hasPremiumSupport()) {
$subscribersCount = $this->subscribersRepository->getTotalSubscribersWithoutWPUsers();
} else {
$subscribersCount = $this->subscribersRepository->getTotalSubscribers();
}
$subscribersCount = $this->getSubscribersCount();
return $subscribersCount > $limit;
}
public function getSubscribersCount() {
if ($this->hasPremiumSupport()) {
return $this->subscribersRepository->getTotalSubscribersWithoutWPUsers();
}
return $this->subscribersRepository->getTotalSubscribers();
}
public function hasValidApiKey() {
return $this->hasValidMssKey() || $this->hasValidPremiumKey();
}
@@ -84,7 +87,7 @@ class Subscribers {
return (int)$this->settings->get(self::PREMIUM_SUBSCRIBERS_LIMIT_SETTING_KEY);
}
private function hasPremiumSupport() {
public function hasPremiumSupport() {
return $this->hasValidPremiumKey() && $this->settings->get(self::PREMIUM_SUPPORT_SETTING_KEY) === 'premium';
}