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

@ -8,6 +8,7 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterQueueTask;
use MailPoet\Features\FeaturesController;
use MailPoet\Listing;
use MailPoet\Models\Newsletter;
use MailPoet\Models\NewsletterOption;
@ -43,6 +44,9 @@ class Newsletters extends APIEndpoint {
/** @var SettingsController */
private $settings;
/** @var FeaturesController */
private $features_controller;
public $permissions = array(
'global' => AccessControl::PERMISSION_MANAGE_EMAILS
);
@ -52,13 +56,15 @@ class Newsletters extends APIEndpoint {
Listing\Handler $listing_handler,
WPFunctions $wp,
WCHelper $woocommerce_helper,
SettingsController $settings
SettingsController $settings,
FeaturesController $features_controller
) {
$this->bulk_action = $bulk_action;
$this->listing_handler = $listing_handler;
$this->wp = $wp;
$this->woocommerce_helper = $woocommerce_helper;
$this->settings = $settings;
$this->features_controller = $features_controller;
}
function get($data = array()) {
@ -443,13 +449,13 @@ class Newsletters extends APIEndpoint {
$newsletter
->withSegments(true)
->withSendingQueue()
->withStatistics($this->woocommerce_helper);
->withStatistics($this->woocommerce_helper, $this->features_controller);
} else if ($newsletter->type === Newsletter::TYPE_WELCOME || $newsletter->type === Newsletter::TYPE_AUTOMATIC) {
$newsletter
->withOptions()
->withTotalSent()
->withScheduledToBeSent()
->withStatistics($this->woocommerce_helper);
->withStatistics($this->woocommerce_helper, $this->features_controller);
} else if ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
$newsletter
->withOptions()
@ -459,7 +465,7 @@ class Newsletters extends APIEndpoint {
$newsletter
->withSegments(true)
->withSendingQueue()
->withStatistics($this->woocommerce_helper);
->withStatistics($this->woocommerce_helper, $this->features_controller);
}
if ($newsletter->status === Newsletter::STATUS_SENT ||