diff --git a/app/Abstracts/View/Components/DocumentShow.php b/app/Abstracts/View/Components/DocumentShow.php index e366076ec..904b88bee 100644 --- a/app/Abstracts/View/Components/DocumentShow.php +++ b/app/Abstracts/View/Components/DocumentShow.php @@ -604,7 +604,9 @@ abstract class DocumentShow extends Base return $logo; } - $media = Media::find(setting('company.logo')); + $media_id = (!empty($this->document->contact->logo) && !empty($this->document->contact->logo->id)) ? $this->document->contact->logo->id : setting('company.logo'); + + $media = Media::find($media_id); if (!empty($media)) { $path = $media->getDiskPath(); @@ -1180,7 +1182,7 @@ abstract class DocumentShow extends Base return trans($translation); } - return false; + return setting('invoice.subheading'); } protected function getTextTimelineCreateTitle($type, $textTimelineCreateTitle) diff --git a/app/Abstracts/View/Components/DocumentTemplate.php b/app/Abstracts/View/Components/DocumentTemplate.php index 7a7430755..9b9e6ab18 100644 --- a/app/Abstracts/View/Components/DocumentTemplate.php +++ b/app/Abstracts/View/Components/DocumentTemplate.php @@ -203,7 +203,9 @@ abstract class DocumentTemplate extends Base return $logo; } - $media = Media::find(setting('company.logo')); + $media_id = (!empty($this->document->contact->logo) && !empty($this->document->contact->logo->id)) ? $this->document->contact->logo->id : setting('company.logo'); + + $media = Media::find($media_id); if (!empty($media)) { $path = $media->getDiskPath(); @@ -279,7 +281,7 @@ abstract class DocumentTemplate extends Base return setting($type . '.title'); } - $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type), 'trans_choice'); + $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type)); if (!empty($translation)) { return trans_choice($translation, 1); diff --git a/app/Abstracts/View/Components/TransactionShow.php b/app/Abstracts/View/Components/TransactionShow.php index 9b2403845..aea94d38f 100644 --- a/app/Abstracts/View/Components/TransactionShow.php +++ b/app/Abstracts/View/Components/TransactionShow.php @@ -514,7 +514,9 @@ abstract class TransactionShow extends Base return $logo; } - $media = Media::find(setting('company.logo')); + $media_id = (!empty($this->transaction->contact->logo) && !empty($this->transaction->contact->logo->id)) ? $this->transaction->contact->logo->id : setting('company.logo'); + + $media = Media::find($media_id); if (!empty($media)) { $path = $media->getDiskPath(); diff --git a/app/Abstracts/View/Components/TransactionTemplate.php b/app/Abstracts/View/Components/TransactionTemplate.php index 91f9ba5eb..4ebb74c39 100644 --- a/app/Abstracts/View/Components/TransactionTemplate.php +++ b/app/Abstracts/View/Components/TransactionTemplate.php @@ -254,7 +254,9 @@ abstract class TransactionTemplate extends Base return $logo; } - $media = Media::find(setting('company.logo')); + $media_id = (!empty($this->transaction->contact->logo) && !empty($this->transaction->contact->logo->id)) ? $this->transaction->contact->logo->id : setting('company.logo'); + + $media = Media::find($media_id); if (!empty($media)) { $path = $media->getDiskPath();