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

Merge pull request #910 from batuhawk/master

Browse Source 
Invoice logo updated to company logo
This commit is contained in:
Batuhan Baş 2019-11-17 17:02:24 +03:00 committed by GitHub
commit 98a7bc366e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/incomes/invoices/show.blade.php
View File

@ -185,10 +185,8 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if (setting('invoice.logo')) @if (setting('company.logo'))
<img src="{{ Storage::url(setting('invoice.logo')) }}" class="invoice-logo" /> <img src="{{ Storage::url(setting('company.logo')) }}"/>
@elseif (setting('company.logo'))
<img src="{{ Storage::url(setting('company.logo')) }}" class="invoice-logo" />
@else @else
<span class="avatar avatar-size rounded-circle bg-default"> <span class="avatar avatar-size rounded-circle bg-default">
<i class="fas fa-building"></i> <i class="fas fa-building"></i>

2
resources/views/portal/invoices/invoice.blade.php
View File

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
@if ($logo) @if ($logo)
<img src="{{ $logo }}" class="invoice-logo" /> <img src="{{ $logo }}"/>
@endif @endif
</div> </div>
<div class="col-md-5 invoice-company"> <div class="col-md-5 invoice-company">

6
resources/views/portal/invoices/show.blade.php
View File

@ -20,10 +20,8 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if (setting('invoice.logo')) @if (setting('company.logo'))
<img src="{{ Storage::url(setting('invoice.logo')) }}" class="invoice-logo" /> <img src="{{ Storage::url(setting('company.logo')) }}"/>
@elseif (setting('company.logo'))
<img src="{{ Storage::url(setting('company.logo')) }}" class="invoice-logo" />
@else @else
<span class="avatar avatar-size rounded-circle bg-primary"> <span class="avatar avatar-size rounded-circle bg-primary">
<i class="fas fa-building"></i> <i class="fas fa-building"></i>

6
resources/views/portal/invoices/signed.blade.php
View File

@ -20,10 +20,8 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if (setting('invoice.logo')) @if (setting('company.logo'))
<img src="{{ Storage::url(setting('invoice.logo')) }}" class="invoice-logo" /> <img src="{{ Storage::url(setting('company.logo')) }}" />
@elseif (setting('company.logo'))
<img src="{{ Storage::url(setting('company.logo')) }}" class="invoice-logo" />
@else @else
<span class="avatar avatar-size rounded-circle bg-primary"> <span class="avatar avatar-size rounded-circle bg-primary">
<i class="fas fa-building"></i> <i class="fas fa-building"></i>

2
resources/views/settings/invoice/edit.blade.php
View File

@ -39,8 +39,6 @@
{{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
{{ Form::textareaGroup('footer', trans('general.footer')) }} {{ Form::textareaGroup('footer', trans('general.footer')) }}
{{ Form::fileGroup('logo', trans('settings.invoice.logo')) }}
</div> </div>
</div> </div>