diff --git a/CHANGELOG.md b/CHANGELOG.md index 05750485054f..18d6c02534ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Release notes ## [Unreleased (daily channel)](https://github.com/invoiceninja/invoiceninja/tree/v5-develop) +## Fixed: +- Fix User created/updated/deleted Actvity display format ## Added: - Invoice / Quote / Credit created notifications diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php index baad1fcf549d..8df5f9842025 100644 --- a/app/Listeners/User/ArchivedUserActivity.php +++ b/app/Listeners/User/ArchivedUserActivity.php @@ -43,8 +43,8 @@ class ArchivedUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->user->id; - $fields->notes = $event->creating_user->present()->name . " Archived User"; + $fields->user_id = $event->creating_user->id; + $fields->notes = $event->creating_user->present()->name . " Archived User " . $event->user->present()->name(); $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::ARCHIVE_USER; diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php index 757253f0e744..73266845a598 100644 --- a/app/Listeners/User/CreatedUserActivity.php +++ b/app/Listeners/User/CreatedUserActivity.php @@ -43,8 +43,8 @@ class CreatedUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->user->id; - $fields->notes = $event->creating_user->present()->name() . " Created the user"; + $fields->user_id = $event->creating_user->id; + $fields->notes = $event->creating_user->present()->name() . " Created the user " . $event->user->present()->name(); $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::CREATE_USER; diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php index c530fa2c204a..9e961d4dacf8 100644 --- a/app/Listeners/User/DeletedUserActivity.php +++ b/app/Listeners/User/DeletedUserActivity.php @@ -48,8 +48,8 @@ class DeletedUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->user->id; - $fields->notes = $event->creating_user->present()->name . " Deleted User"; + $fields->user_id = $event->creating_user->id; + $fields->notes = $event->creating_user->present()->name() . " Deleted the user " . $event->user->present()->name(); $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::DELETE_USER; diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php index 77fbc99870d1..963ed7ef58a0 100644 --- a/app/Listeners/User/RestoredUserActivity.php +++ b/app/Listeners/User/RestoredUserActivity.php @@ -43,8 +43,8 @@ class RestoredUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->user->id; - $fields->notes = $event->creating_user->present()->name() . " Restored user"; + $fields->user_id = $creating_user->user->id; + $fields->notes = $event->creating_user->present()->name() . " Restored user " . $event->user->present()->name(); $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::RESTORE_USER; diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php index a94121dcd61d..a04ab4f6e51e 100644 --- a/app/Listeners/User/UpdatedUserActivity.php +++ b/app/Listeners/User/UpdatedUserActivity.php @@ -42,8 +42,9 @@ class UpdatedUserActivity implements ShouldQueue MultiDB::setDb($event->company->db); $fields = new stdClass; - $fields->user_id = $event->user->id; - $fields->notes = $event->creating_user->present()->name . " Updated user"; + $fields->user_id = $event->creating_user->id; + $fields->notes = $event->creating_user->present()->name() . " Updated user " . $event->user->present()->name(); + $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::UPDATE_USER;