hot fix
This commit is contained in:
parent
9c6e776a0b
commit
15645ee7a4
@ -75,7 +75,7 @@ abstract class Model extends Eloquent implements Ownable
|
||||
*/
|
||||
public function owner()
|
||||
{
|
||||
return $this->belongsTo('App\Models\Auth\User', 'id', 'created_by');
|
||||
return $this->belongsTo('App\Models\Auth\User', 'created_by', 'id');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -73,6 +73,10 @@ class Header
|
||||
|
||||
if ($new_apps) {
|
||||
foreach ($new_apps as $new_app) {
|
||||
if (setting('notifications.' . user()->id . '.' . $new_app->alias)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$notifications++;
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user