diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index 99d5b04c8e..8a6ae000eb 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -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')));