From 682ce02995fd923ba1179d1ffac51470f6003bb6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 27 Nov 2016 17:00:29 +0200 Subject: [PATCH] Merge dashboard fix --- app/Ninja/Repositories/DashboardRepository.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Ninja/Repositories/DashboardRepository.php b/app/Ninja/Repositories/DashboardRepository.php index 2f89e71749d0..be43d1ce993f 100644 --- a/app/Ninja/Repositories/DashboardRepository.php +++ b/app/Ninja/Repositories/DashboardRepository.php @@ -47,7 +47,7 @@ class DashboardRepository $count += $item->count; $balance += isset($item->balance) ? $item->balance : 0; }, $records); - + $padding = $groupBy == 'DAYOFYEAR' ? 'day' : ($groupBy == 'WEEK' ? 'week' : 'month'); $endDate->modify('+1 '.$padding); $interval = new DateInterval('P1'.substr($groupBy, 0, 1)); @@ -195,6 +195,7 @@ class DashboardRepository ->where('payments.account_id', '=', $accountId) ->where('clients.is_deleted', '=', false) ->where('invoices.is_deleted', '=', false) + ->where('payments.is_deleted', '=', false) ->whereNotIn('payments.payment_status_id', [PAYMENT_STATUS_VOIDED, PAYMENT_STATUS_FAILED]); if (!$viewAll){