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

Move MSS Activation to change handler

Browse Source 
[MAILPOET-4061]
This commit is contained in:
John Oleksowicz
2022-01-27 13:45:48 -06:00
committed by Veljko V
parent 00f3e3787d
commit 5f5255f921
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mailpoet/lib/API/JSON/v1/Settings.php
View File

@@ -208,7 +208,7 @@ class Settings extends APIEndpoint {
$oldSendingMethod = $oldSettings['mta_group'];
$newSendingMethod = $newSettings['mta_group'];
if (($oldSendingMethod !== $newSendingMethod) && ($newSendingMethod === 'mailpoet')) {
$this->onMSSActivate($newSettings);
$this->settingsChangeHandler->onMSSActivate($newSettings);
}
// Sync WooCommerce Customers list
@@ -227,23 +227,6 @@ class Settings extends APIEndpoint {
}
}
private function onMSSActivate($newSettings) {
// see mailpoet/assets/js/src/wizard/create_sender_settings.jsx:freeAddress
$domain = str_replace('www.', '', $_SERVER['HTTP_HOST']);
if (
isset($newSettings['sender']['address'])
&& !empty($newSettings['reply_to']['address'])
&& ($newSettings['sender']['address'] === ('wordpress@' . $domain))
) {
$sender = [
'name' => $newSettings['reply_to']['name'] ?? '',
'address' => $newSettings['reply_to']['address'],
];
$this->settings->set('sender', $sender);
$this->settings->set('reply_to', null);
}
}
public function recalculateSubscribersCountsCache() {
$segments = $this->segmentsRepository->findAll();
foreach ($segments as $segment) {

28
mailpoet/lib/Settings/SettingsChangeHandler.php
View File

@@ -11,15 +11,18 @@ use MailPoetVendor\Carbon\Carbon;
class SettingsChangeHandler {
/**
* @var ScheduledTasksRepository
*/
/** @var ScheduledTasksRepository */
private $scheduledTasksRepository;
/** @var SettingsController */
private $settingsController;
public function __construct(
ScheduledTasksRepository $scheduledTasksRepository
ScheduledTasksRepository $scheduledTasksRepository,
SettingsController $settingsController
) {
$this->scheduledTasksRepository = $scheduledTasksRepository;
$this->settingsController = $settingsController;
}
public function onSubscribeOldWoocommerceCustomersChange(): void {
@@ -50,6 +53,23 @@ class SettingsChangeHandler {
$this->scheduledTasksRepository->flush();
}
public function onMSSActivate($newSettings) {
// see mailpoet/assets/js/src/wizard/create_sender_settings.jsx:freeAddress
$domain = str_replace('www.', '', $_SERVER['HTTP_HOST']);
if (
isset($newSettings['sender']['address'])
&& !empty($newSettings['reply_to']['address'])
&& ($newSettings['sender']['address'] === ('wordpress@' . $domain))
) {
$sender = [
'name' => $newSettings['reply_to']['name'] ?? '',
'address' => $newSettings['reply_to']['address'],
];
$this->settingsController->set('sender', $sender);
$this->settingsController->set('reply_to', null);
}
}
private function createScheduledTask(string $type): ScheduledTaskEntity {
$task = new ScheduledTaskEntity();
$task->setType($type);