shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed logo issue for document and transaction show pages..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-27 18:06:36 +03:00
parent 3ba29262be
commit c1c1bbd083
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Abstracts/View/Components/DocumentShow.php
View File

@ -604,7 +604,9 @@ abstract class DocumentShow extends Base
return $logo; 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)) { if (!empty($media)) {
$path = $media->getDiskPath(); $path = $media->getDiskPath();
@ -1180,7 +1182,7 @@ abstract class DocumentShow extends Base
return trans($translation); return trans($translation);
} }
return false; return setting('invoice.subheading');
} }
protected function getTextTimelineCreateTitle($type, $textTimelineCreateTitle) protected function getTextTimelineCreateTitle($type, $textTimelineCreateTitle)

6
app/Abstracts/View/Components/DocumentTemplate.php
View File

@ -203,7 +203,9 @@ abstract class DocumentTemplate extends Base
return $logo; 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)) { if (!empty($media)) {
$path = $media->getDiskPath(); $path = $media->getDiskPath();
@ -279,7 +281,7 @@ abstract class DocumentTemplate extends Base
return setting($type . '.title'); 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)) { if (!empty($translation)) {
return trans_choice($translation, 1); return trans_choice($translation, 1);

4
app/Abstracts/View/Components/TransactionShow.php
View File

@ -514,7 +514,9 @@ abstract class TransactionShow extends Base
return $logo; 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)) { if (!empty($media)) {
$path = $media->getDiskPath(); $path = $media->getDiskPath();

4
app/Abstracts/View/Components/TransactionTemplate.php
View File

@ -254,7 +254,9 @@ abstract class TransactionTemplate extends Base
return $logo; 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)) { if (!empty($media)) {
$path = $media->getDiskPath(); $path = $media->getDiskPath();