Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #3885 from turbo124/v2

Browse Source 
Fixes for Invoice PDF Preview
This commit is contained in:
David Bomba 2020-07-05 21:40:49 +10:00 committed by GitHub
commit 8912ae2719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/PreviewController.php
View File

@ -18,6 +18,7 @@ use App\Jobs\Invoice\CreateInvoicePdf;
use App\Jobs\Util\PreviewPdf; use App\Jobs\Util\PreviewPdf;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesInvoiceHtml; use App\Utils\Traits\MakesInvoiceHtml;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@ -127,6 +128,8 @@ class PreviewController extends BaseController
private function blankEntity() private function blankEntity()
{ {
DB::beginTransaction();
$client = factory(\App\Models\Client::class)->create([ $client = factory(\App\Models\Client::class)->create([
'user_id' => auth()->user()->id, 'user_id' => auth()->user()->id,
'company_id' => auth()->user()->company()->id, 'company_id' => auth()->user()->company()->id,
@ -156,15 +159,13 @@ class PreviewController extends BaseController
return response()->json(['message' => 'Invalid custom design object'], 400); return response()->json(['message' => 'Invalid custom design object'], 400);
} }
$designer = new Designer($invoice, $design_object, auth()->user()->company()->settings->pdf_variables, lcfirst(request()->has('entity'))); $designer = new Designer($invoice, $design_object, auth()->user()->company()->settings->pdf_variables, lcfirst(request()->input('entity')));
$html = $this->generateEntityHtml($designer, $invoice, $contact); $html = $this->generateEntityHtml($designer, $invoice, $contact);
$file_path = PreviewPdf::dispatchNow($html, auth()->user()->company()); $file_path = PreviewPdf::dispatchNow($html, auth()->user()->company());
$invoice->forceDelete(); DB::rollBack();
$contact->forceDelete();
$client->forceDelete();
$response = Response::make($file_path, 200); $response = Response::make($file_path, 200);
$response->header('Content-Type', 'application/pdf'); $response->header('Content-Type', 'application/pdf');