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

Improve error when downloading deleted invoice

Browse Source
This commit is contained in:
Hillel Coren 2017-07-24 16:53:35 +03:00
parent f573e09349
commit 9e437e8a12
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,6 +584,10 @@ class ClientPortalController extends BaseController
private function returnError($error = false) private function returnError($error = false)
{ {
if (request()->phantomjs) {
abort(404);
}
return response()->view('error', [ return response()->view('error', [
'error' => $error ?: trans('texts.invoice_not_found'), 'error' => $error ?: trans('texts.invoice_not_found'),
'hideHeader' => true, 'hideHeader' => true,

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

@ -423,7 +423,12 @@ class InvoiceApiController extends BaseAPIController
public function download(InvoiceRequest $request) public function download(InvoiceRequest $request)
{ {
$invoice = $request->entity(); $invoice = $request->entity();
$pdfString = $invoice->getPDFString();
return $this->fileReponse($invoice->getFileName(), $invoice->getPDFString()); if ($pdfString) {
return $this->fileReponse($invoice->getFileName(), $pdfString);
} else {
abort(404);
}
} }
} }