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

Fixes for pdf preview

Browse Source
This commit is contained in:
David Bomba 2020-07-05 20:58:30 +10:00
parent 920bbf8b75
commit 8856e3fada
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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\Response;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
class PreviewController extends BaseController class PreviewController extends BaseController
@ -155,7 +156,7 @@ 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, $invoice->client->getSetting('pdf_variables'), lcfirst(request()->has('entity'))); $designer = new Designer($invoice, $design_object, auth()->user()->company()->settings->pdf_variables, lcfirst(request()->has('entity')));
$html = $this->generateEntityHtml($designer, $invoice, $contact); $html = $this->generateEntityHtml($designer, $invoice, $contact);
@ -165,6 +166,9 @@ class PreviewController extends BaseController
$contact->forceDelete(); $contact->forceDelete();
$client->forceDelete(); $client->forceDelete();
return response()->file($file_path, array('content-type' => 'application/pdf')); $response = Response::make($file_path, 200);
$response->header('Content-Type', 'application/pdf');
return $response;
} }
} }

16
app/Jobs/Util/PreviewPdf.php
View File

@ -33,14 +33,10 @@ use Spatie\Browsershot\Browsershot;
class PreviewPdf implements ShouldQueue class PreviewPdf implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, PdfMaker;
public $invoice;
public $company; public $company;
public $contact;
private $disk; private $disk;
public $design_string; public $design_string;
@ -61,16 +57,8 @@ class PreviewPdf implements ShouldQueue
public function handle() public function handle()
{ {
$path = $this->company->company_key;
//Storage::makeDirectory($path, 0755); return $this->makePdf(null, null, $this->design_string);
$file_path = $path . '/stream.pdf';
$pdf = $this->makePdf(null, null, $this->design_string);
$instance = Storage::disk('local')->put($file_path, $pdf);
return storage_path('app') .'/'. $file_path;
} }
} }