summary amount format change for Humans..

This commit is contained in:
Cüneyt Şentürk
2022-08-05 09:56:18 +03:00
parent 8d7a8b2897
commit 58a03d0498
11 changed files with 92 additions and 24 deletions

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>

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>

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>

View File

@@ -30,19 +30,31 @@
<x-show.summary.right>
@stack('summary_overdue_start')
@if (! $hideOverdue)
<x-slot name="first" amount="{{ money($totals['overdue'], setting('default.currency'), true) }}" title="{{ trans('general.overdue') }}"></x-slot>
<x-slot name="first"
amount="{{ $summary_amounts['overdue_for_humans'] }}"
title="{{ trans('general.overdue') }}"
tooltip="{{ $summary_amounts['overdue_exact'] }}"
></x-slot>
@endif
@stack('summary_overdue_end')
@stack('summary_open_start')
@if (! $hideOpen)
<x-slot name="second" amount="{{ money($totals['open'], setting('default.currency'), true) }}" title="{{ trans('general.open') }}"></x-slot>
<x-slot name="second"
amount="{{ $summary_amounts['open_for_humans'] }}"
title="{{ trans('general.open') }}"
tooltip="{{ $summary_amounts['open_exact'] }}"
></x-slot>
@endif
@stack('summary_open_end')
@stack('summary_paid_start')
@if (! $hidePaid)
<x-slot name="third" amount="{{ money($totals['paid'], setting('default.currency'), true) }}" title="{{ trans('general.paid') }}"></x-slot>
<x-slot name="third"
amount="{{ $summary_amounts['paid_for_humans'] }}"
title="{{ trans('general.paid') }}"
tooltip="{{ $summary_amounts['paid_exact'] }}"
></x-slot>
@endif
@stack('summary_paid_end')
</x-show.summary.right>

View File

@@ -5,7 +5,7 @@
@foreach ($items as $item)
<div @class(['w-1/2 sm:w-1/3 text-center'])>
@if (! empty($item['tooltip']))
<x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
<x-tooltip id="tooltip-summary-{{ $loop->index }}" placement="top" message="{!! $item['tooltip'] !!}">
<a href="{{ $item['href'] }}" class="group">
@php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>

View File

@@ -5,7 +5,7 @@
@foreach ($items as $item)
<div @class(['w-1/2 sm:w-1/3 text-center'])>
@if (! empty($item['tooltip']))
<x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
<x-tooltip id="tooltip-summary-{{ $loop->index }}" placement="top" message="{!! $item['tooltip'] !!}">
<a href="{{ $item['href'] }}" class="group">
@php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>