diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php index c5528a35..80d2c709 100644 --- a/app/Models/Estimate.php +++ b/app/Models/Estimate.php @@ -430,7 +430,12 @@ class Estimate extends Model implements HasMedia $company = Company::find($this->company_id); $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(); } diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 668c2ac8..de997e16 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -514,7 +514,11 @@ class Invoice extends Model implements HasMedia $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(); } @@ -528,7 +532,6 @@ class Invoice extends Model implements HasMedia 'labels' => $labels, 'taxes' => $taxes ]); - return PDF::loadView('app.pdf.invoice.' . $invoiceTemplate->view); } diff --git a/app/Models/Payment.php b/app/Models/Payment.php index c9ff59a1..eaf8aab3 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -375,10 +375,16 @@ class Payment extends Model implements HasMedia $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(); } + view()->share([ 'payment' => $this, 'company_address' => $this->getCompanyAddress(),