@open-mercato/core 0.6.6 → 0.6.7-develop.6553.1.2ec7246e04

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

@@ -5,6 +5,7 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { FormHeader } from '@open-mercato/ui/backend/forms'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
@@ -663,51 +664,40 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
             subtitle={t('resources.resources.detail.subtitle', 'Resource profile and activity')}
           />
 
-          <div className="border-b">
-            <nav className="flex flex-wrap items-center gap-5 text-sm" aria-label={t('resources.resources.tabs.label', 'Resource sections')}>
+          <Tabs
+            value={activeTab}
+            onValueChange={(value) => setActiveTab(value as 'details' | 'availability')}
+            variant="underline"
+          >
+            <TabsList
+              className="w-full flex-wrap"
+              aria-label={t('resources.resources.tabs.label', 'Resource sections')}
+            >
               {tabs.map((tab) => (
-                <Button
-                  key={tab.id}
-                  type="button"
-                  role="tab"
-                  aria-selected={activeTab === tab.id}
-                  variant="ghost"
-                  size="sm"
-                  className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-2 font-medium ${
-                    activeTab === tab.id
-                      ? 'border-accent-indigo text-foreground'
-                      : 'border-transparent text-muted-foreground hover:text-foreground'
-                  }`}
-                  onClick={() => setActiveTab(tab.id as 'details' | 'availability')}
-                >
+                <TabsTrigger key={tab.id} value={tab.id}>
                   {tab.label}
-                </Button>
+                </TabsTrigger>
               ))}
-            </nav>
-          </div>
+            </TabsList>
+          </Tabs>
 
           {activeTab === 'details' ? (
             <>
               <div className="rounded-lg border bg-card p-4">
                 <div className="flex flex-wrap items-center justify-between gap-3">
-                  <div className="flex gap-2">
-                    {detailTabs.map((tab) => (
-                      <Button
-                        key={tab.id}
-                        type="button"
-                        variant="ghost"
-                        size="sm"
-                        className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-1 font-medium ${
-                          activeDetailTab === tab.id
-                            ? 'border-accent-indigo text-foreground'
-                            : 'border-transparent text-muted-foreground hover:text-foreground'
-                        }`}
-                        onClick={() => setActiveDetailTab(tab.id)}
-                      >
-                        {tab.label}
-                      </Button>
-                    ))}
-                  </div>
+                  <Tabs
+                    value={activeDetailTab}
+                    onValueChange={(value) => setActiveDetailTab(value as 'notes' | 'activities')}
+                    variant="underline"
+                  >
+                    <TabsList className="h-auto flex-wrap border-b-0">
+                      {detailTabs.map((tab) => (
+                        <TabsTrigger key={tab.id} value={tab.id}>
+                          {tab.label}
+                        </TabsTrigger>
+                      ))}
+                    </TabsList>
+                  </Tabs>
                   {sectionAction ? (
                     <Button
                       type="button"

package/src/modules/sales/backend/sales/channels/create/page.meta.ts

@@ -1,4 +1,6 @@
 import React from 'react'
+import type { RouteVisibilityContext } from '@open-mercato/shared/modules/registry'
+import { isSalesChannelsEnabledForTenant } from '../../../../lib/salesChannelsToggle'
 
 const createIcon = React.createElement(
   'svg',
@@ -11,6 +13,7 @@ const createIcon = React.createElement(
 export const metadata = {
   requireAuth: true,
   requireFeatures: ['sales.channels.manage'],
+  visible: (ctx: RouteVisibilityContext) => isSalesChannelsEnabledForTenant(ctx.auth?.tenantId ?? null),
   pageTitle: 'Create channel',
   pageTitleKey: 'sales.channels.form.createTitle',
   pageGroup: 'Sales',

package/src/modules/sales/backend/sales/channels/create/page.tsx

@@ -9,13 +9,20 @@ import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customF
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useChannelFields, buildChannelPayload, type ChannelFormValues } from '@open-mercato/core/modules/sales/components/channels/channelFormFields'
+import { useSalesChannelsEnabled } from '@open-mercato/core/modules/sales/components/useSalesChannelsEnabled'
+import { SalesChannelsDisabledNotice } from '@open-mercato/core/modules/sales/components/SalesChannelsDisabledNotice'
 import { E } from '#generated/entities.ids.generated'
 
 export default function CreateChannelPage() {
   const t = useT()
   const { fields, groups } = useChannelFields()
+  const { enabled: channelsEnabled, isLoading: channelsEnabledLoading } = useSalesChannelsEnabled()
   const router = useRouter()
 
+  if (!channelsEnabled && !channelsEnabledLoading) {
+    return <SalesChannelsDisabledNotice />
+  }
+
   return (
     <Page>
       <PageBody>

package/src/modules/sales/backend/sales/channels/offers/page.meta.ts

@@ -1,4 +1,6 @@
 import React from 'react'
+import type { RouteVisibilityContext } from '@open-mercato/shared/modules/registry'
+import { isSalesChannelsEnabledForTenant } from '../../../../lib/salesChannelsToggle'
 
 const globeIcon = React.createElement(
   'svg',
@@ -12,6 +14,7 @@ const globeIcon = React.createElement(
 export const metadata = {
   requireAuth: true,
   requireFeatures: ['sales.channels.manage'],
+  visible: (ctx: RouteVisibilityContext) => isSalesChannelsEnabledForTenant(ctx.auth?.tenantId ?? null),
   pageTitle: 'Sales channel offers',
   pageTitleKey: 'sales.channels.offers.listTitle',
   pageGroup: 'Sales',

package/src/modules/sales/backend/sales/channels/offers/page.tsx

@@ -18,6 +18,8 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { mapOfferRow, renderOfferPriceSummary, type OfferRow } from '@open-mercato/core/modules/sales/components/channels/offerTableUtils'
+import { useSalesChannelsEnabled } from '@open-mercato/core/modules/sales/components/useSalesChannelsEnabled'
+import { SalesChannelsDisabledNotice } from '@open-mercato/core/modules/sales/components/SalesChannelsDisabledNotice'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
@@ -34,6 +36,7 @@ const SAVE_CONTEXT_ID = 'sales-channel-offers-list'
 
 export default function SalesChannelOffersListPage() {
   const t = useT()
+  const { enabled: channelsEnabled, isLoading: channelsEnabledLoading } = useSalesChannelsEnabled()
   const router = useRouter()
   const { runMutation, retryLastMutation } = useGuardedMutation<{
     formId: string
@@ -332,6 +335,10 @@ export default function SalesChannelOffersListPage() {
     </div>
   )
 
+  if (!channelsEnabled && !channelsEnabledLoading) {
+    return <SalesChannelsDisabledNotice />
+  }
+
   return (
     <Page>
       <PageBody>

package/src/modules/sales/backend/sales/channels/page.meta.ts

@@ -1,6 +1,10 @@
+import type { RouteVisibilityContext } from '@open-mercato/shared/modules/registry'
+import { isSalesChannelsEnabledForTenant } from '../../../lib/salesChannelsToggle'
+
 export const metadata = {
   requireAuth: true,
   requireFeatures: ['sales.channels.manage'],
+  visible: (ctx: RouteVisibilityContext) => isSalesChannelsEnabledForTenant(ctx.auth?.tenantId ?? null),
   pageTitle: 'Sales channels',
   pageTitleKey: 'sales.channels.nav.title',
   pageGroup: 'Sales',

package/src/modules/sales/backend/sales/channels/page.tsx

@@ -16,6 +16,8 @@ import { buildOptimisticLockHeader, extractOptimisticLockConflict } from '@open-
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useSalesChannelsEnabled } from '../../../components/useSalesChannelsEnabled'
+import { SalesChannelsDisabledNotice } from '../../../components/SalesChannelsDisabledNotice'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
@@ -42,6 +44,7 @@ const SAVE_CONTEXT_ID = 'sales-channels-list'
 
 export default function SalesChannelsPage() {
   const t = useT()
+  const { enabled: channelsEnabled, isLoading: channelsEnabledLoading } = useSalesChannelsEnabled()
   const router = useRouter()
   const { runMutation, retryLastMutation } = useGuardedMutation<{
     formId: string
@@ -190,6 +193,10 @@ export default function SalesChannelsPage() {
     }
   }, [handleRefresh, mutationContext, runMutation, t])
 
+  if (!channelsEnabled && !channelsEnabledLoading) {
+    return <SalesChannelsDisabledNotice />
+  }
+
   return (
     <Page>
       <PageBody>

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

@@ -69,6 +69,7 @@ import { readMarkdownPreferenceCookie, writeMarkdownPreferenceCookie } from '@op
 import { InjectionSpot, useInjectionWidgets } from '@open-mercato/ui/backend/injection/InjectionSpot'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { buildRecordInjectionContext, useSetCurrentRecordInjectionContext } from '@open-mercato/ui/backend/injection/recordContext'
+import { useSalesChannelsEnabled } from '@open-mercato/core/modules/sales/components/useSalesChannelsEnabled'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
@@ -1894,6 +1895,7 @@ export default function SalesDocumentDetailPage({
   includeAmountInMessageMetadata?: boolean
 }) {
   const t = useT()
+  const { enabled: channelsEnabled } = useSalesChannelsEnabled()
   const router = useRouter()
   const searchParams = useSearchParams()
   const pathname = usePathname()
@@ -2578,11 +2580,11 @@ export default function SalesDocumentDetailPage({
   }, [record])
 
   React.useEffect(() => {
-    loadChannels().catch(() => {})
+    if (channelsEnabled) loadChannels().catch(() => {})
     loadStatuses().catch(() => {})
     loadShippingMethods().catch(() => {})
     loadPaymentMethods().catch(() => {})
-  }, [loadChannels, loadPaymentMethods, loadShippingMethods, loadStatuses, scopeVersion])
+  }, [channelsEnabled, loadChannels, loadPaymentMethods, loadShippingMethods, loadStatuses, scopeVersion])
 
   React.useEffect(() => {
     void refreshPaymentPresence()
@@ -3955,11 +3957,11 @@ export default function SalesDocumentDetailPage({
       emptyLabel: t('sales.documents.detail.empty', 'Not set'),
       type: 'email' as const,
     },
-    {
-      key: 'channel',
+    ...(channelsEnabled ? [{
+      key: 'channel' as const,
       title: t('sales.documents.detail.channel', 'Channel'),
       value: record?.channelId ?? null,
-    },
+    }] : []),
     {
       key: 'status',
       title: t('sales.documents.detail.status', 'Status'),

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

@@ -125,6 +125,7 @@ import {
   type SalesLineCalculationResult,
   type SalesDocumentCalculationResult,
 } from "../lib/types";
+import { loadShippedQuantityByLine } from "../lib/shipments/snapshots";
 import { resolveDictionaryEntryValue } from "../lib/dictionaries";
 import { resolveStatusEntryIdByValue } from "../lib/statusHelpers";
 import { SalesDocumentNumberGenerator } from "../services/salesDocumentNumberGenerator";
@@ -6521,6 +6522,69 @@ const quoteAdjustmentDeleteSchema = z.object({
   quoteId: z.string().uuid(),
 });
 
+const SHIPPED_QUANTITY_TOLERANCE = 1e-6;
+
+const hasNumericChange = (
+  next: number | null | undefined,
+  previous: number | null | undefined,
+): boolean => {
+  if (next === undefined || next === null) return false;
+  if (previous === undefined || previous === null) return true;
+  return Math.abs(next - previous) > SHIPPED_QUANTITY_TOLERANCE;
+};
+
+const hasUnitChange = (
+  next: string | null | undefined,
+  previous: string | null | undefined,
+): boolean => {
+  if (next === undefined || next === null) return false;
+  const normalizedPrevious = (previous ?? "").trim().toLowerCase();
+  if (!normalizedPrevious) return false;
+  return next.trim().toLowerCase() !== normalizedPrevious;
+};
+
+async function assertShippedOrderLineEditable(
+  em: EntityManager,
+  order: SalesOrder,
+  existingSnapshot: SalesLineSnapshot | null,
+  parsed: z.infer<typeof orderLineUpsertSchema>,
+): Promise<void> {
+  const lineId = existingSnapshot?.id;
+  if (!existingSnapshot || !lineId) return;
+  const shippedByLine = await loadShippedQuantityByLine(em, order.id, {
+    tenantId: order.tenantId,
+    organizationId: order.organizationId,
+  });
+  const shippedQuantity = shippedByLine.get(lineId) ?? 0;
+  if (shippedQuantity <= 0) return;
+
+  const { translate } = await resolveTranslations();
+  const nextQuantity = parsed.quantity ?? existingSnapshot.quantity;
+  if (nextQuantity < shippedQuantity - SHIPPED_QUANTITY_TOLERANCE) {
+    throw new CrudHttpError(409, {
+      error: translate(
+        "sales.documents.items.errorQuantityBelowShipped",
+        "You cannot lower the quantity below the {{shipped}} already shipped.",
+        { shipped: shippedQuantity },
+      ),
+    });
+  }
+
+  const pricingChanged =
+    hasNumericChange(parsed.unitPriceNet, existingSnapshot.unitPriceNet) ||
+    hasNumericChange(parsed.unitPriceGross, existingSnapshot.unitPriceGross) ||
+    hasNumericChange(parsed.taxRate, existingSnapshot.taxRate) ||
+    hasUnitChange(parsed.quantityUnit, existingSnapshot.quantityUnit);
+  if (pricingChanged) {
+    throw new CrudHttpError(409, {
+      error: translate(
+        "sales.documents.items.errorPriceShipped",
+        "You cannot change the price or unit of a line that has shipped items.",
+      ),
+    });
+  }
+}
+
 const orderLineUpsertCommand: CommandHandler<
   { body?: Record<string, unknown>; query?: Record<string, unknown> },
   { orderId: string; lineId: string }
@@ -6565,6 +6629,7 @@ const orderLineUpsertCommand: CommandHandler<
     const existingSnapshot = parsed.id
       ? (lineSnapshots.find((line) => line.id === parsed.id) ?? null)
       : null;
+    await assertShippedOrderLineEditable(em, order, existingSnapshot, parsed);
     const priceMode =
       parsed.priceMode === "gross"
         ? "gross"

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

@@ -15,8 +15,8 @@ import type { SalesCalculationService } from '../services/salesCalculationServic
 import type { SalesAdjustmentDraft, SalesLineSnapshot, SalesDocumentCalculationResult } from '../lib/types'
 import { cloneJson, deriveLineNetFromGross, ensureOrganizationScope, ensureSameScope, ensureTenantScope, extractUndoPayload, toNumericString, enforceSalesDocumentOptimisticLock, SALES_RESOURCE_KIND_ORDER, SALES_RESOURCE_KIND_RETURN } from './shared'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
-import { SalesOrder, SalesOrderAdjustment, SalesOrderLine, SalesReturn, SalesReturnLine, SalesShipment, SalesShipmentItem } from '../data/entities'
-import { coerceShipmentQuantity } from '../lib/shipments/snapshots'
+import { SalesOrder, SalesOrderAdjustment, SalesOrderLine, SalesReturn, SalesReturnLine } from '../data/entities'
+import { loadShippedQuantityByLine } from '../lib/shipments/snapshots'
 import { computeAvailableReturnQuantity } from '../lib/returnQuantity'
 import {
   returnCreateSchema,
@@ -581,36 +581,6 @@ async function restoreReturnEffects(
   return createdLines
 }
 
-async function loadShippedQuantityByLine(
-  em: EntityManager,
-  orderId: string,
-  scope: { tenantId: string; organizationId: string },
-): Promise<Map<string, number>> {
-  const shipments = await findWithDecryption(
-    em,
-    SalesShipment,
-    { order: orderId, deletedAt: null },
-    {},
-    scope,
-  )
-  const shippedByLine = new Map<string, number>()
-  if (!shipments.length) return shippedByLine
-  const items = await findWithDecryption(
-    em,
-    SalesShipmentItem,
-    { shipment: { $in: shipments.map((shipment) => shipment.id) } },
-    {},
-    scope,
-  )
-  items.forEach((item) => {
-    const orderLineId = typeof item.orderLine === 'string' ? item.orderLine : item.orderLine?.id ?? null
-    if (!orderLineId) return
-    const next = (shippedByLine.get(orderLineId) ?? 0) + coerceShipmentQuantity(item.quantity)
-    shippedByLine.set(orderLineId, next)
-  })
-  return shippedByLine
-}
-
 function normalizeLinesInput(lines: ReturnCreateInput['lines']): ReturnLineInput[] {
   const seen = new Set<string>()
   const result: ReturnLineInput[] = []

package/src/modules/sales/components/SalesChannelsDisabledNotice.tsx

@@ -0,0 +1,21 @@
+"use client"
+
+import * as React from 'react'
+import { Page, PageBody } from '@open-mercato/ui/backend/Page'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+
+export function SalesChannelsDisabledNotice() {
+  const t = useT()
+  return (
+    <Page>
+      <PageBody>
+        <div className="rounded-lg border bg-muted/50 p-6 text-sm text-muted-foreground">
+          {t(
+            'sales.channels.disabledNotice',
+            'Sales channels are disabled for this tenant. Enable the "Sales Channels" feature toggle to manage them.',
+          )}
+        </div>
+      </PageBody>
+    </Page>
+  )
+}

package/src/modules/sales/components/documents/AddressesSection.tsx

@@ -890,8 +890,12 @@ export function SalesDocumentAddressesSection({
         if (res?.result?.id) billingId = res.result.id
       }
 
-      payload.shippingAddressSnapshot = shippingSnapshot ?? null
-      payload.billingAddressSnapshot = billingSnapshot ?? null
+      if (shippingSnapshot || !shippingId) {
+        payload.shippingAddressSnapshot = shippingSnapshot ?? null
+      }
+      if (billingSnapshot || !billingId) {
+        payload.billingAddressSnapshot = billingSnapshot ?? null
+      }
       payload.shippingAddressId = shippingSnapshot ? null : shippingId
       payload.billingAddressId = billingSnapshot ? null : billingId
 

package/src/modules/sales/components/documents/ItemsSection.tsx

@@ -817,6 +817,11 @@ export function SalesDocumentItemsSection({
         organizationId={resolvedOrganizationId}
         tenantId={resolvedTenantId}
         initialLine={lineForEdit}
+        shippedQuantity={
+          lineForEdit
+            ? Math.max(0, shippedTotals.get(lineForEdit.id) ?? 0)
+            : 0
+        }
         onSaved={async () => {
           await loadItems();
           emitSalesDocumentTotalsRefresh({ documentId, kind });

package/src/modules/sales/components/documents/LineItemDialog.tsx

@@ -278,6 +278,7 @@ type SalesLineDialogProps = {
   organizationId: string | null;
   tenantId: string | null;
   initialLine?: SalesLineRecord | null;
+  shippedQuantity?: number;
   onOpenChange: (open: boolean) => void;
   onSaved?: () => Promise<void> | void;
 };
@@ -472,6 +473,7 @@ export function LineItemDialog({
   organizationId,
   tenantId,
   initialLine,
+  shippedQuantity = 0,
   onOpenChange,
   onSaved,
 }: SalesLineDialogProps) {
@@ -1326,6 +1328,14 @@ export function LineItemDialog({
           },
         );
       }
+      if (shippedQuantity > 0 && qtyNumber < shippedQuantity) {
+        const message = t(
+          "sales.documents.items.errorQuantityBelowShipped",
+          "You cannot lower the quantity below the {{shipped}} already shipped.",
+          { shipped: shippedQuantity },
+        );
+        throw createCrudFormError(message, { quantity: message });
+      }
       const resolvedQuantityUnit = (() => {
         const entered = normalizeUnitCode(values.quantityUnit);
         if (isCustomLine) return entered;

package/src/modules/sales/components/documents/SalesDocumentForm.tsx

@@ -57,6 +57,7 @@ import {
   type AddressValue,
 } from '@open-mercato/core/modules/customers/utils/addressFormat'
 import { AddressEditor, type AddressEditorDraft } from '@open-mercato/core/modules/customers/components/AddressEditor'
+import { useSalesChannelsEnabled } from '../useSalesChannelsEnabled'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
@@ -168,6 +169,7 @@ function CustomerQuickCreate({ t, onCreated }: CustomerQuickCreateProps) {
     async (values: PersonFormValues) => {
       setSaving(true)
       try {
+        const addresses = Array.isArray(values.addresses) ? values.addresses : []
         const payload = buildPersonPayload(values, organizationId)
         const { result } = await createCrud<{ id?: string; entityId?: string }>('customers/people', payload, {
           errorMessage: t('sales.documents.form.customer.quick.error', 'Failed to create customer.'),
@@ -177,6 +179,51 @@ function CustomerQuickCreate({ t, onCreated }: CustomerQuickCreateProps) {
           (result && typeof result.id === 'string' && result.id) ||
           null
         if (!id) throw new Error('Missing customer id')
+        if (addresses.length) {
+          const normalize = (value?: string | null) => {
+            if (typeof value !== 'string') return undefined
+            const trimmed = value.trim()
+            return trimmed.length ? trimmed : undefined
+          }
+          for (const entry of addresses) {
+            const normalizedLine1 = normalize(entry.addressLine1)
+            if (!normalizedLine1) continue
+            const body: Record<string, unknown> = {
+              entityId: id,
+              ...(organizationId ? { organizationId } : {}),
+              addressLine1: normalizedLine1,
+              isPrimary: entry.isPrimary ?? false,
+            }
+            const name = normalize(entry.name)
+            if (name !== undefined) body.name = name
+            const purpose = normalize(entry.purpose)
+            if (purpose !== undefined) body.purpose = purpose
+            const line2 = normalize(entry.addressLine2)
+            if (line2 !== undefined) body.addressLine2 = line2
+            const buildingNumber = normalize(entry.buildingNumber)
+            if (buildingNumber !== undefined) body.buildingNumber = buildingNumber
+            const flatNumber = normalize(entry.flatNumber)
+            if (flatNumber !== undefined) body.flatNumber = flatNumber
+            const city = normalize(entry.city)
+            if (city !== undefined) body.city = city
+            const region = normalize(entry.region)
+            if (region !== undefined) body.region = region
+            const postalCode = normalize(entry.postalCode)
+            if (postalCode !== undefined) body.postalCode = postalCode
+            const country = normalize(entry.country)
+            if (country !== undefined) body.country = country.toUpperCase()
+            if (typeof entry.latitude === 'number') body.latitude = entry.latitude
+            if (typeof entry.longitude === 'number') body.longitude = entry.longitude
+            try {
+              await createCrud('customers/addresses', body)
+            } catch (addressErr) {
+              const message =
+                (addressErr instanceof Error && addressErr.message ? addressErr.message : null) ||
+                t('customers.people.detail.addresses.error')
+              flash(message, 'error')
+            }
+          }
+        }
         const displayName =
           typeof values.displayName === 'string' && values.displayName.trim().length
             ? values.displayName.trim()
@@ -758,6 +805,7 @@ function CustomerGroupComponent({ values, setValue, t, customers, setCustomers,
 
 export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind, inboxPreFill }: SalesDocumentFormProps) {
   const t = useT()
+  const { enabled: channelsEnabled } = useSalesChannelsEnabled()
   const [customers, setCustomers] = React.useState<CustomerOption[]>([])
   const [customerLoading, setCustomerLoading] = React.useState(false)
   const [channels, setChannels] = React.useState<ChannelOption[]>([])
@@ -1128,7 +1176,7 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
         />
       ),
     },
-    {
+    ...(channelsEnabled ? [{
       id: 'channelId',
       label: t('sales.documents.form.channel', 'Sales channel'),
       type: 'custom',
@@ -1150,7 +1198,7 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
           selectedHintLabel={(id) => t('sales.documents.form.channel.selected', 'Selected channel: {{id}}', { id })}
         />
       ),
-    },
+    } satisfies CrudField] : []),
     {
       id: 'shippingAddressSection',
       label: '',
@@ -1271,6 +1319,7 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
     addressOptions,
     addressesError,
     addressesLoading,
+    channelsEnabled,
     currencyLabels,
     fetchCurrencyOptions,
     loadAddresses,
@@ -1289,12 +1338,13 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
       fields: [],
       component: (ctx) => <CustomerGroupComponent {...ctx} t={t} customers={customers} setCustomers={setCustomers} customerQuerySetter={customerQuerySetter} loadAddresses={loadAddresses} loadCustomers={loadCustomers} fetchCustomerEmail={fetchCustomerEmail} resetAddressFormState={resetAddressFormState} />,
     },
-    { id: 'channels-comments', title: '', column: 1, fields: ['channelId', 'comments'] },
+    { id: 'channels-comments', title: '', column: 1, fields: channelsEnabled ? ['channelId', 'comments'] : ['comments'] },
     { id: 'currency', title: '', column: 2, fields: ['currencyCode'] },
     { id: 'shipping', title: '', column: 2, fields: ['shippingAddressSection'] },
     { id: 'billing', title: '', column: 2, fields: ['billingAddressSection'] },
     { id: 'custom', title: t('sales.documents.form.customFields', 'Custom fields'), column: 2, kind: 'customFields' },
   ], [
+    channelsEnabled,
     customers,
     fetchCustomerEmail,
     loadAddresses,

package/src/modules/sales/components/documents/SalesDocumentsTable.tsx

@@ -24,6 +24,7 @@ import {
   normalizeDictionaryEntries,
 } from '@open-mercato/core/modules/dictionaries/components/dictionaryAppearance'
 import { SALES_DOCUMENT_NUMBER_COLUMN_META } from './salesDocumentsColumns'
+import { useSalesChannelsEnabled } from '../useSalesChannelsEnabled'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
@@ -146,6 +147,7 @@ function normalizeNumberInput(value: unknown): number | null {
 
 export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
   const t = useT()
+  const { enabled: channelsEnabled } = useSalesChannelsEnabled()
   const router = useRouter()
   const scopeVersion = useOrganizationScopeVersion()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
@@ -293,20 +295,20 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
   )
 
   React.useEffect(() => {
-    loadChannelOptions().catch(() => {})
+    if (channelsEnabled) loadChannelOptions().catch(() => {})
     loadTagOptions().catch(() => {})
     loadCustomerOptions().catch(() => {})
     loadStatusMap().catch(() => setStatusMap({}))
-  }, [loadChannelOptions, loadCustomerOptions, loadStatusMap, loadTagOptions, scopeVersion])
+  }, [channelsEnabled, loadChannelOptions, loadCustomerOptions, loadStatusMap, loadTagOptions, scopeVersion])
 
   const filters = React.useMemo<FilterDef[]>(() => [
-    {
+    ...(channelsEnabled ? [{
       id: 'channelId',
       label: t('sales.documents.list.filters.channel', 'Channel'),
       type: 'select',
       options: channelOptions,
       loadOptions: loadChannelOptions,
-    },
+    } satisfies FilterDef] : []),
     {
       id: 'date',
       label: t('sales.documents.list.filters.date', 'Date'),
@@ -363,7 +365,7 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
       formatValue: (val: string) => tagOptions.find((o) => o.value === val)?.label ?? val,
       formatDescription: (val: string) => tagOptions.find((o) => o.value === val)?.description ?? null,
     },
-  ], [channelOptions, loadChannelOptions, customerOptions, loadCustomerOptions, loadTagOptions, tagOptions, t])
+  ], [channelsEnabled, channelOptions, loadChannelOptions, customerOptions, loadCustomerOptions, loadTagOptions, tagOptions, t])
 
   const queryParams = React.useMemo(() => {
     const params = new URLSearchParams()
@@ -615,7 +617,7 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
       ),
       enableSorting: false,
     },
-    {
+    ...(channelsEnabled ? [{
       accessorKey: 'channelId',
       header: t('sales.documents.list.table.channel', 'Channel'),
       cell: ({ row }) => {
@@ -627,7 +629,7 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
         )
       },
       enableSorting: false,
-    },
+    } satisfies ColumnDef<SalesDocumentRow>] : []),
     {
       id: 'lineItemCount',
       accessorKey: 'lineItemCount',
@@ -661,7 +663,7 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
           ? <span className="text-xs text-muted-foreground">{new Date(row.original.date).toLocaleString()}</span>
           : <span className="text-xs text-muted-foreground">—</span>,
     },
-  ], [channelOptions, kind, statusMap, t])
+  ], [channelsEnabled, channelOptions, kind, statusMap, t])
 
   const emptyLabel = kind === 'order'
     ? t('sales.documents.list.table.emptyOrders', 'No orders yet.')