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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-06-04 22:22:33 +03:00
parent fe5329d6cd 5ccec6e80a
commit ba05b171bf
104 changed files with 1795 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/auth/users/index.blade.php
View File

@@ -54,11 +54,11 @@
<td class="col-xs-4 col-sm-3 col-md-2 col-lg-3">
<a class="col-aka" href="{{ route('users.edit', $item->id) }}">
@if (setting('default.use_gravatar', '0') == '1')
<img src="{{ $item->picture }}" alt="{{ $item->name }}" title="{{ $item->name }}">
<img src="{{ $item->picture }}" alt="{{ $item->name }}" class="rounded-circle user-img p-1 mr-3 hidden-md" title="{{ $item->name }}">
@elseif ($item->picture)
<img src="{{ Storage::url($item->picture->id) }}" class="rounded-circle user-img p-1 mr-3 hidden-md" alt="{{ $item->name }}" title="{{ $item->name }}">
@else
@if ($item->picture)
<img src="{{ Storage::url($item->picture->id) }}" alt="{{ $item->name }}" title="{{ $item->name }}">
@endif
<img src="{{ asset('public/img/user.svg') }}" class="user-img p-1 mr-3 hidden-md" alt="{{ $item->name }}"/>
@endif
{{ $item->name }}
</a>

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

@@ -211,7 +211,11 @@
<li class="nav-item dropdown">
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<div class="media align-items-center">
<img src="{{ asset('public/img/user.svg') }}" height="36" width="36" alt="User"/>
@if ($user->picture)
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
@else
<img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
@endif
<div class="media-body ml-2 d-none d-lg-block">
<span class="mb-0 text-sm font-weight-bold">
@if (!empty($user->name))

10
resources/views/purchases/payments/index.blade.php
View File

@@ -92,15 +92,17 @@
<a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endif
@if (empty($item->document_id))
@permission('create-purchases-payments')
<a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@endif
@if (!$item->reconciled)
@permission('delete-purchases-payments')
@if (!$item->reconciled)
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'payments.destroy') !!}
@endif
{!! Form::deleteLink($item, 'payments.destroy') !!}
@endpermission
@endif
</div>
</div>
</td>

10
resources/views/sales/revenues/index.blade.php
View File

@@ -92,15 +92,17 @@
<a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endif
@if (empty($item->document_id))
@permission('create-sales-revenues')
<a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@endif
@if (!$item->reconciled)
@permission('delete-sales-revenues')
@if (!$item->reconciled)
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'revenues.destroy') !!}
@endif
{!! Form::deleteLink($item, 'revenues.destroy') !!}
@endpermission
@endif
</div>
</div>
</td>