Added confirmation when 'edit' is clicked

assets/js/src/newsletters/listings/standard.jsx

@@ -110,13 +110,16 @@ let newsletter_actions = [
   },
   {
     name: 'edit',
-    link: function (newsletter) {
-      return (
-        <a href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }>
-          {MailPoet.I18n.t('edit')}
-        </a>
-      );
-    },
+    label: MailPoet.I18n.t('edit'),
+    onClick: (newsletter) => {
+      if(
+        !newsletter.queue
+        || newsletter.queue.status != 'scheduled'
+        || window.confirm(MailPoet.I18n.t('confirmEdit'))
+      ) {
+        window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
+      }
+    }
   },
   {
     name: 'duplicate',

assets/js/src/newsletters/send.jsx

@@ -166,6 +166,9 @@ define(
               }
             }).done(() => {
               this.context.router.push(`/${ this.state.item.type || '' }`);
+              MailPoet.Notice.success(
+                MailPoet.I18n.t('newsletterSendingHasBeenResumed')
+              );
             }).fail((response) => {
               if (response.errors.length > 0) {
                 MailPoet.Notice.error(

lib/Cron/Workers/SendingQueue/SendingQueue.php

@@ -5,7 +5,6 @@ use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Links;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
-use MailPoet\Logger;
 use MailPoet\Mailer\MailerLog;
 use MailPoet\Models\Newsletter as NewsletterModel;
 use MailPoet\Models\SendingQueue as SendingQueueModel;

lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php

@@ -5,7 +5,6 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Links as LinksTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes as ShortcodesTask;
-use MailPoet\Logger;
 use MailPoet\Mailer\MailerLog;
 use MailPoet\Models\Newsletter as NewsletterModel;
 use MailPoet\Models\NewsletterSegment as NewsletterSegmentModel;

lib/Newsletter/Links/Links.php

@@ -1,7 +1,6 @@
 <?php
 namespace MailPoet\Newsletter\Links;
 
-use MailPoet\Logger;
 use MailPoet\Models\NewsletterLink;
 use MailPoet\Models\Subscriber;
 use MailPoet\Newsletter\Shortcodes\Categories\Link;
@@ -20,11 +19,8 @@ class Links {
 
   static function process($content, $newsletter_id, $queue_id) {
     $extracted_links = self::extract($content);
-    Logger::log('extracted', $extracted_links);
     $saved_links = self::load($newsletter_id, $queue_id);
-    Logger::log('saved', $saved_links);
     $processed_links = self::hash($extracted_links, $saved_links);
-    Logger::log('processed', $processed_links);
     return self::replace($content, $processed_links);
   }
 

views/newsletters.html

@@ -229,6 +229,7 @@
     'previous': __('Previous'),
     'newsletterBeingSent': __('The newsletter is being sent...'),
     'newsletterHasBeenScheduled': __('The newsletter has been scheduled.'),
+    'newsletterSendingHasBeenResumed': __('The newsletter sending has been resumed.'),
     'welcomeEmailActivated': __('Your Welcome Email is now activated!'),
     'welcomeEmailActivationFailed': __('Your Welcome Email could not be activated, please check the settings.'),
     'postNotificationActivated': __('Your post notification is now active!'),
@@ -254,7 +255,8 @@
     'mailerConnectionErrorNotice': __('Sending is paused because the following connection issue prevents MailPoet from delivering emails: %$1s'),
     'mailerCheckSettingsNotice': __('Check your [link]sending method settings[/link].'),
     'mailerResumeSendingButton': __('Resume sending'),
-    'mailerSendingResumedNotice': __('Sending has been resumed.')
+    'mailerSendingResumedNotice': __('Sending has been resumed.'),
+    'confirmEdit': __('Sending is in progress. Do you want to pause sending and edit the newsletter?')
   }) %>
 <% endblock %>