@nuxt-customer-portal/timesheets 0.3.2 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @nuxt-customer-portal/timesheets
 
+## 0.4.0
+
+### Patch Changes
+
+- 59c8921: Support organization and personal clients with optional verified self-registration, single-person access safeguards, and shared provider, client, and user timezone preferences. Preserve existing B2B defaults, module references, invoice history, and Timesheets timezone behavior.
+
+  Collect and store first and last names during signup and personal onboarding. Route ordinary personal registration and verified users without memberships or pending invitations through onboarding.
+
+  Allow users to edit first name, last name, and an independent display name in profile settings.
+
+  Synchronize display-name edits with the linked private client name and current billing name in the same transaction, preserving organizations and historical invoices.
+
+  Let private clients edit their own billing address in profile settings, independently of the active organization, with server-side ownership checks.
+
+  Private clients use their own invoice email without contact persons; hide contact management and reject private-client contact creation or selection server-side.
+
+  Add a B2C-only Invite private client action to the Users page, supporting new and existing private clients with atomic record creation, request retry protection, and pending invitation recovery when email delivery fails.
+
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+- Updated dependencies [59c8921]
+  - @nuxt-customer-portal/core@0.4.0
+  - @nuxt-customer-portal/clients@0.4.0
+  - @nuxt-customer-portal/organizations@0.4.0
+  - @nuxt-customer-portal/ui@0.4.0
+
+## 0.3.3
+
+### Patch Changes
+
+- @nuxt-customer-portal/clients@0.3.3
+- @nuxt-customer-portal/core@0.3.3
+- @nuxt-customer-portal/organizations@0.3.3
+- @nuxt-customer-portal/ui@0.3.3
+
 ## 0.3.2
 
 ### Patch Changes

package/app/components/TimesheetsActivityForm.vue

@@ -52,7 +52,12 @@ const schema = computed(() =>
         <UButton v-if="showCancel" type="button" color="neutral" variant="outline" @click="emit('cancel')">
           {{ t('features.timesheets.cancel') }}
         </UButton>
-        <UButton type="submit" :loading="busy">
+        <UButton
+          type="submit"
+          :icon="editing ? 'i-lucide-save' : 'i-lucide-plus'"
+          class="ml-auto flex min-w-28 justify-center"
+          :loading="busy"
+        >
           {{ editing ? t('features.timesheets.save') : t('features.timesheets.admin.createActivity') }}
         </UButton>
       </div>

package/app/components/TimesheetsAdminApprovals.vue

@@ -372,7 +372,7 @@ const reject = () =>
       </div>
     </details>
 
-    <UModal v-model:open="requestOpen" :title="t('features.timesheets.submissions.title')">
+    <UModal v-if="requestOpen" v-model:open="requestOpen" :title="t('features.timesheets.submissions.title')">
       <template #body>
         <UForm
           :schema="requestSchema"
@@ -395,7 +395,7 @@ const reject = () =>
         </UForm>
       </template>
     </UModal>
-    <UModal v-model:open="clientReplyOpen" :title="t('features.timesheets.submissions.reply')">
+    <UModal v-if="clientReplyOpen" v-model:open="clientReplyOpen" :title="t('features.timesheets.submissions.reply')">
       <template #body>
         <UForm
           :schema="clientReplySchema"
@@ -411,7 +411,7 @@ const reject = () =>
         </UForm>
       </template>
     </UModal>
-    <UModal v-model:open="approvalOpen" :title="t('features.timesheets.admin.approve')">
+    <UModal v-if="approvalOpen" v-model:open="approvalOpen" :title="t('features.timesheets.admin.approve')">
       <template #body>
         <UForm :state="approvalState" :schema="approvalSchema" novalidate class="space-y-4" @submit="approve">
           <UFormField name="comment" :label="t('features.timesheets.submissions.remark')">
@@ -428,7 +428,7 @@ const reject = () =>
         </UForm>
       </template>
     </UModal>
-    <UModal v-model:open="rejectionOpen" :title="t('features.timesheets.admin.rejectTimesheet')">
+    <UModal v-if="rejectionOpen" v-model:open="rejectionOpen" :title="t('features.timesheets.admin.rejectTimesheet')">
       <template #body>
         <UForm novalidate :state="rejectionState" :schema="rejectionSchema" class="space-y-4" @submit="reject">
           <UFormField name="comment" :label="t('features.timesheets.admin.rejectionReason')" required>

package/app/components/TimesheetsAdminRates.vue

@@ -72,10 +72,12 @@ watch(
           </UFormField>
           <UButton
             icon="i-lucide-save"
+            class="ml-auto flex min-w-28 justify-center"
             :aria-label="t('features.timesheets.save')"
             :loading="busy"
             @click="saveMember(member.id)"
-          />
+            >{{ t('features.timesheets.save') }}</UButton
+          >
         </div>
       </div>
     </UCard>

package/app/components/TimesheetsClientSettingsPanel.vue

@@ -45,7 +45,9 @@ const save = async () => {
         />
       </UFormField>
       <div class="flex justify-end">
-        <UButton type="submit" icon="i-lucide-save" :loading="busy">{{ t('features.timesheets.save') }}</UButton>
+        <UButton type="submit" icon="i-lucide-save" class="ml-auto flex min-w-28 justify-center" :loading="busy">{{
+          t('features.timesheets.save')
+        }}</UButton>
       </div>
     </UForm>
   </UCard>

package/app/components/TimesheetsClientTimesheetBrowser.vue

@@ -292,7 +292,7 @@ await listing.load()
         </footer>
       </article>
       <UModal
-        v-if="isReview && selected && isApprovalItem(selected)"
+        v-if="disputeOpen && isReview && selected && isApprovalItem(selected)"
         v-model:open="disputeOpen"
         :title="t(`features.timesheets.clientPortal.${reviewAction === 'APPROVE' ? 'approve' : 'dispute'}`)"
       >

package/app/components/TimesheetsProjectDetail.vue

@@ -251,7 +251,14 @@ onKeyStroke('Escape', () => {
           />
         </div>
         <div class="flex justify-end">
-          <UButton size="sm" variant="outline" icon="i-lucide-save" :loading="busy" @click="saveRates">
+          <UButton
+            size="sm"
+            variant="outline"
+            icon="i-lucide-save"
+            class="ml-auto flex min-w-28 justify-center"
+            :loading="busy"
+            @click="saveRates"
+          >
             {{ t('features.timesheets.admin.saveOverrides') }}
           </UButton>
         </div>

package/app/components/TimesheetsProjectForm.vue

@@ -206,7 +206,12 @@ const createActivity = async () => {
         <UButton v-if="showCancel" type="button" color="neutral" variant="outline" @click="emit('cancel')">
           {{ t('features.timesheets.cancel') }}
         </UButton>
-        <UButton type="submit" :loading="busy">
+        <UButton
+          type="submit"
+          :icon="editing ? 'i-lucide-save' : 'i-lucide-plus'"
+          class="ml-auto flex min-w-28 justify-center"
+          :loading="busy"
+        >
           {{ editing ? t('features.timesheets.save') : t('features.timesheets.admin.createProject') }}
         </UButton>
       </div>

package/app/components/TimesheetsWorkspaceSettingsForm.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { z } from 'zod'
+import { isValidTimezone } from '@nuxt-customer-portal/core/shared/timezone'
 import type { TimesheetsAdminBootstrap } from '@nuxt-customer-portal/timesheets/app/composables/useTimesheets'
 
 const props = defineProps<{
@@ -23,7 +24,7 @@ const schema = computed(() =>
   z.object({
     timerRoundingMinutes: z.number().int().min(1).max(60),
     currency: z.string().trim().length(3, t('features.timesheets.validation.currencyLength')),
-    timezone: z.string().trim().min(3, t('features.timesheets.validation.required')).max(100)
+    timezone: z.string().trim().max(100).refine(isValidTimezone, t('timezones.invalid'))
   })
 )
 
@@ -72,7 +73,7 @@ const save = async () => {
       >
         <UInput v-model.number="draft.timerRoundingMinutes" type="number" :min="1" :max="60" class="w-full sm:w-28" />
       </UFormField>
-      <UButton type="submit" class="w-full justify-center sm:w-auto" icon="i-lucide-save" :loading="busy">
+      <UButton type="submit" class="ml-auto flex min-w-28 justify-center" icon="i-lucide-save" :loading="busy">
         {{ t('features.timesheets.save') }}
       </UButton>
     </UForm>

package/app/pages/timesheets/index.vue

@@ -1194,7 +1194,7 @@ const runningDuration = computed(() => {
       </div>
     </details>
 
-    <UModal v-model:open="replyOpen" :title="t('features.timesheets.submissions.resubmit')">
+    <UModal v-if="replyOpen" v-model:open="replyOpen" :title="t('features.timesheets.submissions.resubmit')">
       <template #body>
         <UForm :schema="submissionReplySchema" :state="replyState" novalidate class="space-y-4" @submit="resubmit">
           <UFormField name="reply" :label="t('features.timesheets.submissions.reply')">
@@ -1208,6 +1208,7 @@ const runningDuration = computed(() => {
     </UModal>
 
     <UModal
+      v-if="modalOpen"
       v-model:open="modalOpen"
       :title="form.id ? t('features.timesheets.editEntry') : t('features.timesheets.addEntry')"
       @after:enter="focusPrefilledHours"
@@ -1283,7 +1284,13 @@ const runningDuration = computed(() => {
               <UButton type="button" color="neutral" variant="outline" @click="modalOpen = false">
                 {{ t('features.timesheets.cancel') }}
               </UButton>
-              <UButton type="submit" :loading="saving" :disabled="tariffMissing">
+              <UButton
+                type="submit"
+                icon="i-lucide-save"
+                class="ml-auto flex min-w-28 justify-center"
+                :loading="saving"
+                :disabled="tariffMissing"
+              >
                 {{ t('features.timesheets.save') }}
               </UButton>
             </div>
@@ -1292,7 +1299,7 @@ const runningDuration = computed(() => {
       </template>
     </UModal>
 
-    <UModal v-model:open="cellEntriesOpen" :title="t('features.timesheets.cellEntries.title')">
+    <UModal v-if="cellEntriesOpen" v-model:open="cellEntriesOpen" :title="t('features.timesheets.cellEntries.title')">
       <template #body>
         <div v-if="selectedCell" class="space-y-4">
           <div>
@@ -1341,7 +1348,11 @@ const runningDuration = computed(() => {
       </template>
     </UModal>
 
-    <UModal v-model:open="submissionModalOpen" :title="t('features.timesheets.submissions.title')">
+    <UModal
+      v-if="submissionModalOpen"
+      v-model:open="submissionModalOpen"
+      :title="t('features.timesheets.submissions.title')"
+    >
       <template #body>
         <UForm :state="submissionState" :schema="submissionSchema" novalidate class="space-y-4" @submit="submit">
           <p class="text-sm text-muted">{{ t('features.timesheets.submissions.description') }}</p>
@@ -1397,7 +1408,7 @@ const runningDuration = computed(() => {
       </template>
     </UModal>
 
-    <UModal v-model:open="timerModalOpen" :title="t('features.timesheets.timer.start')">
+    <UModal v-if="timerModalOpen" v-model:open="timerModalOpen" :title="t('features.timesheets.timer.start')">
       <template #body>
         <UAlert
           v-if="!isOrganizationAdmin && workspaceStructureIncomplete"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt-customer-portal/timesheets",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "license": "MIT",
   "homepage": "https://nuxt-customer-portal.com",
   "repository": {
@@ -45,10 +45,10 @@
     "pg": "^8.22.0",
     "resend": "^6.18.1",
     "zod": "^4.4.3",
-    "@nuxt-customer-portal/core": "^0.3.2",
-    "@nuxt-customer-portal/clients": "^0.3.2",
-    "@nuxt-customer-portal/organizations": "^0.3.2",
-    "@nuxt-customer-portal/ui": "^0.3.2"
+    "@nuxt-customer-portal/core": "^0.4.0",
+    "@nuxt-customer-portal/organizations": "^0.4.0",
+    "@nuxt-customer-portal/clients": "^0.4.0",
+    "@nuxt-customer-portal/ui": "^0.4.0"
   },
   "peerDependencies": {
     "nuxt": "^4.5.1",

package/portal.manifest.mjs

@@ -1,6 +1,6 @@
 export default {
   id: 'timesheets',
-  version: '0.3.2',
+  version: '0.4.0',
   source: '@nuxt-customer-portal/timesheets',
   clientModuleId: 'timesheets',
   dependsOn: ['core', 'ui', 'organizations', 'clients'],

package/server/utils/timesheet-email.ts

@@ -4,6 +4,7 @@ import { and, eq, isNotNull } from 'drizzle-orm'
 import { db } from '@nuxt-customer-portal/core/server/portal'
 import { member, organization, user } from '@nuxt-customer-portal/core/schema'
 import { getPortalEmailSettings, sendPortalEmail } from '@nuxt-customer-portal/core/server/utils/portal-email'
+import { emailRecipientName } from '@nuxt-customer-portal/core/shared/email-recipient'
 import { timesheetEmails } from '../../shared/emails'
 import {
   internalApproverAssignment,
@@ -48,7 +49,7 @@ export const notifyTimesheetEvent = async (
     const baseUrl = process.env.BETTER_AUTH_URL || process.env.PUBLIC_URL || 'http://localhost:3051'
     const send = async (
       id: string,
-      recipient: { id: string; email: string; name: string },
+      recipient: { id: string; email: string; name: string; firstName?: string | null },
       path: string,
       clientName = '',
       comment = '',
@@ -63,7 +64,13 @@ export const notifyTimesheetEvent = async (
           to: recipient.email,
           idempotencyKey: `timesheet/${submission.id}/${submission.version}/${id}/${scope}/${recipient.id}`,
           values: {
-            recipient_name: escapeHtml(recipient.name),
+            recipient_name: escapeHtml(
+              emailRecipientName({
+                firstName: recipient.firstName,
+                displayName: recipient.name,
+                email: recipient.email
+              })
+            ),
             person_name: escapeHtml(person.name),
             organization_name: escapeHtml(workspace.name),
             period: escapeHtml(formatTimesheetPeriod(submission.periodStartsOn, submission.periodEndsOn, emailLocale)),

package/server/utils/timesheet-validation.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { timezoneSchema } from '@nuxt-customer-portal/core/server/utils/timezone-validation'
 
 const isoDate = z.string().regex(/^\d{4}-\d{2}-\d{2}$/)
 const id = z.string().min(1).max(128)
@@ -195,7 +196,7 @@ export const settingsUpdateSchema = z.object({
     .length(3)
     .transform((v) => v.toUpperCase())
     .optional(),
-  timezone: z.string().min(3).max(100).optional()
+  timezone: timezoneSchema.optional()
 })
 
 export const reviewSchema = z

package/shared/emails.ts

@@ -7,11 +7,15 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Internal approval requested — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>Please review the timesheet.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nA timesheet is ready for your internal review. Please check the submitted hours and details before deciding whether it can move to the next step.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Comment:** {{comment}}\n\n[Review the timesheet]({{action_url}})',
+        footer:
+          'Thank you for taking the time to review this submission. Your prompt response helps keep the approval process moving smoothly.'
       },
       nl: {
         subject: 'Interne goedkeuring gevraagd — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>Beoordeel de urenstaat.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nEr staat een urenstaat klaar voor uw interne beoordeling. Controleer de ingediende uren en gegevens voordat u beslist of deze door kan naar de volgende stap.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Opmerking:** {{comment}}\n\n[Urenstaat beoordelen]({{action_url}})',
+        footer:
+          'Bedankt dat u de tijd neemt om deze urenstaat te beoordelen. Met een snelle reactie blijft het goedkeuringsproces soepel verlopen.'
       }
     },
     placeholders: [
@@ -64,11 +68,15 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Timesheet approved internally — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>Your timesheet has been approved internally.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nGood news: your timesheet has been approved internally and can now continue through the approval process.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Comment:** {{comment}}\n\n[View the approved timesheet]({{action_url}})',
+        footer:
+          'No further action is needed from you right now. You can use the link above whenever you want to review the latest status.'
       },
       nl: {
         subject: 'Urenstaat intern goedgekeurd — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>Uw urenstaat is intern goedgekeurd.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nGoed nieuws: uw urenstaat is intern goedgekeurd en kan nu verder in het goedkeuringsproces.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Opmerking:** {{comment}}\n\n[Goedgekeurde urenstaat bekijken]({{action_url}})',
+        footer:
+          'U hoeft op dit moment niets te doen. Via de bovenstaande link kunt u altijd de meest recente status bekijken.'
       }
     },
     placeholders: [
@@ -121,11 +129,15 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Timesheet rejected internally — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>Your timesheet has been rejected internally.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nYour timesheet could not be approved internally yet. Please review the feedback below, update the submission where needed, and submit it again when it is ready.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Feedback:** {{comment}}\n\n[Review and update the timesheet]({{action_url}})',
+        footer:
+          'If the feedback is unclear, please contact the person responsible for the internal review before resubmitting.'
       },
       nl: {
         subject: 'Urenstaat intern afgewezen — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>Uw urenstaat is intern afgewezen.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nUw urenstaat kon intern nog niet worden goedgekeurd. Bekijk de feedback hieronder, pas de urenstaat waar nodig aan en dien deze opnieuw in zodra alles klopt.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Feedback:** {{comment}}\n\n[Urenstaat bekijken en aanpassen]({{action_url}})',
+        footer:
+          'Is de feedback niet duidelijk? Neem dan contact op met de interne beoordelaar voordat u de urenstaat opnieuw indient.'
       }
     },
     placeholders: [
@@ -178,11 +190,14 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Timesheet reopened — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>Your timesheet has been reopened for editing.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nYour timesheet has been reopened, so you can make changes again. Please review the reason below and update the relevant entries before resubmitting.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Comment:** {{comment}}\n\n[Open and edit the timesheet]({{action_url}})',
+        footer: 'When your changes are complete, submit the timesheet again so the approval process can continue.'
       },
       nl: {
         subject: 'Urenstaat heropend — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>Uw urenstaat is heropend voor wijzigingen.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nUw urenstaat is heropend, zodat u opnieuw wijzigingen kunt aanbrengen. Bekijk de reden hieronder en pas de betreffende registraties aan voordat u de urenstaat opnieuw indient.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Opmerking:** {{comment}}\n\n[Urenstaat openen en bewerken]({{action_url}})',
+        footer:
+          'Dien de urenstaat opnieuw in zodra uw wijzigingen klaar zijn, zodat het goedkeuringsproces verder kan gaan.'
       }
     },
     placeholders: [
@@ -235,11 +250,15 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Client approval requested — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>Please review the timesheet for your organization.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nA timesheet has completed its internal review and is now waiting for your organization’s approval. Please check the hours and supporting details below.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Comment:** {{comment}}\n\n[Review the timesheet]({{action_url}})',
+        footer:
+          'You can approve the timesheet or raise a concern from the review page. Thank you for helping us complete the process.'
       },
       nl: {
         subject: 'Klantgoedkeuring gevraagd — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>Beoordeel de urenstaat voor uw organisatie.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nEen urenstaat heeft de interne beoordeling doorlopen en wacht nu op goedkeuring door uw organisatie. Controleer de uren en aanvullende gegevens hieronder.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Opmerking:** {{comment}}\n\n[Urenstaat beoordelen]({{action_url}})',
+        footer:
+          'Op de beoordelingspagina kunt u de urenstaat goedkeuren of een bezwaar aangeven. Bedankt dat u helpt het proces af te ronden.'
       }
     },
     placeholders: [
@@ -292,11 +311,15 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Timesheet approved by client — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>The client has approved your timesheet.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nGood news: the client has reviewed and approved the timesheet below. The approval process for this submission is now complete.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Comment:** {{comment}}\n\n[View the approved timesheet]({{action_url}})',
+        footer:
+          'Thank you for keeping the timesheet accurate and complete. No further action is required for this submission.'
       },
       nl: {
         subject: 'Urenstaat goedgekeurd door klant — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>De klant heeft uw urenstaat goedgekeurd.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nGoed nieuws: de klant heeft de onderstaande urenstaat beoordeeld en goedgekeurd. Het goedkeuringsproces voor deze inzending is daarmee afgerond.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Opmerking:** {{comment}}\n\n[Goedgekeurde urenstaat bekijken]({{action_url}})',
+        footer:
+          'Bedankt voor het zorgvuldig en volledig bijhouden van de uren. Voor deze inzending hoeft u niets meer te doen.'
       }
     },
     placeholders: [
@@ -349,11 +372,15 @@ export const timesheetEmails: PortalEmailDefinition[] = [
     defaults: {
       en: {
         subject: 'Timesheet disputed by client — {{person_name}} ({{period}})',
-        body: 'Dear {{recipient_name}},<br><br>The client has disputed your timesheet.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Open timesheets</a>'
+        body: 'Dear {{recipient_name}},\n\nThe client has raised a concern about the timesheet below. Please review their feedback and coordinate any necessary corrections before the timesheet is submitted again.\n\n- **Organization:** {{organization_name}}\n- **Team member:** {{person_name}}\n- **Period:** {{period}}\n- **Client:** {{client_name}}\n- **Client feedback:** {{comment}}\n\n[Review the disputed timesheet]({{action_url}})',
+        footer:
+          'Please follow up with the client if clarification is needed. Resolving the concern promptly will help keep the approval process on track.'
       },
       nl: {
         subject: 'Urenstaat betwist door klant — {{person_name}} ({{period}})',
-        body: 'Beste {{recipient_name}},<br><br>De klant heeft uw urenstaat betwist.<br><br>{{organization_name}}<br>{{person_name}}: {{period}}<br>{{client_name}}<br>{{comment}}<br><br><a href="{{action_url}}" class="button">Urenstaten openen</a>'
+        body: 'Beste {{recipient_name}},\n\nDe klant heeft een bezwaar aangegeven bij de onderstaande urenstaat. Bekijk de feedback en stem eventuele correcties af voordat de urenstaat opnieuw wordt ingediend.\n\n- **Organisatie:** {{organization_name}}\n- **Medewerker:** {{person_name}}\n- **Periode:** {{period}}\n- **Klant:** {{client_name}}\n- **Feedback van de klant:** {{comment}}\n\n[Betwiste urenstaat bekijken]({{action_url}})',
+        footer:
+          'Neem contact op met de klant als nadere uitleg nodig is. Door het bezwaar snel op te lossen, blijft het goedkeuringsproces op schema.'
       }
     },
     placeholders: [