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

Merge branch 'localhost-img-issue' into 'master'

Browse Source 
fix localhost img display issue

See merge request mohit.panjvani/crater-web!638
This commit is contained in:
Mohit Panjwani
2020-12-08 12:15:57 +00:00
parent 729db694a3 419104a4ec
commit 265c219fdc
4 changed files with 32 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) { $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
$logo = $logo->getPath();
} else if($logo) {
$logo = $logo->getFullUrl(); $logo = $logo->getFullUrl();
} }

13
app/Models/FileDisk.php
View File

@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
class FileDisk extends Model class FileDisk extends Model
{ {
CONST DISK_TYPE_SYSTEM = 'SYSTEM';
CONST DISK_TYPE_REMOTE = 'REMOTE';
use HasFactory; use HasFactory;
protected $guarded = [ protected $guarded = [
@ -184,4 +187,14 @@ class FileDisk extends Model
return $this; return $this;
} }
public function isSystem()
{
return $this->type === self::DISK_TYPE_SYSTEM;
}
public function isRemote()
{
return $this->type === self::DISK_TYPE_REMOTE;
}
} }

8
app/Models/Invoice.php
View File

@ -514,7 +514,12 @@ class Invoice extends Model implements HasMedia
$logo = $company->getMedia('logo')->first(); $logo = $company->getMedia('logo')->first();
if ($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(); $logo = $logo->getFullUrl();
} }
@ -528,7 +533,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) { $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ;
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
$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(),