Update ViewInBrowserRenderer, Fix tracking config error
MAILPOET-4599
This commit is contained in:
committed by
Aschepikov
parent
63e797ba37
commit
3c718e3f68
@@ -15,8 +15,8 @@ class ViewInBrowserRenderer {
|
|||||||
/** @var Emoji */
|
/** @var Emoji */
|
||||||
private $emoji;
|
private $emoji;
|
||||||
|
|
||||||
/** @var bool */
|
/** @var TrackingConfig */
|
||||||
private $isTrackingEnabled;
|
private $trackingConfig;
|
||||||
|
|
||||||
/** @var Renderer */
|
/** @var Renderer */
|
||||||
private $renderer;
|
private $renderer;
|
||||||
@@ -35,7 +35,7 @@ class ViewInBrowserRenderer {
|
|||||||
Links $links
|
Links $links
|
||||||
) {
|
) {
|
||||||
$this->emoji = $emoji;
|
$this->emoji = $emoji;
|
||||||
$this->isTrackingEnabled = $trackingConfig->isEmailTrackingEnabled();
|
$this->trackingConfig = $trackingConfig;
|
||||||
$this->renderer = $renderer;
|
$this->renderer = $renderer;
|
||||||
$this->shortcodes = $shortcodes;
|
$this->shortcodes = $shortcodes;
|
||||||
$this->links = $links;
|
$this->links = $links;
|
||||||
@@ -48,6 +48,8 @@ class ViewInBrowserRenderer {
|
|||||||
SendingQueueEntity $queue = null
|
SendingQueueEntity $queue = null
|
||||||
) {
|
) {
|
||||||
$wpUserPreview = $isPreview;
|
$wpUserPreview = $isPreview;
|
||||||
|
$isTrackingEnabled = $this->trackingConfig->isEmailTrackingEnabled();
|
||||||
|
|
||||||
if ($queue && $queue->getNewsletterRenderedBody()) {
|
if ($queue && $queue->getNewsletterRenderedBody()) {
|
||||||
$body = $queue->getNewsletterRenderedBody();
|
$body = $queue->getNewsletterRenderedBody();
|
||||||
if (is_array($body)) {
|
if (is_array($body)) {
|
||||||
@@ -83,7 +85,7 @@ class ViewInBrowserRenderer {
|
|||||||
$wpUserPreview
|
$wpUserPreview
|
||||||
);
|
);
|
||||||
$renderedNewsletter = $this->shortcodes->replace($newsletterBody);
|
$renderedNewsletter = $this->shortcodes->replace($newsletterBody);
|
||||||
if (!$wpUserPreview && $queue && $subscriber && $this->isTrackingEnabled) {
|
if (!$wpUserPreview && $queue && $subscriber && $isTrackingEnabled) {
|
||||||
$renderedNewsletter = $this->links->replaceSubscriberData(
|
$renderedNewsletter = $this->links->replaceSubscriberData(
|
||||||
$subscriber->getId(),
|
$subscriber->getId(),
|
||||||
$queue->getId(),
|
$queue->getId(),
|
||||||
|
Reference in New Issue
Block a user