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

added amount for humans in account show page

Browse Source
This commit is contained in:
Denis Duliçi 2022-07-19 14:41:43 +03:00
parent 7944b22e72
commit 273f762fe7
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Banking/Accounts.php
View File

@ -42,7 +42,20 @@ class Accounts extends Controller
->orWhereHas('income_transaction', fn ($query) => $query->where('account_id', $account->id)) ->orWhereHas('income_transaction', fn ($query) => $query->where('account_id', $account->id))
->collect(['expense_transaction.paid_at' => 'desc']); ->collect(['expense_transaction.paid_at' => 'desc']);
return view('banking.accounts.show', compact('account', 'transactions', 'transfers')); $incoming_amount = money($account->income_balance, $account->currency_code, true);
$outgoing_amount = money($account->expense_balance, $account->currency_code, true);
$current_amount = money($account->balance, $account->currency_code, true);
$summary_amounts = [
'incoming_exact' => $incoming_amount->format(),
'incoming_for_humans' => $incoming_amount->formatForHumans(),
'outgoing_exact' => $outgoing_amount->format(),
'outgoing_for_humans' => $outgoing_amount->formatForHumans(),
'current_exact' => $current_amount->format(),
'current_for_humans' => $current_amount->formatForHumans(),
];
return view('banking.accounts.show', compact('account', 'transactions', 'transfers', 'summary_amounts'));
} }
/** /**

4
app/Utilities/Overrider.php
View File

@ -2,6 +2,7 @@
namespace App\Utilities; namespace App\Utilities;
use Akaunting\Money\Money;
use App\Models\Setting\Currency; use App\Models\Setting\Currency;
class Overrider class Overrider
@ -58,6 +59,9 @@ class Overrider
app()->setLocale($locale); app()->setLocale($locale);
} }
// Set locale for Money package
Money::setLocale(app()->getLocale());
// Set app url dynamically if empty // Set app url dynamically if empty
if (! config('app.url')) { if (! config('app.url')) {
config(['app.url' => url('/')]); config(['app.url' => url('/')]);

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

@ -116,15 +116,15 @@
<x-show.summary.right> <x-show.summary.right>
@stack('summary_incoming_start') @stack('summary_incoming_start')
<x-slot name="first" amount="{{ money($account->income_balance, $account->currency_code, true) }}" title="{{ trans('accounts.incoming') }}"></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_incoming_end')
@stack('summary_outgoing_start') @stack('summary_outgoing_start')
<x-slot name="second" amount="{{ money($account->expense_balance, $account->currency_code, true) }}" title="{{ trans('accounts.outgoing') }}"></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_outgoing_end')
@stack('summary_current_start') @stack('summary_current_start')
<x-slot name="third" amount="{{ money($account->balance, $account->currency_code, true) }}" title="{{ trans('accounts.current_balance') }}"></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') @stack('summary_current_end')
</x-show.summary.right> </x-show.summary.right>
</x-show.summary> </x-show.summary>