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

Fix subscriber status resetting on WP user creation

Browse Source 
Fixes:#2960
[MAILPOET-3016]
This commit is contained in:
Lysy Jan
2020-08-03 11:15:19 +02:00
committed by Veljko V
parent 762d205438
commit ba4fd9eb1b
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Segments/WP.php
View File

@ -43,6 +43,11 @@ class WP {
$wpSegment = Segment::getWPSegment();
if (!$wpSegment) return;
// find subscriber by email when is false
if (!$subscriber) {
$subscriber = Subscriber::where('email', $wpUser->user_email)->findOne(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
}
$scheduleWelcomeNewsletter = false;
if (in_array($currentFilter, ['profile_update', 'user_register'])) {
$scheduleWelcomeNewsletter = true;

13
tests/integration/Segments/WPTest.php
View File

@ -32,6 +32,19 @@ class WPTest extends \MailPoetTest {
expect($dbSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
}
public function testSynchronizeUserKeepsStatusOfOldSubscriber() {
$randomNumber = rand();
$subscriber = Subscriber::createOrUpdate([
'email' => 'user-sync-test' . $randomNumber . '@example.com',
'status' => Subscriber::STATUS_SUBSCRIBED,
'wp_user_id' => null,
]);
$id = $this->insertUser($randomNumber);
WP::synchronizeUser($id);
$dbSubscriber = Subscriber::where('wp_user_id', $id)->findOne();
expect($dbSubscriber->status)->equals($subscriber->status);
}
public function testSynchronizeUserStatusIsSubscribedForNewUserWithSignUpConfirmationDisabled() {
$this->settings->set('signup_confirmation', ['enabled' => '0']);
$randomNumber = rand();