Adds method to validate rendered newsletter body on sending queue
Prevents sending queue worker from sending when sending queue's rendered newsletter body is invalid
This commit is contained in:
@ -86,9 +86,8 @@ class SendingQueue extends Model {
|
||||
|
||||
function asArray() {
|
||||
$model = parent::asArray();
|
||||
$model['subscribers'] = (is_serialized($this->subscribers))
|
||||
? unserialize($this->subscribers)
|
||||
: $this->subscribers;
|
||||
$model['subscribers'] = $this->getSubscribers();
|
||||
$model['newsletter_rendered_body'] = $this->getNewsletterRenderedBody();
|
||||
return $model;
|
||||
}
|
||||
|
||||
@ -120,6 +119,11 @@ class SendingQueue extends Model {
|
||||
$this->updateCount();
|
||||
}
|
||||
|
||||
function isRenderedNewsletterBodyValid() {
|
||||
$newsletter_body = $this->getNewsletterRenderedBody();
|
||||
return (is_array($newsletter_body) && !empty($newsletter_body['html']) && !empty($newsletter_body['text']));
|
||||
}
|
||||
|
||||
function updateCount() {
|
||||
$this->subscribers = $this->getSubscribers();
|
||||
$this->count_processed = count($this->subscribers['processed']);
|
||||
|
Reference in New Issue
Block a user