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

Fix colors in rendering [MAILPOET-2569]

Browse Source
This commit is contained in:
wxa
2019-12-18 13:06:56 +03:00
committed by wxa
parent e864311faf
commit d84c45e5f1
5 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Newsletter/Renderer/Preprocessor.php
View File

@@ -4,7 +4,7 @@ namespace MailPoet\Newsletter\Renderer;
use MailPoet\Newsletter\Editor\LayoutHelper;
use MailPoet\Newsletter\Renderer\Blocks\Renderer as BlocksRenderer;
use MailPoet\WP\Functions as WPFunctions;
use MailPoet\WooCommerce\TransactionalEmails;
class Preprocessor {
const WC_HEADING_PLACEHOLDER = '[mailpet_woocommerce_heading_placeholder]';
@@ -13,12 +13,12 @@ class Preprocessor {
/** @var BlocksRenderer */
private $blocks_renderer;
/** @var WPFunctions */
private $wp;
/** @var TransactionalEmails */
private $transactional_emails;
public function __construct(BlocksRenderer $blocks_renderer, WPFunctions $wp) {
public function __construct(BlocksRenderer $blocks_renderer, TransactionalEmails $transactional_emails) {
$this->blocks_renderer = $blocks_renderer;
$this->wp = $wp;
$this->transactional_emails = $transactional_emails;
}
/**
@@ -46,10 +46,9 @@ class Preprocessor {
case 'automatedLatestContentLayout':
return $this->blocks_renderer->automatedLatestContentTransformedPosts($block);
case 'woocommerceHeading':
$base_color = $this->wp->getOption('woocommerce_email_base_color');
$text_color = $this->wp->getOption('woocommerce_email_text_color');
$content = '<h1 style="color:' . $text_color . ';">' . self::WC_HEADING_PLACEHOLDER . '</h1>';
return $this->placeholder($content, ['backgroundColor' => $base_color]);
$wc_email_settings = $this->transactional_emails->getWCEmailSettings();
$content = '<h1 style="color:' . $wc_email_settings['base_text_color'] . ';">' . self::WC_HEADING_PLACEHOLDER . '</h1>';
return $this->placeholder($content, ['backgroundColor' => $wc_email_settings['base_color']]);
case 'woocommerceContent':
return $this->placeholder(self::WC_CONTENT_PLACEHOLDER);
}

9
lib/Newsletter/Renderer/Renderer.php
View File

@@ -3,17 +3,19 @@
namespace MailPoet\Newsletter\Renderer;
use MailPoet\Config\Env;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Models\Newsletter;
use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper;
use MailPoet\Services\Bridge;
use MailPoet\Util\License\License;
use MailPoet\Util\pQuery\DomNode;
use MailPoet\WooCommerce\TransactionalEmails;
use MailPoet\WP\Functions as WPFunctions;
class Renderer {
public $blocks_renderer;
public $columns_renderer;
private $preprocessor;
public $preprocessor;
public $CSS_inliner;
public $newsletter;
public $preview;
@@ -31,7 +33,10 @@ class Renderer {
$this->preview = $preview;
$this->blocks_renderer = new Blocks\Renderer($this->newsletter);
$this->columns_renderer = new Columns\Renderer();
$this->preprocessor = new Preprocessor($this->blocks_renderer, WPFunctions::get());
$this->preprocessor = new Preprocessor(
$this->blocks_renderer,
ContainerWrapper::getInstance()->get(TransactionalEmails::class)
);
$this->CSS_inliner = new \MailPoetVendor\CSS();
$this->template = file_get_contents(dirname(__FILE__) . '/' . self::NEWSLETTER_TEMPLATE);
$this->premium_activated = License::getLicense();