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

Load recent edited tasks with history

Browse Source
This commit is contained in:
Hillel Coren 2016-09-06 14:55:15 +03:00
parent 2f54d1dfa3
commit 9e082ef274
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Libraries/HistoryUtils.php
View File

@ -22,6 +22,8 @@ class HistoryUtils
$activityTypes = [ $activityTypes = [
ACTIVITY_TYPE_CREATE_CLIENT, ACTIVITY_TYPE_CREATE_CLIENT,
ACTIVITY_TYPE_CREATE_TASK,
ACTIVITY_TYPE_UPDATE_TASK,
ACTIVITY_TYPE_CREATE_INVOICE, ACTIVITY_TYPE_CREATE_INVOICE,
ACTIVITY_TYPE_UPDATE_INVOICE, ACTIVITY_TYPE_UPDATE_INVOICE,
ACTIVITY_TYPE_EMAIL_INVOICE, ACTIVITY_TYPE_EMAIL_INVOICE,
@ -33,7 +35,7 @@ class HistoryUtils
]; ];
$activities = Activity::scope() $activities = Activity::scope()
->with(['client.contacts', 'invoice']) ->with(['client.contacts', 'invoice', 'task'])
->whereIn('user_id', $userIds) ->whereIn('user_id', $userIds)
->whereIn('activity_type_id', $activityTypes) ->whereIn('activity_type_id', $activityTypes)
->orderBy('id', 'asc') ->orderBy('id', 'asc')
@ -44,6 +46,9 @@ class HistoryUtils
{ {
if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_CLIENT) { if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_CLIENT) {
$entity = $activity->client; $entity = $activity->client;
} else if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_TASK || $activity->activity_type_id == ACTIVITY_TYPE_UPDATE_TASK) {
$entity = $activity->task;
$entity->setRelation('client', $activity->client);
} else { } else {
$entity = $activity->invoice; $entity = $activity->invoice;
$entity->setRelation('client', $activity->client); $entity->setRelation('client', $activity->client);