From c11b1a78f1c31b25fe17761b5143f285bb111641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ja=CC=81n=20Mikla=CC=81s=CC=8C?= Date: Tue, 1 Oct 2019 10:44:50 +0200 Subject: [PATCH] Use Twig to render WooCommerce settings overlay [MAILPOET-2283] --- lib/WooCommerce/Settings.php | 51 +++++-------------------- views/woocommerce/settings_overlay.html | 30 +++++++++++++++ 2 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 views/woocommerce/settings_overlay.html diff --git a/lib/WooCommerce/Settings.php b/lib/WooCommerce/Settings.php index 566804924d..2bb26acb2c 100644 --- a/lib/WooCommerce/Settings.php +++ b/lib/WooCommerce/Settings.php @@ -2,29 +2,29 @@ namespace MailPoet\WooCommerce; +use MailPoet\Config\Renderer; use MailPoet\Features\FeaturesController; use MailPoet\Settings\SettingsController; -use MailPoet\WP\Functions as WPFunctions; class Settings { /** @var FeaturesController */ private $features_controller; + /** @var Renderer */ + private $renderer; + /** @var SettingsController */ private $settings; - /** @var WPFunctions */ - private $wp; - function __construct( FeaturesController $features_controller, - SettingsController $settings, - WPFunctions $wp + Renderer $renderer, + SettingsController $settings ) { $this->features_controller = $features_controller; + $this->renderer = $renderer; $this->settings = $settings; - $this->wp = $wp; } function disableWooCommerceSettings() { @@ -37,40 +37,9 @@ class Settings { if (!(bool)$this->settings->get('woocommerce.use_mailpoet_editor')) { return; } - $woocommerce_template_id = $this->settings->get('woocommerce.transactional_email_id'); - ?> - - -
- - wp->_x('Customize with MailPoet', 'Button in WooCommerce settings page'); ?> - -
-
- - wp->_x('Disable MailPoet customizer', 'Link from WooCommerce plugin to MailPoet'); ?> - -
- - renderer->render('woocommerce/settings_overlay.html', [ + 'woocommerce_template_id' => $this->settings->get('woocommerce.transactional_email_id'), + ]); } } diff --git a/views/woocommerce/settings_overlay.html b/views/woocommerce/settings_overlay.html new file mode 100644 index 0000000000..bcb1230372 --- /dev/null +++ b/views/woocommerce/settings_overlay.html @@ -0,0 +1,30 @@ + + +
+ + <%= _x('Customize with MailPoet', 'Button in WooCommerce settings page') %> + +
+
+ + <%= _x('Disable MailPoet customizer', 'Link from WooCommerce plugin to MailPoet') %> + +