From d2494469c0bb348a1d97cbc8860b633c0ce18323 Mon Sep 17 00:00:00 2001
From: Amine Ben hammou <amine@mailpoet.com>
Date: Mon, 13 Jan 2020 09:49:29 +0100
Subject: [PATCH] Rename method and variables for clarity

[MAILPOET-2624]
---
 assets/js/src/notices/subscribers_limit_notice.jsx | 8 ++++----
 lib/AdminPages/Pages/Newsletters.php               | 2 +-
 lib/Cron/Workers/StatsNotifications/Worker.php     | 6 +++---
 lib/Util/License/Features/Subscribers.php          | 4 ++--
 views/emails/statsNotification.txt                 | 2 +-
 views/newsletters.html                             | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assets/js/src/notices/subscribers_limit_notice.jsx b/assets/js/src/notices/subscribers_limit_notice.jsx
index f9a7f4fb7f..23e3d786df 100644
--- a/assets/js/src/notices/subscribers_limit_notice.jsx
+++ b/assets/js/src/notices/subscribers_limit_notice.jsx
@@ -4,12 +4,12 @@ import Notice from 'notices/notice.jsx';
 
 const SubscribersLimitNotice = () => {
   if (!window.mailpoet_subscribers_limit_reached) return null;
-  const hasKey = window.mailpoet_has_api_key;
+  const hasValidApiKey = window.mailpoet_has_valid_api_key;
   const title = MailPoet.I18n.t('subscribersLimitNoticeTitle')
     .replace('[subscribersLimit]', window.mailpoet_subscribers_limit);
-  const youReachedTheLimit = MailPoet.I18n.t(hasKey ? 'yourPlanLimit' : 'freeVersionLimit')
+  const youReachedTheLimit = MailPoet.I18n.t(hasValidApiKey ? 'yourPlanLimit' : 'freeVersionLimit')
     .replace('[subscribersLimit]', window.mailpoet_subscribers_limit);
-  const upgradeLink = hasKey
+  const upgradeLink = hasValidApiKey
     ? 'https://account.mailpoet.com/upgrade'
     : `https://account.mailpoet.com/?s=${window.mailpoet_subscribers_count + 1}`;
   const refreshSubscribers = async () => {
@@ -38,7 +38,7 @@ const SubscribersLimitNotice = () => {
         >
           {MailPoet.I18n.t('upgradeNow')}
         </a>
-        {hasKey && (
+        {hasValidApiKey && (
         <>
           {' '}
           <button
diff --git a/lib/AdminPages/Pages/Newsletters.php b/lib/AdminPages/Pages/Newsletters.php
index 67ac47ee10..0b8d63e434 100644
--- a/lib/AdminPages/Pages/Newsletters.php
+++ b/lib/AdminPages/Pages/Newsletters.php
@@ -97,7 +97,7 @@ class Newsletters {
     $data['installed_days_ago'] = (int)$installedAtDateTime->diff(new \DateTime())->format('%a');
     $data['subscribers_limit'] = $this->subscribers_feature->getSubscribersLimit();
     $data['subscribers_limit_reached'] = $this->subscribers_feature->check();
-    $data['has_api_key'] = $this->subscribers_feature->hasAPIKey();
+    $data['has_valid_api_key'] = $this->subscribers_feature->hasValidApiKey();
 
     $date_time = new DateTime();
     $data['current_date'] = $date_time->getCurrentDate(DateTime::DEFAULT_DATE_FORMAT);
diff --git a/lib/Cron/Workers/StatsNotifications/Worker.php b/lib/Cron/Workers/StatsNotifications/Worker.php
index 9d19f0ecf1..c89c3bfdc7 100644
--- a/lib/Cron/Workers/StatsNotifications/Worker.php
+++ b/lib/Cron/Workers/StatsNotifications/Worker.php
@@ -128,7 +128,7 @@ class Worker {
     $unsubscribed = ($statistics->getUnsubscribeCount() * 100) / $statistics->getTotalSentCount();
     $subject = $newsletter->getLatestQueue()->getNewsletterRenderedSubject();
     $subscribers_count = $this->subscribers_repository->getTotalSubscribers();
-    $has_key = $this->subscribers_feature->hasAPIKey();
+    $has_valid_api_key = $this->subscribers_feature->hasValidApiKey();
     $context = [
       'subject' => $subject,
       'preheader' => sprintf(_x(
@@ -143,9 +143,9 @@ class Worker {
       'clicked' => $clicked,
       'opened' => $opened,
       'subscribersLimitReached' => $this->subscribers_feature->check(),
-      'hasKey' => $has_key,
+      'hasValidApiKey' => $has_valid_api_key,
       'subscribersLimit' => $this->subscribers_feature->getSubscribersLimit(),
-      'upgradeNowLink' => $has_key ? 'https://account.mailpoet.com/upgrade' : 'https://account.mailpoet.com/?s=' . ($subscribers_count + 1),
+      'upgradeNowLink' => $has_valid_api_key ? 'https://account.mailpoet.com/upgrade' : 'https://account.mailpoet.com/?s=' . ($subscribers_count + 1),
     ];
     if ($link) {
       $context['topLinkClicks'] = $link->getTotalClicksCount();
diff --git a/lib/Util/License/Features/Subscribers.php b/lib/Util/License/Features/Subscribers.php
index dd00c728cb..cf7f7ac700 100644
--- a/lib/Util/License/Features/Subscribers.php
+++ b/lib/Util/License/Features/Subscribers.php
@@ -33,12 +33,12 @@ class Subscribers {
     return $subscribers_count > $limit;
   }
 
-  public function hasAPIKey() {
+  public function hasValidApiKey() {
     return $this->hasValidMssKey() || $this->hasValidPremiumKey();
   }
 
   public function getSubscribersLimit() {
-    if (!$this->hasAPIKey()) {
+    if (!$this->hasValidApiKey()) {
       return $this->getFreeSubscribersLimit();
     }
 
diff --git a/views/emails/statsNotification.txt b/views/emails/statsNotification.txt
index 40e29965c1..8eee3354f9 100644
--- a/views/emails/statsNotification.txt
+++ b/views/emails/statsNotification.txt
@@ -8,7 +8,7 @@
 <% if subscribersLimitReached %>
 <%= __('Congratulations, you now have more than [subscribersLimit] subscribers!')|replace({'[subscribersLimit]': subscribersLimit}) %>
 
-<% if hasKey %>
+<% if hasValidApiKey %>
 <%= __('Your plan is limited to [subscribersLimit] subscribers.')|replace({'[subscribersLimit]': subscribersLimit}) %>
 <% else %>
 <%= __('Our free version is limited to [subscribersLimit] subscribers.')|replace({'[subscribersLimit]': subscribersLimit}) %>
diff --git a/views/newsletters.html b/views/newsletters.html
index 60cf9f339b..8e74f8cab5 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -10,7 +10,7 @@
       var mailpoet_display_nps_poll = <%= (sent_newsletters_count > 0 and settings.display_nps_poll) ? 'true' : 'false' %>;
       var mailpoet_subscribers_limit = <%= subscribers_limit ? subscribers_limit : 'false'  %>;
       var mailpoet_subscribers_limit_reached = <%= subscribers_limit_reached ? 'true' : 'false' %>;
-      var mailpoet_has_api_key = <%= has_api_key ? 'true' : 'false' %>;
+      var mailpoet_has_valid_api_key = <%= has_valid_api_key ? 'true' : 'false' %>;
       var mailpoet_segments = <%= json_encode(segments) %>;
       var mailpoet_show_congratulate_after_first_newsletter = <%= show_congratulate_after_first_newsletter %>;
       var mailpoet_installed_days_ago = <%= installed_days_ago %>;