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

remove doing_ajax logic from API and created dedicated class for subscription form non ajax submission

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-09-22 16:24:13 +02:00
parent 6091751a4b
commit ea5c73721b
7 changed files with 117 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Models/Subscriber.php
View File

@ -166,34 +166,32 @@ class Subscriber extends Model {
$subscriber = self::findOne($subscriber->id);
}
if($subscriber !== false) {
// restore trashed subscriber
if($subscriber->deleted_at !== null) {
$subscriber->setExpr('deleted_at', 'NULL');
// restore trashed subscriber
if($subscriber->deleted_at !== null) {
$subscriber->setExpr('deleted_at', 'NULL');
}
// set status depending on signup confirmation setting
if($subscriber->status !== self::STATUS_SUBSCRIBED) {
if($signup_confirmation_enabled === true) {
$subscriber->set('status', self::STATUS_UNCONFIRMED);
} else {
$subscriber->set('status', self::STATUS_SUBSCRIBED);
}
}
// set status depending on signup confirmation setting
if($subscriber->status !== self::STATUS_SUBSCRIBED) {
if($signup_confirmation_enabled === true) {
$subscriber->set('status', self::STATUS_UNCONFIRMED);
} else {
$subscriber->set('status', self::STATUS_SUBSCRIBED);
}
}
if($subscriber->save()) {
// link subscriber to segments
SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
if($subscriber->save()) {
// link subscriber to segments
SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
// signup confirmation
$subscriber->sendConfirmationEmail();
// signup confirmation
$subscriber->sendConfirmationEmail();
// welcome email
Scheduler::scheduleSubscriberWelcomeNotification(
$subscriber->id,
$segment_ids
);
}
// welcome email
Scheduler::scheduleSubscriberWelcomeNotification(
$subscriber->id,
$segment_ids
);
}
return $subscriber;