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

Update counting subscriber in listings

Browse Source 
[MAILPOET-2631]
This commit is contained in:
Pavel Dohnal
2020-01-20 15:06:30 +01:00
committed by Jack Kitterhing
parent 32c71f130c
commit ceafe62782
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Models/Subscriber.php
View File

@@ -226,7 +226,14 @@ class Subscriber extends Model {
if (isset($data['filter']['segment']) && $data['filter']['segment'] === $wpSegment->id) {
return $query;
}
$query->whereNull('wp_user_id');
$settings = SettingsController::getInstance();
if (
($settings->get('premium.premium_key_state.state') === 'valid')
&&
($settings->get('premium.premium_key_state.data.support_tier') === 'premium')
) {
$query->whereNull('wp_user_id');
}
return $query;
}

2
lib/Util/License/Features/Subscribers.php
View File

@@ -85,7 +85,7 @@ class Subscribers {
}
private function hasPremiumSupport() {
return $this->hasValidApiKey() && $this->settings->get(self::PREMIUM_SUPPORT_SETTING_KEY) === 'premium';
return $this->hasValidPremiumKey() && $this->settings->get(self::PREMIUM_SUPPORT_SETTING_KEY) === 'premium';
}
private function getFreeSubscribersLimit() {