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

Add 'display_revenues' feature flag

Browse Source 
[MAILPOET-1853]
This commit is contained in:
Jan Jakeš
2019-05-07 11:23:41 +02:00
committed by M. Shull
parent 977a9fb121
commit 38001c2ad0
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Models/Newsletter.php
View File

@@ -589,7 +589,8 @@ class Newsletter extends Model {
} }
// WooCommerce revenues // WooCommerce revenues
if ($woocommerce_helper->isWooCommerceActive()) { $settings = new SettingsController();
if ($woocommerce_helper->isWooCommerceActive() && $settings->get('display_revenues')) {
$currency = $woocommerce_helper->getWoocommerceCurrency(); $currency = $woocommerce_helper->getWoocommerceCurrency();
$row = StatisticsWooCommercePurchases::selectExpr('SUM(order_price_total) AS total') $row = StatisticsWooCommercePurchases::selectExpr('SUM(order_price_total) AS total')
->where([ ->where([

5
tests/DataFactories/Settings.php
View File

@@ -116,4 +116,9 @@ class Settings {
$this->settings->set('deactivate_subscriber_after_inactive_days', 180); $this->settings->set('deactivate_subscriber_after_inactive_days', 180);
return $this; return $this;
} }
function withDisplayRevenuesEnabled() {
$this->settings->set('display_revenues', true);
return $this;
}
} }

3
tests/acceptance/NewsletterStatisticsCest.php
View File

@@ -4,6 +4,7 @@ namespace MailPoet\Test\Acceptance;
require_once __DIR__ . '/../DataFactories/Newsletter.php'; require_once __DIR__ . '/../DataFactories/Newsletter.php';
require_once __DIR__ . '/../DataFactories/NewsletterLink.php'; require_once __DIR__ . '/../DataFactories/NewsletterLink.php';
require_once __DIR__ . '/../DataFactories/Settings.php';
require_once __DIR__ . '/../DataFactories/StatisticsClicks.php'; require_once __DIR__ . '/../DataFactories/StatisticsClicks.php';
require_once __DIR__ . '/../DataFactories/StatisticsWooCommercePurchases.php'; require_once __DIR__ . '/../DataFactories/StatisticsWooCommercePurchases.php';
require_once __DIR__ . '/../DataFactories/Subscriber.php'; require_once __DIR__ . '/../DataFactories/Subscriber.php';
@@ -11,6 +12,7 @@ require_once __DIR__ . '/../DataFactories/WooCommerceOrder.php';
use MailPoet\Test\DataFactories\Newsletter; use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\NewsletterLink; use MailPoet\Test\DataFactories\NewsletterLink;
use MailPoet\Test\DataFactories\Settings;
use MailPoet\Test\DataFactories\StatisticsClicks; use MailPoet\Test\DataFactories\StatisticsClicks;
use MailPoet\Test\DataFactories\StatisticsWooCommercePurchases; use MailPoet\Test\DataFactories\StatisticsWooCommercePurchases;
use MailPoet\Test\DataFactories\Subscriber; use MailPoet\Test\DataFactories\Subscriber;
@@ -20,6 +22,7 @@ class NewsletterStatisticsCest {
function _before(\AcceptanceTester $I) { function _before(\AcceptanceTester $I) {
$I->activateWooCommerce(); $I->activateWooCommerce();
(new Settings())->withDisplayRevenuesEnabled();
} }
function showWooCommercePurchaseStatistics(\AcceptanceTester $I) { function showWooCommercePurchaseStatistics(\AcceptanceTester $I) {