diff --git a/assets/js/src/dismissible-notice.jsx b/assets/js/src/dismissible-notice.jsx index 94b1c5095a..0ee736d8df 100644 --- a/assets/js/src/dismissible-notice.jsx +++ b/assets/js/src/dismissible-notice.jsx @@ -1,4 +1,5 @@ import jQuery from 'jquery'; +import MailPoet from 'mailpoet'; jQuery(($) => { $(document).on('click', '.mailpoet-dismissible-notice .notice-dismiss', function dismiss() { @@ -12,4 +13,18 @@ jQuery(($) => { }, }); }); + $(document).on('click', '.notice .mailpoet-js-button-resume-sending', function resumeSending() { + const noticeElement = $(this).closest('.notice'); + MailPoet.Ajax.post({ + api_version: window.mailpoet_api_version, + endpoint: 'mailer', + action: 'resumeSending', + }).done(() => { + noticeElement.slideUp(); + MailPoet.Notice.success(MailPoet.I18n.t('mailerSendingResumedNotice')); + if (window.mailpoet_listing) { window.mailpoet_listing.forceUpdate(); } + }).fail((response) => { + MailPoet.Notice.showApiErrorNotice(response, { scroll: true }); + }); + }); }); diff --git a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php index ea31e134f8..527366cc0a 100644 --- a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php @@ -103,9 +103,8 @@ class MailPoetMapper { 'rel' => 'noopener noreferrer', ] ); - $message .= ' '; + $message .= ' '; $message .= '
'; - $message .= ""; return $message; } diff --git a/lib/Util/Notices/UnauthorizedEmailNotice.php b/lib/Util/Notices/UnauthorizedEmailNotice.php index 53ff9faa04..c89b5d3b49 100644 --- a/lib/Util/Notices/UnauthorizedEmailNotice.php +++ b/lib/Util/Notices/UnauthorizedEmailNotice.php @@ -90,23 +90,6 @@ class UnauthorizedEmailNotice { private function getResumeSendingButton() { $button = ''; - $script = " - "; - $button .= str_replace("\n", "", $script); return "$button
"; } } diff --git a/views/layout.html b/views/layout.html index 76e0ef50d0..374bfec584 100644 --- a/views/layout.html +++ b/views/layout.html @@ -71,6 +71,7 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last') 'senderEmailAddressWarning1': _x('You might not reach the inbox of your subscribers if you use this email address.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'), 'senderEmailAddressWarning2': _x('Use an address like %suggested for the Sender and put %originalSender in the Reply-to field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'), 'senderEmailAddressWarning3': _x('Read more.'), + 'mailerSendingResumedNotice': __('Sending has been resumed.'), }) %> <% block translations %><% endblock %> diff --git a/views/newsletters.html b/views/newsletters.html index 9ecc70e5b5..7bee7bb1f1 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -293,7 +293,6 @@ 'mailerErrorCode': __('Error code: %$1s'), 'mailerCheckSettingsNotice': __('Check your [link]sending method settings[/link].'), 'mailerResumeSendingButton': __('Resume sending'), - 'mailerSendingResumedNotice': __('Sending has been resumed.'), 'confirmEdit': __('Sending is in progress. Do you want to pause sending and edit the newsletter?'), 'confirmTitle': __('Confirm to proceed'), 'confirmLabel': __('Confirm'),