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

Hide warning when API key exists but limit missing

Browse Source 
[MAILPOET-2617]
This commit is contained in:
Amine Ben hammou
2020-01-07 18:23:05 +01:00
committed by Jack Kitterhing
parent 9f5a1a0c32
commit ac3d383209
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Util/License/Features/Subscribers.php
View File

@ -25,8 +25,10 @@ class Subscribers {
} }
public function check() { public function check() {
$limit = $this->getSubscribersLimit();
if ($limit === false) return false;
$subscribers_count = $this->subscribers_repository->getTotalSubscribers(); $subscribers_count = $this->subscribers_repository->getTotalSubscribers();
return $subscribers_count > $this->getSubscribersLimit(); return $subscribers_count > $limit;
} }
public function hasAPIKey() { public function hasAPIKey() {
@ -44,6 +46,8 @@ class Subscribers {
$premium_subscribers_limit = $this->settings->get(self::PREMIUM_SUBSCRIBERS_LIMIT_SETTING_KEY); $premium_subscribers_limit = $this->settings->get(self::PREMIUM_SUBSCRIBERS_LIMIT_SETTING_KEY);
if ($has_premium_key && !empty($premium_subscribers_limit)) return (int)$premium_subscribers_limit; if ($has_premium_key && !empty($premium_subscribers_limit)) return (int)$premium_subscribers_limit;
if ($has_mss_key || $has_premium_key) return false;
$installation_time = strtotime($this->settings->get('installed_at')); $installation_time = strtotime($this->settings->get('installed_at'));
$old_user = $installation_time < strtotime(self::NEW_LIMIT_DATE); $old_user = $installation_time < strtotime(self::NEW_LIMIT_DATE);
return $old_user ? self::SUBSCRIBERS_OLD_LIMIT : self::SUBSCRIBERS_NEW_LIMIT; return $old_user ? self::SUBSCRIBERS_OLD_LIMIT : self::SUBSCRIBERS_NEW_LIMIT;

2
views/newsletters.html
View File

@ -8,7 +8,7 @@
var mailpoet_update_available = <%= is_mailpoet_update_available ? 'true' : 'false' %> var mailpoet_update_available = <%= is_mailpoet_update_available ? 'true' : 'false' %>
var mailpoet_listing_per_page = <%= items_per_page %>; var mailpoet_listing_per_page = <%= items_per_page %>;
var mailpoet_display_nps_poll = <%= (sent_newsletters_count > 0 and settings.display_nps_poll) ? 'true' : 'false' %>; var mailpoet_display_nps_poll = <%= (sent_newsletters_count > 0 and settings.display_nps_poll) ? 'true' : 'false' %>;
var mailpoet_subscribers_limit = <%= subscribers_limit %>; var mailpoet_subscribers_limit = <%= subscribers_limit ? subscribers_limit : 'false' %>;
var mailpoet_subscribers_limit_reached = <%= subscribers_limit_reached ? 'true' : 'false' %>; var mailpoet_subscribers_limit_reached = <%= subscribers_limit_reached ? 'true' : 'false' %>;
var mailpoet_has_api_key = <%= has_api_key ? 'true' : 'false' %>; var mailpoet_has_api_key = <%= has_api_key ? 'true' : 'false' %>;
var mailpoet_segments = <%= json_encode(segments) %>; var mailpoet_segments = <%= json_encode(segments) %>;