Add support for segment displayInManageSubscriptionPage on Subscription management page
MAILPOET-4669
This commit is contained in:
committed by
Aschepikov
parent
48181994d8
commit
e64dc1669f
@@ -10,7 +10,6 @@ use MailPoet\Entities\SubscriberEntity;
|
||||
use MailPoet\Form\Block\Date as FormBlockDate;
|
||||
use MailPoet\Form\Renderer as FormRenderer;
|
||||
use MailPoet\Segments\SegmentsRepository;
|
||||
use MailPoet\Settings\SettingsController;
|
||||
use MailPoet\Subscribers\LinkTokens;
|
||||
use MailPoet\Util\Helpers;
|
||||
use MailPoet\Util\Url as UrlHelper;
|
||||
@@ -21,9 +20,6 @@ class ManageSubscriptionFormRenderer {
|
||||
const FORM_STATE_SUCCESS = 'success';
|
||||
const FORM_STATE_NOT_SUBMITTED = 'not_submitted';
|
||||
|
||||
/** @var SettingsController */
|
||||
private $settings;
|
||||
|
||||
/** @var UrlHelper */
|
||||
private $urlHelper;
|
||||
|
||||
@@ -50,7 +46,6 @@ class ManageSubscriptionFormRenderer {
|
||||
|
||||
public function __construct(
|
||||
WPFunctions $wp,
|
||||
SettingsController $settings,
|
||||
UrlHelper $urlHelper,
|
||||
LinkTokens $linkTokens,
|
||||
FormRenderer $formRenderer,
|
||||
@@ -60,7 +55,6 @@ class ManageSubscriptionFormRenderer {
|
||||
SegmentsRepository $segmentsRepository
|
||||
) {
|
||||
$this->wp = $wp;
|
||||
$this->settings = $settings;
|
||||
$this->urlHelper = $urlHelper;
|
||||
$this->linkTokens = $linkTokens;
|
||||
$this->formRenderer = $formRenderer;
|
||||
@@ -227,13 +221,12 @@ class ManageSubscriptionFormRenderer {
|
||||
}
|
||||
|
||||
private function getSegmentField(SubscriberEntity $subscriber): array {
|
||||
$segmentIds = $this->settings->get('subscription.segments', []);
|
||||
|
||||
// Get default segments
|
||||
$criteria = ['type' => SegmentEntity::TYPE_DEFAULT, 'deletedAt' => null];
|
||||
if (!empty($segmentIds)) {
|
||||
$criteria['id'] = $segmentIds;
|
||||
}
|
||||
$criteria = [
|
||||
'type' => SegmentEntity::TYPE_DEFAULT,
|
||||
'deletedAt' => null,
|
||||
'displayInManageSubscriptionPage' => 1,
|
||||
];
|
||||
$segments = $this->segmentsRepository->findBy($criteria, ['name' => Criteria::ASC]);
|
||||
|
||||
$subscribedSegmentIds = [];
|
||||
|
Reference in New Issue
Block a user