Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Conditional display of statistics column (for standard)

Browse Source 
- improved duplicate action (for standard)
- moved STATUS_COMPLETED constant from worker to SendingQueue model where it belongs
This commit is contained in:
Jonathan Labreuille
2016-06-14 13:18:27 +02:00
parent cabfd8a946
commit ee6e261c42
10 changed files with 209 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Cron/Workers/SendingQueue.php
View File

@ -4,6 +4,7 @@ namespace MailPoet\Cron\Workers;
use MailPoet\Cron\CronHelper;
use MailPoet\Mailer\Mailer;
use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Models\NewsletterPost;
use MailPoet\Models\Setting;
use MailPoet\Models\StatisticsNewsletters;
@ -23,7 +24,6 @@ class SendingQueue {
private $timer;
const BATCH_SIZE = 50;
const DIVIDER = '***MailPoet***';
const STATUS_COMPLETED = 'completed';
function __construct($timer = false) {
$this->mta_config = $this->getMailerConfig();
@ -295,7 +295,7 @@ class SendingQueue {
}
function getQueues() {
return \MailPoet\Models\SendingQueue::orderByDesc('priority')
return SendingQueueModel::orderByDesc('priority')
->whereNull('deleted_at')
->whereNull('status')
->findResultSet();
@ -321,7 +321,7 @@ class SendingQueue {
$queue->count_processed + $queue->count_to_process;
if(!$queue->count_to_process) {
$queue->processed_at = current_time('mysql');
$queue->status = self::STATUS_COMPLETED;
$queue->status = SendingQueueModel::STATUS_COMPLETED;
}
$queue->subscribers = serialize((array) $queue->subscribers);
$queue->save();