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

- Formats all numbers >1000 to use comma

Browse Source 
- Removes subscriber count from segments if its === 0
Fixes #431
This commit is contained in:
Vlad
2016-05-10 20:06:20 -04:00
parent 2dab89135f
commit 1bd7639cc2
6 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Models/Subscriber.php
View File

@ -127,7 +127,7 @@ class Subscriber extends Model {
static function verifyToken($email, $token) {
return (self::generateToken($email) === $token);
}
static function subscribe($subscriber_data = array(), $segment_ids = array()) {
if(empty($subscriber_data) or empty($segment_ids)) {
return false;
@ -192,11 +192,14 @@ class Subscriber extends Model {
'label' => __('All segments'),
'value' => ''
);
$subscribers_without_segment = self::filter('withoutSegments')->count();
$subscribers_without_segment_label = sprintf(
__('Subscribers without a segment (%s)'),
number_format($subscribers_without_segment)
);
$segment_list[] = array(
'label' => sprintf(
__('Subscribers without a segment (%d)'),
self::filter('withoutSegments')->count()
),
'label' => str_replace(' (0)', '', $subscribers_without_segment_label),
'value' => 'none'
);
@ -205,8 +208,9 @@ class Subscriber extends Model {
->filter('groupBy', $group)
->count();
$label = sprintf('%s (%s)', $segment->name, number_format($subscribers_count));
$segment_list[] = array(
'label' => sprintf('%s (%d)', $segment->name, $subscribers_count),
'label' => str_replace(' (0)', '', $label),
'value' => $segment->id()
);
}