Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 18:27:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improving error reporting API

Browse Source
This commit is contained in:
David Bomba 2016-02-17 09:38:23 +11:00
parent 170ee5a40b
commit 1fde9261e6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/InvoiceApiController.php
View File

@ -289,10 +289,10 @@ class InvoiceApiController extends BaseAPIController
return $this->errorResponse(['message'=>'Invoice does not exist.'], 400); return $this->errorResponse(['message'=>'Invoice does not exist.'], 400);
$emailResponse = $this->mailer->sendInvoice($invoice, false, false); $this->mailer->sendInvoice($invoice, false, $invoice->getPDFString());
if($emailResponse === FALSE) { if($error) {
return $this->errorResponse(['message'=>'There was an error sending the invoice'], 400); return $this->errorResponse(['message'=>'There was an error sending the invoice'], 400);
} }
else { else {

2
app/Ninja/Mailers/ContactMailer.php
View File

@ -41,8 +41,6 @@ class ContactMailer extends Mailer
$client = $invoice->client; $client = $invoice->client;
$account = $invoice->account; $account = $invoice->account;
$response = false;
if ($client->trashed()) { if ($client->trashed()) {
return trans('texts.email_errors.inactive_client'); return trans('texts.email_errors.inactive_client');
} elseif ($invoice->trashed()) { } elseif ($invoice->trashed()) {