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

- Enables error response in newsletter preview if sending fails

Browse Source
This commit is contained in:
Vlad
2016-11-08 21:03:21 -05:00
parent 8a278360f4
commit d1def923f8
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/Endpoints/Mailer.php
View File

@ -20,9 +20,9 @@ class Mailer extends APIEndpoint {
)); ));
} }
if($result === false) { if($result['response'] === false) {
return $this->errorResponse(array( return $this->errorResponse(array(
APIError::BAD_REQUEST => __("The email could not be sent. Please check your settings.", 'mailpoet') APIError::BAD_REQUEST => __('The email could not be sent. Please check your settings.', 'mailpoet')
)); ));
} else { } else {
return $this->successResponse(null); return $this->successResponse(null);

17
lib/API/Endpoints/Newsletters.php
View File

@ -275,10 +275,19 @@ class Newsletters extends APIEndpoint {
$sender = false, $sender = false,
$reply_to = false $reply_to = false
); );
$mailer->send($newsletter, $data['subscriber']); $result = $mailer->send($newsletter, $data['subscriber']);
return $this->successResponse(
Newsletter::findOne($id)->asArray() if($result['response'] === false) {
); $error = sprintf(
__('The email could not be sent: %s', 'mailpoet'),
$result['error']
);
return $this->errorResponse(array(APIError::BAD_REQUEST => $error));
} else {
return $this->successResponse(
Newsletter::findOne($id)->asArray()
);
}
} catch(\Exception $e) { } catch(\Exception $e) {
return $this->errorResponse(array( return $this->errorResponse(array(
$e->getCode() => $e->getMessage() $e->getCode() => $e->getMessage()