move Client visibleByEmployee logic to model scope

when enabled users are blocked from creating or editing new time entries that are overlapping with other time entries

app/Exceptions/Api/OverlappingTimeEntryApiException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class OverlappingTimeEntryApiException extends ApiException
+{
+    public const string KEY = 'overlapping_time_entry';
+}

app/Http/Controllers/Api/V1/ClientController.php

@@ -38,11 +38,17 @@ class ClientController extends Controller
     public function index(Organization $organization, ClientIndexRequest $request): ClientCollection
     {
         $this->checkPermission($organization, 'clients:view');
+        $canViewAllClients = $this->hasPermission($organization, 'clients:view:all');
+        $user = $this->user();
 
         $clientsQuery = Client::query()
             ->whereBelongsTo($organization, 'organization')
             ->orderBy('created_at', 'desc');
 
+        if (! $canViewAllClients) {
+            $clientsQuery->visibleByEmployee($user);
+        }
+
         $filterArchived = $request->getFilterArchived();
         if ($filterArchived === 'true') {
             $clientsQuery->whereNotNull('archived_at');

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -61,6 +61,9 @@ class OrganizationController extends Controller
         if ($request->getTimeFormat() !== null) {
             $organization->time_format = $request->getTimeFormat();
         }
+        if ($request->getPreventOverlappingTimeEntries() !== null) {
+            $organization->prevent_overlapping_time_entries = $request->getPreventOverlappingTimeEntries();
+        }
         $hasBillableRate = $request->has('billable_rate');
         if ($hasBillableRate) {
             $oldBillableRate = $organization->billable_rate;

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -7,6 +7,7 @@ namespace App\Http\Controllers\Api\V1;
 use App\Enums\ExportFormat;
 use App\Enums\Role;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
+use App\Exceptions\Api\OverlappingTimeEntryApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
 use App\Exceptions\Api\TimeEntryStillRunningApiException;
@@ -45,6 +46,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\File;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
@@ -56,6 +58,43 @@ use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class TimeEntryController extends Controller
 {
+    private function assertNoOverlap(Organization $organization, Member $member, \Illuminate\Support\Carbon $start, ?\Illuminate\Support\Carbon $end, ?TimeEntry $exclude = null): void
+    {
+        if (! $organization->prevent_overlapping_time_entries) {
+            return;
+        }
+
+        $query = TimeEntry::query()
+            ->where('organization_id', $organization->getKey())
+            ->where('user_id', $member->user_id)
+            ->when($exclude !== null, function (Builder $q) use ($exclude): void {
+                $q->where('id', '!=', $exclude->getKey());
+            })
+            ->where(function (Builder $q) use ($start, $end): void {
+                $q->where(function (Builder $q2) use ($start): void {
+                    $q2->where('end', '>', $start)
+                        ->where('start', '<', $start);
+                });
+
+                if ($end !== null) {
+                    $q->orWhere(function (Builder $q4) use ($end): void {
+                        $q4->where('start', '<', $end)
+                            ->where('end', '>', $end);
+                    });
+                    // Check if the new entry completely surrounds an existing entry
+                    $q->orWhere(function (Builder $q6) use ($start, $end): void {
+                        $q6->where('start', '>=', $start)
+                            ->where('end', '<=', $end);
+                    });
+                }
+
+            });
+
+        if ($query->exists()) {
+            throw new OverlappingTimeEntryApiException;
+        }
+    }
+
     protected function checkPermission(Organization $organization, string $permission, ?TimeEntry $timeEntry = null): void
     {
         parent::checkPermission($organization, $permission);
@@ -549,17 +588,15 @@ class TimeEntryController extends Controller
             throw new TimeEntryStillRunningApiException;
         }
 
+        // Overlap check for create
+        $start = Carbon::parse($request->input('start'));
+        $end = $request->input('end') !== null ? Carbon::parse($request->input('end')) : null;
+        $this->assertNoOverlap($organization, $member, $start, $end);
+
         $project = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id')) : null;
         $client = $project?->client;
         $task = $request->input('task_id') !== null ? $project->tasks()->findOrFail((string) $request->input('task_id')) : null;
 
-        if ($project !== null) {
-            RecalculateSpentTimeForProject::dispatch($project);
-        }
-        if ($task !== null) {
-            RecalculateSpentTimeForTask::dispatch($task);
-        }
-
         $timeEntry = new TimeEntry;
         $timeEntry->fill($request->validated());
         $timeEntry->client()->associate($client);
@@ -569,6 +606,13 @@ class TimeEntryController extends Controller
         $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
 
+        if ($project !== null) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
+
         return new TimeEntryResource($timeEntry);
     }
 
@@ -593,6 +637,13 @@ class TimeEntryController extends Controller
             throw new TimeEntryCanNotBeRestartedApiException;
         }
 
+        // Overlap check for update (exclude current)
+        /** @var Member $effectiveMember */
+        $effectiveMember = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : $timeEntry->member;
+        $effectiveStart = $request->has('start') ? Carbon::parse($request->input('start')) : $timeEntry->start;
+        $effectiveEnd = $request->has('end') ? ($request->input('end') !== null ? Carbon::parse($request->input('end')) : null) : $timeEntry->end;
+        $this->assertNoOverlap($organization, $effectiveMember, $effectiveStart, $effectiveEnd, $timeEntry);
+
         $oldProject = $timeEntry->project;
         $oldTask = $timeEntry->task;
 

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -39,6 +39,9 @@ class OrganizationUpdateRequest extends BaseFormRequest
             'employees_can_see_billable_rates' => [
                 'boolean',
             ],
+            'prevent_overlapping_time_entries' => [
+                'boolean',
+            ],
             'number_format' => [
                 Rule::enum(NumberFormat::class),
             ],
@@ -98,4 +101,9 @@ class OrganizationUpdateRequest extends BaseFormRequest
     {
         return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
     }
+
+    public function getPreventOverlappingTimeEntries(): ?bool
+    {
+        return $this->has('prevent_overlapping_time_entries') ? $this->boolean('prevent_overlapping_time_entries') : null;
+    }
 }

app/Http/Resources/V1/Organization/OrganizationResource.php

@@ -53,6 +53,8 @@ class OrganizationResource extends BaseResource
             'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
             /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
             'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
+            /** @var bool $prevent_overlapping_time_entries Prevent creating overlapping time entries (only new entries) */
+            'prevent_overlapping_time_entries' => $this->resource->prevent_overlapping_time_entries,
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->currency,
             /** @var string $currency_symbol Currency symbol */

app/Models/Client.php

@@ -7,6 +7,7 @@ namespace App\Models;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ClientFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -62,6 +63,18 @@ class Client extends Model implements AuditableContract
         return $this->hasMany(Project::class, 'client_id');
     }
 
+    /**
+     * @param  Builder<Client>  $builder
+     * @return Builder<Client>
+     */
+    public function scopeVisibleByEmployee(Builder $builder, User $user): Builder
+    {
+        return $builder->whereHas('projects', function (Builder $builder) use ($user): Builder {
+            /** @var Builder<Project> $builder */
+            return $builder->visibleByEmployee($user);
+        });
+    }
+
     /**
      * @return Attribute<bool, never>
      */

app/Models/Organization.php

@@ -70,6 +70,7 @@ class Organization extends JetstreamTeam implements AuditableContract
         'personal_team' => 'boolean',
         'currency' => 'string',
         'employees_can_see_billable_rates' => 'boolean',
+        'prevent_overlapping_time_entries' => 'boolean',
         'number_format' => NumberFormat::class,
         'currency_format' => CurrencyFormat::class,
         'date_format' => DateFormat::class,

app/Providers/JetstreamServiceProvider.php

@@ -109,6 +109,7 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
+            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -172,6 +173,7 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
+            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -232,6 +234,7 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
+            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -256,12 +259,13 @@ class JetstreamServiceProvider extends ServiceProvider
             'projects:view',
             'tags:view',
             'tasks:view',
+            'clients:view',
             'time-entries:view:own',
             'time-entries:create:own',
             'time-entries:update:own',
             'time-entries:delete:own',
             'organizations:view',
-        ])->description('Employees have the ability to read, create, and update their own time entries and they can see the projects that they are members of.');
+        ])->description('Employees have the ability to read, create, and update their own time entries, they can see the projects that they are members of and the clients they are assigned to.');
 
         Jetstream::role(Role::Placeholder->value, 'Placeholder', [
         ])->description('Placeholders are used for importing data. They cannot log in and have no permissions.');

app/Service/TimeEntryAggregationService.php

@@ -47,12 +47,20 @@ class TimeEntryAggregationService
     public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate, ?TimeEntryRoundingType $roundingType, ?int $roundingMinutes): array
     {
         $fillGapsInTimeGroupsIsPossible = $fillGapsInTimeGroups && $start !== null && $end !== null;
+        /** @var Builder<TimeEntry> $baseTotalsQuery */
+        $baseTotalsQuery = $timeEntriesQuery->clone();
         $group1Select = null;
         $group2Select = null;
         $groupBy = null;
-        // If any grouping is by tag, expand rows per tag via CROSS JOIN LATERAL on the JSONB array
+        // If any grouping is by tag, expand rows per tag and ensure a NULL row for entries without tags
         if (($group1Type === TimeEntryAggregationType::Tag) || ($group2Type === TimeEntryAggregationType::Tag)) {
-            $timeEntriesQuery->crossJoin(DB::raw("LATERAL jsonb_array_elements_text(coalesce(tags, '[]'::jsonb)) as tag(tag)"));
+            $timeEntriesQuery->crossJoin(DB::raw(
+                "LATERAL (\n".
+                "  SELECT jsonb_array_elements_text(coalesce(tags, '[]'::jsonb)) AS tag\n".
+                "  UNION ALL\n".
+                "  SELECT ''::text AS tag WHERE coalesce(jsonb_array_length(tags), 0) = 0\n".
+                ') AS tag(tag)'
+            ));
         }
         if ($group1Type !== null) {
             $group1Select = $this->getGroupByQuery($group1Type, $timezone, $startOfWeek);
@@ -90,6 +98,26 @@ class TimeEntryAggregationService
             $group1Response = [];
             $group1ResponseSum = 0;
             $group1ResponseCost = 0;
+            // If Tag is subgroup, prepare base totals per primary group without tag expansion
+            $baseTotalsPerGroup1Map = [];
+            if ($group2Type === TimeEntryAggregationType::Tag) {
+                $baseTotalsPerGroup1Query = $baseTotalsQuery->clone();
+                $baseTotalsPerGroup1 = $baseTotalsPerGroup1Query
+                    ->selectRaw(
+                        $group1Select.' as group_1,'.
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
+                    )
+                    ->groupBy('group_1')
+                    ->get();
+                foreach ($baseTotalsPerGroup1 as $row) {
+                    /** @var object{group_1: mixed, aggregate: int|null, cost: int|null} $row */
+                    $baseTotalsPerGroup1Map[(string) ($row->group_1 ?? '')] = [
+                        'aggregate' => (int) ($row->aggregate ?? 0),
+                        'cost' => (int) ($row->cost ?? 0),
+                    ];
+                }
+            }
             foreach ($groupedAggregates as $group1 => $group1Aggregates) {
                 /** @var string|int $group1 */
                 $group2Response = [];
@@ -109,6 +137,14 @@ class TimeEntryAggregationService
                         $group2ResponseSum += (int) $aggregate->get(0)->aggregate;
                         $group2ResponseCost += (int) $aggregate->get(0)->cost;
                     }
+                    // Override primary group totals when Tag is subgroup to avoid double counting
+                    if ($group2Type === TimeEntryAggregationType::Tag) {
+                        $keyForMap = (string) $group1;
+                        if (array_key_exists($keyForMap, $baseTotalsPerGroup1Map)) {
+                            $group2ResponseSum = $baseTotalsPerGroup1Map[$keyForMap]['aggregate'];
+                            $group2ResponseCost = $baseTotalsPerGroup1Map[$keyForMap]['cost'];
+                        }
+                    }
                 } else {
                     /** @var Collection<int, object{aggregate: int, cost: int}> $group1Aggregates */
                     $group2ResponseSum = (int) $group1Aggregates->get(0)->aggregate;
@@ -127,6 +163,23 @@ class TimeEntryAggregationService
                 $group1ResponseCost += $group2ResponseCost;
             }
 
+            // If Tag is selected in any grouping, compute overall totals from base (non-tag-expanded) query to avoid double counting
+            $hasTagGrouping = ($group1Type === TimeEntryAggregationType::Tag) || ($group2Type === TimeEntryAggregationType::Tag);
+            if ($hasTagGrouping) {
+                // Reset selects and ordering on the cloned base query
+                $baseTotals = $baseTotalsQuery
+                    ->selectRaw(
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
+                    )
+                    ->first();
+                if ($baseTotals !== null) {
+                    /** @var object{aggregate: int|null, cost: int|null} $baseTotals */
+                    $group1ResponseSum = (int) ($baseTotals->aggregate ?? 0);
+                    $group1ResponseCost = (int) ($baseTotals->cost ?? 0);
+                }
+            }
+
             if ($fillGapsInTimeGroupsIsPossible) {
                 $group1Response = $this->fillGapsInTimeGroups($group1Response, $group1Type, $group2Type, $timezone, $startOfWeek, $start, $end);
             }

database/migrations/2025_10_02_000001_add_prevent_overlapping_time_entries_to_organizations_table.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('organizations', function (Blueprint $table): void {
+            $table->boolean('prevent_overlapping_time_entries')->default(false)->after('employees_can_see_billable_rates');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('organizations', function (Blueprint $table): void {
+            $table->dropColumn('prevent_overlapping_time_entries');
+        });
+    }
+};

lang/en/exceptions.php

@@ -14,6 +14,7 @@ use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
 use App\Exceptions\Api\OnlyPlaceholdersCanBeMergedIntoAnotherMember;
 use App\Exceptions\Api\OrganizationHasNoSubscriptionButMultipleMembersException;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
+use App\Exceptions\Api\OverlappingTimeEntryApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
 use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
@@ -47,6 +48,7 @@ return [
         OnlyPlaceholdersCanBeMergedIntoAnotherMember::KEY => 'Only placeholders can be merged into another member',
         ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException::KEY => 'This placeholder can not be invited use the merge tool instead',
         InvitationForTheEmailAlreadyExistsApiException::KEY => 'The email has already been invited to the organization. Please wait for the user to accept the invitation or resend the invitation email.',
+        OverlappingTimeEntryApiException::KEY => 'Overlapping time entries are not allowed.',
     ],
     'unknown_error_in_admin_panel' => 'An unknown error occurred. Please check the logs.',
 ];

lang/en/validation.php

@@ -203,6 +203,7 @@ return [
     'organization' => 'The :attribute does not exist.',
     'task_belongs_to_project' => 'The :attribute is not part of the given project.',
     'project_name_already_exists' => 'A project with the same name and client already exists in the organization.',
+    'overlapping_time_entry' => 'Overlapping time entries are not allowed.',
     'tag_name_already_exists' => 'A tag with the same name already exists in the organization.',
     'client_name_already_exists' => 'A client with the same name already exists in the organization.',
     'task_name_already_exists' => 'A task with the same name already exists in the project.',

resources/js/Components/Common/Reporting/ReportingChart.vue

@@ -113,7 +113,7 @@ const option = computed(() => ({
         },
         axisLabel: {
             fontSize: 12,
-            fontWeight: 600,
+            fontWeight: 400,
             color: labelColor.value,
             margin: 16,
             fontFamily: 'Inter, sans-serif',

resources/js/Components/Common/Reporting/ReportingRow.vue

@@ -30,10 +30,7 @@ const organization = inject<ComputedRef<Organization>>('organization');
 <template>
     <div
         class="contents text-text-primary [&>*]:transition [&>*]:border-card-background-separator [&>*]:border-b [&>*]:h-[50px]">
-        <div
-            :class="
-                twMerge('pl-6 font-medium flex items-center space-x-3', props.indent ? 'pl-16' : '')
-            ">
+        <div :class="twMerge('pl-6 flex items-center space-x-3', props.indent ? 'pl-16' : '')">
             <GroupedItemsCountButton
                 v-if="entry.grouped_data && entry.grouped_data?.length > 0"
                 :expanded="expanded"

resources/js/Components/Common/User/UserTimezoneMismatchModal.vue

@@ -27,9 +27,10 @@ onMounted(() => {
     timezone.value = Intl.DateTimeFormat().resolvedOptions().timeZone;
     userTimezone.value = getUserTimezone();
 
+    const now = getDayJsInstance()();
+
     if (
-        getDayJsInstance()().tz(timezone.value).format() !==
-            getDayJsInstance()().tz(userTimezone.value).format() &&
+        now.tz(timezone.value).format() !== now.tz(userTimezone.value).format() &&
         !hideTimezoneMismatchModal.value
     ) {
         show.value = true;

resources/js/Pages/ReportingDetailed.vue

@@ -400,6 +400,7 @@ async function downloadExport(format: ExportFormat) {
                     :on-start-stop-click="() => startTimeEntryFromExisting(entry)"
                     :delete-time-entry="() => deleteTimeEntries([entry])"
                     :currency="getOrganizationCurrencyString()"
+                    :duplicate-time-entry="() => createTimeEntry(entry)"
                     :members="members"
                     show-date
                     show-member

resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue

@@ -27,7 +27,7 @@ interface FormValues {
 }
 
 const store = useOrganizationStore();
-const { fetchOrganization, updateOrganization } = store;
+const { updateOrganization } = store;
 const { organization } = storeToRefs(store);
 const queryClient = useQueryClient();
 
@@ -47,7 +47,6 @@ const mutation = useMutation({
 });
 
 onMounted(async () => {
-    await fetchOrganization();
     if (organization.value) {
         form.value = {
             number_format: organization.value.number_format as NumberFormat,

resources/js/Pages/Teams/Partials/OrganizationTimeEntrySettings.vue

@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import FormSection from '@/Components/FormSection.vue';
+import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
+import { onMounted, ref } from 'vue';
+import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
+import { Checkbox } from '@/packages/ui/src';
+import type { UpdateOrganizationBody } from '@/packages/api/src';
+import { useOrganizationStore } from '@/utils/useOrganization';
+import { storeToRefs } from 'pinia';
+import { useMutation, useQueryClient } from '@tanstack/vue-query';
+
+const store = useOrganizationStore();
+const { updateOrganization } = store;
+const { organization } = storeToRefs(store);
+const queryClient = useQueryClient();
+
+const form = ref<{ prevent_overlapping_time_entries: boolean }>({
+    prevent_overlapping_time_entries: false,
+});
+
+onMounted(async () => {
+    form.value.prevent_overlapping_time_entries =
+        organization.value?.prevent_overlapping_time_entries ?? false;
+});
+
+const mutation = useMutation({
+    mutationFn: (values: Partial<UpdateOrganizationBody>) => updateOrganization(values),
+    onSuccess: () => {
+        queryClient.invalidateQueries({ queryKey: ['organization'] });
+    },
+});
+
+async function submit() {
+    await mutation.mutateAsync({
+        prevent_overlapping_time_entries: form.value.prevent_overlapping_time_entries,
+    });
+}
+</script>
+
+<template>
+    <FormSection>
+        <template #title>Time Entry Settings</template>
+        <template #description>
+            Disallow overlapping time entries for members of this organization. When enabled, users
+            cannot create new time entries that overlap with their existing ones. This only affects
+            newly created entries.
+        </template>
+
+        <template #form>
+            <div class="col-span-6">
+                <div class="col-span-6 sm:col-span-4">
+                    <div class="flex items-center space-x-2">
+                        <Checkbox
+                            id="preventOverlappingTimeEntries"
+                            v-model:checked="form.prevent_overlapping_time_entries" />
+                        <InputLabel
+                            for="preventOverlappingTimeEntries"
+                            value="Prevent overlapping time entries (new entries only)" />
+                    </div>
+                </div>
+            </div>
+        </template>
+
+        <template #actions>
+            <PrimaryButton :disabled="mutation.isPending.value" @click="submit">Save</PrimaryButton>
+        </template>
+    </FormSection>
+</template>

resources/js/Pages/Teams/Show.vue

@@ -8,12 +8,25 @@ import type { Permissions, Role } from '@/types/jetstream';
 import { canUpdateOrganization } from '@/utils/permissions';
 import OrganizationBillableRate from '@/Pages/Teams/Partials/OrganizationBillableRate.vue';
 import OrganizationFormatSettings from '@/Pages/Teams/Partials/OrganizationFormatSettings.vue';
+import OrganizationTimeEntrySettings from '@/Pages/Teams/Partials/OrganizationTimeEntrySettings.vue';
+import { onMounted, ref } from 'vue';
+import { useOrganizationStore } from '@/utils/useOrganization';
+import { storeToRefs } from 'pinia';
 
 defineProps<{
     team: Organization;
     availableRoles: Role[];
     permissions: Permissions;
 }>();
+
+const loading = ref(true);
+const orgStore = useOrganizationStore();
+const { organization } = storeToRefs(orgStore);
+
+onMounted(async () => {
+    await orgStore.fetchOrganization();
+    loading.value = false;
+});
 </script>
 
 <template>
@@ -26,17 +39,25 @@ defineProps<{
 
         <div>
             <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
-                <UpdateTeamNameForm :team="team" :permissions="permissions" />
+                <div v-if="loading || !organization" class="py-16 text-center text-text-secondary">
+                    Loading organization settings...
+                </div>
+                <template v-else>
+                    <UpdateTeamNameForm :team="team" :permissions="permissions" />
 
-                <SectionBorder />
-                <OrganizationBillableRate v-if="canUpdateOrganization()" :team="team" />
-                <SectionBorder />
+                    <SectionBorder />
+                    <OrganizationBillableRate v-if="canUpdateOrganization()" :team="team" />
+                    <SectionBorder />
 
-                <OrganizationFormatSettings v-if="canUpdateOrganization()" :team="team" />
-                <SectionBorder />
+                    <OrganizationFormatSettings v-if="canUpdateOrganization()" :team="team" />
+                    <SectionBorder />
 
-                <template v-if="permissions.canDeleteTeam && !team.personal_team">
-                    <DeleteTeamForm class="mt-10 sm:mt-0" :team="team" />
+                    <OrganizationTimeEntrySettings v-if="canUpdateOrganization()" />
+                    <SectionBorder />
+
+                    <template v-if="permissions.canDeleteTeam && !team.personal_team">
+                        <DeleteTeamForm class="mt-10 sm:mt-0" :team="team" />
+                    </template>
                 </template>
             </div>
         </div>

resources/js/packages/api/src/openapi.json.client.ts

@@ -118,10 +118,10 @@ const InvoiceEntryResource = z
         id: z.string(),
         invoice_id: z.string(),
         name: z.string(),
-        description: z.string(),
-        unit_price: z.string(),
+        description: z.union([z.string(), z.null()]),
+        unit_price: z.number().int(),
         quantity: z.number(),
-        order_index: z.string(),
+        order_index: z.number().int(),
         created_at: z.union([z.string(), z.null()]),
         updated_at: z.union([z.string(), z.null()]),
     })
@@ -227,20 +227,20 @@ const InvoiceUpdateRequest = z
 const InvoiceDownloadRequest = z.object({ with_e_invoice: z.boolean() }).passthrough();
 const InvoiceSettingResource = z
     .object({
-        seller_name: z.string(),
-        seller_vatin: z.string(),
-        seller_address_line_1: z.string(),
-        seller_address_line_2: z.string(),
-        seller_address_line_3: z.string(),
-        seller_address_post_code: z.string(),
-        seller_address_city: z.string(),
-        seller_address_country: z.string(),
-        seller_phone: z.string(),
-        seller_email: z.string(),
-        footer_default: z.string(),
-        notes_default: z.string(),
-        tax_rate_default: z.string(),
-        e_invoicing_enabled: z.string(),
+        seller_name: z.union([z.string(), z.null()]),
+        seller_vatin: z.union([z.string(), z.null()]),
+        seller_address_line_1: z.union([z.string(), z.null()]),
+        seller_address_line_2: z.union([z.string(), z.null()]),
+        seller_address_line_3: z.union([z.string(), z.null()]),
+        seller_address_post_code: z.union([z.string(), z.null()]),
+        seller_address_city: z.union([z.string(), z.null()]),
+        seller_address_country: z.union([z.string(), z.null()]),
+        seller_phone: z.union([z.string(), z.null()]),
+        seller_email: z.union([z.string(), z.null()]),
+        footer_default: z.union([z.string(), z.null()]),
+        notes_default: z.union([z.string(), z.null()]),
+        tax_rate_default: z.union([z.number(), z.null()]),
+        e_invoicing_enabled: z.boolean(),
         organization_id: z.string(),
     })
     .passthrough();
@@ -317,6 +317,7 @@ const OrganizationResource = z
         is_personal: z.boolean(),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
+        prevent_overlapping_time_entries: z.boolean(),
         currency: z.string(),
         currency_symbol: z.string(),
         number_format: NumberFormat,
@@ -331,6 +332,7 @@ const OrganizationUpdateRequest = z
         name: z.string().max(255),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
+        prevent_overlapping_time_entries: z.boolean(),
         number_format: NumberFormat,
         currency_format: CurrencyFormat,
         date_format: DateFormat,
@@ -1863,7 +1865,7 @@ const endpoints = makeApi([
             {
                 name: 'invoice',
                 type: 'Path',
-                schema: z.number().int(),
+                schema: z.string(),
             },
         ],
         response: z.object({ data: DetailedInvoiceResource }).passthrough(),
@@ -1904,7 +1906,7 @@ const endpoints = makeApi([
             {
                 name: 'invoice',
                 type: 'Path',
-                schema: z.number().int(),
+                schema: z.string(),
             },
         ],
         response: z.object({ data: DetailedInvoiceResource }).passthrough(),
@@ -1947,7 +1949,7 @@ const endpoints = makeApi([
             {
                 name: 'invoice',
                 type: 'Path',
-                schema: z.number().int(),
+                schema: z.string(),
             },
         ],
         response: z.void(),
@@ -1988,7 +1990,7 @@ const endpoints = makeApi([
             {
                 name: 'invoice',
                 type: 'Path',
-                schema: z.number().int(),
+                schema: z.string(),
             },
         ],
         response: z.object({ download_link: z.string() }).passthrough(),
@@ -2038,7 +2040,7 @@ const endpoints = makeApi([
             {
                 name: 'invoice',
                 type: 'Path',
-                schema: z.number().int(),
+                schema: z.string(),
             },
         ],
         response: z.object({ download_link: z.string() }).passthrough(),

resources/js/packages/ui/src/FullCalendar/FullCalendarDayHeader.vue

@@ -2,9 +2,10 @@
 import { computed, inject, type ComputedRef } from 'vue';
 import { formatDate, formatHumanReadableDuration } from '../utils/time';
 import type { Organization } from '@/packages/api/src';
+import type { Dayjs } from 'dayjs';
 
 const props = defineProps<{
-    date: Date;
+    date: Dayjs;
     totalMinutes?: number;
 }>();
 
@@ -20,7 +21,7 @@ const dateFormat = computed(() => organization?.value?.date_format);
 <template>
     <div class="fc-day-header-custom">
         <div class="text-xs text-muted-foreground font-medium">
-            {{ date.toLocaleDateString('en-US', { weekday: 'short' }) }}
+            {{ date.format('ddd') }}
         </div>
         <span>{{ formatDate(date.toISOString(), dateFormat) }}</span>
         <span class="block text-xs text-muted-foreground font-medium mt-1">

resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue

@@ -250,7 +250,7 @@ const calendarOptions = computed(() => ({
     editable: true,
     eventResizableFromStart: true,
     eventDurationEditable: true,
-    timeZone: 'America/Adak',
+    timeZone: getUserTimezone(),
     eventStartEditable: true,
     select: handleDateSelect,
     eventClick: handleEventClick,
@@ -332,9 +332,16 @@ watch(showEditTimeEntryModal, (value) => {
             </template>
             <template #dayHeaderContent="arg">
                 <FullCalendarDayHeader
-                    :date="arg.date"
+                    :date="
+                        getDayJsInstance()(arg.date.toISOString()).utc().tz(getUserTimezone(), true)
+                    "
                     :total-minutes="
-                        dailyTotals[getDayJsInstance()(arg.date).format('YYYY-MM-DD')] || 0
+                        dailyTotals[
+                            getDayJsInstance()(arg.date)
+                                .utc()
+                                .tz(getUserTimezone(), true)
+                                .format('YYYY-MM-DD')
+                        ] || 0
                     " />
             </template>
         </FullCalendar>

resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue

@@ -33,6 +33,7 @@ const props = defineProps<{
     createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     onStartStopClick: (timeEntry: TimeEntry) => void;
+    duplicateTimeEntry: (timeEntry: TimeEntry) => void;
     updateTimeEntries: (ids: string[], changes: Partial<TimeEntry>) => void;
     updateTimeEntry: (timeEntry: TimeEntry) => void;
     deleteTimeEntries: (timeEntries: TimeEntry[]) => void;
@@ -173,6 +174,7 @@ function onSelectChange(checked: boolean) {
                         @changed="onStartStopClick(timeEntry)"></TimeTrackerStartStop>
                     <TimeEntryMoreOptionsDropdown
                         :show-edit="false"
+                        :show-duplicate="false"
                         @delete="
                             deleteTimeEntries(timeEntry?.timeEntries ?? [])
                         "></TimeEntryMoreOptionsDropdown>
@@ -202,6 +204,7 @@ function onSelectChange(checked: boolean) {
                 :update-time-entry="(timeEntry: TimeEntry) => updateTimeEntry(timeEntry)"
                 :on-start-stop-click="() => onStartStopClick(subEntry)"
                 :delete-time-entry="() => deleteTimeEntries([subEntry])"
+                :duplicate-time-entry="() => duplicateTimeEntry(subEntry)"
                 :currency="currency"
                 :create-tag
                 :time-entry="subEntry"

resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue

@@ -108,6 +108,7 @@ function startTimeEntryFromExisting(entry: TimeEntry) {
         tags: [...entry.tags],
     });
 }
+
 function sumDuration(timeEntries: TimeEntry[]) {
     return timeEntries.reduce((acc, entry) => acc + (entry?.duration ?? 0), 0);
 }
@@ -158,6 +159,7 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                 :tags="tags"
                 :clients
                 :on-start-stop-click="startTimeEntryFromExisting"
+                :duplicate-time-entry="createTimeEntry"
                 :update-time-entries
                 :update-time-entry
                 :delete-time-entries
@@ -198,6 +200,7 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                 :update-time-entry
                 :on-start-stop-click="() => startTimeEntryFromExisting(entry)"
                 :delete-time-entry="() => deleteTimeEntries([entry])"
+                :duplicate-time-entry="() => createTimeEntry(entry)"
                 :currency="currency"
                 :time-entry="entry.timeEntries[0]"
                 @selected="selectedTimeEntries.push(entry)"

resources/js/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TrashIcon, PencilIcon } from '@heroicons/vue/20/solid';
+import { TrashIcon, PencilIcon, DocumentDuplicateIcon } from '@heroicons/vue/20/solid';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -10,8 +10,10 @@ import {
 const props = withDefaults(
     defineProps<{
         showEdit?: boolean;
+        showDuplicate?: boolean;
     }>(),
     {
+        showDuplicate: true,
         showEdit: true,
     }
 );
@@ -19,6 +21,7 @@ const props = withDefaults(
 const emit = defineEmits<{
     edit: [];
     delete: [];
+    duplicate: [];
 }>();
 </script>
 
@@ -51,6 +54,14 @@ const emit = defineEmits<{
                 <PencilIcon class="w-5" />
                 <span>Edit</span>
             </DropdownMenuItem>
+            <DropdownMenuItem
+                v-if="props.showDuplicate"
+                data-testid="time_entry_duplicate"
+                class="flex items-center space-x-3 cursor-pointer"
+                @click="emit('duplicate')">
+                <DocumentDuplicateIcon class="w-5" />
+                <span>Duplicate</span>
+            </DropdownMenuItem>
             <DropdownMenuItem
                 data-testid="time_entry_delete"
                 class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"

resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue

@@ -36,6 +36,7 @@ const props = defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     onStartStopClick: () => void;
     deleteTimeEntry: () => void;
+    duplicateTimeEntry?: () => void;
     updateTimeEntry: (timeEntry: TimeEntry) => void;
     currency: string;
     showMember?: boolean;
@@ -166,6 +167,7 @@ async function handleDeleteTimeEntry() {
                         @changed="onStartStopClick"></TimeTrackerStartStop>
                     <TimeEntryMoreOptionsDropdown
                         @edit="handleEdit"
+                        @duplicate="duplicateTimeEntry"
                         @delete="deleteTimeEntry"></TimeEntryMoreOptionsDropdown>
                 </div>
             </div>

tests/Unit/Endpoint/Api/V1/ClientEndpointTest.php

@@ -34,6 +34,7 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
+            'clients:view:all',
         ]);
         $clients = Client::factory()->forOrganization($data->organization)->randomCreatedAt()->createMany(4);
         Passport::actingAs($data->user);
@@ -57,11 +58,43 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         );
     }
 
+    public function test_index_endpoint_returns_list_of_clients_assigned_to_employee_user(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'clients:view',
+        ]);
+
+        $clients = Client::factory()->forOrganization($data->organization)->createMany(2);
+        $projectWithMembership1 = Project::factory()->forOrganization($data->organization)->forClient($clients->get(0))->addMember($data->member)->isPrivate()->create();
+        $projectWithMembership2 = Project::factory()->forOrganization($data->organization)->forClient($clients->get(1))->addMember($data->member)->isPrivate()->create();
+
+        $otherClients = Client::factory()->forOrganization($data->organization)->createMany(2);
+        $projectWithoutMembership = Project::factory()->forOrganization($data->organization)->forClient($otherClients->get(0))->isPrivate()->create();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.clients.index', [$data->organization->getKey()]));
+
+        // Assert
+        $response->assertStatus(200);
+        $response->assertJsonCount(2, 'data');
+        $response->assertJson(fn (AssertableJson $json) => $json
+            ->has('data')
+            ->has('links')
+            ->has('meta')
+            ->count('data', 2)
+            ->where('data.0.id', $clients->get(0)->getKey())
+            ->where('data.1.id', $clients->get(1)->getKey())
+        );
+    }
+
     public function test_index_endpoint_without_filter_archived_returns_only_non_archived_clients(): void
     {
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
+            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);
@@ -81,6 +114,7 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
+            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);
@@ -103,6 +137,7 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
+            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);
@@ -125,6 +160,7 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
+            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);

tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php

@@ -1872,147 +1872,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         );
     }
 
-    public function test_aggregate_endpoint_groups_by_tag(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $tag1 = Tag::factory()->forOrganization($data->organization)->create();
-        $tag2 = Tag::factory()->forOrganization($data->organization)->create();
-        $start = Carbon::now()->timezone($data->user->timezone);
-        // Entry with two tags => contributes to both tag groups
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->startWithDuration($start, 100)
-            ->create([
-                'tags' => [$tag1->getKey(), $tag2->getKey()],
-            ]);
-        // Entry with one tag
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->startWithDuration($start, 50)
-            ->create([
-                'tags' => [$tag1->getKey()],
-            ]);
-        // Entry with no tags should not appear in tag grouping
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->startWithDuration($start, 25)
-            ->create([
-                'tags' => [],
-            ]);
-
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate', [
-            $data->organization->getKey(),
-            'group' => 'tag',
-        ]));
-
-        // Assert
-        $response->assertSuccessful();
-        $response->assertExactJson([
-            'data' => [
-                'seconds' => 250, // total seconds across all groups
-                'cost' => 0,
-                'grouped_type' => 'tag',
-                'grouped_data' => [
-                    [
-                        'key' => $tag1->getKey(),
-                        'seconds' => 150, // 100 + 50
-                        'cost' => 0,
-                        'grouped_type' => null,
-                        'grouped_data' => null,
-                    ],
-                    [
-                        'key' => $tag2->getKey(),
-                        'seconds' => 100, // 100 from first entry
-                        'cost' => 0,
-                        'grouped_type' => null,
-                        'grouped_data' => null,
-                    ],
-                ],
-            ],
-        ]);
-    }
-
-    public function test_aggregate_endpoint_groups_by_project_and_sub_group_tag(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $project = Project::factory()->forOrganization($data->organization)->create();
-        $tag1 = Tag::factory()->forOrganization($data->organization)->create();
-        $tag2 = Tag::factory()->forOrganization($data->organization)->create();
-        $start = Carbon::now()->timezone($data->user->timezone);
-
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->forProject($project)
-            ->startWithDuration($start, 120)
-            ->create([
-                'tags' => [$tag1->getKey()],
-            ]);
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->forProject($project)
-            ->startWithDuration($start, 60)
-            ->create([
-                'tags' => [$tag2->getKey()],
-            ]);
-
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate', [
-            $data->organization->getKey(),
-            'group' => 'project',
-            'sub_group' => 'tag',
-        ]));
-
-        // Assert
-        $response->assertSuccessful();
-        $response->assertExactJson([
-            'data' => [
-                'seconds' => 180,
-                'cost' => 0,
-                'grouped_type' => 'project',
-                'grouped_data' => [
-                    [
-                        'key' => $project->getKey(),
-                        'seconds' => 180,
-                        'cost' => 0,
-                        'grouped_type' => 'tag',
-                        'grouped_data' => [
-                            [
-                                'key' => $tag1->getKey(),
-                                'seconds' => 120,
-                                'cost' => 0,
-                                'grouped_type' => null,
-                                'grouped_data' => null,
-                            ],
-                            [
-                                'key' => $tag2->getKey(),
-                                'seconds' => 60,
-                                'cost' => 0,
-                                'grouped_type' => null,
-                                'grouped_data' => null,
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-    }
-
     public function test_aggregate_endpoint_with_no_group(): void
     {
         // Arrange
@@ -3534,6 +3393,241 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
+    public function test_store_endpoint_blocks_overlapping_entries_when_start_overlaps(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:create:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
+        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
+        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseStart,
+                'end' => $baseEnd,
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
+            'member_id' => $data->member->getKey(),
+            'billable' => true,
+            'start' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
+            'end' => $baseEnd->copy()->addMinutes(30)->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'overlapping_time_entry',
+            'message' => 'Overlapping time entries are not allowed.',
+        ]);
+    }
+
+    public function test_store_endpoint_blocks_overlapping_entries_when_end_overlaps(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:create:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
+        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
+        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseStart,
+                'end' => $baseEnd,
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
+            'member_id' => $data->member->getKey(),
+            'billable' => true,
+            'start' => $baseStart->copy()->subMinutes(30)->toIso8601ZuluString(),
+            'end' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'overlapping_time_entry',
+            'message' => 'Overlapping time entries are not allowed.',
+        ]);
+    }
+
+    public function test_store_endpoint_blocks_overlapping_entries_when_new_entry_is_within_existing(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:create:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
+        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
+        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseStart,
+                'end' => $baseEnd,
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
+            'member_id' => $data->member->getKey(),
+            'billable' => true,
+            'start' => $baseStart->copy()->addMinutes(15)->toIso8601ZuluString(),
+            'end' => $baseStart->copy()->addMinutes(45)->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'overlapping_time_entry',
+            'message' => 'Overlapping time entries are not allowed.',
+        ]);
+    }
+
+    public function test_store_endpoint_blocks_overlapping_entries_when_new_entry_surrounds_existing(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:create:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
+        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
+        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseStart,
+                'end' => $baseEnd,
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
+            'member_id' => $data->member->getKey(),
+            'billable' => true,
+            'start' => $baseStart->copy()->subMinutes(30)->toIso8601ZuluString(),
+            'end' => $baseEnd->copy()->addMinutes(30)->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'overlapping_time_entry',
+            'message' => 'Overlapping time entries are not allowed.',
+        ]);
+    }
+
+    public function test_store_endpoint_blocks_starting_active_entry_when_it_overlaps_with_existing(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:create:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
+        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
+        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseStart,
+                'end' => $baseEnd,
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
+            'member_id' => $data->member->getKey(),
+            'billable' => true,
+            'start' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
+            'end' => null,
+        ]);
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'overlapping_time_entry',
+            'message' => 'Overlapping time entries are not allowed.',
+        ]);
+    }
+
+    public function test_store_endpoint_allows_future_time_entries_even_with_running_now(): void
+    {
+        // Arrange
+        $now = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
+        $this->travelTo($now);
+        $data = $this->createUserWithPermission([
+            'time-entries:create:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $now->copy()->subHour(),
+                'end' => null,
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
+            'member_id' => $data->member->getKey(),
+            'billable' => true,
+            'start' => $now->copy()->addDay()->toIso8601ZuluString(),
+            'end' => $now->copy()->addDay()->addHour()->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(201);
+    }
+
+    public function test_update_endpoint_blocks_overlap_and_excludes_current_entry(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:update:own',
+        ]);
+        $data->organization->prevent_overlapping_time_entries = true;
+        $data->organization->save();
+        $baseStart = Carbon::create(2025, 1, 1, 14, 0, 0, 'UTC');
+        $baseEnd = Carbon::create(2025, 1, 1, 15, 0, 0, 'UTC');
+        $base = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseStart,
+                'end' => $baseEnd,
+            ]);
+        $toUpdate = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
+            ->create([
+                'start' => $baseEnd->copy()->addMinutes(30),
+                'end' => $baseEnd->copy()->addHour(),
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->putJson(route('api.v1.time-entries.update', [$data->organization->getKey(), $toUpdate->getKey()]), [
+            'start' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'overlapping_time_entry',
+            'message' => 'Overlapping time entries are not allowed.',
+        ]);
+    }
+
     public function test_update_multiple_refreshes_billable_rate_on_updates_time_entries(): void
     {
         // Arrange

tests/Unit/Service/TimeEntryAggregationServiceTest.php

@@ -9,6 +9,7 @@ use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Models\Client;
 use App\Models\Project;
+use App\Models\Tag;
 use App\Models\TimeEntry;
 use App\Service\TimeEntryAggregationService;
 use Illuminate\Support\Carbon;
@@ -1007,4 +1008,201 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             ],
         ], $result);
     }
+
+    public function test_aggregate_time_entries_group_by_tag_includes_no_tag_and_avoids_double_counting_overall(): void
+    {
+        // Arrange
+        $tag1 = Tag::factory()->create();
+        $tag2 = Tag::factory()->create();
+        $start = Carbon::now();
+
+        // One entry with two tags (100s)
+        TimeEntry::factory()->startWithDuration($start, 100)->create([
+            'tags' => [$tag1->getKey(), $tag2->getKey()],
+        ]);
+        // One entry with one tag (50s)
+        TimeEntry::factory()->startWithDuration($start, 50)->create([
+            'tags' => [$tag1->getKey()],
+        ]);
+        // One entry with no tags (25s)
+        TimeEntry::factory()->startWithDuration($start, 25)->create([
+            'tags' => [],
+        ]);
+
+        $query = TimeEntry::query();
+
+        // Act
+        $result = $this->service->getAggregatedTimeEntries(
+            $query,
+            TimeEntryAggregationType::Tag,
+            null,
+            'Europe/Vienna',
+            Weekday::Monday,
+            false,
+            null,
+            null,
+            true,
+            null,
+            null
+        );
+
+        // Assert - overall total should be 175 and groups: null=25, tag1=150, tag2=100
+        $expected = [
+            'seconds' => 175,
+            'cost' => 0,
+            'grouped_type' => 'tag',
+            'grouped_data' => [
+                [
+                    'key' => null,
+                    'seconds' => 25,
+                    'cost' => 0,
+                    'grouped_type' => null,
+                    'grouped_data' => null,
+                ],
+                [
+                    'key' => $tag1->getKey(),
+                    'seconds' => 150,
+                    'cost' => 0,
+                    'grouped_type' => null,
+                    'grouped_data' => null,
+                ],
+                [
+                    'key' => $tag2->getKey(),
+                    'seconds' => 100,
+                    'cost' => 0,
+                    'grouped_type' => null,
+                    'grouped_data' => null,
+                ],
+            ],
+        ];
+        $this->assertEqualsCanonicalizing($expected, $result);
+    }
+
+    public function test_aggregate_time_entries_group_by_project_and_subgroup_tag(): void
+    {
+        // Arrange
+        $project = Project::factory()->create();
+        $tag1 = Tag::factory()->create();
+        $tag2 = Tag::factory()->create();
+        $start = Carbon::now();
+
+        TimeEntry::factory()->startWithDuration($start, 120)->forProject($project)->create([
+            'tags' => [$tag1->getKey()],
+        ]);
+        TimeEntry::factory()->startWithDuration($start, 60)->forProject($project)->create([
+            'tags' => [$tag2->getKey()],
+        ]);
+
+        $query = TimeEntry::query();
+
+        // Act
+        $result = $this->service->getAggregatedTimeEntries(
+            $query,
+            TimeEntryAggregationType::Project,
+            TimeEntryAggregationType::Tag,
+            'Europe/Vienna',
+            Weekday::Monday,
+            false,
+            null,
+            null,
+            true,
+            null,
+            null
+        );
+
+        // Assert
+        $expected = [
+            'seconds' => 180,
+            'cost' => 0,
+            'grouped_type' => 'project',
+            'grouped_data' => [
+                [
+                    'key' => $project->getKey(),
+                    'seconds' => 180,
+                    'cost' => 0,
+                    'grouped_type' => 'tag',
+                    'grouped_data' => [
+                        [
+                            'key' => $tag1->getKey(),
+                            'seconds' => 120,
+                            'cost' => 0,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                        [
+                            'key' => $tag2->getKey(),
+                            'seconds' => 60,
+                            'cost' => 0,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->assertEqualsCanonicalizing($expected, $result);
+    }
+
+    public function test_aggregate_time_entries_group_by_project_and_subgroup_tag_avoids_double_counting(): void
+    {
+        // Arrange
+        $project = Project::factory()->create();
+        $tag1 = Tag::factory()->create();
+        $tag2 = Tag::factory()->create();
+        $start = Carbon::now();
+
+        // One entry with two tags => subgroup rows show both tags, but project total should equal entry duration
+        TimeEntry::factory()->startWithDuration($start, 100)->forProject($project)->create([
+            'tags' => [$tag1->getKey(), $tag2->getKey()],
+        ]);
+
+        $query = TimeEntry::query();
+
+        // Act
+        $result = $this->service->getAggregatedTimeEntries(
+            $query,
+            TimeEntryAggregationType::Project,
+            TimeEntryAggregationType::Tag,
+            'Europe/Vienna',
+            Weekday::Monday,
+            false,
+            null,
+            null,
+            true,
+            null,
+            null
+        );
+
+        // Assert
+        $expected = [
+            'seconds' => 100,
+            'cost' => 0,
+            'grouped_type' => 'project',
+            'grouped_data' => [
+                [
+                    'key' => $project->getKey(),
+                    'seconds' => 100,
+                    'cost' => 0,
+                    'grouped_type' => 'tag',
+                    'grouped_data' => [
+                        [
+                            'key' => $tag1->getKey(),
+                            'seconds' => 100,
+                            'cost' => 0,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                        [
+                            'key' => $tag2->getKey(),
+                            'seconds' => 100,
+                            'cost' => 0,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->assertEqualsCanonicalizing($expected, $result);
+    }
 }