From b8000c872cb373a88d73f3a8a5a19b61889d6285 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Mon, 29 Apr 2019 16:22:05 +0200 Subject: [PATCH] Revert "Display user's time in scheduling emails" This reverts commit 4624ac2a92f40c2f60c7ba020f8f200f92619a14. --- assets/js/src/date.js | 7 ---- assets/js/src/newsletters/listings/mixins.jsx | 8 +--- assets/js/src/newsletters/send/standard.jsx | 37 ++++++++----------- lib/Config/Menu.php | 2 +- package-lock.json | 8 ---- package.json | 1 - views/newsletters.html | 3 +- 7 files changed, 20 insertions(+), 46 deletions(-) diff --git a/assets/js/src/date.js b/assets/js/src/date.js index 6d31cd7c6b..ca03fd58c4 100644 --- a/assets/js/src/date.js +++ b/assets/js/src/date.js @@ -1,7 +1,6 @@ import mp from 'mailpoet'; import jQuery from 'jquery'; import Moment from 'moment'; -import MomentTZ from 'moment-timezone'; var MailPoet = mp; @@ -64,12 +63,6 @@ MailPoet.Date = { format: 'H:i:s', }); }, - convertToServerTimeZone: function convertToServerTimeZone(date, serverTimezone) { - return MomentTZ(date).tz(serverTimezone).format('YYYY-MM-DD HH:mm:ss'); - }, - convertToUserTimeZone: function convertToUserTimeZone(date, serverTimezone) { - return MomentTZ.tz(date, serverTimezone).local().format('YYYY-MM-DD HH:mm:ss'); - }, convertFormat: function convertFormat(format) { var replacements; var convertedFormat; diff --git a/assets/js/src/newsletters/listings/mixins.jsx b/assets/js/src/newsletters/listings/mixins.jsx index 3aecc77d53..56972398dd 100644 --- a/assets/js/src/newsletters/listings/mixins.jsx +++ b/assets/js/src/newsletters/listings/mixins.jsx @@ -67,13 +67,7 @@ const QueueMixin = { { MailPoet.I18n.t('scheduledFor') } {' '} - { - MailPoet.Date.format( - MailPoet.Date.convertToUserTimeZone( - newsletter.queue.scheduled_at, window.mailpoet_server_time_zone - ) - ) - } + { MailPoet.Date.format(newsletter.queue.scheduled_at) } ); } diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx index 8e5513e1b8..93c3054d17 100644 --- a/assets/js/src/newsletters/send/standard.jsx +++ b/assets/js/src/newsletters/send/standard.jsx @@ -7,7 +7,7 @@ import PropTypes from 'prop-types'; import DateTime from 'newsletters/send/date_time.jsx'; import SenderField from 'newsletters/send/sender_address_field.jsx'; -const serverTimezone = window.mailpoet_server_time_zone; +const currentTime = window.mailpoet_current_time || '00:00'; const defaultDateTime = `${window.mailpoet_current_date} 00:00:00`; const timeOfDayItems = window.mailpoet_schedule_time_of_day; const dateDisplayFormat = window.mailpoet_date_display_format; @@ -17,7 +17,7 @@ class StandardScheduling extends React.Component { getCurrentValue = () => { const schedulingOptions = { isScheduled: '0', - scheduledAt: MailPoet.Date.convertToServerTimeZone(defaultDateTime, serverTimezone), + scheduledAt: defaultDateTime, }; return _.defaults( this.props.item[this.props.field.name] || {}, @@ -33,23 +33,16 @@ class StandardScheduling extends React.Component { isScheduled = () => this.getCurrentValue().isScheduled === '1'; - handleCheckboxChange = event => this.handleValueChange({ - name: event.target.name, - value: event.target.checked ? '1' : '0', - }); - - handleTimeChange = (event) => { - const value = MailPoet.Date.convertToServerTimeZone(event.target.value, serverTimezone); - return this.handleValueChange({ - name: event.target.name, - value, - }); + handleCheckboxChange = (event) => { + const changeEvent = event; + changeEvent.target.value = event.target.checked ? '1' : '0'; + return this.handleValueChange(changeEvent); }; - handleValueChange = (value) => { + handleValueChange = (event) => { const oldValue = this.getCurrentValue(); const newValue = {}; - newValue[value.name] = value.value; + newValue[event.target.name] = event.target.value; return this.props.onValueChange({ target: { @@ -67,12 +60,8 @@ class StandardScheduling extends React.Component { +   + + {MailPoet.I18n.t('websiteTimeIs')} + {' '} + {currentTime} + ); } diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index b09a57fa8e..974748cfe3 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -647,7 +647,7 @@ class Menu { $date_time = new DateTime(); $data['current_date'] = $date_time->getCurrentDate(DateTime::DEFAULT_DATE_FORMAT); - $data['current_time_zone'] = (new Carbon())->getTimezone()->getName(); + $data['current_time'] = $date_time->getCurrentTime(); $data['schedule_time_of_day'] = $date_time->getTimeInterval( '00:00:00', '+1 hour', diff --git a/package-lock.json b/package-lock.json index c1f3ab1e27..523eebab53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7354,14 +7354,6 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" }, - "moment-timezone": { - "version": "0.5.23", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz", - "integrity": "sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==", - "requires": { - "moment": ">= 2.9.0" - } - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", diff --git a/package.json b/package.json index 9678d41636..b85721b10d 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "intro.js": "2.9.0", "jquery": "3.3.1", "moment": "^2.22.1", - "moment-timezone": "^0.5.23", "papaparse": "4.1.1", "parsleyjs": "^2.8.1", "prop-types": "^15.6.2", diff --git a/views/newsletters.html b/views/newsletters.html index df695ce08c..7cb2a37672 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -14,7 +14,7 @@ var mailpoet_lists = <%= json_encode(lists) %>; var mailpoet_roles = <%= json_encode(roles) %>; var mailpoet_current_date = <%= json_encode(current_date) %>; - var mailpoet_server_time_zone = <%= json_encode(current_time_zone) %>; + var mailpoet_current_time = <%= json_encode(current_time) %>; var mailpoet_schedule_time_of_day = <%= json_encode(schedule_time_of_day) %>; var mailpoet_date_display_format = "<%= wp_date_format() %>"; var mailpoet_start_of_week = "<%= wp_start_of_week() %>"; @@ -209,6 +209,7 @@ 'helpTooltipSendEmail': __('You cannot send the same email twice, as that would be considered spam.
If you must send the same email more than one time, simply duplicate this email first.'), 'orSimply': __('or simply'), 'goBackToDesign': __('go back to the Design page'), + 'websiteTimeIs': __("Your website’s time is"), 'noScheduledDateError': __('Please enter the scheduled date.'), 'schedule': __('Schedule'),