From 7c8f29a90da86bf8f0958bb0c61cc8d5bd04d65e Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Thu, 7 Jan 2021 16:04:54 +0100
Subject: [PATCH] Get rid of premium_subscriber_count and load count using
 doctrine

[MAILPOET-3143]
---
 assets/js/src/mailpoet.js                              | 1 -
 assets/js/src/subscribers/stats/opened_email_stats.tsx | 2 +-
 lib/AdminPages/Pages/Segments.php                      | 3 +--
 lib/AdminPages/Pages/Subscribers.php                   | 3 +--
 views/segments.html                                    | 3 +--
 views/subscribers/subscribers.html                     | 1 -
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/assets/js/src/mailpoet.js b/assets/js/src/mailpoet.js
index 562b64d271..092a090cf9 100644
--- a/assets/js/src/mailpoet.js
+++ b/assets/js/src/mailpoet.js
@@ -12,7 +12,6 @@ var MailPoet = {
   premiumActive: window.mailpoet_premium_active,
   subscribersLimit: window.mailpoet_subscribers_limit,
   subscribersLimitReached: window.mailpoet_subscribers_limit_reached,
-  subscribersCountTowardsLimit: window.mailpoet_premium_subscribers_count,
   subscribersCount: window.mailpoet_subscribers_in_plan_count,
   hasPremiumSupport: window.mailpoet_has_premium_support,
   hasValidApiKey: window.mailpoet_has_valid_api_key,
diff --git a/assets/js/src/subscribers/stats/opened_email_stats.tsx b/assets/js/src/subscribers/stats/opened_email_stats.tsx
index 030e90f4da..3cd7c104c7 100644
--- a/assets/js/src/subscribers/stats/opened_email_stats.tsx
+++ b/assets/js/src/subscribers/stats/opened_email_stats.tsx
@@ -21,7 +21,7 @@ const OpenedEmailsStats = ({ params, location }: Props) => (
       <NoAccessInfo
         limitReached={MailPoet.subscribersLimitReached}
         limitValue={MailPoet.subscribersLimit}
-        subscribersCountTowardsLimit={MailPoet.subscribersCountTowardsLimit}
+        subscribersCountTowardsLimit={MailPoet.subscribersCount}
         premiumActive={MailPoet.premiumActive}
         hasValidApiKey={MailPoet.hasValidApiKey}
         hasPremiumSupport={MailPoet.hasPremiumSupport}
diff --git a/lib/AdminPages/Pages/Segments.php b/lib/AdminPages/Pages/Segments.php
index f1432ac500..2247b7eb3e 100644
--- a/lib/AdminPages/Pages/Segments.php
+++ b/lib/AdminPages/Pages/Segments.php
@@ -63,8 +63,7 @@ class Segments {
     $data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit();
     $data['subscribers_limit_reached'] = $this->subscribersFeature->check();
     $data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
-    $data['subscriber_count'] = Subscriber::getTotalSubscribers();
-    $data['premium_subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
+    $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
     $data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport();
 
     $data['wp_users_count'] = false;
diff --git a/lib/AdminPages/Pages/Subscribers.php b/lib/AdminPages/Pages/Subscribers.php
index 0407e1bcc9..6cce6adeef 100644
--- a/lib/AdminPages/Pages/Subscribers.php
+++ b/lib/AdminPages/Pages/Subscribers.php
@@ -94,8 +94,7 @@ class Subscribers {
     $data['subscribers_limit'] = $this->subscribersFeature->getSubscribersLimit();
     $data['subscribers_limit_reached'] = $this->subscribersFeature->check();
     $data['has_valid_api_key'] = $this->subscribersFeature->hasValidApiKey();
-    $data['subscriber_count'] = Subscriber::getTotalSubscribers();
-    $data['premium_subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
+    $data['subscriber_count'] = $this->subscribersFeature->getSubscribersCount();
     $data['has_premium_support'] = $this->subscribersFeature->hasPremiumSupport();
     $data['link_premium'] = $this->wp->getSiteUrl(null, '/wp-admin/admin.php?page=mailpoet-premium');
 
diff --git a/views/segments.html b/views/segments.html
index 168073fcbf..bf604a67d0 100644
--- a/views/segments.html
+++ b/views/segments.html
@@ -22,7 +22,6 @@
     var mailpoet_mss_key_invalid = <%= mss_key_invalid ? 'true' : 'false' %>;
     var mailpoet_subscribers_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_wp_users_count = <%= wp_users_count ? wp_users_count : 'false' %>;
     var wordpress_editable_roles_list = <%= json_encode(wordpress_editable_roles_list)  %>;
@@ -85,7 +84,7 @@
     'trashDisallowed': _x('List cannot be deleted because it’s used for %$1s email', 'Alert shown when trying to delete segment, which is assigned to any automatic emails.'),
     'trashAndDisable': __('Trash and disable'),
     'restoreAndEnable': __('Restore and enable'),
-    
+
     'previousPage': __('Previous page'),
     'firstPage': __('First page'),
     'nextPage': __('Next page'),
diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html
index 4bfbebaa83..7d997e7e50 100644
--- a/views/subscribers/subscribers.html
+++ b/views/subscribers/subscribers.html
@@ -25,7 +25,6 @@
     var mailpoet_mss_key_invalid = <%= mss_key_invalid ? 'true' : 'false' %>;
     var mailpoet_subscribers_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_wp_users_count = <%= wp_users_count ? wp_users_count : 'false' %>;
     var mailpoet_premium_link = <%= json_encode(link_premium) %>;