shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hot fix

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-27 23:42:55 +03:00
parent 9c6e776a0b
commit 15645ee7a4
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Model.php
View File

@ -75,7 +75,7 @@ abstract class Model extends Eloquent implements Ownable
*/ */
public function owner() public function owner()
{ {
return $this->belongsTo('App\Models\Auth\User', 'id', 'created_by'); return $this->belongsTo('App\Models\Auth\User', 'created_by', 'id');
} }
/** /**

4
app/Http/ViewComposers/Header.php
View File

@ -73,6 +73,10 @@ class Header
if ($new_apps) { if ($new_apps) {
foreach ($new_apps as $new_app) { foreach ($new_apps as $new_app) {
if (setting('notifications.' . user()->id . '.' . $new_app->alias)) {
continue;
}
$notifications++; $notifications++;
} }
} }

2
resources/views/components/documents/template/classic.blade.php
View File

@ -20,7 +20,7 @@
@stack('company_logo_start') @stack('company_logo_start')
@if (!$hideCompanyLogo) @if (!$hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) @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 @else
<img class="c-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}" /> <img class="c-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
@endif @endif

2
resources/views/components/documents/template/default.blade.php
View File

@ -20,7 +20,7 @@
@stack('company_logo_start') @stack('company_logo_start')
@if (!$hideCompanyLogo) @if (!$hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) @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 @else
<img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/> <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
@endif @endif

2
resources/views/components/documents/template/modern.blade.php
View File

@ -20,7 +20,7 @@
@stack('company_logo_start') @stack('company_logo_start')
@if (!$hideCompanyLogo) @if (!$hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) @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 @else
<img src="{{ $logo }}" alt="{{ setting('company.name') }}" /> <img src="{{ $logo }}" alt="{{ setting('company.name') }}" />
@endif @endif