From ccec190985b15baecfc9d3c35e343dddfb7a7674 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 20 Feb 2024 13:59:50 -0800 Subject: [PATCH] Set label title properly --- app/View/Label.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/View/Label.php b/app/View/Label.php index 83184e4b04..fd6b172550 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -90,13 +90,9 @@ class Label implements View $assetData->put('id', $asset->id); $assetData->put('tag', $asset->asset_tag); - if ($template->getSupportTitle()) { - - if ($asset->company && !empty($settings->label2_title)) { - $title = str_replace('{COMPANY}', $asset->company->name, $settings->label2_title); - $settings->qr_text; - $assetData->put('title', $title); - } + if ($template->getSupportTitle() && !empty($settings->label2_title)) { + $title = str_replace('{COMPANY}', data_get($asset, 'company.name'), $settings->label2_title); + $assetData->put('title', $title); } if ($template->getSupportLogo()) { @@ -216,4 +212,4 @@ class Label implements View return self::NAME; } -} \ No newline at end of file +}