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

Status column

Browse Source 
- updated migration for subscribers status column from int to varchar
- updated Subscriber model to reflect the change
This commit is contained in:
Jonathan Labreuille
2015-09-02 16:36:57 +02:00
parent 3fe895a7fe
commit fc42296f1b
2 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Config/Migrator.php
View File

@ -44,7 +44,7 @@ class Migrator {
'first_name tinytext NOT NULL,',
'last_name tinytext NOT NULL,',
'email varchar(150) NOT NULL,',
'status tinyint(1) NOT NULL DEFAULT 0,',
'status varchar(12) NOT NULL DEFAULT "unconfirmed",',
'created_at TIMESTAMP NOT NULL DEFAULT 0,',
'updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
'PRIMARY KEY (id),',

33
lib/Models/Subscriber.php
View File

@ -6,10 +6,6 @@ if (!defined('ABSPATH')) exit;
class Subscriber extends Model {
public static $_table = MP_SUBSCRIBERS_TABLE;
const STATE_SUBSCRIBED = 1;
const STATE_UNCONFIRMED = 0;
const STATE_UNSUBSCRIBED = -1;
function __construct() {
parent::__construct();
@ -36,43 +32,24 @@ class Subscriber extends Model {
array(
'name' => 'subscribed',
'label' => __('Subscribed'),
'count' => Subscriber::where(
'status',
Subscriber::STATE_SUBSCRIBED
)->count()
'count' => Subscriber::where('status', 'subscribed')->count()
),
array(
'name' => 'unconfirmed',
'label' => __('Unconfirmed'),
'count' => Subscriber::where(
'status',
Subscriber::STATE_UNCONFIRMED
)->count()
'count' => Subscriber::where('status', 'unconfirmed')->count()
),
array(
'name' => 'unsubscribed',
'label' => __('Unsubscribed'),
'count' => Subscriber::where(
'status',
Subscriber::STATE_UNSUBSCRIBED
)->count()
'count' => Subscriber::where('status', 'unsubscribed')->count()
)
);
}
static function group($orm, $group = null) {
switch($group) {
case 'subscribed':
return $orm->where('status', Subscriber::STATE_SUBSCRIBED);
break;
case 'unconfirmed':
return $orm->where('status', Subscriber::STATE_UNCONFIRMED);
break;
case 'unsubscribed':
return $orm->where('status', Subscriber::STATE_UNSUBSCRIBED);
break;
if(in_array($group, array('subscribed', 'unconfirmed', 'unsubscribed'))) {
return $orm->where('status', $group);
}
}
}