From 7b95ccb5fc72eb696d9f16f1c90ab1aef9a8fc53 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Fri, 22 Jan 2021 19:00:37 +0530
Subject: [PATCH] fix company logo issue

---
 app/Models/Company.php  | 19 ++++++++++++++++---
 app/Models/Estimate.php |  2 +-
 app/Models/Invoice.php  |  2 +-
 app/Models/Payment.php  | 10 +++++-----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/Models/Company.php b/app/Models/Company.php
index 71e4c631..3f9482fb 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Models;
 
 use Crater\Models\Address;
@@ -17,9 +18,9 @@ class Company extends Model implements HasMedia
 
     protected $fillable = ['name', 'logo', 'unique_hash'];
 
-    protected $appends=['logo'];
+    protected $appends = ['logo', 'logo_path'];
 
-    public function getLogoAttribute()
+    public function getLogoPathAttribute()
     {
         $logo = $this->getMedia('logo')->first();
 
@@ -28,10 +29,22 @@ class Company extends Model implements HasMedia
         if ($logo) {
             if ($isSystem) {
                 return $logo->getPath();
-            } else  {
+            } else {
                 return $logo->getFullUrl();
             }
         }
+
+        return null;
+    }
+
+    public function getLogoAttribute()
+    {
+        $logo = $this->getMedia('logo')->first();
+
+        if ($logo) {
+            return $logo->getFullUrl();
+        }
+
         return null;
     }
 
diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php
index 447d6eb2..ed1bd8f5 100644
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@@ -426,7 +426,7 @@ class Estimate extends Model implements HasMedia
         $estimateTemplate = EstimateTemplate::find($this->estimate_template_id);
 
         $company = Company::find($this->company_id);
-        $logo = $company->logo;
+        $logo = $company->logo_path;
 
         view()->share([
             'estimate' => $this,
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index a2541b74..e213bcd2 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -510,7 +510,7 @@ class Invoice extends Model implements HasMedia
 
         $company = Company::find($this->company_id);
 
-        $logo = $company->logo;
+        $logo = $company->logo_path;
 
         view()->share([
             'invoice' => $this,
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 8b1319dd..1c485663 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -216,10 +216,10 @@ class Payment extends Model implements HasMedia
         }
 
         $payment = Payment::with([
-                'user',
-                'invoice',
-                'paymentMethod',
-            ])
+            'user',
+            'invoice',
+            'paymentMethod',
+        ])
             ->find($this->id);
 
         return $payment;
@@ -373,7 +373,7 @@ class Payment extends Model implements HasMedia
     {
         $company = Company::find($this->company_id);
 
-        $logo = $company->logo;
+        $logo = $company->logo_path;
 
         view()->share([
             'payment' => $this,