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

fix bulk actions and messages

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-09-06 17:21:15 +02:00
parent f650455a90
commit 4a72995bf4
17 changed files with 207 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Models/Subscriber.php
View File

@@ -538,7 +538,7 @@ class Subscriber extends Model {
if($segment === false) return false;
$subscribers_count = parent::bulkAction($orm,
$count = parent::bulkAction($orm,
function($subscriber_ids) use($segment) {
SubscriberSegment::subscribeManyToSegments(
$subscriber_ids, array($segment->id)
@@ -547,7 +547,7 @@ class Subscriber extends Model {
);
return array(
'subscribers' => $subscribers_count,
'count' => $count,
'segment' => $segment->name
);
}
@@ -558,7 +558,7 @@ class Subscriber extends Model {
if($segment === false) return false;
$subscribers_count = parent::bulkAction($orm,
$count = parent::bulkAction($orm,
function($subscriber_ids) use($segment) {
SubscriberSegment::deleteManySubscriptions($subscriber_ids);
SubscriberSegment::subscribeManyToSegments(
@@ -568,7 +568,7 @@ class Subscriber extends Model {
);
return array(
'subscribers' => $subscribers_count,
'count' => $count,
'segment' => $segment->name
);
}
@@ -579,7 +579,7 @@ class Subscriber extends Model {
if($segment === false) return false;
$subscribers_count = $orm->count();
$count = $orm->count();
parent::bulkAction($orm, function($subscriber_ids) use($segment) {
SubscriberSegment::deleteManySubscriptions(
@@ -588,19 +588,21 @@ class Subscriber extends Model {
});
return array(
'subscribers' => $subscribers_count,
'count' => $count,
'segment' => $segment->name
);
}
static function bulkRemoveFromAllLists($orm, $data = array()) {
$subscribers_count = $orm->count();
$count = $orm->count();
parent::bulkAction($orm, function($subscriber_ids) {
SubscriberSegment::deleteManySubscriptions($subscriber_ids);
});
return $subscribers_count;
return array(
'count' => $count
);
}
static function bulkSendConfirmationEmail($orm) {
@@ -615,13 +617,15 @@ class Subscriber extends Model {
$emails_sent++;
}
}
return $emails_sent;
}
return false;
return array(
'count' => $emails_sent
);
}
static function bulkTrash($orm) {
return parent::bulkAction($orm, function($subscriber_ids) {
$count = parent::bulkAction($orm, function($subscriber_ids) {
self::rawExecute(join(' ', array(
'UPDATE `'.self::$_table.'`',
'SET `deleted_at` = NOW()',
@@ -633,10 +637,12 @@ class Subscriber extends Model {
$subscriber_ids
);
});
return array('count' => $count);
}
static function bulkDelete($orm) {
return parent::bulkAction($orm, function($subscriber_ids) {
$count = parent::bulkAction($orm, function($subscriber_ids) {
// delete all subscriber/segment relationships
SubscriberSegment::deleteManySubscriptions($subscriber_ids);
@@ -645,6 +651,8 @@ class Subscriber extends Model {
->whereNull('wp_user_id')
->deleteMany();
});
return array('count' => $count);
}
static function subscribed($orm) {