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

summary amount format change for Humans..

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Abstracts/View/Components/Contacts/Index.php
View File

@ -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(),
];
}

10
app/Abstracts/View/Components/Documents/Index.php
View File

@ -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,
];
}

12
app/Http/Controllers/Banking/Reconciliations.php
View File

@ -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'));
}
/**

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

@ -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'
));
}

17
app/View/Components/Contacts/Show/Content.php
View File

@ -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'));