Convert 'display_revenues' setting to feature flag

[MAILPOET-2008]
This commit is contained in:
Jan Jakeš
2019-05-08 11:21:09 +02:00
committed by M. Shull
parent fe51e5e38c
commit 4b0beecdfb
8 changed files with 45 additions and 16 deletions

View File

@@ -5,6 +5,7 @@ namespace MailPoet\Cron\Workers\StatsNotifications;
use Carbon\Carbon;
use MailPoet\Config\Renderer;
use MailPoet\Cron\CronHelper;
use MailPoet\Features\FeaturesController;
use MailPoet\Mailer\Mailer;
use MailPoet\Models\Newsletter;
use MailPoet\Models\NewsletterLink;
@@ -32,6 +33,9 @@ class Worker {
/** @var SettingsController */
private $settings;
/** @var FeaturesController */
private $features_controller;
/** @var WCHelper */
private $woocommerce_helper;
@@ -39,6 +43,7 @@ class Worker {
Mailer $mailer,
Renderer $renderer,
SettingsController $settings,
FeaturesController $features_controller,
WCHelper $woocommerce_helper,
$timer = false
) {
@@ -46,6 +51,7 @@ class Worker {
$this->renderer = $renderer;
$this->mailer = $mailer;
$this->settings = $settings;
$this->features_controller = $features_controller;
$this->woocommerce_helper = $woocommerce_helper;
}
@@ -103,7 +109,7 @@ class Worker {
return $newsletter
->withSendingQueue()
->withTotalSent()
->withStatistics($this->woocommerce_helper);
->withStatistics($this->woocommerce_helper, $this->features_controller);
}
/**

View File

@@ -13,6 +13,7 @@ use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck as PremiumKeyCheckWorker;
use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck as SendingServiceKeyCheckWorker;
use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker;
use MailPoet\Cron\Workers\SendingQueue\SendingErrorHandler;
use MailPoet\Features\FeaturesController;
use MailPoet\Segments\WooCommerce as WooCommerceSegment;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\Mailer\Mailer;
@@ -33,6 +34,9 @@ class WorkersFactory {
/** @var SettingsController */
private $settings;
/** @var FeaturesController */
private $features_controller;
/** @var WooCommerceSegment */
private $woocommerce_segment;
@@ -53,6 +57,7 @@ class WorkersFactory {
Mailer $mailer,
Renderer $renderer,
SettingsController $settings,
FeaturesController $features_controller,
WooCommerceSegment $woocommerce_segment,
InactiveSubscribersController $inactive_subscribers_controller,
WooCommerceHelper $woocommerce_helper
@@ -62,6 +67,7 @@ class WorkersFactory {
$this->mailer = $mailer;
$this->renderer = $renderer;
$this->settings = $settings;
$this->features_controller = $features_controller;
$this->woocommerce_segment = $woocommerce_segment;
$this->inactive_subscribers_controller = $inactive_subscribers_controller;
$this->woocommerce_helper = $woocommerce_helper;
@@ -78,7 +84,7 @@ class WorkersFactory {
}
function createStatsNotificationsWorker($timer) {
return new StatsNotificationsWorker($this->mailer, $this->renderer, $this->settings, $this->woocommerce_helper, $timer);
return new StatsNotificationsWorker($this->mailer, $this->renderer, $this->settings, $this->features_controller, $this->woocommerce_helper, $timer);
}
/** @return SendingServiceKeyCheckWorker */