From 419104a4ec9bb9dec724b7c31d4e5df23a50f358 Mon Sep 17 00:00:00 2001 From: raishvaria Date: Tue, 8 Dec 2020 15:07:57 +0530 Subject: [PATCH] check system using file disk type --- app/Models/Estimate.php | 4 ++-- app/Models/FileDisk.php | 13 +++++++++++++ app/Models/Invoice.php | 4 ++-- app/Models/Payment.php | 4 ++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php index e2f75c6d..44935587 100644 --- a/app/Models/Estimate.php +++ b/app/Models/Estimate.php @@ -430,10 +430,10 @@ class Estimate extends Model implements HasMedia $company = Company::find($this->company_id); $logo = $company->getMedia('logo')->first(); - $isLocal = $logo->disk == 'local' || $logo->disk == 'public'; + $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem(); $isLocalhost = config('session.domain') === 'localhost'; - if ($logo && $isLocalhost && $isLocal) { + if ($logo && $isLocalhost && $isSystem) { $logo = $logo->getPath(); } else if($logo) { $logo = $logo->getFullUrl(); diff --git a/app/Models/FileDisk.php b/app/Models/FileDisk.php index 6587bf8c..73ce1b6a 100644 --- a/app/Models/FileDisk.php +++ b/app/Models/FileDisk.php @@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class FileDisk extends Model { + CONST DISK_TYPE_SYSTEM = 'SYSTEM'; + CONST DISK_TYPE_REMOTE = 'REMOTE'; + use HasFactory; protected $guarded = [ @@ -184,4 +187,14 @@ class FileDisk extends Model return $this; } + + public function isSystem() + { + return $this->type === self::DISK_TYPE_SYSTEM; + } + + public function isRemote() + { + return $this->type === self::DISK_TYPE_REMOTE; + } } diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 85c0c27a..f85011a8 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -514,10 +514,10 @@ class Invoice extends Model implements HasMedia $logo = $company->getMedia('logo')->first(); - $isLocal = $logo->disk == 'local' || $logo->disk == 'public'; + $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ; $isLocalhost = config('session.domain') === 'localhost'; - if ($logo && $isLocalhost && $isLocal) { + if ($logo && $isLocalhost && $isSystem) { $logo = $logo->getPath(); } else if($logo) { $logo = $logo->getFullUrl(); diff --git a/app/Models/Payment.php b/app/Models/Payment.php index f86a2c24..aeca5109 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -375,10 +375,10 @@ class Payment extends Model implements HasMedia $logo = $company->getMedia('logo')->first(); - $isLocal = $logo->disk == 'local' || $logo->disk == 'public'; + $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ; $isLocalhost = config('session.domain') === 'localhost'; - if ($logo && $isLocalhost && $isLocal) { + if ($logo && $isLocalhost && $isSystem) { $logo = $logo->getPath(); } else if($logo) { $logo = $logo->getFullUrl();