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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-02-23 22:07:21 +03:00
committed by GitHub
parent 4f02f14056 05d3706836
commit f5425ecdb2
284 changed files with 19538 additions and 1384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/banking/reconciliations/index.blade.php
View File

@@ -82,7 +82,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'reconciliations', 'docs_path' => 'banking/reconciliations'])
<x-empty-page group="banking" page="reconciliations" />
@endif
@endsection

19
resources/views/banking/transfers/index.blade.php
View File

@@ -43,12 +43,19 @@
<tbody>
@foreach($transfers as $item)
@php
$item->name = trans('transfers.messages.delete', [
'from' => $item->expense_transaction->account->name,
'to' => $item->income_transaction->account->name,
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)
]);
@endphp
<tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->from_account) }}</td>
<td class="col-md-2 d-none d-md-block"><a class="col-aka" href="{{ route('transfers.edit', $item->id) }}">@date($item->paid_at)</a></td>
<td class="col-sm-2 col-md-3 d-none d-sm-block">{{ $item->from_account }}</td>
<td class="col-xs-4 col-sm-4 col-md-2">{{ $item->to_account }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 col-md-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->expense_transaction->account->name) }}</td>
<td class="col-md-2 d-none d-md-block"><a class="col-aka" href="{{ route('transfers.edit', $item->id) }}">@date($item->expense_transaction->paid_at)</a></td>
<td class="col-sm-2 col-md-3 d-none d-sm-block">{{ $item->expense_transaction->account->name }}</td>
<td class="col-xs-4 col-sm-4 col-md-2">{{ $item->income_transaction->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center">
<div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -76,7 +83,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'transfers', 'docs_path' => 'banking/transfers'])
<x-empty-page group="banking" page="transfers" />
@endif
@endsection