diff --git a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php index e5cececf68..a4f2502651 100644 --- a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php @@ -54,29 +54,9 @@ class MailPoetMapper { case API::RESPONSE_CODE_CAN_NOT_SEND: if ($result['message'] === MailerError::MESSAGE_EMAIL_NOT_AUTHORIZED) { $operation = MailerError::OPERATION_AUTHORIZATION; - $message = sprintf(__('
The MailPoet Sending Service did not send your latest email because the address %s is not yet authorized.
', 'mailpoet'), $sender ? $sender['from_email'] : __('Unknown address')); - $message .= ''; - $message .= Helpers::replaceLinkTags( - __('[link]Authorize your email in your account now.[/link]', 'mailpoet'), - 'https://account.mailpoet.com/account/authorization', - array( - 'class' => 'button button-primary', - 'target' => '_blank', - 'rel' => 'noopener noreferrer', - ) - ); - $message .= ' '; - $message .= '
'; - $message .= ""; + $message = $this->getUnauthorizedEmailMessage($sender); } else { - $message = Helpers::replaceLinkTags( - __('You currently are not permitted to send any emails with MailPoet Sending Service, which may have happened due to poor deliverability. Please [link]contact our support team[/link] to resolve the issue.', 'mailpoet'), - 'https://www.mailpoet.com/support/', - array( - 'target' => '_blank', - 'rel' => 'noopener noreferrer', - ) - ); + $message = $this->getAccountBannedMessage(); } break; case API::RESPONSE_CODE_KEY_INVALID: @@ -104,4 +84,33 @@ class MailPoetMapper { } return $errors; } + + private function getUnauthorizedEmailMessage($sender) { + $message = sprintf(__('The MailPoet Sending Service did not send your latest email because the address %s is not yet authorized.
', 'mailpoet'), $sender ? $sender['from_email'] : __('Unknown address')); + $message .= ''; + $message .= Helpers::replaceLinkTags( + __('[link]Authorize your email in your account now.[/link]', 'mailpoet'), + 'https://account.mailpoet.com/account/authorization', + array( + 'class' => 'button button-primary', + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + ) + ); + $message .= ' '; + $message .= '
'; + $message .= ""; + return $message; + } + + private function getAccountBannedMessage() { + return Helpers::replaceLinkTags( + __('You currently are not permitted to send any emails with MailPoet Sending Service, which may have happened due to poor deliverability. Please [link]contact our support team[/link] to resolve the issue.', 'mailpoet'), + 'https://www.mailpoet.com/support/', + array( + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + ) + ); + } }