diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php index d1c0de026..9ae9aa7d6 100644 --- a/app/Http/Controllers/Banking/Accounts.php +++ b/app/Http/Controllers/Banking/Accounts.php @@ -42,7 +42,20 @@ class Accounts extends Controller ->orWhereHas('income_transaction', fn ($query) => $query->where('account_id', $account->id)) ->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')); } /** diff --git a/app/Utilities/Overrider.php b/app/Utilities/Overrider.php index 1d8147d1a..12dd16dee 100644 --- a/app/Utilities/Overrider.php +++ b/app/Utilities/Overrider.php @@ -2,6 +2,7 @@ namespace App\Utilities; +use Akaunting\Money\Money; use App\Models\Setting\Currency; class Overrider @@ -58,6 +59,9 @@ class Overrider app()->setLocale($locale); } + // Set locale for Money package + Money::setLocale(app()->getLocale()); + // Set app url dynamically if empty if (! config('app.url')) { config(['app.url' => url('/')]); diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php index 10418dc77..5bfa87706 100644 --- a/resources/views/banking/accounts/show.blade.php +++ b/resources/views/banking/accounts/show.blade.php @@ -116,15 +116,15 @@ @stack('summary_incoming_start') - + @stack('summary_incoming_end') @stack('summary_outgoing_start') - + @stack('summary_outgoing_end') @stack('summary_current_start') - + @stack('summary_current_end')