diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index 82b5aeb50b..72ef719f53 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -250,6 +250,12 @@ define( return true; }, render: function () { + const isPaused = this.state.item.status == 'sending' + && this.state.item.queue + && this.state.item.queue.status == 'paused'; + const fields = (!isPaused) + ? this.state.fields + : this.state.fields.filter(field => field.name != 'segments' && field.name != 'options'); return (

{MailPoet.I18n.t('finalNewsletterStep')}

@@ -258,32 +264,30 @@ define(

- + : + -   - { - this.state.item.status == 'sending' - && this.state.item.queue - && this.state.item.queue.status == 'paused' - ? - : null } +   newsletter_id = 3; $link->queue_id = 3; diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index e30b9d66d1..86858f40e5 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -341,7 +341,7 @@ 'unsavedChangesWillBeLost': __('There are unsaved changes which will be lost if you leave this page.'), 'selectColor': _x('Select', 'select color'), 'cancelColorSelection': _x('Cancel', 'cancel color selection'), - 'newsletterIsPaused': __('Email sending has been paused'), + 'newsletterIsPaused': __('Email sending has been paused.'), }) %> <% endblock %> @@ -1226,7 +1226,14 @@ } }).done(response => MailPoet.Notice.success(MailPoet.I18n.t('newsletterIsPaused')) - ); + ).fail(function(response) { + if (response.errors.length > 0) { + MailPoet.Notice.error( + response.errors.map(function(error) { return error.message; }), + { scroll: true, static: true } + ); + } + }); } }).fail(function(response) { if (response.errors.length > 0) {