@open-mercato/core 0.5.1-develop.3043.1a796c3920 → 0.6.0

package/src/modules/customers/components/detail/ScheduleActivityDialog.tsx

@@ -4,7 +4,9 @@ import * as React from 'react'
 import { Users, Phone, Check, Mail, Calendar, AlertTriangle, X } from 'lucide-react'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { validatePhoneNumber } from '@open-mercato/shared/lib/phone'
 import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { mapCrudServerErrorToFormErrors } from '@open-mercato/ui/backend/utils/serverErrors'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { Alert, AlertDescription, AlertTitle } from '@open-mercato/ui/primitives/alert'
@@ -12,7 +14,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
 import { Dialog, DialogContent, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { VisuallyHidden } from '@radix-ui/react-visually-hidden'
-import { SwitchableMarkdownInput } from '@open-mercato/ui/backend/inputs'
+import { PhoneNumberField, SwitchableMarkdownInput } from '@open-mercato/ui/backend/inputs'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import {
   useScheduleFormState,
@@ -112,15 +114,41 @@ export function ScheduleActivityDialog({
   const [callDirection, setCallDirection] = React.useState<'outbound' | 'inbound'>('outbound')
   const [callOutcome, setCallOutcome] = React.useState<string | null>(null)
   const [callPhoneNumber, setCallPhoneNumber] = React.useState('')
+  const [callPhoneError, setCallPhoneError] = React.useState<string | null>(null)
   const [taskPriority, setTaskPriority] = React.useState<string>('medium')
+  const callPhoneInvalidMessage = React.useMemo(
+    () =>
+      t(
+        'customers.activities.errors.phoneInvalid',
+        'Enter a valid phone number with country code (e.g. +1 212 555 1234)',
+      ),
+    [t],
+  )
+  const translateErrorMessage = React.useCallback(
+    (message: string | undefined, fallback: string) => {
+      const key = typeof message === 'string' ? message.trim() : ''
+      return key ? t(key, key) : fallback
+    },
+    [t],
+  )
 
   React.useEffect(() => {
     if (!open) return
-    const raw = editData as (Record<string, unknown> & { customValues?: unknown }) | null | undefined
+    const raw = editData as (Record<string, unknown> & { customValues?: unknown; phoneNumber?: unknown }) | null | undefined
     const cv = (raw?.customValues && typeof raw.customValues === 'object' ? raw.customValues : null) as Record<string, unknown> | null
     setCallDirection(typeof cv?.callDirection === 'string' && cv.callDirection === 'inbound' ? 'inbound' : 'outbound')
     setCallOutcome(typeof cv?.callOutcome === 'string' ? cv.callOutcome : null)
-    setCallPhoneNumber(typeof cv?.callPhoneNumber === 'string' ? cv.callPhoneNumber : '')
+    // Seed phone number from either top-level `phoneNumber` (newer write path)
+    // or legacy `customValues.callPhoneNumber` so previously-saved calls still
+    // round-trip on edit (#1808).
+    const seededPhone =
+      typeof raw?.phoneNumber === 'string' && raw.phoneNumber.trim().length > 0
+        ? raw.phoneNumber
+        : typeof cv?.callPhoneNumber === 'string'
+          ? cv.callPhoneNumber
+          : ''
+    setCallPhoneNumber(seededPhone)
+    setCallPhoneError(null)
     setTaskPriority(typeof cv?.taskPriority === 'string' ? cv.taskPriority : 'medium')
   }, [open, editData])
 
@@ -131,9 +159,15 @@ export function ScheduleActivityDialog({
     setCallDirection('outbound')
     setCallOutcome(null)
     setCallPhoneNumber('')
+    setCallPhoneError(null)
     setTaskPriority('medium')
   }, [state.activityType, open, isEditing])
 
+  const handleCallPhoneChange = React.useCallback((next: string | undefined) => {
+    setCallPhoneNumber(next ?? '')
+    setCallPhoneError(null)
+  }, [])
+
   const formSnapshot = React.useMemo(() => JSON.stringify({
     activityType: state.activityType,
     title: state.title,
@@ -284,8 +318,41 @@ export function ScheduleActivityDialog({
     return () => clearTimeout(timer)
   }, [editData?.id, open, state.date, state.startTime, state.duration, state.allDay, t]) // eslint-disable-line react-hooks/exhaustive-deps
 
+  const trimmedDate = state.date.trim()
+  const trimmedStartTime = state.startTime.trim()
+  const trimmedCallPhone = callPhoneNumber.trim()
+  const isDateMissing = !trimmedDate
+  const isTimeMissing = !state.allDay && !trimmedStartTime
+  const isSubmitDisabled =
+    state.saving ||
+    !state.title.trim() ||
+    isDateMissing ||
+    isTimeMissing
+
   const handleSave = React.useCallback(async () => {
     if (!state.title.trim()) return
+    if (isDateMissing) {
+      flash(t('customers.activities.errors.dateRequired', 'Date is required'), 'error')
+      return
+    }
+    if (isTimeMissing) {
+      flash(t('customers.activities.errors.timeRequired', 'Time is required'), 'error')
+      return
+    }
+    let phoneNumberForPayload: string | undefined
+    if (state.activityType === 'call' && trimmedCallPhone) {
+      const phoneValidation = validatePhoneNumber(trimmedCallPhone)
+      if (!phoneValidation.valid) {
+        setCallPhoneError(callPhoneInvalidMessage)
+        flash(callPhoneInvalidMessage, 'error')
+        return
+      }
+      phoneNumberForPayload = phoneValidation.normalized ?? trimmedCallPhone
+      setCallPhoneError(null)
+      if (phoneNumberForPayload !== callPhoneNumber) {
+        setCallPhoneNumber(phoneNumberForPayload)
+      }
+    }
     state.setSaving(true)
     try {
       const scheduledAt = state.allDay
@@ -301,7 +368,7 @@ export function ScheduleActivityDialog({
       if (state.activityType === 'call') {
         customValues.callDirection = callDirection
         if (callOutcome) customValues.callOutcome = callOutcome
-        if (callPhoneNumber.trim()) customValues.callPhoneNumber = callPhoneNumber.trim()
+        if (phoneNumberForPayload) customValues.callPhoneNumber = phoneNumberForPayload
       }
       if (state.activityType === 'task') {
         customValues.taskPriority = taskPriority
@@ -314,6 +381,9 @@ export function ScheduleActivityDialog({
         title: state.title.trim(),
         body: state.description.trim() || null,
         status: 'planned',
+        date: trimmedDate,
+        time: state.allDay ? '00:00' : trimmedStartTime,
+        phoneNumber: state.activityType === 'call' ? phoneNumberForPayload : undefined,
         scheduledAt,
         durationMinutes: visibleFields.has('duration') && !state.allDay ? state.duration : null,
         location: visibleFields.has('location') ? (state.location.trim() || null) : null,
@@ -350,12 +420,23 @@ export function ScheduleActivityDialog({
       onClose()
       // Delay data reload so the dialog can unmount cleanly and Radix restores body scroll
       requestAnimationFrame(() => { onActivityCreated?.() })
-    } catch {
-      flash(t('customers.schedule.error', 'Failed to schedule activity'), 'error')
+    } catch (err) {
+      const { message, fieldErrors } = mapCrudServerErrorToFormErrors(err)
+      const phoneFieldError = fieldErrors?.phoneNumber
+      if (state.activityType === 'call' && phoneFieldError) {
+        const translatedPhoneError = translateErrorMessage(phoneFieldError, callPhoneInvalidMessage)
+        setCallPhoneError(translatedPhoneError)
+        flash(translatedPhoneError, 'error')
+        return
+      }
+      flash(
+        translateErrorMessage(message, t('customers.schedule.error', 'Failed to schedule activity')),
+        'error',
+      )
     } finally {
       state.setSaving(false)
     }
-  }, [state.activityType, state.allDay, state.date, state.description, dealId, state.duration, editData, entityId, state.guestPermissions, state.linkedEntities, state.location, onActivityCreated, onClose, state.participants, state.recurrenceCount, state.recurrenceDays, state.recurrenceEnabled, state.recurrenceEndDate, state.recurrenceEndType, state.reminderMinutes, runGuardedMutation, state.startTime, t, state.title, state.visibility, visibleFields]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [callDirection, callOutcome, callPhoneInvalidMessage, callPhoneNumber, isDateMissing, isTimeMissing, state.activityType, state.allDay, state.date, state.description, dealId, state.duration, editData, entityId, state.guestPermissions, state.linkedEntities, state.location, onActivityCreated, onClose, state.participants, state.recurrenceCount, state.recurrenceDays, state.recurrenceEnabled, state.recurrenceEndDate, state.recurrenceEndType, state.reminderMinutes, runGuardedMutation, state.startTime, t, taskPriority, state.title, translateErrorMessage, trimmedCallPhone, trimmedDate, trimmedStartTime, state.visibility, visibleFields]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const handleKeyDown = React.useCallback((e: React.KeyboardEvent) => {
     if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
@@ -580,15 +661,17 @@ export function ScheduleActivityDialog({
         {/* Location (or phone number for calls) */}
         {state.activityType === 'call' ? (
           <div className="flex flex-col gap-1.5">
-            <label className="text-overline font-semibold uppercase text-muted-foreground tracking-wider">
+            <label htmlFor="schedule-call-phone" className="text-overline font-semibold uppercase text-muted-foreground tracking-wider">
               {t('customers.schedule.call.phoneLabel', 'Phone number')}
             </label>
-            <input
-              type="tel"
+            <PhoneNumberField
+              id="schedule-call-phone"
               value={callPhoneNumber}
-              onChange={(e) => setCallPhoneNumber(e.target.value)}
+              onValueChange={handleCallPhoneChange}
               placeholder={t('customers.schedule.call.phonePlaceholder', '+1 555 000 0000')}
-              className="w-full rounded-md border border-border bg-background px-3 py-2.5 text-sm text-foreground outline-none focus:border-foreground"
+              externalError={callPhoneError}
+              invalidLabel={callPhoneInvalidMessage}
+              minDigits={7}
             />
           </div>
         ) : (
@@ -642,7 +725,7 @@ export function ScheduleActivityDialog({
           <Button type="button" variant="outline" onClick={() => { void guardedClose() }} className="rounded-md border border-input bg-background px-5 py-3 text-sm font-semibold text-foreground">
             {t('customers.schedule.cancel', 'Cancel')}
           </Button>
-          <Button type="button" onClick={handleSave} disabled={state.saving || !state.title.trim()} className="flex items-center gap-2 rounded-md bg-foreground px-5 py-3 text-sm font-semibold text-background hover:bg-foreground/90 disabled:opacity-50">
+          <Button type="button" onClick={handleSave} disabled={isSubmitDisabled} className="flex items-center gap-2 rounded-md bg-foreground px-5 py-3 text-sm font-semibold text-background hover:bg-foreground/90 disabled:opacity-50">
             <SaveIcon className="size-3.5" />
             {state.saving
               ? t('customers.schedule.saving', 'Saving...')

package/src/modules/customers/components/detail/schedule/DateTimeFields.tsx

@@ -65,6 +65,11 @@ export function DateTimeFields({
   const showAllDay = isVisible(activityType, 'allDay')
   const showRecurrence = isVisible(activityType, 'recurrence')
 
+  const dateMissing = !date.trim()
+  const timeMissing = showStartTime && !allDay && !startTime.trim()
+  const dateErrorId = 'schedule-date-error'
+  const timeErrorId = 'schedule-time-error'
+
   return (
     <>
       {/* Date / Time / Duration */}
@@ -72,21 +77,62 @@ export function DateTimeFields({
         <div className="flex flex-[2] flex-col gap-1.5">
           <label className="text-overline font-semibold text-muted-foreground tracking-wider">
             {getFieldLabel(activityType, 'date', t, 'customers.schedule.date', 'Date')}
+            <span aria-hidden="true" className="ml-1 text-status-error-foreground">*</span>
           </label>
-          <div className="flex items-center gap-2 rounded-md border border-border bg-background px-3 py-2.5">
+          <div
+            className={cn(
+              'flex items-center gap-2 rounded-md border bg-background px-3 py-2.5',
+              dateMissing ? 'border-status-error-border' : 'border-border',
+            )}
+          >
             <Calendar className="size-3.5 text-muted-foreground" />
-            <input type="date" value={date} onChange={(e) => setDate(e.target.value)} className="flex-1 bg-transparent text-sm text-foreground focus:outline-none" />
+            <input
+              type="date"
+              value={date}
+              onChange={(e) => setDate(e.target.value)}
+              required
+              aria-required="true"
+              aria-invalid={dateMissing ? true : undefined}
+              aria-describedby={dateMissing ? dateErrorId : undefined}
+              className="flex-1 bg-transparent text-sm text-foreground focus:outline-none"
+            />
           </div>
+          {dateMissing ? (
+            <p id={dateErrorId} className="text-xs text-status-error-foreground">
+              {t('customers.activities.errors.dateRequired', 'Date is required')}
+            </p>
+          ) : null}
         </div>
         {showStartTime && (
           <div className="flex flex-1 flex-col gap-1.5">
             <label className="text-overline font-semibold text-muted-foreground tracking-wider">
               {getFieldLabel(activityType, 'startTime', t, 'customers.schedule.start', 'Start')}
+              <span aria-hidden="true" className="ml-1 text-status-error-foreground">*</span>
             </label>
-            <div className="flex items-center gap-2 rounded-md border border-border bg-background px-3 py-2.5">
+            <div
+              className={cn(
+                'flex items-center gap-2 rounded-md border bg-background px-3 py-2.5',
+                timeMissing ? 'border-status-error-border' : 'border-border',
+              )}
+            >
               <Clock className="size-3.5 text-muted-foreground" />
-              <input type="time" value={startTime} onChange={(e) => setStartTime(e.target.value)} disabled={allDay} className="flex-1 bg-transparent text-sm text-foreground focus:outline-none disabled:opacity-50" />
+              <input
+                type="time"
+                value={startTime}
+                onChange={(e) => setStartTime(e.target.value)}
+                disabled={allDay}
+                required={!allDay}
+                aria-required={!allDay}
+                aria-invalid={timeMissing ? true : undefined}
+                aria-describedby={timeMissing ? timeErrorId : undefined}
+                className="flex-1 bg-transparent text-sm text-foreground focus:outline-none disabled:opacity-50"
+              />
             </div>
+            {timeMissing ? (
+              <p id={timeErrorId} className="text-xs text-status-error-foreground">
+                {t('customers.activities.errors.timeRequired', 'Time is required')}
+              </p>
+            ) : null}
           </div>
         )}
         {showDuration && (

package/src/modules/customers/components/detail/schedule/useScheduleFormState.ts

@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { format } from 'date-fns'
 import type { ActivityType } from './fieldConfig'
 
 export type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'
@@ -23,6 +24,12 @@ export type ScheduleActivityEditData = {
   title?: string | null
   body?: string | null
   scheduledAt?: string | null
+  /**
+   * Historical timestamp for completed activities (status `done`). Required for
+   * the edit prefill to restore the original date/time instead of falling back
+   * to "today" (#1807).
+   */
+  occurredAt?: string | null
   durationMinutes?: number | null
   location?: string | null
   allDay?: boolean | null
@@ -64,7 +71,7 @@ interface UseScheduleFormStateParams {
 export function useScheduleFormState({ open, editData }: UseScheduleFormStateParams) {
   const [activityType, setActivityType] = React.useState<ActivityType>('meeting')
   const [title, setTitle] = React.useState('')
-  const [date, setDate] = React.useState(() => new Date().toISOString().slice(0, 10))
+  const [date, setDate] = React.useState(() => format(new Date(), 'yyyy-MM-dd'))
   const [startTime, setStartTime] = React.useState('10:00')
   const [duration, setDuration] = React.useState(30)
   const [allDay, setAllDay] = React.useState(false)
@@ -91,9 +98,18 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
         const resolvedType = (editData.interactionType as ActivityType) ?? 'meeting'
         setActivityType(resolvedType)
         setTitle(editData.title ?? '')
-        const scheduledDate = editData.scheduledAt ? new Date(editData.scheduledAt) : new Date()
-        setDate(scheduledDate.toISOString().slice(0, 10))
-        setStartTime(scheduledDate.toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' }))
+        // For historical activities the canonical timestamp is `occurredAt`; for
+        // planned/future ones it's `scheduledAt`. Without this fallback editing a
+        // past activity prefilled to "today" instead of its actual moment (#1807).
+        // Use `date-fns` `format(...)` so the seed values are in the user's local
+        // timezone (matches the cluster-E local-day convention).
+        const sourceTimestamp = editData.occurredAt ?? editData.scheduledAt ?? null
+        const seedDate = sourceTimestamp ? new Date(sourceTimestamp) : new Date()
+        const seedDateValid = !Number.isNaN(seedDate.getTime())
+        const fallbackNow = new Date()
+        const dateForForm = seedDateValid ? seedDate : fallbackNow
+        setDate(format(dateForForm, 'yyyy-MM-dd'))
+        setStartTime(format(dateForForm, 'HH:mm'))
         setDuration(editData.durationMinutes ?? 30)
         setAllDay(editData.allDay ?? false)
         setDescription(editData.body ?? '')
@@ -154,7 +170,7 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
         // Create mode: reset all fields
         setActivityType('meeting')
         setTitle('')
-        setDate(new Date().toISOString().slice(0, 10))
+        setDate(format(new Date(), 'yyyy-MM-dd'))
         setStartTime('10:00')
         setDuration(30)
         setAllDay(false)

package/src/modules/customers/data/validators.ts

@@ -4,11 +4,17 @@ import { isValidPhoneNumber } from '@open-mercato/shared/lib/phone'
 const uuid = () => z.string().uuid()
 
 export const CUSTOMER_PHONE_INVALID_MESSAGE_KEY = 'customers.people.form.primaryPhone.invalid'
+export const ACTIVITY_DATE_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.dateRequired'
+export const ACTIVITY_TIME_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.timeRequired'
+export const ACTIVITY_PHONE_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.phoneRequired'
+export const ACTIVITY_PHONE_INVALID_MESSAGE_KEY = 'customers.activities.errors.phoneInvalid'
 
 const phoneSchema = z.string().trim().max(50).refine((val) => {
   return isValidPhoneNumber(val)
 }, { message: CUSTOMER_PHONE_INVALID_MESSAGE_KEY }).optional()
 
+const interactionPhoneNumberSchema = z.string().trim().max(50).optional().nullable()
+
 const scopedSchema = z.object({
   organizationId: uuid(),
   tenantId: uuid(),
@@ -140,6 +146,9 @@ export const activityCreateSchema = scopedSchema.extend({
   activityType: z.string().min(1).max(100),
   subject: z.string().max(200).optional(),
   body: z.string().max(8000).optional(),
+  date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional(),
+  time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional(),
+  phoneNumber: interactionPhoneNumberSchema,
   occurredAt: z.coerce.date().optional(),
   dealId: uuid().optional(),
   authorUserId: uuid().optional(),
@@ -351,13 +360,16 @@ const interactionExtendedFields = {
   guestPermissions: interactionGuestPermissionsSchema.optional().nullable(),
 } as const
 
-export const interactionCreateSchema = scopedSchema.extend({
+const interactionCreateBaseSchema = scopedSchema.extend({
   id: z.string().uuid().optional(),
   entityId: z.string().uuid(),
   interactionType: z.string().trim().min(1).max(100),
   title: z.string().trim().max(500).optional().nullable(),
   body: z.string().trim().max(10000).optional().nullable(),
   status: z.enum(interactionStatusValues).optional().default('planned'),
+  date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional(),
+  time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional(),
+  phoneNumber: interactionPhoneNumberSchema,
   scheduledAt: z.coerce.date().optional().nullable(),
   occurredAt: z.coerce.date().optional().nullable(),
   priority: z.number().int().min(0).max(100).optional().nullable(),
@@ -370,9 +382,48 @@ export const interactionCreateSchema = scopedSchema.extend({
   ...interactionExtendedFields,
 })
 
+function deriveScheduledAtFromDateTime(date?: string, time?: string): Date | null {
+  if (!date || typeof date !== 'string') return null
+  const trimmedDate = date.trim()
+  if (!trimmedDate) return null
+  const trimmedTime = typeof time === 'string' ? time.trim() : ''
+  const iso = trimmedTime ? `${trimmedDate}T${trimmedTime}:00` : `${trimmedDate}T00:00:00`
+  const parsed = new Date(iso)
+  return Number.isNaN(parsed.getTime()) ? null : parsed
+}
+
+export const interactionCreateSchema = interactionCreateBaseSchema
+  .superRefine((value, ctx) => {
+    if (value.interactionType === 'call' && value.phoneNumber !== undefined && value.phoneNumber !== null) {
+      const phone = typeof value.phoneNumber === 'string' ? value.phoneNumber.trim() : ''
+      if (!phone) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ['phoneNumber'],
+          message: ACTIVITY_PHONE_REQUIRED_MESSAGE_KEY,
+        })
+      } else if (!isValidPhoneNumber(phone)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ['phoneNumber'],
+          message: ACTIVITY_PHONE_INVALID_MESSAGE_KEY,
+        })
+      }
+    }
+  })
+  // Derive `scheduledAt` from `date+time` when only the latter are sent so
+  // external API consumers don't silently persist `scheduled_at: null` after
+  // the validator already enforced non-empty date/time. The form already
+  // computes `scheduledAt` itself, so this branch is a no-op for the form path.
+  .transform((value) => {
+    if (value.scheduledAt) return value
+    const derived = deriveScheduledAtFromDateTime(value.date, value.time)
+    return derived ? { ...value, scheduledAt: derived } : value
+  })
+
 export type InteractionCreateInput = z.infer<typeof interactionCreateSchema>
 
-export const interactionUpdateSchema = z
+const interactionUpdateBaseSchema = z
   .object({
     id: z.string().uuid(),
   })
@@ -383,6 +434,9 @@ export const interactionUpdateSchema = z
         title: z.string().trim().max(500).optional().nullable(),
         body: z.string().trim().max(10000).optional().nullable(),
         status: z.enum(interactionStatusValues).optional(),
+        date: z.string().trim().min(1, ACTIVITY_DATE_REQUIRED_MESSAGE_KEY).optional(),
+        time: z.string().trim().min(1, ACTIVITY_TIME_REQUIRED_MESSAGE_KEY).optional(),
+        phoneNumber: interactionPhoneNumberSchema,
         scheduledAt: z.coerce.date().optional().nullable(),
         occurredAt: z.coerce.date().optional().nullable(),
         priority: z.number().int().min(0).max(100).optional().nullable(),
@@ -397,6 +451,35 @@ export const interactionUpdateSchema = z
       .partial(),
   )
 
+export const interactionUpdateSchema = interactionUpdateBaseSchema
+  .superRefine((value, ctx) => {
+    if (value.interactionType === 'call' && value.phoneNumber !== undefined) {
+      const phone = typeof value.phoneNumber === 'string' ? value.phoneNumber.trim() : ''
+      if (!phone) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ['phoneNumber'],
+          message: ACTIVITY_PHONE_REQUIRED_MESSAGE_KEY,
+        })
+      } else if (!isValidPhoneNumber(phone)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ['phoneNumber'],
+          message: ACTIVITY_PHONE_INVALID_MESSAGE_KEY,
+        })
+      }
+    }
+  })
+  // Mirror the create-schema derivation for partial updates: when an external
+  // caller supplies `date+time` without `scheduledAt`, derive the timestamp so
+  // the update doesn't silently leave `scheduled_at` stale.
+  .transform((value) => {
+    if (value.scheduledAt !== undefined) return value
+    if (!value.date && !value.time) return value
+    const derived = deriveScheduledAtFromDateTime(value.date, value.time)
+    return derived ? { ...value, scheduledAt: derived } : value
+  })
+
 export type InteractionUpdateInput = z.infer<typeof interactionUpdateSchema>
 
 export const interactionCompleteSchema = z.object({

package/src/modules/customers/i18n/de.json

@@ -4,6 +4,9 @@
   "audit_logs.resource_kind.customers.comment": "Kommentar",
   "audit_logs.resource_kind.customers.todoLink": "Aufgabe",
   "backend.nav.configuration": "Konfiguration",
+  "customers.activities.actions.markDone": "Als erledigt markieren",
+  "customers.activities.actions.markDoneError": "Aktivität konnte nicht als erledigt markiert werden",
+  "customers.activities.actions.markDoneSuccess": "Aktivität als erledigt markiert",
   "customers.activities.add.call": "Anruf protokollieren",
   "customers.activities.add.email": "E-Mail verfassen",
   "customers.activities.add.meeting": "Neues Meeting",
@@ -24,6 +27,10 @@
   "customers.activities.card.empty": "Für diesen Tag ist nichts geplant.",
   "customers.activities.card.overdue": "{count} überfällig",
   "customers.activities.card.title": "Aktivitäten",
+  "customers.activities.errors.dateRequired": "Datum ist erforderlich",
+  "customers.activities.errors.phoneInvalid": "Geben Sie eine gültige Telefonnummer mit Ländervorwahl ein (z. B. +49 30 1234567)",
+  "customers.activities.errors.phoneRequired": "Telefonnummer ist für Anrufaktivitäten erforderlich",
+  "customers.activities.errors.timeRequired": "Uhrzeit ist erforderlich",
   "customers.activities.filters.clearAll": "Clear filters",
   "customers.activities.filters.dateRange": "Date range",
   "customers.activities.loadFailed": "Aktivitäten konnten nicht geladen werden.",
@@ -52,6 +59,7 @@
   "customers.activityComposer.types.email": "Email",
   "customers.activityComposer.types.meeting": "Meeting",
   "customers.activityComposer.types.note": "Note",
+  "customers.activityComposer.types.task": "Aufgabe",
   "customers.activityComposer.validation.descriptionRequired": "Description is required",
   "customers.activityComposer.validation.typeRequired": "Select an activity type",
   "customers.activityComposer.weekPreviewTitle": "Diese Woche",
@@ -59,6 +67,8 @@
   "customers.activityLog.direction.with": "with",
   "customers.activityLog.emptyDescription": "Try broadening the date range or removing some filters.",
   "customers.activityLog.error": "Failed to load activity history",
+  "customers.activityLog.filters.dateRangeLabel": "Nach Datumsbereich filtern",
+  "customers.activityLog.filters.sortLabel": "Aktivitäten sortieren",
   "customers.activityLog.searchPlaceholder": "Search by title, note, or author",
   "customers.activityLog.sort.recent": "Sort: newest",
   "customers.activityLog.sort.titleAsc": "Sort: Name A-Z",
@@ -2022,6 +2032,7 @@
   "customers.timeline.filter.from": "From date",
   "customers.timeline.filter.meeting": "Meeting",
   "customers.timeline.filter.note": "Note",
+  "customers.timeline.filter.task": "Aufgabe",
   "customers.timeline.filter.to": "To date",
   "customers.timeline.history.filtered": "filtered: {{types}} · {{count}} results",
   "customers.timeline.history.searchAriaLabel": "",

package/src/modules/customers/i18n/en.json

@@ -4,6 +4,9 @@
   "audit_logs.resource_kind.customers.comment": "Comment",
   "audit_logs.resource_kind.customers.todoLink": "Todo",
   "backend.nav.configuration": "Configuration",
+  "customers.activities.actions.markDone": "Mark done",
+  "customers.activities.actions.markDoneError": "Could not mark activity as done",
+  "customers.activities.actions.markDoneSuccess": "Activity marked done",
   "customers.activities.add.call": "Log call",
   "customers.activities.add.email": "Compose email",
   "customers.activities.add.meeting": "New meeting",
@@ -24,6 +27,10 @@
   "customers.activities.card.empty": "Nothing scheduled for this day.",
   "customers.activities.card.overdue": "{count} overdue",
   "customers.activities.card.title": "Activities",
+  "customers.activities.errors.dateRequired": "Date is required",
+  "customers.activities.errors.phoneInvalid": "Enter a valid phone number with country code (e.g. +1 212 555 1234)",
+  "customers.activities.errors.phoneRequired": "Phone number is required for Call activities",
+  "customers.activities.errors.timeRequired": "Time is required",
   "customers.activities.filters.clearAll": "Clear filters",
   "customers.activities.filters.dateRange": "Date range",
   "customers.activities.loadFailed": "Failed to load activities.",
@@ -52,6 +59,7 @@
   "customers.activityComposer.types.email": "Email",
   "customers.activityComposer.types.meeting": "Meeting",
   "customers.activityComposer.types.note": "Note",
+  "customers.activityComposer.types.task": "Task",
   "customers.activityComposer.validation.descriptionRequired": "Description is required",
   "customers.activityComposer.validation.typeRequired": "Select an activity type",
   "customers.activityComposer.weekPreviewTitle": "This week",
@@ -59,6 +67,8 @@
   "customers.activityLog.direction.with": "with",
   "customers.activityLog.emptyDescription": "Try broadening the date range or removing some filters.",
   "customers.activityLog.error": "Failed to load activity history",
+  "customers.activityLog.filters.dateRangeLabel": "Date range",
+  "customers.activityLog.filters.sortLabel": "Sort order",
   "customers.activityLog.searchPlaceholder": "Search by title, note, or author",
   "customers.activityLog.sort.recent": "Sort: newest",
   "customers.activityLog.sort.titleAsc": "Sort: Name A-Z",
@@ -2022,6 +2032,7 @@
   "customers.timeline.filter.from": "From date",
   "customers.timeline.filter.meeting": "Meeting",
   "customers.timeline.filter.note": "Note",
+  "customers.timeline.filter.task": "Task",
   "customers.timeline.filter.to": "To date",
   "customers.timeline.history.filtered": "filtered: {{types}} · {{count}} results",
   "customers.timeline.history.searchAriaLabel": "Search interaction history",

package/src/modules/customers/i18n/es.json

@@ -4,6 +4,9 @@
   "audit_logs.resource_kind.customers.comment": "Comentario",
   "audit_logs.resource_kind.customers.todoLink": "Tarea",
   "backend.nav.configuration": "Configuración",
+  "customers.activities.actions.markDone": "Marcar como hecho",
+  "customers.activities.actions.markDoneError": "No se pudo marcar la actividad como hecha",
+  "customers.activities.actions.markDoneSuccess": "Actividad marcada como hecha",
   "customers.activities.add.call": "Registrar llamada",
   "customers.activities.add.email": "Redactar correo",
   "customers.activities.add.meeting": "Nueva reunión",
@@ -24,6 +27,10 @@
   "customers.activities.card.empty": "Nada programado para este día.",
   "customers.activities.card.overdue": "{count} vencidas",
   "customers.activities.card.title": "Actividades",
+  "customers.activities.errors.dateRequired": "La fecha es obligatoria",
+  "customers.activities.errors.phoneInvalid": "Introduce un número de teléfono válido con prefijo internacional (p. ej., +34 912 345 678)",
+  "customers.activities.errors.phoneRequired": "El número de teléfono es obligatorio para actividades de llamada",
+  "customers.activities.errors.timeRequired": "La hora es obligatoria",
   "customers.activities.filters.clearAll": "Clear filters",
   "customers.activities.filters.dateRange": "Date range",
   "customers.activities.loadFailed": "No se pudieron cargar las actividades.",
@@ -52,6 +59,7 @@
   "customers.activityComposer.types.email": "Email",
   "customers.activityComposer.types.meeting": "Meeting",
   "customers.activityComposer.types.note": "Note",
+  "customers.activityComposer.types.task": "Tarea",
   "customers.activityComposer.validation.descriptionRequired": "Description is required",
   "customers.activityComposer.validation.typeRequired": "Select an activity type",
   "customers.activityComposer.weekPreviewTitle": "Esta semana",
@@ -59,6 +67,8 @@
   "customers.activityLog.direction.with": "with",
   "customers.activityLog.emptyDescription": "Try broadening the date range or removing some filters.",
   "customers.activityLog.error": "Failed to load activity history",
+  "customers.activityLog.filters.dateRangeLabel": "Filtrar por rango de fechas",
+  "customers.activityLog.filters.sortLabel": "Ordenar actividades",
   "customers.activityLog.searchPlaceholder": "Search by title, note, or author",
   "customers.activityLog.sort.recent": "Sort: newest",
   "customers.activityLog.sort.titleAsc": "Sort: Name A-Z",
@@ -2022,6 +2032,7 @@
   "customers.timeline.filter.from": "From date",
   "customers.timeline.filter.meeting": "Meeting",
   "customers.timeline.filter.note": "Note",
+  "customers.timeline.filter.task": "Tarea",
   "customers.timeline.filter.to": "To date",
   "customers.timeline.history.filtered": "filtered: {{types}} · {{count}} results",
   "customers.timeline.history.searchAriaLabel": "",