Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix history with multiple companies

Browse Source
This commit is contained in:
Hillel Coren 2016-12-29 12:49:08 +02:00
parent e12292aa38
commit 0c5225df51
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Libraries/HistoryUtils.php
View File

@ -36,15 +36,14 @@ class HistoryUtils
ACTIVITY_TYPE_VIEW_QUOTE, ACTIVITY_TYPE_VIEW_QUOTE,
]; ];
$activities = Activity::scope() $activities = Activity::with(['client.contacts', 'invoice', 'task', 'expense'])
->with(['client.contacts', 'invoice', 'task', 'expense'])
->whereIn('user_id', $userIds) ->whereIn('user_id', $userIds)
->whereIn('activity_type_id', $activityTypes) ->whereIn('activity_type_id', $activityTypes)
->orderBy('id', 'asc') ->orderBy('id', 'desc')
->limit(100) ->limit(100)
->get(); ->get();
foreach ($activities as $activity) foreach ($activities->reverse() as $activity)
{ {
if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_CLIENT) { if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_CLIENT) {
$entity = $activity->client; $entity = $activity->client;