Use Newsletter\Url as service

[MAILPOET-3269]
This commit is contained in:
Jan Lysý
2021-05-28 11:21:32 +02:00
committed by Veljko V
parent c9636ebf1b
commit aeeceeeb8d
16 changed files with 130 additions and 35 deletions

View File

@ -5,11 +5,13 @@ namespace MailPoet\Subscription;
use MailPoet\Config\Renderer as TemplateRenderer;
use MailPoet\Form\Block\Date as FormBlockDate;
use MailPoet\Form\Renderer as FormRenderer;
use MailPoet\InvalidStateException;
use MailPoet\Models\CustomField;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscribers\LinkTokens;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Util\Helpers;
use MailPoet\Util\Url as UrlHelper;
use MailPoet\WP\Functions as WPFunctions;
@ -39,6 +41,9 @@ class ManageSubscriptionFormRenderer {
/** @var TemplateRenderer */
private $templateRenderer;
/** @var SubscribersRepository */
private $subscribersRepository;
public function __construct(
WPFunctions $wp,
SettingsController $settings,
@ -46,7 +51,8 @@ class ManageSubscriptionFormRenderer {
LinkTokens $linkTokens,
FormRenderer $formRenderer,
FormBlockDate $dateBlock,
TemplateRenderer $templateRenderer
TemplateRenderer $templateRenderer,
SubscribersRepository $subscribersRepository
) {
$this->wp = $wp;
$this->settings = $settings;
@ -55,6 +61,7 @@ class ManageSubscriptionFormRenderer {
$this->formRenderer = $formRenderer;
$this->dateBlock = $dateBlock;
$this->templateRenderer = $templateRenderer;
$this->subscribersRepository = $subscribersRepository;
}
public function renderForm(Subscriber $subscriber, string $formState = self::FORM_STATE_NOT_SUBMITTED): string {
@ -79,11 +86,15 @@ class ManageSubscriptionFormRenderer {
$form = $this->wp->applyFilters('mailpoet_manage_subscription_page_form_fields', $form);
$subscriberEntity = $this->subscribersRepository->findOneById($subscriber->id);
if (!$subscriberEntity) {
throw new InvalidStateException();
}
$templateData = [
'actionUrl' => admin_url('admin-post.php'),
'redirectUrl' => $this->urlHelper->getCurrentUrl(),
'email' => $subscriber->email,
'token' => $this->linkTokens->getToken($subscriber),
'token' => $this->linkTokens->getToken($subscriberEntity),
'editEmailInfo' => __('Need to change your email address? Unsubscribe here, then simply sign up again.', 'mailpoet'),
'formHtml' => $this->formRenderer->renderBlocks($form, [], $honeypot = false, $captcha = false),
'formState' => $formState,