Make dates in newsletter listings and help consistent

[MAILPOET-3441]

assets/js/src/help/tasks_list/tasks_list_data_row.jsx

@@ -1,8 +1,14 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import MailPoet from 'mailpoet';
+import parseDate from 'date-fns/parse';
 
-const TasksListDataRow = (props) => (
+const TasksListDataRow = (props) => {
+  let scheduled = props.task.scheduled_at;
+  if (scheduled) {
+    scheduled = parseDate(scheduled, 'yyyy-MM-dd HH:mm:ss', new Date());
+  }
+  return (
     <tr>
       <td className="column column-primary">
         {props.task.id}
@@ -28,7 +34,7 @@ const TasksListDataRow = (props) => (
       </td>
       {props.show_scheduled_at ? (
         <td className="column-date">
-        <abbr>{ MailPoet.Date.format(props.task.scheduled_at * 1000) }</abbr>
+          <abbr>{`${MailPoet.Date.short(scheduled)} ${MailPoet.Date.time(scheduled)}`}</abbr>
         </td>
       ) : null}
       <td className="column-date">
@@ -36,6 +42,7 @@ const TasksListDataRow = (props) => (
       </td>
     </tr>
   );
+};
 
 TasksListDataRow.propTypes = {
   show_scheduled_at: PropTypes.bool,

lib/Tasks/State.php

@@ -83,7 +83,7 @@ class State {
       'type' => $task->type,
       'priority' => (int)$task->priority,
       'updated_at' => Carbon::createFromTimeString((string)$task->updatedAt)->timestamp,
-      'scheduled_at' => $task->scheduledAt ? Carbon::createFromTimeString($task->scheduledAt)->timestamp : null,
+      'scheduled_at' => $task->scheduledAt ? $task->scheduledAt : null,
       'status' => $task->status,
       'newsletter' => (($queue instanceof SendingQueue) && ($newsletter instanceof Newsletter)) ? [
         'newsletter_id' => (int)$queue->newsletterId,