- Adds "scheduled for" status for notifications

- Adds post notification/welcome activation message
- Implements schedule update when editing newsletter
Implements #405 (3 & 7)
This commit is contained in:
Vlad
2016-04-27 18:58:08 -04:00
parent 1b7ac62b5c
commit 06d56fe19d
5 changed files with 53 additions and 22 deletions

View File

@@ -141,11 +141,17 @@ define(
});
},
renderStatus: function(item) {
console.log(item);
if(!item.queue) {
return (
<span>{MailPoet.I18n.t('notSentYet')}</span>
);
} else {
if (item.queue.status === 'scheduled') {
return (
<span>{MailPoet.I18n.t('scheduledFor')} { item.queue.scheduled_at } </span>
)
}
var progressClasses = classNames(
'mailpoet_progress',
{ 'mailpoet_progress_complete': item.queue.status === 'completed'}

View File

@@ -107,9 +107,7 @@ define(
this.setState({ loading: false });
if(response.result === true) {
this.history.pushState(null, '/');
MailPoet.Notice.success(
MailPoet.I18n.t('newsletterIsBeingSent')
);
MailPoet.Notice.success(response.data.message);
} else {
if(response.errors) {
MailPoet.Notice.error(response.errors);