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
2021-08-18 19:01:19 +03:00
parent de3665b221 05d2599626
commit ac97b08b44
6 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/components/transactions/show/top-buttons.blade.php
View File

@ -8,6 +8,7 @@
<div class="dropdown-menu" role="menu">
@stack('button_dropdown_start')
@stack('edit_button_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonEdit)
@can($permissionUpdate)
<a class="dropdown-item" href="{{ route($routeButtonEdit, $transaction->id) }}">
@ -15,9 +16,11 @@
</a>
@endcan
@endif
@endif
@stack('edit_button_end')
@stack('duplicate_button_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonDuplicate)
@can($permissionCreate)
<a class="dropdown-item" href="{{ route($routeButtonDuplicate, $transaction->id) }}">
@ -25,12 +28,15 @@
</a>
@endcan
@endif
@endif
@stack('duplicate_button_end')
@stack('button_dropdown_divider_1_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonGroupDivider1)
<div class="dropdown-divider"></div>
@endif
@endif
@stack('button_dropdown_divider_1_end')
@if (!$hideButtonPrint)
@ -42,14 +48,17 @@
@endif
@stack('share_button_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonShare)
<a class="dropdown-item" href="{{ $signedUrl }}" target="_blank">
{{ trans('general.share') }}
</a>
@endif
@endif
@stack('share_button_end')
@stack('edit_button_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonEmail)
@if($transaction->contact->email)
<a class="dropdown-item" href="{{ route($routeButtonEmail, $transaction->id) }}">
@ -63,6 +72,7 @@
</el-tooltip>
@endif
@endif
@endif
@stack('edit_button_end')
@stack('button_pdf_start')
@ -74,12 +84,15 @@
@stack('button_pdf_end')
@stack('button_dropdown_divider_3_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonGroupDivider3)
<div class="dropdown-divider"></div>
@endif
@endif
@stack('button_dropdown_divider_3_end')
@stack('delete_button_start')
@if (!$transaction->hasTransferRelation)
@if (!$hideButtonDelete)
@can($permissionDelete)
@if ($checkButtonReconciled)
@ -91,6 +104,7 @@
@endif
@endcan
@endif
@endif
@stack('delete_button_end')
@stack('button_dropdown_end')
</div>

2
resources/views/components/transfers/show/content.blade.php
View File

@ -8,6 +8,8 @@
hide-header-to-account="{{ $hideHeaderToAccount }}"
text-header-to-account="{{ $textHeaderToAccount }}"
class-header-to-account="{{ $classHeaderToAccount }}"
route-from-account-show="{{ $routeFromAccountShow }}"
route-to-account-show="{{ $routeToAccountShow }}"
hide-header-amount="{{ $hideHeaderAmount }}"
text-header-amount="{{ $textHeaderAmount }}"
class-header-amount="{{ $classHeaderAmount }}"

8
resources/views/components/transfers/show/header.blade.php
View File

@ -7,7 +7,9 @@
<strong>
<span class="float-left long-texts mwpx-200 transaction-head-text">
{{ $transfer->expense_transaction->account->name }}
<a href="{{ route($routeFromAccountShow, $transfer->expense_transaction->account->id) }}">
{{ $transfer->expense_transaction->account->name }}
</a>
</span>
</strong>
<br><br>
@ -23,7 +25,9 @@
<strong>
<span class="float-left long-texts mwpx-300 transaction-head-text">
{{ $transfer->income_transaction->account->name }}
<a href="{{ route($routeToAccountShow, $transfer->income_transaction->account->id) }}">
{{ $transfer->income_transaction->account->name }}
</a>
</span>
</strong>
<br><br>