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

Sends confirmation email and schedules welcome notification by default

Browse Source 
Fixes a typo in text string
This commit is contained in:
Vlad
2017-05-16 20:25:30 -04:00
parent a1b3aaf1f8
commit fc51d5f98c
2 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/API/MP/v1/API.php
View File

@ -51,7 +51,7 @@ class API {
// throw exception when none of the segments exist
$found_segments = Segment::whereIn('id', $segments_ids)->findMany();
if(!$found_segments) {
throw new \Exception(__('These lists do not exists.', 'mailpoet'));
throw new \Exception(__('These lists do not exist.', 'mailpoet'));
}
// throw exception when trying to subscribe to a WP Users segment
@ -77,6 +77,9 @@ class API {
}
function addSubscriber(array $subscriber, $segments = array(), $options = array()) {
$send_confirmation_email = (isset($options['send_confirmation_email']) && $options['send_confirmation_email'] === false) ? false : true;
$schedule_welcome_email = (isset($options['schedule_welcome_email']) && $options['schedule_welcome_email'] === false) ? false : true;
// throw exception when subscriber email is missing
if(empty($subscriber['email'])) {
throw new \Exception(
@ -114,12 +117,12 @@ class API {
$this->subscribeToLists($new_subscriber->id, $segments);
// send confirmation email
if(!empty($options['send_confirmation_email']) && $new_subscriber->status === Subscriber::STATUS_UNCONFIRMED) {
if($send_confirmation_email && $new_subscriber->status === Subscriber::STATUS_UNCONFIRMED) {
$this->sendConfirmationEmail($new_subscriber);
}
// schedule welcome email(s)
if(!empty($options['schedule_welcome_email'])) {
if($schedule_welcome_email) {
Scheduler::scheduleSubscriberWelcomeNotification($new_subscriber->id, $segments);
}
}

50
tests/unit/API/MP/APITest.php
View File

@ -62,7 +62,7 @@ class MPAPITest extends MailPoetTest {
API::MP(self::VERSION)->subscribeToLists($subscriber->id, array(1,2,3));
$this->fail('Missing segments exception should have been thrown.');
} catch(\Exception $e) {
expect($e->getMessage())->equals('These lists do not exists.');
expect($e->getMessage())->equals('These lists do not exist.');
}
}
@ -237,7 +237,7 @@ class MPAPITest extends MailPoetTest {
expect($result['subscriptions'][0]['id'])->equals($segment->id);
}
function testItSendsConfirmationEmailAfterAddingSubscriber() {
function testItSendsConfirmationEmailByDefaultAfterAddingSubscriber() {
$segment = Segment::createOrUpdate(
array(
'name' => 'Default',
@ -247,7 +247,49 @@ class MPAPITest extends MailPoetTest {
$subscriber = array(
'email' => 'test@example.com'
);
$options = array('schedule_welcome_email' => true);
// create newsletter with associated options to send welcome email one day after subscription to segment
$newsletter = Newsletter::create();
$newsletter->type = Newsletter::TYPE_WELCOME;
$newsletter->status = Newsletter::STATUS_ACTIVE;
$newsletter->save();
$newsletter_options = array(
'event' => 'segment',
'segment' => $segment->id,
'afterTimeType' => 'days',
'afterTimeNumber' => 1
);
foreach($newsletter_options as $option => $value) {
$newsletter_option_field = NewsletterOptionField::create();
$newsletter_option_field->name = $option;
$newsletter_option_field->newsletter_type = $newsletter->type;
$newsletter_option_field->save();
expect($newsletter_option_field->getErrors())->false();
$newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter->id;
$newsletter_option->value = $value;
$newsletter_option->save();
expect($newsletter_option->getErrors())->false();
}
expect(SendingQueue::findArray())->count(0);
API::MP(self::VERSION)->addSubscriber($subscriber, array($segment->id));
expect(SendingQueue::findArray())->count(1);
}
function testItDoesNotSendConfirmationEmailAfterAddingSubscriberWhenOptionIsSet() {
$segment = Segment::createOrUpdate(
array(
'name' => 'Default',
'type' => Segment::TYPE_DEFAULT
)
);
$subscriber = array(
'email' => 'test@example.com'
);
$options = array('schedule_welcome_email' => false);
// create newsletter with associated options to send welcome email one day after subscription to segment
$newsletter = Newsletter::create();
$newsletter->type = Newsletter::TYPE_WELCOME;
@ -276,7 +318,7 @@ class MPAPITest extends MailPoetTest {
expect(SendingQueue::findArray())->count(0);
API::MP(self::VERSION)->addSubscriber($subscriber, array($segment->id), $options);
expect(SendingQueue::findArray())->count(1);
expect(SendingQueue::findArray())->count(0);
}
function _after() {