diff --git a/assets/js/src/help/system_status.jsx b/assets/js/src/help/system_status.jsx index 9225b30a07..e18543df89 100644 --- a/assets/js/src/help/system_status.jsx +++ b/assets/js/src/help/system_status.jsx @@ -5,7 +5,7 @@ import CronStatus from './cron_status.jsx'; import QueueStatus from './queue_status.jsx'; import Tabs from './tabs.jsx'; -function renderStatusMessage(status, error, link) { +function renderStatusMessage(status, error, link, additionalInfo) { const noticeType = (status) ? 'success' : 'error'; let noticeMessage = (status) ? MailPoet.I18n.t('systemStatusConnectionSuccessful') @@ -16,7 +16,7 @@ function renderStatusMessage(status, error, link) { noticeMessage, /\[link\](.*?)\[\/link\]/g, (match) => ( - { match } + {match} ) ); } @@ -24,6 +24,7 @@ function renderStatusMessage(status, error, link) { return (

{noticeMessage}

+ {additionalInfo ? (

{additionalInfo}

) : null}
); } @@ -31,6 +32,8 @@ function renderStatusMessage(status, error, link) { function renderCronSection(data) { const status = data.cron.isReachable; const url = data.cron.url; + const error = MailPoet.I18n.t('systemStatusCronConnectionUnsuccessfulInfo'); + const additionalInfo = !status ? data.cron.pingResponse : null; return (
@@ -38,7 +41,7 @@ function renderCronSection(data) {

{url}

- {renderStatusMessage(status, MailPoet.I18n.t('systemStatusCronConnectionUnsuccessfulInfo'), 'https://kb.mailpoet.com/article/231-sending-does-not-work')} + {renderStatusMessage(status, error, 'https://kb.mailpoet.com/article/231-sending-does-not-work', additionalInfo)}
); } diff --git a/lib/AdminPages/Pages/Help.php b/lib/AdminPages/Pages/Help.php index 4487810025..d72eebc9ed 100644 --- a/lib/AdminPages/Pages/Help.php +++ b/lib/AdminPages/Pages/Help.php @@ -32,6 +32,7 @@ class Help { 'cron' => [ 'url' => CronHelper::getCronUrl(CronDaemon::ACTION_PING), 'isReachable' => CronHelper::validatePingResponse($cron_ping_response), + 'pingResponse' => $cron_ping_response, ], 'mss' => [ 'enabled' => (Bridge::isMPSendingServiceEnabled()) ?