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

Fixes for design preview (#3461)

Browse Source
This commit is contained in:
David Bomba 2020-03-09 22:12:45 +11:00 committed by GitHub
parent 9d3c6cb0ef
commit 0366d470e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,12 @@ class PreviewController extends BaseController
request()->has('body'))
{
$invoice_design = new Custom(json_encode(request()->input('body')));
$design_object = json_decode(json_encode(request()->all()));
if(!is_object($design_object))
return response()->json(['message' => 'Invalid custom design object'], 400);
$invoice_design = new Custom($design_object->design->design);
$entity = ucfirst(request()->input('entity'));
@ -148,13 +153,12 @@ class PreviewController extends BaseController
$invoice->setRelation('company', auth()->user()->company());
$invoice->load('client');
$design_object = json_encode(request()->all());
$design_object = json_decode(json_encode(request()->all()));
if(!is_object($design_object))
return response()->json(['message' => 'Invalid custom design object'], 400);
$invoice_design = new Custom($design_object);
$invoice_design = new Custom($design_object->design->design);
$designer = new Designer($invoice, $invoice_design, $invoice->client->getSetting('pdf_variables'), lcfirst(request()->has('entity')));