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

Get rid of premium_subscriber_count and load count using doctrine

Browse Source 
[MAILPOET-3143]
This commit is contained in:
Rostislav Wolny
2021-01-07 16:04:54 +01:00
committed by Veljko V
parent 0abb08bdac
commit 7c8f29a90d
6 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/js/src/mailpoet.js
View File

@ -12,7 +12,6 @@ var MailPoet = {
premiumActive: window.mailpoet_premium_active, premiumActive: window.mailpoet_premium_active,
subscribersLimit: window.mailpoet_subscribers_limit, subscribersLimit: window.mailpoet_subscribers_limit,
subscribersLimitReached: window.mailpoet_subscribers_limit_reached, subscribersLimitReached: window.mailpoet_subscribers_limit_reached,
subscribersCountTowardsLimit: window.mailpoet_premium_subscribers_count,
subscribersCount: window.mailpoet_subscribers_in_plan_count, subscribersCount: window.mailpoet_subscribers_in_plan_count,
hasPremiumSupport: window.mailpoet_has_premium_support, hasPremiumSupport: window.mailpoet_has_premium_support,
hasValidApiKey: window.mailpoet_has_valid_api_key, hasValidApiKey: window.mailpoet_has_valid_api_key,

2
assets/js/src/subscribers/stats/opened_email_stats.tsx
View File

@ -21,7 +21,7 @@ const OpenedEmailsStats = ({ params, location }: Props) => (
<NoAccessInfo <NoAccessInfo
limitReached={MailPoet.subscribersLimitReached} limitReached={MailPoet.subscribersLimitReached}
limitValue={MailPoet.subscribersLimit} limitValue={MailPoet.subscribersLimit}
subscribersCountTowardsLimit={MailPoet.subscribersCountTowardsLimit} subscribersCountTowardsLimit={MailPoet.subscribersCount}
premiumActive={MailPoet.premiumActive} premiumActive={MailPoet.premiumActive}
hasValidApiKey={MailPoet.hasValidApiKey} hasValidApiKey={MailPoet.hasValidApiKey}
hasPremiumSupport={MailPoet.hasPremiumSupport} hasPremiumSupport={MailPoet.hasPremiumSupport}

3
lib/AdminPages/Pages/Segments.php
View File

@ -63,8 +63,7 @@ class Segments {
$data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit(); $data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit();
$data['subscribers_limit_reached'] = $this->subscribersFeature->check(); $data['subscribers_limit_reached'] = $this->subscribersFeature->check();
$data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey(); $data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
$data['subscriber_count'] = Subscriber::getTotalSubscribers(); $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['premium_subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport(); $data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport();
$data['wp_users_count'] = false; $data['wp_users_count'] = false;

3
lib/AdminPages/Pages/Subscribers.php
View File

@ -94,8 +94,7 @@ class Subscribers {
$data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit(); $data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit();
$data['subscribers_limit_reached'] = $this->subscribersFeature->check(); $data['subscribers_limit_reached'] = $this->subscribersFeature->check();
$data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey(); $data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
$data['subscriber_count'] = Subscriber::getTotalSubscribers(); $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['premium_subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
$data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport(); $data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport();
$data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-premium'); $data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-premium');

1
views/segments.html
View File

@ -22,7 +22,6 @@
var mailpoet_mss_key_invalid = <%= mss_key_invalid ? 'true' : 'false' %>; var mailpoet_mss_key_invalid = <%= mss_key_invalid ? 'true' : 'false' %>;
var mailpoet_subscribers_count = <%= subscriber_count %>; var mailpoet_subscribers_count = <%= subscriber_count %>;
var mailpoet_subscribers_in_plan_count = <%= subscriber_count %>; var mailpoet_subscribers_in_plan_count = <%= subscriber_count %>;
var mailpoet_premium_subscribers_count = <%= premium_subscriber_count %>;
var mailpoet_has_premium_support = <%= has_premium_support ? 'true' : 'false' %>; var mailpoet_has_premium_support = <%= has_premium_support ? 'true' : 'false' %>;
var mailpoet_wp_users_count = <%= wp_users_count ? wp_users_count : 'false' %>; var mailpoet_wp_users_count = <%= wp_users_count ? wp_users_count : 'false' %>;
var wordpress_editable_roles_list = <%= json_encode(wordpress_editable_roles_list) %>; var wordpress_editable_roles_list = <%= json_encode(wordpress_editable_roles_list) %>;

1
views/subscribers/subscribers.html
View File

@ -25,7 +25,6 @@
var mailpoet_mss_key_invalid = <%= mss_key_invalid ? 'true' : 'false' %>; var mailpoet_mss_key_invalid = <%= mss_key_invalid ? 'true' : 'false' %>;
var mailpoet_subscribers_count = <%= subscriber_count %>; var mailpoet_subscribers_count = <%= subscriber_count %>;
var mailpoet_subscribers_in_plan_count = <%= subscriber_count %>; var mailpoet_subscribers_in_plan_count = <%= subscriber_count %>;
var mailpoet_premium_subscribers_count = <%= premium_subscriber_count %>;
var mailpoet_has_premium_support = <%= has_premium_support ? 'true' : 'false' %>; var mailpoet_has_premium_support = <%= has_premium_support ? 'true' : 'false' %>;
var mailpoet_wp_users_count = <%= wp_users_count ? wp_users_count : 'false' %>; var mailpoet_wp_users_count = <%= wp_users_count ? wp_users_count : 'false' %>;
var mailpoet_premium_link = <%= json_encode(link_premium) %>; var mailpoet_premium_link = <%= json_encode(link_premium) %>;