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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
denisdulici
2020-05-03 10:32:57 +03:00
parent aad139d40b 70bfe8c524
commit 2f8506a2eb
59 changed files with 1131 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,10 +87,12 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('users.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@permission('delete-auth-users')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'users.destroy') !!}
@endpermission
@if (user()->id != $item->id)
@permission('delete-auth-users')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'users.destroy') !!}
@endpermission
@endif
</div>
</div>
</td>

4
resources/views/banking/reconciliations/create.blade.php
View File

@ -16,9 +16,9 @@
<div class="card-body">
<div class="row align-items-center">
{{ Form::dateGroup('started_at', trans('reconciliations.start_date'), 'calendar', ['id' => 'started_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('started_at'), 'col-xl-3') }}
{{ Form::dateGroup('started_at', trans('reconciliations.start_date'), 'calendar', ['id' => 'started_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('started_at', Date::now()->firstOfMonth()->toDateString()), 'col-xl-3') }}
{{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at'), 'col-xl-3') }}
{{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }}
{{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], request('closing_balance', 0.00), 'col-xl-2') }}

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

@ -189,10 +189,10 @@
@endpermission
@endif
@if ($module->purchase_faq)
<div class="text-center mt-3">
<a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
</div>
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{{ $module->purchase_desc }}
</div>
@endif
</div>
</div>