Updated invoicing extension

app/Console/Commands/TimeEntry/TimeEntrySendStillRunningMailsCommand.php

@@ -51,8 +51,7 @@ class TimeEntrySendStillRunningMailsCommand extends Command
             ])
             ->whereHas('user', function (Builder $query): void {
                 /** @var Builder<User> $query */
-                $query->where('is_placeholder', '=', false)
-                    ->where('send_time_entry_still_running_email', '=', true);
+                $query->where('is_placeholder', '=', false);
             })
             ->orderBy('created_at', 'asc')
             ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails): void {

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

@@ -124,10 +124,6 @@ class UserController extends Controller
             $user->week_start = $request->getWeekStart();
         }
 
-        if ($request->getSendTimeEntryStillRunningEmail() !== null) {
-            $user->send_time_entry_still_running_email = $request->getSendTimeEntryStillRunningEmail();
-        }
-
         $user->save();
 
         if ($emailToVerify !== null) {

app/Http/Requests/V1/User/UserUpdateRequest.php

@@ -58,9 +58,6 @@ class UserUpdateRequest extends BaseFormRequest
             'week_start' => [
                 Rule::enum(Weekday::class),
             ],
-            'send_time_entry_still_running_email' => [
-                'boolean',
-            ],
         ];
     }
 
@@ -84,13 +81,6 @@ class UserUpdateRequest extends BaseFormRequest
         return $this->has('week_start') ? Weekday::from($this->input('week_start')) : null;
     }
 
-    public function getSendTimeEntryStillRunningEmail(): ?bool
-    {
-        return $this->has('send_time_entry_still_running_email')
-            ? $this->boolean('send_time_entry_still_running_email')
-            : null;
-    }
-
     public function hasPhotoKey(): bool
     {
         return $this->has('photo');

app/Http/Resources/V1/User/UserResource.php

@@ -36,8 +36,6 @@ class UserResource extends BaseResource
             'timezone' => $this->resource->timezone,
             /** @var Weekday $week_start Starting day of the week */
             'week_start' => $this->resource->week_start->value,
-            /** @var bool $send_time_entry_still_running_email Whether to email the user when a time entry has been running for more than 8 hours */
-            'send_time_entry_still_running_email' => $this->resource->send_time_entry_still_running_email,
         ];
     }
 }

app/Models/User.php

@@ -42,7 +42,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $timezone
  * @property bool $is_placeholder
  * @property Weekday $week_start
- * @property bool $send_time_entry_still_running_email
  * @property string|null $profile_photo_path
  * @property-read Organization|null $currentOrganization
  * @property-read string $profile_photo_url
@@ -109,7 +108,6 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
         'is_admin' => 'boolean',
         'is_placeholder' => 'boolean',
         'week_start' => Weekday::class,
-        'send_time_entry_still_running_email' => 'boolean',
     ];
 
     /**
@@ -119,7 +117,6 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
      */
     protected $attributes = [
         'week_start' => Weekday::Monday,
-        'send_time_entry_still_running_email' => true,
     ];
 
     /**

database/migrations/2026_08_31_000001_add_send_time_entry_still_running_email_to_users_table.php

@@ -1,24 +0,0 @@
-<?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
-{
-    public function up(): void
-    {
-        Schema::table('users', function (Blueprint $table): void {
-            $table->boolean('send_time_entry_still_running_email')->default(true)->after('week_start');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('users', function (Blueprint $table): void {
-            $table->dropColumn('send_time_entry_still_running_email');
-        });
-    }
-};

e2e/profile.spec.ts

@@ -20,12 +20,6 @@ function profileInformationForm(page: Page) {
         .locator('xpath=ancestor::*[descendant::form][1]');
 }
 
-function notificationSettingsForm(page: Page) {
-    return page
-        .getByRole('heading', { name: 'Notifications', exact: true })
-        .locator('xpath=ancestor::*[descendant::form][1]');
-}
-
 async function saveProfileForm(page: Page): Promise<void> {
     const form = profileInformationForm(page);
     await form.getByRole('button', { name: 'Save' }).click();
@@ -56,22 +50,6 @@ test('week-start change persists across reload', async ({ page }) => {
     await expect(page.getByLabel('Start of the week')).toHaveValue('sunday');
 });
 
-test('still-running email notification setting persists across reload', async ({ page }) => {
-    await goToProfilePage(page);
-    const form = notificationSettingsForm(page);
-    const checkbox = form.getByLabel('Still-running time entry reminders');
-
-    await expect(checkbox).toBeChecked();
-    await checkbox.uncheck();
-    await form.getByRole('button', { name: 'Save' }).click();
-    await expect(form.getByText('Saved.', { exact: true })).toBeVisible();
-
-    await page.reload();
-    await expect(
-        notificationSettingsForm(page).getByLabel('Still-running time entry reminders')
-    ).not.toBeChecked();
-});
-
 test('profile photo can be uploaded, persists across reload, and can be removed', async ({
     page,
 }) => {

extensions/manifest.json

@@ -9,6 +9,6 @@
     },
     "Invoicing": {
         "repository": "solidtime-io/extension-invoicing",
-        "ref": "v0.0.2"
+        "ref": "v0.0.3"
     }
 }

resources/js/Pages/Profile/Partials/NotificationSettingsForm.vue

@@ -1,103 +0,0 @@
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import ActionMessage from '@/Components/ActionMessage.vue';
-import FormSection from '@/Components/FormSection.vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import { Checkbox } from '@/packages/ui/src';
-import {
-    Field,
-    FieldContent,
-    FieldDescription,
-    FieldError,
-    FieldLabel,
-} from '@/packages/ui/src/field';
-import { getApiValidationFieldErrors } from '@/utils/apiValidation';
-import { useUpdateUserMutation, useUserQuery } from '@/utils/useUserQuery';
-
-const { user } = useUserQuery();
-const updateUser = useUpdateUserMutation();
-
-const sendTimeEntryStillRunningEmail = ref(true);
-const recentlySaved = ref(false);
-
-watch(
-    user,
-    (currentUser, previousUser) => {
-        if (currentUser && previousUser === undefined) {
-            sendTimeEntryStillRunningEmail.value = currentUser.send_time_entry_still_running_email;
-        }
-    },
-    { immediate: true }
-);
-
-const isUserLoaded = computed(() => user.value !== undefined);
-const isSaveDisabled = computed(() => !isUserLoaded.value || updateUser.isPending.value);
-const fieldErrors = computed<Record<string, string>>(() =>
-    getApiValidationFieldErrors(updateUser.error.value)
-);
-
-async function save() {
-    if (isSaveDisabled.value || !user.value) return;
-
-    if (sendTimeEntryStillRunningEmail.value === user.value.send_time_entry_still_running_email) {
-        flashSaved();
-        return;
-    }
-
-    try {
-        const updatedUser = await updateUser.mutateAsync({
-            userId: user.value.id,
-            body: {
-                send_time_entry_still_running_email: sendTimeEntryStillRunningEmail.value,
-            },
-        });
-        sendTimeEntryStillRunningEmail.value = updatedUser.send_time_entry_still_running_email;
-        flashSaved();
-    } catch {
-        // 422: field errors render below. Other errors: toast handled in the mutation.
-    }
-}
-
-function flashSaved() {
-    recentlySaved.value = true;
-    setTimeout(() => (recentlySaved.value = false), 2000);
-}
-</script>
-
-<template>
-    <FormSection @submitted="save">
-        <template #title>Notifications</template>
-
-        <template #description>Choose which email notifications you want to receive.</template>
-
-        <template #form>
-            <div class="col-span-6 sm:col-span-4">
-                <Field orientation="horizontal">
-                    <Checkbox
-                        id="send_time_entry_still_running_email"
-                        v-model:checked="sendTimeEntryStillRunningEmail"
-                        :disabled="!isUserLoaded" />
-                    <FieldContent>
-                        <FieldLabel for="send_time_entry_still_running_email">
-                            Still-running time entry reminders
-                        </FieldLabel>
-                        <FieldDescription>
-                            Email me when a time entry has been running for more than 8 hours.
-                        </FieldDescription>
-                    </FieldContent>
-                </Field>
-                <FieldError v-if="fieldErrors.send_time_entry_still_running_email">
-                    {{ fieldErrors.send_time_entry_still_running_email }}
-                </FieldError>
-            </div>
-        </template>
-
-        <template #actions>
-            <ActionMessage :on="recentlySaved" class="me-3">Saved.</ActionMessage>
-
-            <PrimaryButton :class="{ 'opacity-25': isSaveDisabled }" :disabled="isSaveDisabled">
-                Save
-            </PrimaryButton>
-        </template>
-    </FormSection>
-</template>

resources/js/Pages/Profile/Show.vue

@@ -9,7 +9,6 @@ import UpdateProfileInformationForm from '@/Pages/Profile/Partials/UpdateProfile
 import type { Session } from '@/types/jetstream';
 import ApiTokensForm from '@/Pages/Profile/Partials/ApiTokensForm.vue';
 import ThemeForm from '@/Pages/Profile/Partials/ThemeForm.vue';
-import NotificationSettingsForm from '@/Pages/Profile/Partials/NotificationSettingsForm.vue';
 
 defineProps<{
     confirmsTwoFactorAuthentication: boolean;
@@ -37,12 +36,6 @@ defineProps<{
                     <SectionBorder />
                 </div>
 
-                <div>
-                    <NotificationSettingsForm />
-
-                    <SectionBorder />
-                </div>
-
                 <div>
                     <UpdatePasswordForm class="mt-10 sm:mt-0" />
 

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

@@ -705,7 +705,6 @@ const UserResource = z
         profile_photo_url: z.string(),
         timezone: z.string(),
         week_start: Weekday,
-        send_time_entry_still_running_email: z.boolean(),
     })
     .passthrough();
 const UserUpdateRequest = z
@@ -715,7 +714,6 @@ const UserUpdateRequest = z
         photo: z.union([z.string(), z.null()]),
         timezone: z.string(),
         week_start: Weekday,
-        send_time_entry_still_running_email: z.boolean(),
     })
     .partial()
     .passthrough();

resources/js/types/models.d.ts

@@ -76,7 +76,6 @@ export interface User {
     two_factor_confirmed_at: string | null;
     timezone: string;
     week_start: string;
-    send_time_entry_still_running_email: boolean;
     profile_photo_url: string;
     organizations: Organization[];
     clients: Client[];

tests/Unit/Console/Commands/TimeEntry/TimeEntrySendStillRunningMailsCommandTest.php

@@ -159,26 +159,4 @@ class TimeEntrySendStillRunningMailsCommandTest extends TestCaseWithDatabase
         $this->assertSame("Sending still running time entry emails...\n".
             "Finished sending 0 still running time entry emails...\n", $output);
     }
-
-    public function test_does_not_send_emails_to_users_who_disabled_them(): void
-    {
-        // Arrange
-        $user = $this->createUserWithPermission();
-        $user->user->send_time_entry_still_running_email = false;
-        $user->user->save();
-        $timeEntry = TimeEntry::factory()->forMember($user->member)->create([
-            'start' => Carbon::now()->subHours(8)->subSecond(),
-            'end' => null,
-        ]);
-
-        // Act
-        $exitCode = $this->withoutMockingConsoleOutput()->artisan('time-entry:send-still-running-mails');
-
-        // Assert
-        Mail::assertNothingOutgoing();
-        $this->assertNull($timeEntry->fresh()->still_active_email_sent_at);
-        $this->assertSame(Command::SUCCESS, $exitCode);
-        $this->assertSame("Sending still running time entry emails...\n".
-            "Finished sending 0 still running time entry emails...\n", Artisan::output());
-    }
 }

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

@@ -45,7 +45,6 @@ class UserEndpointTest extends ApiEndpointTestAbstract
                 'profile_photo_url' => $data->user->profile_photo_url,
                 'timezone' => $data->user->timezone,
                 'week_start' => $data->user->week_start->value,
-                'send_time_entry_still_running_email' => true,
             ],
         ]);
     }
@@ -132,7 +131,7 @@ class UserEndpointTest extends ApiEndpointTestAbstract
         $response->assertJsonValidationErrors('organization_id');
     }
 
-    public function test_update_changes_user_profile_settings(): void
+    public function test_update_changes_user_name_timezone_and_week_start(): void
     {
         // Arrange
         $data = $this->createUserWithPermission();
@@ -143,7 +142,6 @@ class UserEndpointTest extends ApiEndpointTestAbstract
             'name' => 'Updated Name',
             'timezone' => 'America/New_York',
             'week_start' => Weekday::Sunday->value,
-            'send_time_entry_still_running_email' => false,
         ]);
 
         // Assert
@@ -154,7 +152,6 @@ class UserEndpointTest extends ApiEndpointTestAbstract
                 'name' => 'Updated Name',
                 'timezone' => 'America/New_York',
                 'week_start' => Weekday::Sunday->value,
-                'send_time_entry_still_running_email' => false,
             ],
         ]);
 
@@ -162,7 +159,6 @@ class UserEndpointTest extends ApiEndpointTestAbstract
         $this->assertSame('Updated Name', $user->name);
         $this->assertSame('America/New_York', $user->timezone);
         $this->assertSame(Weekday::Sunday, $user->week_start);
-        $this->assertFalse($user->send_time_entry_still_running_email);
     }
 
     public function test_update_does_not_change_user_fields_that_are_not_given(): void
@@ -507,22 +503,6 @@ class UserEndpointTest extends ApiEndpointTestAbstract
         $response->assertJsonValidationErrors(['week_start']);
     }
 
-    public function test_update_fails_if_send_time_entry_still_running_email_is_not_boolean(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.users.update', $data->user->getKey()), [
-            'send_time_entry_still_running_email' => 'not-a-boolean',
-        ]);
-
-        // Assert
-        $response->assertUnprocessable();
-        $response->assertJsonValidationErrors(['send_time_entry_still_running_email']);
-    }
-
     public function test_update_fails_if_photo_is_not_a_string(): void
     {
         // Arrange