Merge pull request #3 from mageplaza/develop

Develop

Block/Adminhtml/Job/Edit/Tab/Main.php

@@ -73,7 +73,7 @@ public function __construct(
         array $data = []
     ) {
         $this->jobStatus = $jobStatus;
-        $this->group = $group;
+        $this->group     = $group;
 
         parent::__construct($context, $registry, $formFactory, $data);
     }

Block/Adminhtml/Timetable.php

@@ -66,8 +66,8 @@ public function __construct(
         CollectionFactory $collectionFactory,
         array $data = []
     ) {
-        $this->helper = $helper;
-        $this->datetime = $datetime;
+        $this->helper            = $helper;
+        $this->datetime          = $datetime;
         $this->collectionFactory = $collectionFactory;
 
         parent::__construct($context, $data);
@@ -78,7 +78,7 @@ public function __construct(
      */
     public function getCronJobData()
     {
-        $data = [];
+        $data  = [];
         $count = 0;
 
         $schedules = $this->collectionFactory->create();
@@ -88,16 +88,16 @@ public function getCronJobData()
         /** @var Schedule $schedule */
         foreach ($schedules->getItems() as $schedule) {
             $status = $schedule->getStatus();
-            $start = $schedule->getScheduledAt();
-            $end = $start;
+            $start  = $schedule->getScheduledAt();
+            $end    = $start;
 
             switch ($status) {
                 case Schedule::STATUS_RUNNING:
                     $end = $this->helper->getTime();
                     break;
                 case Schedule::STATUS_SUCCESS:
                     $start = $schedule->getExecutedAt();
-                    $end = $schedule->getFinishedAt();
+                    $end   = $schedule->getFinishedAt();
                     break;
             }
 
@@ -134,7 +134,7 @@ private function getToolTip($schedule, $status)
         $tooltip .= sprintf('<tr><th>%s</th><td>%s</td></tr>', __('ID'), $schedule->getId());
 
         $statusHtml = sprintf('<span class="tooltip-severity %s">%s</span>', $status, $status);
-        $tooltip .= sprintf('<tr><th>%s</th><td>%s</td></tr>', __('Status'), $statusHtml);
+        $tooltip    .= sprintf('<tr><th>%s</th><td>%s</td></tr>', __('Status'), $statusHtml);
 
         if ($message = $schedule->getMessages()) {
             $tooltip .= sprintf('<tr><th>%s</th><td>%s</td></tr>', __('Message'), $this->escapeQuote($message));

CHANGELOG

@@ -1 +1 @@
-CHANGELOG: https://www.mageplaza.com/releases/cron-schedule/
+CHANGELOG: https://www.mageplaza.com/releases/cron-schedule/

Controller/Adminhtml/AbstractJob.php

@@ -112,13 +112,13 @@ public function __construct(
         TypeListInterface $cacheTypeList
     ) {
         $this->resultPageFactory = $resultPageFactory;
-        $this->jsonFactory = $jsonFactory;
-        $this->registry = $registry;
-        $this->helper = $helper;
-        $this->jobFactory = $jobFactory;
-        $this->scheduleFactory = $scheduleFactory;
-        $this->logger = $logger;
-        $this->cacheTypeList = $cacheTypeList;
+        $this->jsonFactory       = $jsonFactory;
+        $this->registry          = $registry;
+        $this->helper            = $helper;
+        $this->jobFactory        = $jobFactory;
+        $this->scheduleFactory   = $scheduleFactory;
+        $this->logger            = $logger;
+        $this->cacheTypeList     = $cacheTypeList;
 
         parent::__construct($context);
     }
@@ -174,7 +174,7 @@ protected function getSelectedRecords($data)
             });
         }
 
-        $jobs = array_values($allJobs);
+        $jobs    = array_values($allJobs);
         $filters = (array) $data['filters'];
         unset($filters['placeholder']);
         foreach ($filters as $column => $value) {

Controller/Adminhtml/AbstractLog.php

@@ -70,7 +70,7 @@ public function __construct(
         CollectionFactory $collectionFactory
     ) {
         $this->resultPageFactory = $resultPageFactory;
-        $this->filter = $filter;
+        $this->filter            = $filter;
         $this->collectionFactory = $collectionFactory;
 
         parent::__construct($context);

Controller/Adminhtml/Job/Edit.php

@@ -38,7 +38,7 @@ class Edit extends AbstractJob
     public function execute()
     {
         $object = $this->_initJob();
-        $name = $this->getRequest()->getParam('name');
+        $name   = $this->getRequest()->getParam('name');
 
         if ($name !== null) {
             if ($object->getData() === null) {
@@ -61,7 +61,7 @@ public function execute()
 
         $this->registry->register('mpcronschedule_job', $object);
 
-        $pageTitle = $name !== null ? __('Edit Cron Job "%1"', $name) : __('Create New Cron Job');
+        $pageTitle  = $name !== null ? __('Edit Cron Job "%1"', $name) : __('Create New Cron Job');
         $resultPage = $this->_initAction();
         $resultPage->getConfig()->getTitle()->prepend($pageTitle);
 

Controller/Adminhtml/Job/InlineEdit.php

@@ -39,9 +39,9 @@ public function execute()
     {
         /** @var Json $resultJson */
         $resultJson = $this->jsonFactory->create();
-        $error = false;
-        $messages = [];
-        $items = $this->getRequest()->getParam('items', []);
+        $error      = false;
+        $messages   = [];
+        $items      = $this->getRequest()->getParam('items', []);
 
         if (empty($items) && !$this->getRequest()->getParam('isAjax')) {
             return $resultJson->setData([
@@ -57,7 +57,7 @@ public function execute()
                 $object->changeJobStatus($items[$name]['status']);
             } catch (Exception $e) {
                 $messages[] = '[Cron Job: ' . $object->getName() . '] ' . $e->getMessage();
-                $error = true;
+                $error      = true;
             }
         }
 

Controller/Adminhtml/Job/Validate.php

@@ -45,7 +45,7 @@ public function execute()
         $error = false;
 
         $request = $this->getRequest();
-        $name = $request->getParam('code');
+        $name    = $request->getParam('code');
 
         $validator = new Zend_Validate_Regex('/^[a-z][a-z_0-9]{0,30}$/');
         if (!$validator->isValid($name)) {
@@ -57,15 +57,15 @@ public function execute()
         }
 
         $orgName = $request->getParam('org_name');
-        $jobs = $this->helper->getJobs();
+        $jobs    = $this->helper->getJobs();
 
         if ($name !== $orgName && isset($jobs[$name])) {
             $this->messageManager->addErrorMessage(__('A cron job with this code already exists.'));
             $error = true;
         }
 
         $schedule = $request->getParam('schedule');
-        $e = count(preg_split('#\s+#', $schedule, null, PREG_SPLIT_NO_EMPTY));
+        $e        = count(preg_split('#\s+#', $schedule, null, PREG_SPLIT_NO_EMPTY));
         if ($e < 5 || $e > 6) {
             $this->messageManager->addErrorMessage(__('Invalid cron expression: %1', $schedule));
             $error = true;

Helper/Data.php

@@ -72,8 +72,8 @@ public function __construct(
         DateTime $dateTime
     ) {
         $this->cronConfig = $cronConfig;
-        $this->timezone = $timezone;
-        $this->dateTime = $dateTime;
+        $this->timezone   = $timezone;
+        $this->dateTime   = $dateTime;
 
         parent::__construct($context, $objectManager, $storeManager);
     }
@@ -133,7 +133,7 @@ public function getJobs($name = null)
      */
     private function getJobData($job, $code, $group)
     {
-        $job['name'] = $code;
+        $job['name']  = $code;
         $job['group'] = $group;
 
         if (!isset($job['schedule'])) {
@@ -174,7 +174,7 @@ public function isJobDisabled($name)
      */
     public function getTime($isFloor = false)
     {
-        $time = $this->versionCompare('2.2.0') ? $this->dateTime->gmtTimestamp() : $this->timezone->scopeTimeStamp();
+        $time   = $this->versionCompare('2.2.0') ? $this->dateTime->gmtTimestamp() : $this->timezone->scopeTimeStamp();
         $format = $isFloor ? '%Y-%m-%d %H:%M:00' : '%Y-%m-%d %H:%M:%S';
 
         return strftime($format, $time);

Helper/Email.php

@@ -23,6 +23,7 @@
 
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\ObjectManagerInterface;
@@ -115,7 +116,7 @@ public function getSchedule($storeId = null)
      * @param array $templateVars
      *
      * @throws MailException
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function sendEmail($templateVars = [])
     {

LICENSE

@@ -1,21 +1,21 @@
-The MIT License
-
-Copyright (c) 2015-present Mageplaza, Co. Ltd. https://www.mageplaza.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+The MIT License
+
+Copyright (c) 2015-present Mageplaza, Co. Ltd. https://www.mageplaza.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

Model/Command.php

@@ -52,7 +52,7 @@ public function __construct(
         ShellInterface $shell,
         PhpExecutableFinderFactory $phpExecutableFinderFactory
     ) {
-        $this->shell = $shell;
+        $this->shell               = $shell;
         $this->phpExecutableFinder = $phpExecutableFinderFactory->create();
     }
 

Model/EmailNotify.php

@@ -22,6 +22,8 @@
 namespace Mageplaza\CronSchedule\Model;
 
 use Magento\Cron\Model\Schedule;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\MailException;
 use Mageplaza\CronSchedule\Helper\Email;
 use Mageplaza\CronSchedule\Model\ResourceModel\Schedule\Collection;
 use Mageplaza\CronSchedule\Model\ResourceModel\Schedule\CollectionFactory;
@@ -53,13 +55,13 @@ public function __construct(
         Email $helper,
         CollectionFactory $collectionFactory
     ) {
-        $this->helper = $helper;
+        $this->helper            = $helper;
         $this->collectionFactory = $collectionFactory;
     }
 
     /**
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws LocalizedException
+     * @throws MailException
      */
     public function sendEmail()
     {
@@ -74,7 +76,7 @@ public function sendEmail()
             ->addFieldToFilter('mpcronschedule_email_sent', ['null' => true])
             ->addFieldToFilter('status', ['in' => [Schedule::STATUS_ERROR, Schedule::STATUS_MISSED]]);
 
-        if (!$collection->getSize()) {
+        if (!$collection->getSize() || empty($this->helper->getConfigGeneral('send_to'))) {
             return;
         }
 

Model/Job.php

@@ -82,7 +82,7 @@ public function __construct(
         AbstractDb $resourceCollection = null,
         array $data = []
     ) {
-        $this->helper = $helper;
+        $this->helper       = $helper;
         $this->valueFactory = $valueFactory;
 
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
@@ -140,7 +140,7 @@ public function deleteJob()
     public function executeJob(&$schedule)
     {
         $instance = $this->getInstance();
-        $method = $this->getMethod();
+        $method   = $this->getMethod();
 
         if (!isset($instance, $method)) {
             throw new RuntimeException(__('No callbacks found'));
@@ -171,10 +171,12 @@ public function executeJob(&$schedule)
      */
     public function changeJobStatus($statusValue)
     {
+        $path = $this->getCronPath(self::STATUS_PATH);
+
         /** @var Value $config */
         $config = $this->valueFactory->create();
-        $config->load($this->getCronPath(self::STATUS_PATH), 'path');
-        $config->setValue($statusValue);
+        $config->load($path, 'path');
+        $config->setPath($path)->setValue($statusValue);
         $config->save();
 
         return $this;

Model/Message.php

@@ -61,8 +61,8 @@ public function __construct(
         UrlInterface $urlBuilder,
         CollectionFactory $collectionFactory
     ) {
-        $this->helper = $helper;
-        $this->urlBuilder = $urlBuilder;
+        $this->helper            = $helper;
+        $this->urlBuilder        = $urlBuilder;
         $this->collectionFactory = $collectionFactory;
     }
 

Observer/ConfigObserver.php

@@ -53,7 +53,7 @@ public function __construct(
         Data $helper
     ) {
         $this->modelConfig = $modelConfig;
-        $this->helper = $helper;
+        $this->helper      = $helper;
     }
 
     /**