From eba441f4c10c3de5fc7d787f82b64344e663093b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Thu, 30 Jan 2020 10:19:36 +0100 Subject: [PATCH] Add SubscribersLimitNotice to mailpoet-segments page [MAILPOET-2626] --- assets/js/src/segments/form.jsx | 3 +++ assets/js/src/segments/list.jsx | 3 +++ lib/AdminPages/Pages/Segments.php | 14 +++++++++++++- views/segments.html | 4 ++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/assets/js/src/segments/form.jsx b/assets/js/src/segments/form.jsx index 8d402f974a..20eb6db17a 100644 --- a/assets/js/src/segments/form.jsx +++ b/assets/js/src/segments/form.jsx @@ -3,6 +3,7 @@ import { Link } from 'react-router-dom'; import MailPoet from 'mailpoet'; import Form from 'form/form.jsx'; import PropTypes from 'prop-types'; +import SubscribersLimitNotice from 'notices/subscribers_limit_notice.jsx'; const fields = [ { @@ -37,6 +38,8 @@ const SegmentForm = (props) => ( {MailPoet.I18n.t('backToList')} + +
segment.type === 'wp_users'; const isWooCommerceCustomersSegment = (segment) => segment.type === 'woocommerce_users'; @@ -298,6 +299,8 @@ class SegmentList extends React.Component { {MailPoet.I18n.t('new')} + + pageRenderer = $pageRenderer; $this->listingPageLimit = $listingPageLimit; + $this->subscribersFeature = $subscribersFeature; } public function render() { $data = []; $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('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(); + $this->pageRenderer->displayPage('segments.html', $data); } } diff --git a/views/segments.html b/views/segments.html index bb37c6bcd5..d2b7ff24aa 100644 --- a/views/segments.html +++ b/views/segments.html @@ -10,6 +10,10 @@ '57f47ca3c697914f21035256', '5d4beee42c7d3a330e3c4207', ]; + var mailpoet_subscribers_limit = <%= subscribers_limit ? subscribers_limit : 'false' %>; + var mailpoet_subscribers_limit_reached = <%= subscribers_limit_reached ? 'true' : 'false' %>; + var mailpoet_has_valid_api_key = <%= has_valid_api_key ? 'true' : 'false' %>; + var mailpoet_subscribers_count = <%= subscriber_count %>; <% endblock %>