TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-29 12:41:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'logo-issue' into 'master'

Browse Source 
fix logo display issue

See merge request mohit.panjvani/crater-web!664
This commit is contained in:
Mohit Panjwani
2021-01-15 10:16:28 +00:00
parent 8eeafd3fed 9c5e9e56f5
commit c4db50d3f0
4 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Company.php
View File

@ -22,10 +22,17 @@ class Company extends Model implements HasMedia
public function getLogoAttribute() public function getLogoAttribute()
{ {
$logo = $this->getMedia('logo')->first(); $logo = $this->getMedia('logo')->first();
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
if ($logo) { if ($logo) {
return asset($logo->getUrl()); if ($isSystem) {
return $logo->getPath();
} else {
return $logo->getFullUrl();
}
} }
return ; return null;
} }
public function user() public function user()

11
app/Models/Estimate.php
View File

@ -428,16 +428,7 @@ class Estimate extends Model implements HasMedia
$estimateTemplate = EstimateTemplate::find($this->estimate_template_id); $estimateTemplate = EstimateTemplate::find($this->estimate_template_id);
$company = Company::find($this->company_id); $company = Company::find($this->company_id);
$logo = $company->getMedia('logo')->first(); $logo = $company->logo;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
$logo = $logo->getPath();
} else if ($logo) {
$logo = $logo->getFullUrl();
}
view()->share([ view()->share([
'estimate' => $this, 'estimate' => $this,

11
app/Models/Invoice.php
View File

@ -512,16 +512,7 @@ class Invoice extends Model implements HasMedia
$company = Company::find($this->company_id); $company = Company::find($this->company_id);
$logo = $company->getMedia('logo')->first(); $logo = $company->logo;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
$logo = $logo->getPath();
} else if ($logo) {
$logo = $logo->getFullUrl();
}
view()->share([ view()->share([
'invoice' => $this, 'invoice' => $this,

11
app/Models/Payment.php
View File

@ -373,16 +373,7 @@ class Payment extends Model implements HasMedia
{ {
$company = Company::find($this->company_id); $company = Company::find($this->company_id);
$logo = $company->getMedia('logo')->first(); $logo = $company->logo;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
$logo = $logo->getPath();
} else if($logo) {
$logo = $logo->getFullUrl();
}
view()->share([ view()->share([
'payment' => $this, 'payment' => $this,