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

Status update of newsletters completed

Browse Source 
- duplicate newsletter now includes options as well
- fixed NaN issue in statistics when newsletter is being sent
- use constant for scheduled (and put it as the sendingQueue Model level)
This commit is contained in:
Jonathan Labreuille
2016-06-16 20:01:53 +02:00
parent 744455f0df
commit aa3a46b941
7 changed files with 122 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Models/Newsletter.php
View File

@ -86,12 +86,24 @@ class Newsletter extends Model {
foreach($segments as $segment) {
$relation = NewsletterSegment::create();
$relation->segment_id = $segment['id'];
$relation->newsletter_id = $duplicate->id();
$result = $relation->save();
$relation->newsletter_id = $duplicate->id;
$relation->save();
}
}
// TODO: duplicate options (if need be)
// duplicate options
$options = NewsletterOption::where('newsletter_id', $this->id)
->findArray();
if(!empty($options)) {
foreach($options as $option) {
$relation = NewsletterOption::create();
$relation->newsletter_id = $duplicate->id;
$relation->option_field_id = $option['option_field_id'];
$relation->value = $option['value'];
$relation->save();
}
}
}
return $duplicate;

8
lib/Models/SendingQueue.php
View File

@ -7,6 +7,8 @@ class SendingQueue extends Model {
public static $_table = MP_SENDING_QUEUES_TABLE;
const STATUS_COMPLETED = 'completed';
const STATUS_SCHEDULED = 'scheduled';
const STATUS_PAUSED = 'paused';
function __construct() {
parent::__construct();
@ -16,7 +18,7 @@ class SendingQueue extends Model {
if($this->count_processed === $this->count_total) {
return false;
} else {
$this->set('status', 'paused');
$this->set('status', STATUS_PAUSED);
$this->save();
return ($this->getErrors() === false && $this->id() > 0);
}
@ -26,14 +28,14 @@ class SendingQueue extends Model {
if($this->count_processed === $this->count_total) {
return $this->complete();
} else {
$this->set_expr('status', 'NULL');
$this->setExpr('status', 'NULL');
$this->save();
return ($this->getErrors() === false && $this->id() > 0);
}
}
function complete() {
$this->set('status', 'completed');
$this->set('status', self::STATUS_COMPLETED);
$this->save();
return ($this->getErrors() === false && $this->id() > 0);
}