return sending queue object for standard / newsletter for automated\n- bugfix loading screen not going away\n- fixed not being used in sending queue endpoint

assets/js/src/newsletters/send.jsx

@@ -108,8 +108,9 @@ define(
             } else {
               return response;
             }
-          }).done((response) => {
+          }).always(() => {
             this.setState({ loading: false });
+          }).done((response) => {
             // redirect to listing based on newsletter type
             this.context.router.push(`/${ this.state.item.type || '' }`);
             // display success message depending on newsletter type
@@ -118,7 +119,11 @@ define(
             } else if (this.state.item.type === 'notification') {
               MailPoet.Notice.success(MailPoet.I18n.t('postNotificationActivated'));
             } else {
-              MailPoet.Notice.success(MailPoet.I18n.t('newsletterBeingSent'));
+              if (response.data.status === 'scheduled') {
+                MailPoet.Notice.success(MailPoet.I18n.t('newsletterHasBeenScheduled'));
+              } else {
+                MailPoet.Notice.success(MailPoet.I18n.t('newsletterBeingSent'));
+              }
             }
           }).fail((response) => {
             if (response.errors.length > 0) {

lib/API/Endpoints/SendingQueue.php

@@ -21,8 +21,7 @@ class SendingQueue extends APIEndpoint {
     $id = (isset($data['id']) ? (int)$data['id'] : null);
 
     // check that the newsletter exists
-    $newsletter = Newsletter::filter('filterWithOptions')
-      ->findOne($data['id']);
+    $newsletter = Newsletter::filter('filterWithOptions')->findOne($id);
 
     if($newsletter === false) {
       return $this->errorResponse(array(
@@ -118,7 +117,7 @@ class SendingQueue extends APIEndpoint {
         return $this->errorResponse($errors);
       } else {
         return $this->successResponse(
-          Newsletter::findOne($newsletter->id)->asArray()
+          $newsletter->getQueue()->asArray()
         );
       }
     }
@@ -142,7 +141,7 @@ class SendingQueue extends APIEndpoint {
       } else {
         $queue->pause();
         return $this->successResponse(
-          Newsletter::findOne($newsletter->id)->asArray()
+          $newsletter->getQueue()->asArray()
         );
       }
     }
@@ -166,7 +165,7 @@ class SendingQueue extends APIEndpoint {
       } else {
         $queue->resume();
         return $this->successResponse(
-          Newsletter::findOne($newsletter->id)->asArray()
+          $newsletter->getQueue()->asArray()
         );
       }
     }

views/newsletters.html

@@ -211,6 +211,7 @@
     'next': __('Next'),
     'previous': __('Previous'),
     'newsletterBeingSent': __('The newsletter is being sent...'),
+    'newsletterHasBeenScheduled': __('The newsletter has been scheduled.'),
     '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!'),