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

fix localhost img display issue

Browse Source
This commit is contained in:
raishvaria
2020-12-08 11:39:47 +05:30
parent 599e6270e8
commit 1b74a3720e
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Estimate.php
View File

@ -430,7 +430,12 @@ class Estimate extends Model implements HasMedia
$company = Company::find($this->company_id); $company = Company::find($this->company_id);
$logo = $company->getMedia('logo')->first(); $logo = $company->getMedia('logo')->first();
if ($logo) { $isLocal = $logo->disk == 'local' || $logo->disk == 'public';
$isLocalhost = env('SESSION_DOMAIN') === 'localhost';
if ($logo && $isLocalhost && $isLocal) {
$logo = $logo->getPath();
} else if($logo) {
$logo = $logo->getFullUrl(); $logo = $logo->getFullUrl();
} }

7
app/Models/Invoice.php
View File

@ -514,7 +514,11 @@ class Invoice extends Model implements HasMedia
$logo = $company->getMedia('logo')->first(); $logo = $company->getMedia('logo')->first();
if ($logo) { $isLocal = $logo->disk == 'local' || $logo->disk == 'public';
if ($logo && env('SESSION_DOMAIN') === 'localhost' && $isLocal) {
$logo = $logo->getPath();
} else if($logo) {
$logo = $logo->getFullUrl(); $logo = $logo->getFullUrl();
} }
@ -528,7 +532,6 @@ class Invoice extends Model implements HasMedia
'labels' => $labels, 'labels' => $labels,
'taxes' => $taxes 'taxes' => $taxes
]); ]);
return PDF::loadView('app.pdf.invoice.' . $invoiceTemplate->view); return PDF::loadView('app.pdf.invoice.' . $invoiceTemplate->view);
} }

8
app/Models/Payment.php
View File

@ -375,10 +375,16 @@ class Payment extends Model implements HasMedia
$logo = $company->getMedia('logo')->first(); $logo = $company->getMedia('logo')->first();
if ($logo) { $isLocal = $logo->disk == 'local' || $logo->disk == 'public';
$isLocalhost = env('SESSION_DOMAIN') === 'localhost';
if ($logo && $isLocalhost && $isLocal) {
$logo = $logo->getPath();
} else if($logo) {
$logo = $logo->getFullUrl(); $logo = $logo->getFullUrl();
} }
view()->share([ view()->share([
'payment' => $this, 'payment' => $this,
'company_address' => $this->getCompanyAddress(), 'company_address' => $this->getCompanyAddress(),