From 0c5225df51d47c9f453f8ceb9dc9f9f035ad1a94 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 29 Dec 2016 12:49:08 +0200 Subject: [PATCH] Fix history with multiple companies --- app/Libraries/HistoryUtils.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Libraries/HistoryUtils.php b/app/Libraries/HistoryUtils.php index 8d34c2bed60b..5b8643ed6521 100644 --- a/app/Libraries/HistoryUtils.php +++ b/app/Libraries/HistoryUtils.php @@ -36,15 +36,14 @@ class HistoryUtils ACTIVITY_TYPE_VIEW_QUOTE, ]; - $activities = Activity::scope() - ->with(['client.contacts', 'invoice', 'task', 'expense']) + $activities = Activity::with(['client.contacts', 'invoice', 'task', 'expense']) ->whereIn('user_id', $userIds) ->whereIn('activity_type_id', $activityTypes) - ->orderBy('id', 'asc') + ->orderBy('id', 'desc') ->limit(100) ->get(); - foreach ($activities as $activity) + foreach ($activities->reverse() as $activity) { if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_CLIENT) { $entity = $activity->client;