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

Merge pull request #956 from batuhawk/master

Browse Source 
Forgotten company and user logo added
This commit is contained in:
Batuhan Baş 2019-11-29 11:10:28 +03:00 committed by GitHub
commit ca6771881d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/img/company.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
public/img/user.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

2
resources/views/expenses/bills/bill.blade.php
View File

@ -12,7 +12,7 @@
<tr> <tr>
<th> <th>
@if ($logo) @if ($logo)
<img src="{{ $logo }}"/> <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
@endif @endif
</th> </th>
</tr> </tr>

4
resources/views/expenses/bills/show.blade.php
View File

@ -166,9 +166,7 @@
@if (isset($bill->contact->logo) && !empty($bill->contact->logo->id)) @if (isset($bill->contact->logo) && !empty($bill->contact->logo->id))
<img src="{{ Storage::url($bill->contact->logo->id) }}"/> <img src="{{ Storage::url($bill->contact->logo->id) }}"/>
@else @else
<span class="avatar avatar-size rounded-circle bg-primary"> <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
<i class="fas fa-building"></i>
</span>
@endif @endif
</th> </th>
</tr> </tr>

18
resources/views/incomes/invoices/invoice.blade.php
View File

@ -12,7 +12,7 @@
<tr> <tr>
<th> <th>
@if ($logo) @if ($logo)
<img src="{{ $logo }}"/> <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
@endif @endif
</th> </th>
</tr> </tr>
@ -263,10 +263,22 @@
</div> </div>
</div> </div>
@if ($invoice->footer)
<div class="row"> <div class="row">
<div class="col-md-12">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<tr>
<th>
@if ($invoice->footer)
{!! $invoice->footer !!} {!! $invoice->footer !!}
</div>
@endif @endif
</th>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div> </div>
@endsection @endsection

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

@ -188,9 +188,7 @@
@if (setting('company.logo')) @if (setting('company.logo'))
<img src="{{ Storage::url(setting('company.logo')) }}"/> <img src="{{ Storage::url(setting('company.logo')) }}"/>
@else @else
<span class="avatar avatar-size rounded-circle bg-default"> <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
<i class="fas fa-building"></i>
</span>
@endif @endif
</th> </th>
</tr> </tr>

2
resources/views/layouts/auth.blade.php
View File

@ -12,7 +12,7 @@
<div class="header-body text-center mb-5"> <div class="header-body text-center mb-5">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-xl-5 col-lg-6 col-md-8"> <div class="col-xl-5 col-lg-6 col-md-8">
<img class="login-logo pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting" /> <img class="login-logo pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting"/>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/modules/item/pre_sale.blade.php
View File

@ -107,7 +107,7 @@
@else @else
{!! $module->price_prefix !!} {!! $module->price_prefix !!}
@if (isset($module->special_price)) @if (isset($module->special_price))
<del>{{ $module->price }}</del> <del class="text-danger">{{ $module->price }}</del>
{{ $module->special_price }} {{ $module->special_price }}
@else @else
{{ $module->price }} {{ $module->price }}

2
resources/views/modules/item/show.blade.php
View File

@ -182,7 +182,7 @@
{!! $module->price_prefix !!} {!! $module->price_prefix !!}
@if (isset($module->special_price)) @if (isset($module->special_price))
<del>{{ $module->price }}</del> <del class="text-danger">{{ $module->price }}</del>
{{ $module->special_price }} {{ $module->special_price }}
@else @else
{{ $module->price }} {{ $module->price }}

4
resources/views/partials/admin/navbar.blade.php
View File

@ -199,9 +199,7 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<div class="media align-items-center"> <div class="media align-items-center">
<span class="avatar avatar-sm rounded-circle bg-default font-size-1"> <img src="{{ asset('public/img/user.png') }}" height="36" width="36" alt="User"/>
<i class="fas fa-user-alt"></i>
</span>
<div class="media-body ml-2 d-none d-lg-block"> <div class="media-body ml-2 d-none d-lg-block">
<span class="mb-0 text-sm font-weight-bold"> <span class="mb-0 text-sm font-weight-bold">
@if (!empty($user->name)) @if (!empty($user->name))

2
resources/views/partials/modules/item.blade.php
View File

@ -46,7 +46,7 @@
@else @else
{!! $module->price_prefix !!} {!! $module->price_prefix !!}
@if (isset($module->special_price)) @if (isset($module->special_price))
<del>{{ $module->price }}</del> <del class="text-danger">{{ $module->price }}</del>
{{ $module->special_price }} {{ $module->special_price }}
@else @else
{{ $module->price }} {{ $module->price }}

2
resources/views/partials/modules/pre_sale.blade.php
View File

@ -30,7 +30,7 @@
@else @else
{!! $module->price_prefix !!} {!! $module->price_prefix !!}
@if (isset($module->special_price)) @if (isset($module->special_price))
<del>{{ $module->price }}</del> <del class="text-danger">{{ $module->price }}</del>
{{ $module->special_price }} {{ $module->special_price }}
@else @else
{{ $module->price }} {{ $module->price }}

4
resources/views/partials/portal/navbar.blade.php
View File

@ -91,9 +91,7 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<div class="media align-items-center"> <div class="media align-items-center">
<span class="avatar avatar-sm rounded-circle bg-default font-size-1"> <img src="{{ asset('public/img/user.png') }}" height="36" width="36" alt="User"/>
<i class="fas fa-user-alt"></i>
</span>
<div class="media-body ml-2 d-none d-lg-block"> <div class="media-body ml-2 d-none d-lg-block">
<span class="mb-0 text-sm font-weight-bold"> <span class="mb-0 text-sm font-weight-bold">
@if (!empty($user->name)) @if (!empty($user->name))

1
resources/views/wizard/companies/edit.blade.php
View File

@ -15,6 +15,7 @@
'class' => 'form-loading-button mb-0', 'class' => 'form-loading-button mb-0',
'novalidate' => true 'novalidate' => true
]) !!} ]) !!}
<div id="wizard-loading"></div>
<div class="card-header wizard-header pb-0"> <div class="card-header wizard-header pb-0">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">