diff --git a/app/Widgets/TotalExpenses.php b/app/Widgets/TotalExpenses.php index b69ce3dfd..82014f0d9 100644 --- a/app/Widgets/TotalExpenses.php +++ b/app/Widgets/TotalExpenses.php @@ -29,6 +29,8 @@ class TotalExpenses extends Widget $overdue += $overdue_tmp; }); + $grand = $current + $open + $overdue; + $progress = 100; if (!empty($open) && !empty($overdue)) { @@ -36,7 +38,7 @@ class TotalExpenses extends Widget } $totals = [ - 'current' => $current, + 'grand' => money($grand, setting('default.currency'), true), 'open' => money($open, setting('default.currency'), true), 'overdue' => money($overdue, setting('default.currency'), true), 'progress' => $progress, diff --git a/app/Widgets/TotalIncome.php b/app/Widgets/TotalIncome.php index e41ecc73d..e48bd42f8 100644 --- a/app/Widgets/TotalIncome.php +++ b/app/Widgets/TotalIncome.php @@ -29,6 +29,8 @@ class TotalIncome extends Widget $overdue += $overdue_tmp; }); + $grand = $current + $open + $overdue; + $progress = 100; if (!empty($open) && !empty($overdue)) { @@ -36,7 +38,7 @@ class TotalIncome extends Widget } $totals = [ - 'current' => $current, + 'grand' => money($grand, setting('default.currency'), true), 'open' => money($open, setting('default.currency'), true), 'overdue' => money($overdue, setting('default.currency'), true), 'progress' => $progress, diff --git a/app/Widgets/TotalProfit.php b/app/Widgets/TotalProfit.php index 298e4a00f..0e1c37a77 100644 --- a/app/Widgets/TotalProfit.php +++ b/app/Widgets/TotalProfit.php @@ -48,6 +48,8 @@ class TotalProfit extends Widget $open = $open_invoice - $open_bill; $overdue = $overdue_invoice - $overdue_bill; + $grand = $current + $open + $overdue; + $progress = 100; if (!empty($open) && !empty($overdue)) { @@ -55,7 +57,7 @@ class TotalProfit extends Widget } $totals = [ - 'current' => $current, + 'grand' => money($grand, setting('default.currency'), true), 'open' => money($open, setting('default.currency'), true), 'overdue' => money($overdue, setting('default.currency'), true), 'progress' => $progress, diff --git a/resources/views/widgets/total_expenses.blade.php b/resources/views/widgets/total_expenses.blade.php index 58bafe65f..db3b366d6 100644 --- a/resources/views/widgets/total_expenses.blade.php +++ b/resources/views/widgets/total_expenses.blade.php @@ -6,7 +6,7 @@