mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-10-14 16:53:17 +01:00
Delete running time entries of placeholder when merging members
The running time entries of the merged member could give the destination member a second running time entry. The placeholder is deleted after the merge, so its running time entries can not stay with it.
This commit is contained in:
committed by
Constantin Graf
parent
b42e84294c
commit
f65a1532ad
@@ -159,6 +159,13 @@ class MemberService
|
||||
|
||||
public function assignOrganizationEntitiesToDifferentMember(Organization $organization, Member $fromMember, Member $toMember): void
|
||||
{
|
||||
// Running time entries are deleted instead of moved, since $toMember could already have a running time entry
|
||||
TimeEntry::query()
|
||||
->whereBelongsTo($organization, 'organization')
|
||||
->whereBelongsTo($fromMember, 'member')
|
||||
->whereNull('end')
|
||||
->delete();
|
||||
|
||||
// Time entries
|
||||
TimeEntry::query()
|
||||
->whereBelongsTo($organization, 'organization')
|
||||
|
||||
Reference in New Issue
Block a user