From 514eaaff00a00126a144c9b8517a9979b570357c Mon Sep 17 00:00:00 2001 From: hendryb Date: Sun, 5 Apr 2020 15:50:21 +0200 Subject: [PATCH] fixed money progress totals portal dashboard --- app/Http/Controllers/Portal/Dashboard.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Portal/Dashboard.php b/app/Http/Controllers/Portal/Dashboard.php index 5706334b7..688f198e9 100644 --- a/app/Http/Controllers/Portal/Dashboard.php +++ b/app/Http/Controllers/Portal/Dashboard.php @@ -61,19 +61,20 @@ class Dashboard $total = count($unpaid) + count($paid) + count($partial_paid) + count($overdue); - $progress = [ - 'unpaid' => count($unpaid), - 'paid' => count($paid), - 'overdue' => count($overdue), - 'partially_paid' => count($partial_paid), - 'total' => $total, - ]; $unpaid = $this->calculateTotals($unpaid, $start, $end, 'unpaid'); $paid = $this->calculateTotals($paid, $start, $end, 'paid'); $partial_paid = $this->calculateTotals($partial_paid, $start, $end, 'partial'); $overdue = $this->calculateTotals($overdue, $start, $end, 'overdue'); + $progress = [ + 'unpaid' => array_sum($unpaid), + 'paid' => array_sum($paid), + 'overdue' => array_sum($overdue), + 'partially_paid' => array_sum($partial_paid), + 'total' => $total, + ]; + $chart = new Chartjs(); $chart->type('line') ->width(0)