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

Resume sending if API key approved when new FROM address saved

Browse Source 
[MAILPOET-2804]
This commit is contained in:
Jan Jakeš
2020-03-26 10:59:25 +01:00
committed by Veljko V
parent 3ef072b599
commit 8e057d2a2d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/API/JSON/v1/Settings.php
View File

@ -5,8 +5,10 @@ namespace MailPoet\API\JSON\v1;
use MailPoet\API\JSON\Endpoint as APIEndpoint; use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError; use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\Workers\InactiveSubscribers; use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Cron\Workers\WooCommerceSync; use MailPoet\Cron\Workers\WooCommerceSync;
use MailPoet\Mailer\MailerLog;
use MailPoet\Models\Form; use MailPoet\Models\Form;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
@ -30,6 +32,9 @@ class Settings extends APIEndpoint {
/** @var TransactionalEmails */ /** @var TransactionalEmails */
private $wcTransactionalEmails; private $wcTransactionalEmails;
/** @var ServicesChecker */
private $servicesChecker;
public $permissions = [ public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS, 'global' => AccessControl::PERMISSION_MANAGE_SETTINGS,
]; ];
@ -38,12 +43,14 @@ class Settings extends APIEndpoint {
SettingsController $settings, SettingsController $settings,
Bridge $bridge, Bridge $bridge,
AuthorizedEmailsController $authorizedEmailsController, AuthorizedEmailsController $authorizedEmailsController,
TransactionalEmails $wcTransactionalEmails TransactionalEmails $wcTransactionalEmails,
ServicesChecker $servicesChecker
) { ) {
$this->settings = $settings; $this->settings = $settings;
$this->bridge = $bridge; $this->bridge = $bridge;
$this->authorizedEmailsController = $authorizedEmailsController; $this->authorizedEmailsController = $authorizedEmailsController;
$this->wcTransactionalEmails = $wcTransactionalEmails; $this->wcTransactionalEmails = $wcTransactionalEmails;
$this->servicesChecker = $servicesChecker;
} }
public function get() { public function get() {
@ -91,6 +98,10 @@ class Settings extends APIEndpoint {
APIError::UNAUTHORIZED => WPFunctions::get()->__('Can’t use this email yet! Please authorize it first.', 'mailpoet'), APIError::UNAUTHORIZED => WPFunctions::get()->__('Can’t use this email yet! Please authorize it first.', 'mailpoet'),
]); ]);
} }
if (MailerLog::isSendingPaused() && !$this->servicesChecker->isMailPoetAPIKeyPendingApproval()) {
MailerLog::resumeSending();
}
return $this->successResponse(); return $this->successResponse();
} }