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

Added "Subscribers without a segment" filter

Browse Source 
- removed useless dependency in filters.jsx
- fixed issue with Router\Subscribers::save() not updating segments
This commit is contained in:
Jonathan Labreuille
2016-02-08 10:32:06 +01:00
parent 67a3440ced
commit 4b6fa0e760
3 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/Models/Subscriber.php
View File

@ -33,12 +33,17 @@ class Subscriber extends Model {
}
function addToSegments(array $segment_ids = array()) {
$segments = Segment::whereIn('id', $segment_ids)->findMany();
foreach($segments as $segment) {
$association = SubscriberSegment::create();
$association->subscriber_id = $this->id;
$association->segment_id = $segment->id;
$association->save();
// delete all relations to segments
SubscriberSegment::where('subscriber_id', $this->id)->deleteMany();
if(!empty($segment_ids)) {
$segments = Segment::whereIn('id', $segment_ids)->findMany();
foreach($segments as $segment) {
$association = SubscriberSegment::create();
$association->subscriber_id = $this->id;
$association->segment_id = $segment->id;
$association->save();
}
}
}
@ -92,20 +97,22 @@ class Subscriber extends Model {
$segments = Segment::orderByAsc('name')->findMany();
$segment_list = array();
$segment_list[] = array(
'label' => __('All lists'),
'label' => __('All segments'),
'value' => ''
);
$segment_list[] = array(
'label' => __('Subscribers without a segment'),
'value' => 'none'
);
foreach($segments as $segment) {
$subscribers_count = $segment->subscribers()
->whereNull('deleted_at')
->count();
if($subscribers_count > 0) {
$segment_list[] = array(
'label' => sprintf('%s (%d)', $segment->name, $subscribers_count),
'value' => $segment->id()
);
}
$segment_list[] = array(
'label' => sprintf('%s (%d)', $segment->name, $subscribers_count),
'value' => $segment->id()
);
}
$filters = array(
@ -121,9 +128,13 @@ class Subscriber extends Model {
}
foreach($filters as $key => $value) {
if($key === 'segment') {
$segment = Segment::findOne($value);
if($segment !== false) {
return $segment->subscribers();
if($value === 'none') {
return Subscriber::filter('withoutSegments');
} else {
$segment = Segment::findOne($value);
if($segment !== false) {
return $segment->subscribers();
}
}
}
}
@ -430,6 +441,19 @@ class Subscriber extends Model {
->where('status', 'unconfirmed');
}
static function withoutSegments($orm) {
return $orm->select(MP_SUBSCRIBERS_TABLE.'.*')
->leftOuterJoin(
MP_SUBSCRIBER_SEGMENT_TABLE,
array(
MP_SUBSCRIBERS_TABLE.'.id',
'=',
MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id'
)
)
->whereNull(MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id');
}
static function createMultiple($columns, $values) {
return self::rawExecute(
'INSERT INTO `' . self::$_table . '` ' .