Added Newsletter queue improvements

Author: Usik2203

app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php

@@ -135,24 +135,25 @@ protected function _prepareLayout()
                 ]
             ]
         );
-
-        $this->getToolbar()->addChild(
-            'save_and_resume',
-            \Magento\Backend\Block\Widget\Button::class,
-            [
-                'label' => __('Save and Resume'),
-                'class' => 'save',
-                'data_attribute' => [
-                    'mage-init' => [
-                        'button' => [
-                            'event' => 'save',
-                            'target' => '#queue_edit_form',
-                            'eventData' => ['action' => ['args' => ['_resume' => 1]]],
+        if ($this->getCanResume()) {
+            $this->getToolbar()->addChild(
+                'save_and_resume',
+                \Magento\Backend\Block\Widget\Button::class,
+                [
+                    'label' => __('Save and Resume'),
+                    'class' => 'save',
+                    'data_attribute' => [
+                        'mage-init' => [
+                            'button' => [
+                                'event' => 'save',
+                                'target' => '#queue_edit_form',
+                                'eventData' => ['action' => ['args' => ['_resume' => 1]]],
+                            ],
                         ],
-                    ],
+                    ]
                 ]
-            ]
-        );
+            );
+        }
 
         return parent::_prepareLayout();
     }

app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
 
+use Magento\Newsletter\Model\Queue;
+
 /**
  * Newsletter queue edit form
  *
@@ -227,7 +229,7 @@ protected function _prepareForm()
                     'value' => $queue->getTemplate()->getTemplateStyles()
                 ]
             );
-        } elseif (\Magento\Newsletter\Model\Queue::STATUS_NEVER != $queue->getQueueStatus()) {
+        } elseif (Queue::STATUS_NEVER != $queue->getQueueStatus() && $queue->getQueueStatus() != Queue::STATUS_PAUSE) {
             $fieldset->addField(
                 'text',
                 'textarea',

app/code/Magento/Newsletter/Model/Queue.php

@@ -251,7 +251,11 @@ public function sendPerSubscriber($count = 20)
             ]
         );
 
-        /** @var \Magento\Newsletter\Model\Subscriber $item */
+        if ($this->getQueueStatus() != self::STATUS_SENDING && count($collection->getItems()) > 0) {
+            $this->startQueue();
+        }
+
+        /** @var Subscriber $item */
         foreach ($collection->getItems() as $item) {
             $transport = $this->_transportBuilder->setTemplateOptions(
                 ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $item->getStoreId()]
@@ -283,6 +287,19 @@ public function sendPerSubscriber($count = 20)
         return $this;
     }
 
+    /**
+     * Start queue: set status SENDING for queue
+     *
+     * @return $this
+     */
+    private function startQueue()
+    {
+        $this->setQueueStatus(self::STATUS_SENDING);
+        $this->save();
+
+        return $this;
+    }
+
     /**
      * Finish queue: set status SENT and update finish date
      *