From e7a1f8ef74d142fb1756a1be31763d1384a69a15 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 25 Oct 2023 10:47:54 +1100 Subject: [PATCH] Fixes for default terms/footers etc --- app/Http/Controllers/PreviewController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index 4d4afc0fa68c..6c2d217fbe4d 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -100,9 +100,9 @@ class PreviewController extends BaseController /** Update necessary objecty props */ if(!$entity_obj->id) { $entity_obj->design_id = intval($this->decodePrimaryKey($settings->{$entity_prop."_design_id"})); - $entity_obj->footer = $settings->{$entity_prop."_footer"}; - $entity_obj->terms = $settings->{$entity_prop."_terms"}; - $entity_obj->public_notes = $request->getClient()->public_notes; + $entity_obj->footer = empty($entity_obj->footer) ? $settings->{$entity_prop."_footer"} : $entity_obj->footer; + $entity_obj->terms = empty($entity_obj->term) ? $settings->{$entity_prop."_terms"} : $entity_obj->terms; + $entity_obj->public_notes = empty($entity_obj->public_notes) ? $request->getClient()->public_notes : $entity_obj->public_notes; $invitation->{$request->entity} = $entity_obj; }