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

Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean

Browse Source
This commit is contained in:
Burak Civan
2022-08-05 14:48:35 +03:00
parent bfd1f11fb9 7a07a7512a
commit d452dc097a
56 changed files with 1184 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/banking/accounts/show.blade.php
View File

@@ -116,15 +116,27 @@
<x-show.summary.right>
@stack('summary_incoming_start')
<x-slot name="first" amount="{{ $summary_amounts['incoming_for_humans'] }}" title="{{ trans('accounts.incoming') }}" tooltip="{{ $summary_amounts['incoming_exact'] }}"></x-slot>
<x-slot name="first"
amount="{{ $summary_amounts['incoming_for_humans'] }}"
title="{{ trans('accounts.incoming') }}"
tooltip="{{ $summary_amounts['incoming_exact'] }}"
></x-slot>
@stack('summary_incoming_end')
@stack('summary_outgoing_start')
<x-slot name="second" amount="{{ $summary_amounts['outgoing_for_humans'] }}" title="{{ trans('accounts.outgoing') }}" tooltip="{{ $summary_amounts['outgoing_exact'] }}"></x-slot>
<x-slot name="second"
amount="{{ $summary_amounts['outgoing_for_humans'] }}"
title="{{ trans('accounts.outgoing') }}"
tooltip="{{ $summary_amounts['outgoing_exact'] }}"
></x-slot>
@stack('summary_outgoing_end')
@stack('summary_current_start')
<x-slot name="third" amount="{{ $summary_amounts['current_for_humans'] }}" title="{{ trans('accounts.current_balance') }}" tooltip="{{ $summary_amounts['current_exact'] }}"></x-slot>
<x-slot name="third"
amount="{{ $summary_amounts['current_for_humans'] }}"
title="{{ trans('accounts.current_balance') }}"
tooltip="{{ $summary_amounts['current_exact'] }}"
></x-slot>
@stack('summary_current_end')
</x-show.summary.right>
</x-show.summary>

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

@@ -20,14 +20,16 @@
<x-index.summary>
<x-slot name="first"
href="{{ route('reconciliations.index', ['search' => 'reconciled:1']) }}"
amount="{{ money($reconciliations->where('reconciled', 1)->sum('closing_balance'), setting('default.currency'), true) }}"
amount="{{ $summary_amounts['amount_for_humans'] }}"
title="{{ trans('reconciliations.reconciled_amount') }}"
tooltip="{{ $summary_amounts['amount_exact'] }}"
></x-slot>
<x-slot name="second"
href="{{ route('reconciliations.index', ['search' => 'reconciled:0']) }}"
amount="{{ money($reconciliations->where('reconciled', 0)->sum('closing_balance'), setting('default.currency'), true) }}"
amount="{{ $summary_amounts['in_progress_for_humans'] }}"
title="{{ trans('reconciliations.in_progress') }}"
tooltip="{{ $summary_amounts['in_progress_exact'] }}"
></x-slot>
</x-index.summary>

9
resources/views/banking/transactions/index.blade.php
View File

@@ -44,21 +44,24 @@
<x-index.summary>
<x-slot name="first"
href="{{ route('transactions.index', ['search' => 'type:income']) }}"
amount="{{ money($totals['income'], setting('default.currency'), true) }}"
amount="{{ $summary_amounts['incoming_for_humans'] }}"
title="{{ trans_choice('general.incomes', 1) }}"
tooltip="{{ $summary_amounts['incoming_exact'] }}"
divider="remove"
></x-slot>
<x-slot name="second"
href="{{ route('transactions.index', ['search' => 'type:expense']) }}"
amount="{{ money($totals['expense'], setting('default.currency'), true) }}"
amount="{{ $summary_amounts['expense_for_humans'] }}"
title="{{ trans_choice('general.expenses', 2) }}"
tooltip="{{ $summary_amounts['expense_exact'] }}"
divider="drag_handle"
></x-slot>
<x-slot name="third"
amount="{{ money($totals['profit'], setting('default.currency'), true) }}"
amount="{{ $summary_amounts['profit_for_humans'] }}"
title="{{ trans_choice('general.profits', 1) }}"
tooltip="{{ $summary_amounts['profit_exact'] }}"
class="cursor-default"
></x-slot>
</x-index.summary>