Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 11:14:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-10-09 07:42:52 +03:00
parent 1355bd4ecc
commit 478d435cf1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Ninja/Mailers/Mailer.php
View File

@ -9,10 +9,15 @@ class Mailer
{ {
public function sendTo($toEmail, $fromEmail, $fromName, $subject, $view, $data = []) public function sendTo($toEmail, $fromEmail, $fromName, $subject, $view, $data = [])
{ {
// https://github.com/wildbit/laravel-postmark-provider/issues/2
if (isset($data['invoice_id']) && isset($_ENV['POSTMARK_API_TOKEN'])) {
$views = 'emails.'.$view.'_html';
} else {
$views = [ $views = [
'emails.'.$view.'_html', 'emails.'.$view.'_html',
'emails.'.$view.'_text', 'emails.'.$view.'_text',
]; ];
}
try { try {
Mail::send($views, $data, function ($message) use ($toEmail, $fromEmail, $fromName, $subject, $data) { Mail::send($views, $data, function ($message) use ($toEmail, $fromEmail, $fromName, $subject, $data) {
@ -40,7 +45,7 @@ class Mailer
return true; return true;
} catch (Exception $exception) { } catch (Exception $exception) {
Utils::logError('Email Error: ' . $exception->getMessage()); Utils::logError('Email Error: ' . $exception->getMessage());
if (isset($_ENV['POSTMARK_API_TOKEN'])) { if (false && isset($_ENV['POSTMARK_API_TOKEN'])) {
$response = $exception->getResponse()->getBody()->getContents(); $response = $exception->getResponse()->getBody()->getContents();
$response = json_decode($response); $response = json_decode($response);
return nl2br($response->Message); return nl2br($response->Message);