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

Checkbox implementation and refactor naming structure

Browse Source 
[MAILPOET-3920]
This commit is contained in:
Mike Jolley
2021-11-03 15:14:52 +00:00
committed by Veljko V
parent 0f5b7d0ac7
commit 72d4db26e3
18 changed files with 393 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Config/Initializer.php
View File

@@ -6,8 +6,8 @@ use MailPoet\API\JSON\API;
use MailPoet\AutomaticEmails\AutomaticEmails;
use MailPoet\Cron\CronTrigger;
use MailPoet\InvalidStateException;
use MailPoet\PostEditorBlocks\NewsletterBlock;
use MailPoet\PostEditorBlocks\PostEditorBlock;
use MailPoet\PostEditorBlocks\WooCommerceBlocksIntegration;
use MailPoet\Router;
use MailPoet\Settings\SettingsController;
use MailPoet\Util\ConflictResolver;
@@ -72,8 +72,8 @@ class Initializer {
/** @var \MailPoet\PostEditorBlocks\PostEditorBlock */
private $postEditorBlock;
/** @var \MailPoet\PostEditorBlocks\NewsletterBlock */
private $newsletterBlock;
/** @var \MailPoet\PostEditorBlocks\WooCommerceBlocksIntegration */
private $woocommerceBlocksIntegration;
/** @var Localizer */
private $localizer;
@@ -99,7 +99,7 @@ class Initializer {
DatabaseInitializer $databaseInitializer,
WCTransactionalEmails $wcTransactionalEmails,
PostEditorBlock $postEditorBlock,
NewsletterBlock $newsletterBlock,
WooCommerceBlocksIntegration $woocommerceBlocksIntegration,
WooCommerceHelper $wcHelper,
Localizer $localizer,
AssetsLoader $assetsLoader
@@ -120,7 +120,7 @@ class Initializer {
$this->wcTransactionalEmails = $wcTransactionalEmails;
$this->wcHelper = $wcHelper;
$this->postEditorBlock = $postEditorBlock;
$this->newsletterBlock = $newsletterBlock;
$this->woocommerceBlocksIntegration = $woocommerceBlocksIntegration;
$this->localizer = $localizer;
$this->assetsLoader = $assetsLoader;
}
@@ -236,8 +236,8 @@ class Initializer {
$this->setupPermanentNotices();
$this->setupAutomaticEmails();
$this->setupWoocommerceBlocksIntegration();
$this->postEditorBlock->init();
$this->newsletterBlock->init();
WPFunctions::get()->doAction('mailpoet_initialized', MAILPOET_VERSION);
} catch (InvalidStateException $e) {
@@ -389,4 +389,12 @@ class Initializer {
$this->wcTransactionalEmails->useTemplateForWoocommerceEmails();
}
}
private function setupWoocommerceBlocksIntegration() {
$wcEnabled = $this->wcHelper->isWooCommerceActive();
$wcBlocksEnabled = $this->wcHelper->isWooCommerceBlocksActive( '6.3.0-dev' );
if ($wcEnabled && $wcBlocksEnabled) {
$this->woocommerceBlocksIntegration->init();
}
}
}