Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Correctly parse date in email status

Browse Source 
[MAILPOET-3304]
This commit is contained in:
Ján Mikláš
2020-11-23 13:36:09 +01:00
committed by Veljko V
parent 571740288e
commit 7e7f075e82
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletters/listings/queue_status.jsx
View File

@@ -2,7 +2,7 @@ import React from 'react';
import MailPoet from 'mailpoet'; import MailPoet from 'mailpoet';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import parseDate from 'date-fns/parseJSON'; import parseDate from 'date-fns/parse';
import APIErrorsNotice from 'notices/api_errors_notice.tsx'; import APIErrorsNotice from 'notices/api_errors_notice.tsx';
import Button from 'common/button/button'; import Button from 'common/button/button';
import NewsletterStatus from 'common/listings/newsletter_status'; import NewsletterStatus from 'common/listings/newsletter_status';
@@ -69,7 +69,7 @@ QueueSending.propTypes = {
const QueueStatus = ({ newsletter, mailerLog }) => { const QueueStatus = ({ newsletter, mailerLog }) => {
let newsletterDate = newsletter.sent_at || newsletter.queue.scheduled_at; let newsletterDate = newsletter.sent_at || newsletter.queue.scheduled_at;
if (newsletterDate) { if (newsletterDate) {
newsletterDate = parseDate(newsletterDate); newsletterDate = parseDate(newsletterDate, 'yyyy-MM-dd HH:mm:ss', new Date());
} }
const isNewsletterSending = newsletter.queue && newsletter.queue.status !== 'scheduled'; const isNewsletterSending = newsletter.queue && newsletter.queue.status !== 'scheduled';
const isMtaPaused = mailerLog.status === 'paused'; const isMtaPaused = mailerLog.status === 'paused';