From 3f20c1f8c41c3311e136f5cdb7165b2db788b2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 31 Aug 2022 18:16:14 +0300 Subject: [PATCH] `formatForHumans` in cash flow widget --- app/Widgets/CashFlow.php | 13 ++++++++++--- resources/views/widgets/cash_flow.blade.php | 12 +++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/Widgets/CashFlow.php b/app/Widgets/CashFlow.php index d9b1f9d2d..1f882cfce 100644 --- a/app/Widgets/CashFlow.php +++ b/app/Widgets/CashFlow.php @@ -53,10 +53,17 @@ class CashFlow extends Widget ->setDataset(trans('general.outgoing'), 'column', $expense) ->setDataset(trans_choice('general.profits', 1), 'line', $profit); + $incoming_amount = money(array_sum($income), setting('default.currency'), true); + $outgoing_amount = money(abs(array_sum($expense)), setting('default.currency'), true); + $profit_amount = money(array_sum($profit), setting('default.currency'), true); + $totals = [ - 'incoming' => money(array_sum($income), setting('default.currency'), true), - 'outgoing' => money(abs(array_sum($expense)), setting('default.currency'), true), - 'profit' => money(array_sum($profit), setting('default.currency'), true), + 'incoming_exact' => $incoming_amount->format(), + 'incoming_for_humans' => $incoming_amount->formatForHumans(), + 'outgoing_exact' => $outgoing_amount->format(), + 'outgoing_for_humans' => $outgoing_amount->formatForHumans(), + 'profit_exact' => $profit_amount->format(), + 'profit_for_humans' => $profit_amount->formatForHumans(), ]; return $this->view('widgets.cash_flow', [ diff --git a/resources/views/widgets/cash_flow.blade.php b/resources/views/widgets/cash_flow.blade.php index 2c392ec6e..aea334ad5 100644 --- a/resources/views/widgets/cash_flow.blade.php +++ b/resources/views/widgets/cash_flow.blade.php @@ -9,7 +9,9 @@
- {{ $totals['incoming'] }} + + {{ $totals['incoming_for_humans'] }} +
@@ -21,7 +23,9 @@
- {{ $totals['outgoing'] }} + + {{ $totals['outgoing_for_humans'] }} +
@@ -33,7 +37,9 @@
- {{ $totals['profit'] }} + + {{ $totals['profit_for_humans'] }} +
{{ trans_choice('general.profits', 1) }}