diff --git a/app/Abstracts/View/Components/Contacts/Index.php b/app/Abstracts/View/Components/Contacts/Index.php
index a5e591a02..a29b02a00 100644
--- a/app/Abstracts/View/Components/Contacts/Index.php
+++ b/app/Abstracts/View/Components/Contacts/Index.php
@@ -281,9 +281,10 @@ abstract class Index extends Component
foreach ($totals as $key => $total) {
$items[] = [
- 'title' => ($key == 'overdue') ? trans('general.overdue') : trans('documents.statuses.' . $key),
- 'href' => route($route, ['search' => 'status:' . $key]),
- 'amount' => money($total, setting('default.currency'), true),
+ 'title' => ($key == 'overdue') ? trans('general.overdue') : trans('documents.statuses.' . $key),
+ 'href' => route($route, ['search' => 'status:' . $key]),
+ 'amount' => money($total, setting('default.currency'), true)->formatForHumans(),
+ 'tooltip' => money($total, setting('default.currency'), true)->format(),
];
}
diff --git a/app/Abstracts/View/Components/Documents/Index.php b/app/Abstracts/View/Components/Documents/Index.php
index 2fd3cda5d..0fc38f681 100644
--- a/app/Abstracts/View/Components/Documents/Index.php
+++ b/app/Abstracts/View/Components/Documents/Index.php
@@ -392,12 +392,14 @@ abstract class Index extends Component
foreach ($totals as $key => $total) {
$title = ($key == 'overdue') ? trans('general.overdue') : trans('documents.statuses.' . $key);
$href = route($route, ['search' => 'status:' . $key]);
- $amount = money($total, setting('default.currency'), true);
+ $amount = money($total, setting('default.currency'), true)->formatForHumans();
+ $tooltip = money($total, setting('default.currency'), true)->format();
$items[] = [
- 'title' => $title,
- 'href' => $href,
- 'amount' => $amount,
+ 'title' => $title,
+ 'href' => $href,
+ 'amount' => $amount,
+ 'tooltip' => $tooltip,
];
}
diff --git a/app/Http/Controllers/Banking/Reconciliations.php b/app/Http/Controllers/Banking/Reconciliations.php
index 28fd8f03a..80467a7fc 100644
--- a/app/Http/Controllers/Banking/Reconciliations.php
+++ b/app/Http/Controllers/Banking/Reconciliations.php
@@ -24,7 +24,17 @@ class Reconciliations extends Controller
{
$reconciliations = Reconciliation::with('account')->collect();
- return $this->response('banking.reconciliations.index', compact('reconciliations'));
+ $reconciled_amount = money($reconciliations->where('reconciled', 1)->sum('closing_balance'), setting('default.currency'), true);
+ $in_progress_amount = money($reconciliations->where('reconciled', 0)->sum('closing_balance'), setting('default.currency'), true);
+
+ $summary_amounts = [
+ 'amount_exact' => $reconciled_amount->format(),
+ 'amount_for_humans' => $reconciled_amount->formatForHumans(),
+ 'in_progress_exact' => $in_progress_amount->format(),
+ 'in_progress_for_humans' => $in_progress_amount->formatForHumans(),
+ ];
+
+ return $this->response('banking.reconciliations.index', compact('reconciliations', 'summary_amounts'));
}
/**
diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php
index b8101a397..56c317bae 100644
--- a/app/Http/Controllers/Banking/Transactions.php
+++ b/app/Http/Controllers/Banking/Transactions.php
@@ -56,12 +56,25 @@ class Transactions extends Controller
$totals['profit'] = $totals['income'] - $totals['expense'];
+ $incoming_amount = money($totals['income'], setting('default.currency'), true);
+ $expense_amount = money($totals['expense'], setting('default.currency'), true);
+ $profit_amount = money($totals['profit'], setting('default.currency'), true);
+
+ $summary_amounts = [
+ 'incoming_exact' => $incoming_amount->format(),
+ 'incoming_for_humans' => $incoming_amount->formatForHumans(),
+ 'expense_exact' => $expense_amount->format(),
+ 'expense_for_humans' => $expense_amount->formatForHumans(),
+ 'profit_exact' => $profit_amount->format(),
+ 'profit_for_humans' => $profit_amount->formatForHumans(),
+ ];
+
$translations = $this->getTranslationsForConnect('income');
return $this->response('banking.transactions.index', compact(
'transactions',
'translations',
- 'totals'
+ 'summary_amounts'
));
}
diff --git a/app/View/Components/Contacts/Show/Content.php b/app/View/Components/Contacts/Show/Content.php
index 03d278578..d5dca21f3 100644
--- a/app/View/Components/Contacts/Show/Content.php
+++ b/app/View/Components/Contacts/Show/Content.php
@@ -12,7 +12,7 @@ class Content extends Component
{
public $counts;
- public $totals;
+ public $summary_amounts;
public $transactions;
@@ -72,7 +72,20 @@ class Content extends Component
$totals['paid'] += $item->getAmountConvertedToDefault();
});
- $this->totals = $totals;
+ $open_amount = money($totals['open'], setting('default.currency'), true);
+ $overdue_amount = money($totals['overdue'], setting('default.currency'), true);
+ $paid_amount = money($totals['paid'], setting('default.currency'), true);
+
+ $summary_amounts = [
+ 'open_exact' => $open_amount->format(),
+ 'open_for_humans' => $open_amount->formatForHumans(),
+ 'overdue_exact' => $overdue_amount->format(),
+ 'overdue_for_humans' => $overdue_amount->formatForHumans(),
+ 'paid_exact' => $paid_amount->format(),
+ 'paid_for_humans' => $paid_amount->formatForHumans(),
+ ];
+
+ $this->summary_amounts = $summary_amounts;
$this->transactions = $this->paginate($this->transactions->sortByDesc('paid_at'));
$this->documents = $this->paginate($this->documents->sortByDesc('issued_at'));
diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php
index c15287aaa..4b7c04956 100644
--- a/resources/views/banking/accounts/show.blade.php
+++ b/resources/views/banking/accounts/show.blade.php
@@ -116,15 +116,27 @@