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

Display detailed stats only when premium initialized

Browse Source 
[MAILPOET-2506]
This commit is contained in:
Jan Jakeš
2019-11-07 12:31:35 +01:00
committed by Jack Kitterhing
parent 47d464c68d
commit 9d26d3ef24
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletters/campaign_stats/page.jsx
View File

@ -37,8 +37,8 @@ class CampaignStatsPage extends React.Component {
MailPoet.Ajax.post({ MailPoet.Ajax.post({
api_version: window.mailpoet_api_version, api_version: window.mailpoet_api_version,
endpoint: window.mailpoet_premium_active ? 'stats' : 'newsletters', endpoint: window.mailpoet_display_detailed_stats ? 'stats' : 'newsletters',
action: window.mailpoet_premium_active ? 'get' : 'getWithStats', action: window.mailpoet_display_detailed_stats ? 'get' : 'getWithStats',
data: { data: {
id, id,
}, },

2
lib/AdminPages/Pages/Newsletters.php
View File

@ -4,6 +4,7 @@ namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer; use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\Env; use MailPoet\Config\Env;
use MailPoet\Config\Installer;
use MailPoet\Config\Menu; use MailPoet\Config\Menu;
use MailPoet\Features\FeaturesController; use MailPoet\Features\FeaturesController;
use MailPoet\Listing\PageLimit; use MailPoet\Listing\PageLimit;
@ -164,6 +165,7 @@ class Newsletters {
$data['sent_newsletters_count'] = (int)Newsletter::where('status', Newsletter::STATUS_SENT)->count(); $data['sent_newsletters_count'] = (int)Newsletter::where('status', Newsletter::STATUS_SENT)->count();
$data['woocommerce_customizer_enabled'] = (bool)$this->settings->get('woocommerce.use_mailpoet_editor'); $data['woocommerce_customizer_enabled'] = (bool)$this->settings->get('woocommerce.use_mailpoet_editor');
$data['woocommerce_transactional_email_id'] = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID); $data['woocommerce_transactional_email_id'] = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID);
$data['display_detailed_stats'] = Installer::getPremiumStatus()['premium_plugin_initialized'];
$this->wp->wpEnqueueScript('jquery-ui'); $this->wp->wpEnqueueScript('jquery-ui');
$this->wp->wpEnqueueScript('jquery-ui-datepicker'); $this->wp->wpEnqueueScript('jquery-ui-datepicker');

2
lib/Config/Installer.php
View File

@ -41,12 +41,14 @@ class Installer {
$premium_plugin_active = License::getLicense(); $premium_plugin_active = License::getLicense();
$premium_plugin_installed = $premium_plugin_active || self::isPluginInstalled($slug); $premium_plugin_installed = $premium_plugin_active || self::isPluginInstalled($slug);
$premium_plugin_initialized = defined('MAILPOET_PREMIUM_INITIALIZED') && MAILPOET_PREMIUM_INITIALIZED;
$premium_install_url = $premium_plugin_installed ? '' : self::getPluginInstallationUrl($slug); $premium_install_url = $premium_plugin_installed ? '' : self::getPluginInstallationUrl($slug);
$premium_activate_url = $premium_plugin_active ? '' : self::getPluginActivationUrl($slug); $premium_activate_url = $premium_plugin_active ? '' : self::getPluginActivationUrl($slug);
return compact( return compact(
'premium_plugin_active', 'premium_plugin_active',
'premium_plugin_installed', 'premium_plugin_installed',
'premium_plugin_initialized',
'premium_install_url', 'premium_install_url',
'premium_activate_url' 'premium_activate_url'
); );

1
views/newsletters.html
View File

@ -33,6 +33,7 @@
var mailpoet_woocommerce_active = <%= json_encode(is_woocommerce_active) %>; var mailpoet_woocommerce_active = <%= json_encode(is_woocommerce_active) %>;
var mailpoet_woocommerce_customizer_enabled = <%= json_encode(woocommerce_customizer_enabled) %>; var mailpoet_woocommerce_customizer_enabled = <%= json_encode(woocommerce_customizer_enabled) %>;
var mailpoet_woocommerce_transactional_email_id = <%= json_encode(woocommerce_transactional_email_id) %>; var mailpoet_woocommerce_transactional_email_id = <%= json_encode(woocommerce_transactional_email_id) %>;
var mailpoet_display_detailed_stats = <%= json_encode(display_detailed_stats) %>;
var mailpoet_automatic_emails = <%= json_encode(automatic_emails) %>; var mailpoet_automatic_emails = <%= json_encode(automatic_emails) %>;
var mailpoet_feature_announcement_has_news = <%= json_encode(feature_announcement_has_news) %>; var mailpoet_feature_announcement_has_news = <%= json_encode(feature_announcement_has_news) %>;
var mailpoet_last_announcement_seen = <%= json_encode(last_announcement_seen) %>; var mailpoet_last_announcement_seen = <%= json_encode(last_announcement_seen) %>;