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

Always count WP users in group filters [MAILPOET-2917]

Browse Source
This commit is contained in:
wxa
2020-05-28 10:29:58 +03:00
committed by Veljko V
parent b3b0855529
commit e31dcde50e
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Models/Subscriber.php
View File

@@ -221,58 +221,42 @@ class Subscriber extends Model {
return $orm; return $orm;
} }
private static function updateGroupsQuery($data, $query) {
$wpSegment = Segment::getWPSegment();
if (isset($data['filter']['segment']) && $data['filter']['segment'] === $wpSegment->id) {
return $query;
}
$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;
}
public static function groups($data) { public static function groups($data) {
return [ return [
[ [
'name' => 'all', 'name' => 'all',
'label' => WPFunctions::get()->__('All', 'mailpoet'), 'label' => WPFunctions::get()->__('All', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::getPublished())->count(), 'count' => self::getPublished()->count(),
], ],
[ [
'name' => self::STATUS_SUBSCRIBED, 'name' => self::STATUS_SUBSCRIBED,
'label' => WPFunctions::get()->__('Subscribed', 'mailpoet'), 'label' => WPFunctions::get()->__('Subscribed', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::filter(self::STATUS_SUBSCRIBED))->count(), 'count' => self::filter(self::STATUS_SUBSCRIBED)->count(),
], ],
[ [
'name' => self::STATUS_UNCONFIRMED, 'name' => self::STATUS_UNCONFIRMED,
'label' => WPFunctions::get()->__('Unconfirmed', 'mailpoet'), 'label' => WPFunctions::get()->__('Unconfirmed', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::filter(self::STATUS_UNCONFIRMED))->count(), 'count' => self::filter(self::STATUS_UNCONFIRMED)->count(),
], ],
[ [
'name' => self::STATUS_UNSUBSCRIBED, 'name' => self::STATUS_UNSUBSCRIBED,
'label' => WPFunctions::get()->__('Unsubscribed', 'mailpoet'), 'label' => WPFunctions::get()->__('Unsubscribed', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::filter(self::STATUS_UNSUBSCRIBED))->count(), 'count' => self::filter(self::STATUS_UNSUBSCRIBED)->count(),
], ],
[ [
'name' => self::STATUS_INACTIVE, 'name' => self::STATUS_INACTIVE,
'label' => WPFunctions::get()->__('Inactive', 'mailpoet'), 'label' => WPFunctions::get()->__('Inactive', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::filter(self::STATUS_INACTIVE))->count(), 'count' => self::filter(self::STATUS_INACTIVE)->count(),
], ],
[ [
'name' => self::STATUS_BOUNCED, 'name' => self::STATUS_BOUNCED,
'label' => WPFunctions::get()->__('Bounced', 'mailpoet'), 'label' => WPFunctions::get()->__('Bounced', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::filter(self::STATUS_BOUNCED))->count(), 'count' => self::filter(self::STATUS_BOUNCED)->count(),
], ],
[ [
'name' => 'trash', 'name' => 'trash',
'label' => WPFunctions::get()->__('Trash', 'mailpoet'), 'label' => WPFunctions::get()->__('Trash', 'mailpoet'),
'count' => self::updateGroupsQuery($data, self::getTrashed())->count(), 'count' => self::getTrashed()->count(),
], ],
]; ];
} }