hot fix

akaunting · Jun 27, 2021 · 15645ee · 15645ee
1 parent 9c6e776
commit 15645ee
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php
@@ -75,7 +75,7 @@ public function company()
      */
     public function owner()
     {
-        return $this->belongsTo('App\Models\Auth\User', 'id', 'created_by');
+        return $this->belongsTo('App\Models\Auth\User', 'created_by', 'id');
     }
 
     /**

diff --git a/app/Http/ViewComposers/Header.php b/app/Http/ViewComposers/Header.php
@@ -73,6 +73,10 @@ public function compose(View $view)
 
                 if ($new_apps) {
                     foreach ($new_apps as $new_app) {
+                        if (setting('notifications.' . user()->id . '.' . $new_app->alias)) {
+                            continue;
+                        }
+
                         $notifications++;
                     }
                 }

diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php
@@ -20,7 +20,7 @@
             @stack('company_logo_start')
             @if (!$hideCompanyLogo)
                 @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
-                    <img  class="c-logo" src="{{ Storage::url($document->contact->logo->id) }}" height="128" width="128" alt="{{ $document->contact_name }}"/>
+                    <img  class="c-logo" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
                 @else
                     <img  class="c-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                 @endif

diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
@@ -20,7 +20,7 @@
             @stack('company_logo_start')
             @if (!$hideCompanyLogo)
                 @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
-                    <img class="d-logo" src="{{ Storage::url($document->contact->logo->id) }}" height="128" width="128" alt="{{ $document->contact_name }}"/>
+                    <img class="d-logo" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
                 @else
                     <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
                 @endif

diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
@@ -20,7 +20,7 @@
             @stack('company_logo_start')
             @if (!$hideCompanyLogo)
                 @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
-                    <img src="{{ Storage::url($document->contact->logo->id) }}" height="128" width="128" alt="{{ $document->contact_name }}"/>
+                    <img src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
                 @else
                     <img src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                 @endif