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

Remove filter mailpoet_segments_with_subscriber_count

Browse Source 
[MAILPOET-3077]
This commit is contained in:
Rostislav Wolny
2020-09-14 14:00:52 +02:00
committed by Veljko V
parent dd4bf486a6
commit 331e40a137
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,6 @@ class Newsletters {
$data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters'); $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters');
$segments = Segment::getSegmentsWithSubscriberCount($type = false); $segments = Segment::getSegmentsWithSubscriberCount($type = false);
$segments = $this->dynamicSegmentsLoader->add($segments); $segments = $this->dynamicSegmentsLoader->add($segments);
$segments = $this->wp->applyFilters('mailpoet_segments_with_subscriber_count', $segments);
usort($segments, function ($a, $b) { usort($segments, function ($a, $b) {
return strcasecmp($a["name"], $b["name"]); return strcasecmp($a["name"], $b["name"]);
}); });

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

@ -62,7 +62,6 @@ class Subscribers {
$data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('subscribers'); $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('subscribers');
$segments = Segment::getSegmentsWithSubscriberCount($type = false); $segments = Segment::getSegmentsWithSubscriberCount($type = false);
$segments = $this->dynamicSegmentsLoader->add($segments); $segments = $this->dynamicSegmentsLoader->add($segments);
$segments = $this->wp->applyFilters('mailpoet_segments_with_subscriber_count', $segments);
usort($segments, function ($a, $b) { usort($segments, function ($a, $b) {
return strcasecmp($a["name"], $b["name"]); return strcasecmp($a["name"], $b["name"]);
}); });

1
lib/Subscribers/ImportExport/ImportExportFactory.php
View File

@ -29,7 +29,6 @@ class ImportExportFactory {
} else { } else {
$segments = Segment::getSegmentsForExport(); $segments = Segment::getSegmentsForExport();
$segments = $this->dynamicSegmentsLoader->add($segments); $segments = $this->dynamicSegmentsLoader->add($segments);
$segments = $this->wp->applyFilters('mailpoet_segments_with_subscriber_count', $segments);
$segments = array_values(array_filter($segments, function($segment) { $segments = array_values(array_filter($segments, function($segment) {
return $segment['subscribers'] > 0; return $segment['subscribers'] > 0;
})); }));

17
tests/integration/API/JSON/v1/SubscribersTest.php
View File

@ -43,6 +43,7 @@ use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Subscription\Captcha; use MailPoet\Subscription\Captcha;
use MailPoet\Subscription\CaptchaSession; use MailPoet\Subscription\CaptchaSession;
use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Subscription\SubscriptionUrlFactory;
use MailPoet\Test\DataFactories\DynamicSegment;
use MailPoet\WP\Functions; use MailPoet\WP\Functions;
use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Carbon\Carbon;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
@ -323,17 +324,19 @@ class SubscribersTest extends \MailPoetTest {
expect($response->data[0]['email'])->equals($this->subscriber2->getEmail()); expect($response->data[0]['email'])->equals($this->subscriber2->getEmail());
} }
public function testItCanAddSegmentsUsingHooks() { public function testItCanLoadDymanicSegments() {
$addSegment = function() { $dynamicSegmentFactory = new DynamicSegment();
return 'segment'; $dynamicSegment = $dynamicSegmentFactory
}; ->withName('Dynamic')
add_filter('mailpoet_subscribers_listings_filters_segments', $addSegment); ->withUserRoleFilter('master_of_universe')
->create();
$dynamicSegment->save();
$response = $this->endpoint->listing([ $response = $this->endpoint->listing([
'filter' => [ 'filter' => [
'segment' => $this->segment2->getId(), 'segment' => $dynamicSegment->id,
], ],
]); ]);
expect($response->meta['filters']['segment'])->equals('segment'); expect($response->meta['filters']['segment'])->contains(['value' => $dynamicSegment->id, 'label' => 'Dynamic (0)']);
} }
public function testItCanSearchListing() { public function testItCanSearchListing() {