@open-mercato/core 0.6.4-develop.4199.1.86677441c2 → 0.6.4-develop.4217.1.c9aa050183

package/src/modules/dictionaries/components/AppearanceSelector.tsx

@@ -3,6 +3,7 @@
 import * as React from 'react'
 import { Ellipsis } from 'lucide-react'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { ColorPicker } from '@open-mercato/ui/primitives/color-picker'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { ICON_LIBRARY, ICON_SUGGESTIONS, type IconOption, renderDictionaryColor, renderDictionaryIcon } from './dictionaryAppearance'
 
@@ -119,12 +120,10 @@ export function AppearanceSelector({
           {labels.colorHelp ? <span className="text-xs font-normal text-muted-foreground">{labels.colorHelp}</span> : null}
         </label>
         <div className="flex flex-wrap items-center gap-2">
-          <input
-            type="color"
+          <ColorPicker
             value={normalizedColor}
-            onChange={(event) => onColorChange(event.target.value)}
+            onChange={(next) => onColorChange(next)}
             disabled={disabled}
-            className="h-10 w-12 cursor-pointer rounded border border-border bg-background"
             aria-label={labels.colorLabel}
           />
           <Button

package/src/modules/integrations/backend/integrations/[id]/page.tsx

@@ -148,16 +148,16 @@ type DataSyncRunDetail = {
 }
 
 const LOG_LEVEL_STYLES: Record<string, string> = {
-  info: 'bg-blue-100 text-blue-800',
-  warn: 'bg-yellow-100 text-yellow-800',
-  error: 'bg-red-100 text-red-800',
+  info: 'bg-status-info-bg text-status-info-text',
+  warn: 'bg-status-warning-bg text-status-warning-text',
+  error: 'bg-status-error-bg text-status-error-text',
 }
 
 const HEALTH_STATUS_STYLES: Record<string, string> = {
-  healthy: 'bg-green-100 text-green-800',
-  degraded: 'bg-yellow-100 text-yellow-800',
-  unhealthy: 'bg-red-100 text-red-800',
-  unconfigured: 'bg-zinc-100 text-zinc-700',
+  healthy: 'bg-status-success-bg text-status-success-text',
+  degraded: 'bg-status-warning-bg text-status-warning-text',
+  unhealthy: 'bg-status-error-bg text-status-error-text',
+  unconfigured: 'bg-status-neutral-bg text-status-neutral-text',
 }
 
 const HEALTH_STATUS_ICONS: Record<string, React.ElementType> = {
@@ -203,12 +203,12 @@ function RunActivityStrip({
   const processed = typeof run.progressJob?.processedCount === 'number' ? run.progressJob.processedCount : 0
   const total = typeof run.progressJob?.totalCount === 'number' ? run.progressJob.totalCount : null
   const statusClass = run.status === 'completed'
-    ? 'border-emerald-500/30 bg-emerald-500/10 text-emerald-700 dark:text-emerald-300'
+    ? 'border-status-success-border bg-status-success-bg text-status-success-text'
     : run.status === 'failed'
-      ? 'border-red-500/30 bg-red-500/10 text-red-700 dark:text-red-300'
+      ? 'border-status-error-border bg-status-error-bg text-status-error-text'
       : run.status === 'cancelled'
-        ? 'border-zinc-500/30 bg-zinc-500/10 text-zinc-700 dark:text-zinc-300'
-        : 'border-blue-500/30 bg-blue-500/10 text-blue-700 dark:text-blue-300'
+        ? 'border-status-neutral-border bg-status-neutral-bg text-status-neutral-text'
+        : 'border-status-info-border bg-status-info-bg text-status-info-text'
 
   return (
     <div className="flex flex-wrap items-center gap-3 rounded-lg border bg-muted/20 px-4 py-3 text-sm">
@@ -958,8 +958,8 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
   ] satisfies IntegrationDetailTab[]
   const StateIcon = resolvedState?.isEnabled ? CheckCircle2 : XCircle
   const stateBadgeClass = resolvedState?.isEnabled
-    ? 'border-emerald-500/30 bg-emerald-500/10 text-emerald-300'
-    : 'border-zinc-500/30 bg-zinc-500/10 text-zinc-300'
+    ? 'border-status-success-border bg-status-success-bg text-status-success-text'
+    : 'border-status-neutral-border bg-status-neutral-bg text-status-neutral-text'
 
   const showCredentialActions = showCredentialsTab && activeTab === 'credentials' && credentialFormFields.length > 0
 
@@ -1150,7 +1150,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             {showCredentialsTab ? (
               <TabsTrigger
                 value="credentials"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <Key className="h-4 w-4" />
@@ -1161,7 +1161,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             {leadingInjectedTab ? (
               <TabsTrigger
                 value={leadingInjectedTab.id}
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <Settings className="h-4 w-4" />
@@ -1172,7 +1172,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             {showVersionTab ? (
               <TabsTrigger
                 value="version"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <RefreshCw className="h-4 w-4" />
@@ -1183,7 +1183,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             {showDataSyncScheduleTab ? (
               <TabsTrigger
                 value="data-sync-schedule"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <Calendar className="h-4 w-4" />
@@ -1194,7 +1194,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             {showHealthTab ? (
               <TabsTrigger
                 value="health"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <Activity className="h-4 w-4" />
@@ -1205,7 +1205,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             {showLogsTab ? (
               <TabsTrigger
                 value="logs"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <FileText className="h-4 w-4" />
@@ -1217,7 +1217,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
               <TabsTrigger
                 key={tab.id}
                 value={tab.id}
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-foreground aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
+                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
               >
                 <span className="inline-flex items-center gap-2">
                   <Settings className="h-4 w-4" />
@@ -1231,7 +1231,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             <TabsContent value="credentials" className="mt-0">
               <section className="space-y-4 rounded-lg border bg-card p-6">
                 {detail.bundle ? (
-                  <div className="rounded-lg border border-blue-200 bg-blue-50 p-3 text-sm text-blue-800">
+                  <div className="rounded-lg border border-status-info-border bg-status-info-bg p-3 text-sm text-status-info-text">
                     {t('integrations.detail.credentials.bundleShared', { bundle: detail.bundle.title })}
                   </div>
                 ) : null}

package/src/modules/planner/backend/planner/availability-rulesets/[id]/page.tsx

@@ -166,7 +166,7 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
                   size="sm"
                   className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-2 font-medium ${
                     activeTab === tab.id
-                      ? 'border-primary text-foreground'
+                      ? 'border-accent-indigo text-foreground'
                       : 'border-transparent text-muted-foreground hover:text-foreground'
                   }`}
                   onClick={() => setActiveTab(tab.id as 'details' | 'availability')}

package/src/modules/planner/components/AvailabilityRulesEditor.tsx

@@ -27,7 +27,9 @@ import {
 } from '@open-mercato/core/modules/planner/components/unavailabilityReasons'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { normalizeCrudServerError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { parseAvailabilityRuleWindow } from '@open-mercato/core/modules/planner/lib/availabilitySchedule'
+import { deleteAvailabilityRuleSet } from '@open-mercato/core/modules/planner/lib/deleteAvailabilityRuleSet'
 import { CrudForm, type CrudField } from '@open-mercato/ui/backend/CrudForm'
 import { Calendar, Clock, List, PencilLine, Plus, Trash2 } from 'lucide-react'
 import {
@@ -80,6 +82,7 @@ export type AvailabilityRulesEditorProps = {
   initialTimezone?: string
   rulesetId?: string | null
   onRulesetChange?: (rulesetId: string | null) => Promise<void>
+  allowRuleSetDelete?: boolean
   buildScheduleItems: AvailabilityScheduleItemBuilder
   loadBookedEvents?: (range: ScheduleRange) => Promise<AvailabilityBookedEvent[]>
   readOnly?: boolean
@@ -357,6 +360,7 @@ export function AvailabilityRulesEditor({
   initialTimezone,
   rulesetId,
   onRulesetChange,
+  allowRuleSetDelete,
   buildScheduleItems,
   loadBookedEvents,
   readOnly,
@@ -469,6 +473,11 @@ export function AvailabilityRulesEditor({
       ruleSetCreateTimezoneLabel: t(`${labelPrefix}.availability.ruleset.createTimezone`, 'Timezone'),
       ruleSetCreateSuccess: t(`${labelPrefix}.availability.ruleset.createSuccess`, 'Schedule saved.'),
       ruleSetCreateError: t(`${labelPrefix}.availability.ruleset.createError`, 'Failed to save schedule.'),
+      ruleSetDelete: t(`${labelPrefix}.availability.ruleset.delete`, 'Delete schedule'),
+      ruleSetDeleteConfirm: t(`${labelPrefix}.availability.ruleset.deleteConfirm`, 'Delete schedule "{{name}}"?'),
+      ruleSetDeleteSubmit: t(`${labelPrefix}.availability.ruleset.deleteSubmit`, 'Delete'),
+      ruleSetDeleteSuccess: t(`${labelPrefix}.availability.ruleset.deleteSuccess`, 'Schedule deleted.'),
+      ruleSetDeleteError: t(`${labelPrefix}.availability.ruleset.deleteError`, 'Failed to delete schedule.'),
       editTitle: t(`${modeBase}.form.title.edit`, 'Edit availability'),
       addTitle: t(`${modeBase}.form.title.create`, 'Add availability'),
       applyLabel: t(`${labelPrefix}.availability.actions.apply`, 'Apply'),
@@ -1009,6 +1018,47 @@ export function AvailabilityRulesEditor({
     isReadOnly,
   ])
 
+  const handleDeleteRuleSet = React.useCallback(async () => {
+    if (isReadOnly || !onRulesetChange || !rulesetId) return
+    const selected = ruleSets.find((entry) => entry.id === rulesetId)
+    const name = selected?.name ?? rulesetId
+    await deleteAvailabilityRuleSet({
+      ruleSetId: rulesetId,
+      confirmDelete: () => confirm({
+        title: listLabels.ruleSetDeleteConfirm.replace('{{name}}', name),
+        confirmText: listLabels.ruleSetDeleteSubmit,
+        variant: 'destructive',
+      }),
+      deleteRuleSet: async (id) => {
+        await deleteCrud('planner/availability-rule-sets', id, { errorMessage: listLabels.ruleSetDeleteError })
+      },
+      clearAssignment: async () => {
+        setCustomOverridesEnabled(false)
+        await onRulesetChange(null)
+        await refreshAvailability()
+      },
+      refreshRuleSets,
+      onSuccess: () => flash(listLabels.ruleSetDeleteSuccess, 'success'),
+      onError: (error) => {
+        console.error('planner.availability-rule-sets.delete', error)
+        const normalized = normalizeCrudServerError(error)
+        flash(normalized.message ?? listLabels.ruleSetDeleteError, 'error')
+      },
+    })
+  }, [
+    confirm,
+    isReadOnly,
+    listLabels.ruleSetDeleteConfirm,
+    listLabels.ruleSetDeleteError,
+    listLabels.ruleSetDeleteSubmit,
+    listLabels.ruleSetDeleteSuccess,
+    onRulesetChange,
+    refreshAvailability,
+    refreshRuleSets,
+    ruleSets,
+    rulesetId,
+  ])
+
   const ruleSetFormSchema = React.useMemo(
     () => z.object({
       name: z.string().min(1, t('ui.forms.errors.required', 'Required')),
@@ -1369,6 +1419,18 @@ export function AvailabilityRulesEditor({
                   {listLabels.ruleSetReset}
                 </Button>
               ) : null}
+              {allowRuleSetDelete && rulesetId ? (
+                <Button
+                  type="button"
+                  variant="destructive-outline"
+                  size="sm"
+                  onClick={() => { void handleDeleteRuleSet() }}
+                  disabled={isReadOnly}
+                >
+                  <Trash2 className="size-4 mr-2" aria-hidden />
+                  {listLabels.ruleSetDelete}
+                </Button>
+              ) : null}
             </div>
           ) : null}
 

package/src/modules/planner/lib/deleteAvailabilityRuleSet.ts

@@ -0,0 +1,35 @@
+export type DeleteAvailabilityRuleSetOutcome = 'deleted' | 'cancelled' | 'noop' | 'failed'
+
+export type DeleteAvailabilityRuleSetActions = {
+  ruleSetId: string | null | undefined
+  confirmDelete: () => Promise<boolean>
+  deleteRuleSet: (ruleSetId: string) => Promise<void>
+  clearAssignment: () => Promise<void>
+  refreshRuleSets: () => Promise<void>
+  onSuccess: () => void
+  onError: (error: unknown) => void
+}
+
+/**
+ * Orchestrates deleting an availability schedule (rule set) from the availability
+ * editor: confirm, delete the schedule, clear it from the current subject so no
+ * dangling assignment remains, refresh the selector, and report the outcome.
+ */
+export async function deleteAvailabilityRuleSet(
+  actions: DeleteAvailabilityRuleSetActions,
+): Promise<DeleteAvailabilityRuleSetOutcome> {
+  const ruleSetId = actions.ruleSetId
+  if (!ruleSetId) return 'noop'
+  const confirmed = await actions.confirmDelete()
+  if (!confirmed) return 'cancelled'
+  try {
+    await actions.deleteRuleSet(ruleSetId)
+    await actions.clearAssignment()
+    await actions.refreshRuleSets()
+    actions.onSuccess()
+    return 'deleted'
+  } catch (error) {
+    actions.onError(error)
+    return 'failed'
+  }
+}

package/src/modules/resources/backend/resources/resources/[id]/page.tsx

@@ -543,7 +543,7 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
                   size="sm"
                   className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-2 font-medium ${
                     activeTab === tab.id
-                      ? 'border-primary text-foreground'
+                      ? 'border-accent-indigo text-foreground'
                       : 'border-transparent text-muted-foreground hover:text-foreground'
                   }`}
                   onClick={() => setActiveTab(tab.id as 'details' | 'availability')}
@@ -567,7 +567,7 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
                         size="sm"
                         className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-1 font-medium ${
                           activeDetailTab === tab.id
-                            ? 'border-primary text-foreground'
+                            ? 'border-accent-indigo text-foreground'
                             : 'border-transparent text-muted-foreground hover:text-foreground'
                         }`}
                         onClick={() => setActiveDetailTab(tab.id)}

package/src/modules/sales/api/quotes/accept/route.ts

@@ -67,7 +67,15 @@ export async function POST(req: Request) {
     const hashedToken = hashAuthToken(token)
     const tenantScope = auth?.tenantId ? { tenantId: auth.tenantId } : undefined
 
-    const quote = await em.transactional(async (trx) => {
+    const commandBus = container.resolve('commandBus') as CommandBus
+
+    // Lock the quote, flip it to confirmed, and convert it to an order inside a
+    // single transaction. The conversion command reuses this transaction (and its
+    // PESSIMISTIC_WRITE lock) via ctx.transactionalEm, so the status flip and the
+    // order creation are atomic: if conversion fails the whole transaction rolls
+    // back, leaving the quote in its prior 'sent' state with no partial order and
+    // no need for an out-of-band compensating write.
+    const { quote, orderId } = await em.transactional(async (trx) => {
       const findQuoteByToken = (acceptanceToken: string) =>
         findOneWithDecryption(
           trx,
@@ -106,45 +114,21 @@ export async function POST(req: Request) {
       trx.persist(quote)
       await trx.flush()
 
-      return quote
-    })
+      const ctx: CommandRuntimeContext = {
+        container,
+        auth: null,
+        organizationScope: null,
+        selectedOrganizationId: quote.organizationId,
+        organizationIds: [quote.organizationId],
+        request: req,
+        transactionalEm: trx,
+      }
 
-    const commandBus = container.resolve('commandBus') as CommandBus
-    const ctx: CommandRuntimeContext = {
-      container,
-      auth: null,
-      organizationScope: null,
-      selectedOrganizationId: quote.organizationId,
-      organizationIds: [quote.organizationId],
-      request: req,
-    }
+      const result = (await commandBus.execute('sales.quotes.convert_to_order', { input: { quoteId: quote.id }, ctx })) as ConvertToOrderResult | null
+      const orderId = result?.result?.orderId ?? result?.orderId ?? quote.id
 
-    let result: ConvertToOrderResult | null
-    try {
-      result = (await commandBus.execute('sales.quotes.convert_to_order', { input: { quoteId: quote.id }, ctx })) as ConvertToOrderResult | null
-    } catch (conversionError) {
-      const freshEm = (container.resolve('em') as EntityManager).fork()
-      const staleQuote = await findOneWithDecryption(
-        freshEm,
-        SalesQuote,
-        { id: quote.id, deletedAt: null },
-        {},
-        tenantScope,
-      )
-      if (staleQuote) {
-        staleQuote.status = 'sent'
-        staleQuote.statusEntryId = await resolveStatusEntryIdByValue(freshEm, {
-          tenantId: staleQuote.tenantId,
-          organizationId: staleQuote.organizationId,
-          value: 'sent',
-        })
-        staleQuote.updatedAt = new Date()
-        freshEm.persist(staleQuote)
-        await freshEm.flush()
-      }
-      throw conversionError
-    }
-    const orderId = result?.result?.orderId ?? result?.orderId ?? quote.id
+      return { quote, orderId }
+    })
 
     const order = await findOneWithDecryption(em, SalesOrder, { id: orderId, deletedAt: null }, {}, tenantScope)
     const orderNumber = order?.orderNumber ?? orderId

package/src/modules/sales/backend/sales/channels/[channelId]/edit/page.tsx

@@ -102,7 +102,7 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
     <button
       key={value}
       type="button"
-      className={`px-4 py-2 text-sm font-medium border-b-2 ${activeTab === value ? 'border-primary text-primary' : 'border-transparent text-muted-foreground'}`}
+      className={`px-4 py-2 text-sm font-medium border-b-2 ${activeTab === value ? 'border-accent-indigo text-foreground' : 'border-transparent text-muted-foreground'}`}
       onClick={() => handleTabSelect(value)}
     >
       {label}

package/src/modules/sales/backend/sales/documents/[id]/page.tsx

@@ -4783,7 +4783,7 @@ export default function SalesDocumentDetailPage({
                   className={cn(
                     'h-auto rounded-none border-b-2 px-3 py-2 text-sm font-medium transition-colors hover:bg-transparent',
                     activeTab === tab.id
-                      ? 'border-b-2 border-primary text-primary'
+                      ? 'border-b-2 border-accent-indigo text-foreground'
                       : 'border-transparent text-muted-foreground hover:text-foreground'
                   )}
                   onClick={() => setActiveTab(tab.id)}

package/src/modules/sales/commands/documents.ts

@@ -5870,7 +5870,12 @@ const convertQuoteToOrderCommand: CommandHandler<
   },
   async execute(rawInput, ctx) {
     const payload = quoteConvertToOrderSchema.parse(rawInput ?? {});
-    const rootEm = (ctx.container.resolve("em") as EntityManager).fork();
+    // When the caller supplies an existing transactional EntityManager, reuse it
+    // (and its row locks) so the quote status flip and the order materialization
+    // commit or roll back as one atomic unit — no out-of-band compensating write.
+    const callerEm = ctx.transactionalEm;
+    const rootEm =
+      callerEm ?? (ctx.container.resolve("em") as EntityManager).fork();
     const transactionalEm = rootEm as EntityManager & {
       transactional?: <TResult>(
         callback: (trx: EntityManager) => Promise<TResult>,
@@ -6195,12 +6200,21 @@ const convertQuoteToOrderCommand: CommandHandler<
 
       return { orderId: order.id };
     };
+    if (callerEm) {
+      // Already inside the caller's transaction — run directly so the whole flow
+      // stays a single transaction (no nested savepoint).
+      return runConversion(callerEm);
+    }
     return typeof transactionalEm.transactional === "function"
       ? transactionalEm.transactional((trx) => runConversion(trx))
       : runConversion(rootEm);
   },
   captureAfter: async (_input, result, ctx) => {
-    const em = (ctx.container.resolve("em") as EntityManager).fork();
+    // Prefer the caller's transactional EM so the just-created (still
+    // uncommitted) order is visible when building the audit "after" snapshot.
+    const em =
+      ctx.transactionalEm ??
+      (ctx.container.resolve("em") as EntityManager).fork();
     return loadOrderSnapshot(em, result.orderId);
   },
   buildLog: async ({ snapshots, result }) => {

package/src/modules/staff/backend/staff/team-members/[id]/page.tsx

@@ -369,7 +369,7 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
                   onClick={() => setActivePanel(tab.id)}
                   className={`relative -mb-px border-b-2 px-0 py-2 text-sm font-medium transition-colors ${
                     activePanel === tab.id
-                      ? 'border-primary text-foreground'
+                      ? 'border-accent-indigo text-foreground'
                       : 'border-transparent text-muted-foreground hover:text-foreground'
                   }`}
                 >
@@ -431,7 +431,7 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
                             onClick={() => setActiveTab(tab.id)}
                             className={`relative -mb-px border-b-2 px-0 py-1 text-sm font-medium transition-colors ${
                               activeTab === tab.id
-                                ? 'border-primary text-foreground'
+                                ? 'border-accent-indigo text-foreground'
                                 : 'border-transparent text-muted-foreground hover:text-foreground'
                             }`}
                           >
@@ -556,6 +556,7 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
               mode="availability"
               rulesetId={availabilityRuleSetId}
               onRulesetChange={handleRulesetChange}
+              allowRuleSetDelete
               buildScheduleItems={({ availabilityRules, translate: translateLabel }) => (
                 buildMemberScheduleItems({ availabilityRules, translate: translateLabel })
               )}

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -306,7 +306,7 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
                   onClick={() => setActiveTab(tab.id as 'details' | 'members')}
                   className={`relative -mb-px border-b-2 px-0 py-2 text-sm font-medium transition-colors ${
                     activeTab === tab.id
-                      ? 'border-primary text-foreground'
+                      ? 'border-accent-indigo text-foreground'
                       : 'border-transparent text-muted-foreground hover:text-foreground'
                   }`}
                 >

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

@@ -481,6 +481,11 @@
   "staff.teamMembers.availability.ruleset.createTitle": "Als Zeitplan speichern",
   "staff.teamMembers.availability.ruleset.customize": "Zeitplan anpassen",
   "staff.teamMembers.availability.ruleset.customizePrompt": "Dieser Zeitplan basiert auf einem gemeinsamen Regelwerk. Passe ihn an, um Änderungen vorzunehmen.",
+  "staff.teamMembers.availability.ruleset.delete": "Zeitplan löschen",
+  "staff.teamMembers.availability.ruleset.deleteConfirm": "Zeitplan „{{name}}“ löschen?",
+  "staff.teamMembers.availability.ruleset.deleteError": "Zeitplan konnte nicht gelöscht werden.",
+  "staff.teamMembers.availability.ruleset.deleteSubmit": "Löschen",
+  "staff.teamMembers.availability.ruleset.deleteSuccess": "Zeitplan gelöscht.",
   "staff.teamMembers.availability.ruleset.error": "Zeitpläne konnten nicht geladen werden.",
   "staff.teamMembers.availability.ruleset.label": "Zeitplan",
   "staff.teamMembers.availability.ruleset.loading": "Zeitpläne werden geladen...",

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

@@ -481,6 +481,11 @@
   "staff.teamMembers.availability.ruleset.createTitle": "Save as schedule",
   "staff.teamMembers.availability.ruleset.customize": "Customize schedule",
   "staff.teamMembers.availability.ruleset.customizePrompt": "This schedule is based on a shared ruleset. Customize it to make changes.",
+  "staff.teamMembers.availability.ruleset.delete": "Delete schedule",
+  "staff.teamMembers.availability.ruleset.deleteConfirm": "Delete schedule \"{{name}}\"?",
+  "staff.teamMembers.availability.ruleset.deleteError": "Failed to delete schedule.",
+  "staff.teamMembers.availability.ruleset.deleteSubmit": "Delete",
+  "staff.teamMembers.availability.ruleset.deleteSuccess": "Schedule deleted.",
   "staff.teamMembers.availability.ruleset.error": "Failed to load schedules.",
   "staff.teamMembers.availability.ruleset.label": "Schedule",
   "staff.teamMembers.availability.ruleset.loading": "Loading schedules...",

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

@@ -481,6 +481,11 @@
   "staff.teamMembers.availability.ruleset.createTitle": "Guardar como horario",
   "staff.teamMembers.availability.ruleset.customize": "Personalizar horario",
   "staff.teamMembers.availability.ruleset.customizePrompt": "Este horario se basa en un conjunto de reglas compartido. Personalízalo para hacer cambios.",
+  "staff.teamMembers.availability.ruleset.delete": "Eliminar horario",
+  "staff.teamMembers.availability.ruleset.deleteConfirm": "¿Eliminar el horario \"{{name}}\"?",
+  "staff.teamMembers.availability.ruleset.deleteError": "No se pudo eliminar el horario.",
+  "staff.teamMembers.availability.ruleset.deleteSubmit": "Eliminar",
+  "staff.teamMembers.availability.ruleset.deleteSuccess": "Horario eliminado.",
   "staff.teamMembers.availability.ruleset.error": "No se pudieron cargar los horarios.",
   "staff.teamMembers.availability.ruleset.label": "Horario",
   "staff.teamMembers.availability.ruleset.loading": "Cargando horarios...",

package/src/modules/staff/i18n/pl.json

@@ -481,6 +481,11 @@
   "staff.teamMembers.availability.ruleset.createTitle": "Zapisz jako harmonogram",
   "staff.teamMembers.availability.ruleset.customize": "Dostosuj harmonogram",
   "staff.teamMembers.availability.ruleset.customizePrompt": "Ten harmonogram jest oparty na wspólnym zestawie reguł. Dostosuj go, aby wprowadzić zmiany.",
+  "staff.teamMembers.availability.ruleset.delete": "Usuń harmonogram",
+  "staff.teamMembers.availability.ruleset.deleteConfirm": "Usunąć harmonogram „{{name}}”?",
+  "staff.teamMembers.availability.ruleset.deleteError": "Nie udało się usunąć harmonogramu.",
+  "staff.teamMembers.availability.ruleset.deleteSubmit": "Usuń",
+  "staff.teamMembers.availability.ruleset.deleteSuccess": "Harmonogram usunięty.",
   "staff.teamMembers.availability.ruleset.error": "Nie udało się wczytać harmonogramów.",
   "staff.teamMembers.availability.ruleset.label": "Harmonogram",
   "staff.teamMembers.availability.ruleset.loading": "Wczytywanie harmonogramów...",