Send confirmation email when there are unconfirmed data
[MAILPOET-3649]
This commit is contained in:
@ -177,8 +177,8 @@ class Pages {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send new subscriber notification only when status changes to subscribed to avoid spamming
|
// Send new subscriber notification only when status changes to subscribed or there are unconfirmed data to avoid spamming
|
||||||
if ($originalStatus !== Subscriber::STATUS_SUBSCRIBED) {
|
if ($originalStatus !== Subscriber::STATUS_SUBSCRIBED || $subscriberData !== null) {
|
||||||
$this->newSubscriberNotificationSender->send($this->subscriber, $subscriberSegments);
|
$this->newSubscriberNotificationSender->send($this->subscriber, $subscriberSegments);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ class PagesTest extends \MailPoetTest {
|
|||||||
$subscriber = $this->subscriber;
|
$subscriber = $this->subscriber;
|
||||||
$subscriber->setStatus(Subscriber::STATUS_SUBSCRIBED);
|
$subscriber->setStatus(Subscriber::STATUS_SUBSCRIBED);
|
||||||
$subscriber->setFirstName('First name');
|
$subscriber->setFirstName('First name');
|
||||||
$subscriber->setUnconfirmedData('{"first_name" : "Updated first name", "email" : "' . $this->subscriber->getEmail() . '"}');
|
$subscriber->setUnconfirmedData(null);
|
||||||
$subscriber->setLastSubscribedAt(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subDays(10));
|
$subscriber->setLastSubscribedAt(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subDays(10));
|
||||||
$subscriber->setConfirmedIp(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subDays(10));
|
$subscriber->setConfirmedIp(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subDays(10));
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
@ -89,7 +89,7 @@ class PagesTest extends \MailPoetTest {
|
|||||||
expect($confirmedSubscriber->getConfirmedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
|
expect($confirmedSubscriber->getConfirmedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
|
||||||
expect($confirmedSubscriber->getLastSubscribedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
|
expect($confirmedSubscriber->getLastSubscribedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
|
||||||
expect($confirmedSubscriber->getLastSubscribedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
|
expect($confirmedSubscriber->getLastSubscribedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
|
||||||
expect($confirmedSubscriber->getFirstName())->equals('Updated first name');
|
expect($confirmedSubscriber->getFirstName())->equals('First name');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testItSendsWelcomeNotificationUponConfirmingSubscription() {
|
public function testItSendsWelcomeNotificationUponConfirmingSubscription() {
|
||||||
|
Reference in New Issue
Block a user