Fixed sending confirmation email to new subscribers (first time)
- fixed newsletters listing issue with queue
This commit is contained in:
@@ -135,7 +135,7 @@ define(
|
||||
});
|
||||
},
|
||||
renderStatus: function(item) {
|
||||
if(item.queue === false) {
|
||||
if(!item.queue) {
|
||||
return (
|
||||
<span>Not sent yet.</span>
|
||||
);
|
||||
|
@@ -74,13 +74,14 @@ class Newsletter extends Model {
|
||||
|
||||
function withSendingQueue() {
|
||||
$queue = $this->getQueue();
|
||||
if($queue !== false) {
|
||||
if($queue === false) {
|
||||
$this->queue = false;
|
||||
} else {
|
||||
$this->queue = $queue->asArray();
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
static function search($orm, $search = '') {
|
||||
return $orm->where_like('subject', '%' . $search . '%');
|
||||
}
|
||||
|
@@ -182,8 +182,11 @@ class Subscriber extends Model {
|
||||
}
|
||||
|
||||
$subscriber = self::createOrUpdate($subscriber_data);
|
||||
$errors = $subscriber->getErrors();
|
||||
|
||||
if($errors === false && $subscriber->id > 0) {
|
||||
$subscriber = self::findOne($subscriber->id);
|
||||
|
||||
if($subscriber !== false && $subscriber->id() > 0) {
|
||||
// restore deleted subscriber
|
||||
if($subscriber->deleted_at !== NULL) {
|
||||
$subscriber->setExpr('deleted_at', 'NULL');
|
||||
|
Reference in New Issue
Block a user