@open-mercato/core 0.6.7-develop.6726.1.983ae8a07e → 0.6.7-develop.6749.1.6b54c56dfe

package/src/modules/resources/api/resources.ts

@@ -86,6 +86,7 @@ const crud = makeCrudRoute({
       'appearance_color',
       F.is_active,
       'availability_rule_set_id',
+      'custom_fieldset_code',
       F.created_at,
       F.updated_at,
     ],
@@ -242,6 +243,7 @@ const resourceListItemSchema = z.object({
   appearance_color: z.string().nullable().optional(),
   is_active: z.boolean().nullable().optional(),
   availability_rule_set_id: z.string().uuid().nullable().optional(),
+  custom_fieldset_code: z.string().nullable().optional(),
   created_at: z.string().nullable().optional(),
   updated_at: z.string().nullable().optional(),
   tags: z.array(resourceTagListItemSchema).optional(),

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

@@ -59,6 +59,8 @@ type ResourceRecord = {
   is_active?: boolean
   availabilityRuleSetId?: string | null
   availability_rule_set_id?: string | null
+  customFieldsetCode?: string | null
+  custom_fieldset_code?: string | null
 } & Record<string, unknown>
 
 type ResourceResponse = {
@@ -85,6 +87,7 @@ function normalizeResourceRecord(record: ResourceRecord): ResourceRecord {
     appearanceIcon: record.appearanceIcon ?? record.appearance_icon ?? null,
     appearanceColor: record.appearanceColor ?? record.appearance_color ?? null,
     isActive: record.isActive ?? record.is_active ?? true,
+    customFieldsetCode: record.customFieldsetCode ?? record.custom_fieldset_code ?? null,
   }
 }
 
@@ -547,9 +550,12 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
                 : typeof resource.updated_at === 'string'
                   ? resource.updated_at
                   : null,
-            customFieldsetCode: resource.resourceTypeId
-              ? resolveFieldsetCode(resource.resourceTypeId)
-              : RESOURCES_RESOURCE_FIELDSET_DEFAULT,
+            customFieldsetCode:
+              typeof resource.customFieldsetCode === 'string' && resource.customFieldsetCode.trim().length
+                ? resource.customFieldsetCode.trim()
+                : resource.resourceTypeId
+                  ? resolveFieldsetCode(resource.resourceTypeId)
+                  : RESOURCES_RESOURCE_FIELDSET_DEFAULT,
             ...customValues,
           })
         }

package/src/modules/resources/commands/resources.ts

@@ -50,6 +50,7 @@ type ResourceSnapshot = {
   appearanceColor: string | null
   isActive: boolean
   availabilityRuleSetId: string | null
+  customFieldsetCode: string | null
   tags: string[]
   deletedAt: string | null
   customFields?: CustomFieldSnapshot | null
@@ -154,6 +155,7 @@ async function loadResourceSnapshot(em: EntityManager, id: string): Promise<Reso
     appearanceColor: resource.appearanceColor ?? null,
     isActive: resource.isActive,
     availabilityRuleSetId: resource.availabilityRuleSetId ?? null,
+    customFieldsetCode: resource.customFieldsetCode ?? null,
     tags,
     deletedAt: resource.deletedAt ? resource.deletedAt.toISOString() : null,
   }
@@ -235,6 +237,7 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
       appearanceColor: parsed.appearanceColor ?? null,
       isActive: parsed.isActive ?? true,
       availabilityRuleSetId: parsed.availabilityRuleSetId ?? null,
+      customFieldsetCode: parsed.customFieldsetCode ?? null,
       createdAt: now,
       updatedAt: now,
     })
@@ -358,6 +361,7 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
             appearanceColor: after.appearanceColor ?? null,
             isActive: after.isActive,
             availabilityRuleSetId: after.availabilityRuleSetId ?? null,
+            customFieldsetCode: after.customFieldsetCode ?? null,
             deletedAt: null,
             createdAt: new Date(),
             updatedAt: new Date(),
@@ -376,6 +380,7 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
           record.appearanceColor = after.appearanceColor ?? null
           record.isActive = after.isActive
           record.availabilityRuleSetId = after.availabilityRuleSetId ?? null
+          record.customFieldsetCode = after.customFieldsetCode ?? null
           record.deletedAt = null
           record.updatedAt = new Date()
         }
@@ -471,6 +476,7 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
         if (parsed.appearanceIcon !== undefined) record.appearanceIcon = parsed.appearanceIcon ?? null
         if (parsed.appearanceColor !== undefined) record.appearanceColor = parsed.appearanceColor ?? null
         if (parsed.availabilityRuleSetId !== undefined) record.availabilityRuleSetId = parsed.availabilityRuleSetId ?? null
+        if (parsed.customFieldsetCode !== undefined) record.customFieldsetCode = parsed.customFieldsetCode ?? null
         record.updatedAt = new Date()
         if (parsed.isActive !== undefined) record.isActive = parsed.isActive
       },
@@ -531,6 +537,7 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
       'appearanceColor',
       'isActive',
       'availabilityRuleSetId',
+      'customFieldsetCode',
       'deletedAt',
     ])
     if (before.tags.join(',') !== after.tags.join(',')) {
@@ -583,6 +590,7 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
         record.appearanceColor = before.appearanceColor ?? null
         record.isActive = before.isActive
         record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
+        record.customFieldsetCode = before.customFieldsetCode ?? null
         record.deletedAt = before.deletedAt ? new Date(before.deletedAt) : null
         record.updatedAt = new Date()
       },
@@ -716,6 +724,7 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
             appearanceColor: before.appearanceColor ?? null,
             isActive: before.isActive,
             availabilityRuleSetId: before.availabilityRuleSetId ?? null,
+            customFieldsetCode: before.customFieldsetCode ?? null,
             deletedAt: null,
             createdAt: new Date(),
             updatedAt: new Date(),
@@ -734,6 +743,7 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
           record.appearanceColor = before.appearanceColor ?? null
           record.isActive = before.isActive
           record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
+          record.customFieldsetCode = before.customFieldsetCode ?? null
           record.deletedAt = null
           record.updatedAt = new Date()
         }

package/src/modules/resources/components/detail/dictionaries.ts

@@ -1,6 +1,7 @@
 "use client"
 
 import { apiCall, apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { fetchAllDictionaryEntries } from '@open-mercato/core/modules/dictionaries/lib/fetchAllEntries'
 
 export type DictionaryEntryOption = {
   value: string
@@ -52,10 +53,9 @@ export async function loadResourceDictionary(
   const name = 'Resource activity types'
   const dictionary = await ensureDictionary(key, name)
   if (!dictionary) return { dictionary: null, entries: [] }
-  const entriesCall = await apiCall<{ items?: Record<string, unknown>[] }>(`/api/dictionaries/${dictionary.id}/entries`)
+  const entriesCall = await fetchAllDictionaryEntries(dictionary.id)
   if (!entriesCall.ok) return { dictionary, entries: [] }
-  const items = Array.isArray(entriesCall.result?.items) ? entriesCall.result?.items ?? [] : []
-  const entries = items
+  const entries = entriesCall.items
     .map((entry) => {
       if (!entry || typeof entry !== 'object') return null
       const record = entry as Record<string, unknown>

package/src/modules/resources/data/entities.ts

@@ -83,6 +83,9 @@ export class ResourcesResource {
   @Property({ name: 'availability_rule_set_id', type: 'uuid', nullable: true })
   availabilityRuleSetId?: string | null
 
+  @Property({ name: 'custom_fieldset_code', type: 'text', nullable: true })
+  customFieldsetCode?: string | null
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()
 

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

@@ -1,4 +1,7 @@
 import { z } from 'zod'
+import { fieldsetCodeRegex } from '@open-mercato/shared/modules/entities/validators'
+
+const customFieldsetCodeSchema = z.string().trim().regex(fieldsetCodeRegex).max(100)
 
 const scopedCreateFields = {
   tenantId: z.string().uuid(),
@@ -52,6 +55,7 @@ export const resourcesResourceCreateSchema = z.object({
     .nullable(),
   isActive: z.boolean().optional(),
   availabilityRuleSetId: z.string().uuid().optional().nullable(),
+  customFieldsetCode: customFieldsetCodeSchema.optional().nullable(),
 })
 
 export const resourcesResourceUpdateSchema = z.object({
@@ -71,6 +75,7 @@ export const resourcesResourceUpdateSchema = z.object({
     .nullable(),
   isActive: z.boolean().optional(),
   availabilityRuleSetId: z.string().uuid().optional().nullable(),
+  customFieldsetCode: customFieldsetCodeSchema.optional().nullable(),
 })
 
 export const resourcesResourceTagCreateSchema = z.object({

package/src/modules/resources/lib/seeds.ts

@@ -707,25 +707,32 @@ export async function seedResourcesResourceExamples(
   const resourceByName = new Map(existingResources.map((resource) => [resource.name.toLowerCase(), resource]))
   const resourceByKey = new Map<string, ResourcesResource>()
   for (const seed of RESOURCE_SEEDS) {
+    const seedType = seed.typeKey ? typeByKey.get(seed.typeKey) ?? null : null
+    const seedFieldsetCode = resolveResourcesResourceFieldsetCode(seedType?.name ?? seed.name)
     const existing = resourceByName.get(seed.name.toLowerCase())
     if (existing) {
-      if (!existing.resourceTypeId && seed.typeKey) {
-        const typeId = typeByKey.get(seed.typeKey)?.id ?? null
-        if (typeId) {
-          existing.resourceTypeId = typeId
-          existing.updatedAt = now
-          em.persist(existing)
-        }
+      let touched = false
+      if (!existing.resourceTypeId && seedType?.id) {
+        existing.resourceTypeId = seedType.id
+        touched = true
+      }
+      if (!existing.customFieldsetCode) {
+        existing.customFieldsetCode = seedFieldsetCode
+        touched = true
+      }
+      if (touched) {
+        existing.updatedAt = now
+        em.persist(existing)
       }
       resourceByKey.set(seed.key, existing)
       continue
     }
-    const resourceTypeId = seed.typeKey ? typeByKey.get(seed.typeKey)?.id ?? null : null
     const resource = em.create(ResourcesResource, {
       tenantId: scope.tenantId,
       organizationId: scope.organizationId,
       name: seed.name,
-      resourceTypeId,
+      resourceTypeId: seedType?.id ?? null,
+      customFieldsetCode: seedFieldsetCode,
       isActive: true,
       createdAt: now,
       updatedAt: now,

package/src/modules/resources/migrations/.snapshot-open-mercato.json

@@ -1118,6 +1118,22 @@
           "enumItems": [],
           "mappedType": "uuid"
         },
+        "custom_fieldset_code": {
+          "name": "custom_fieldset_code",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
         "capacity": {
           "name": "capacity",
           "type": "int",
@@ -1389,4 +1405,4 @@
   ],
   "views": [],
   "nativeEnums": {}
-}
+}

package/src/modules/resources/migrations/Migration20260608231000.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260608231000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "resources_resources" add column "custom_fieldset_code" text null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "resources_resources" drop column "custom_fieldset_code";`);
+  }
+
+}

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

@@ -58,7 +58,7 @@ export default function CreateSalesDocumentPage() {
       } catch { /* ignore */ }
 
       // Auto-add line items from the inbox draft
-      const lineItems = Array.isArray(inboxDraft.payload.lineItems)
+      const lineItems = kind === 'quote' && Array.isArray(inboxDraft.payload.lineItems)
         ? (inboxDraft.payload.lineItems as Record<string, unknown>[])
         : []
       const lineEndpoint = kind === 'order' ? '/api/sales/order-lines' : '/api/sales/quote-lines'
@@ -123,9 +123,7 @@ export default function CreateSalesDocumentPage() {
           initialKind={initialKind}
           inboxPreFill={inboxPreFill}
         />
-        <p className="mt-4 text-sm text-muted-foreground">
-          {t('sales.documents.form.nextStep', 'After creation you will add items, prices, and fulfillment details.')}
-        </p>
+
       </PageBody>
     </Page>
   )

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

@@ -7066,6 +7066,14 @@ const orderLineDeleteCommand: CommandHandler<
           "Document not found or inaccessible.",
         ));
     }
+    if (filtered.length === 0) {
+      throw new CrudHttpError(409, {
+        error: translate(
+          "sales.documents.items.errorDeleteLast",
+          "An order must contain at least one line item.",
+        ),
+      });
+    }
     const sourceInputs = filtered.map((line, index) => ({
       ...mapOrderLineEntityToSnapshot(line),
       statusEntryId: line.statusEntryId ?? null,

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

@@ -833,6 +833,7 @@ export function SalesDocumentItemsSection({
                           size="icon"
                           variant="ghost"
                           className="h-8 w-8"
+                          aria-label={t('ui.actions.edit', 'Edit')}
                           onClick={(event) => {
                             event.stopPropagation();
                             handleEdit(item);
@@ -840,17 +841,25 @@ export function SalesDocumentItemsSection({
                         >
                           <Pencil className="h-4 w-4" />
                         </Button>
-                        <Button
-                          size="icon"
-                          variant="ghost"
-                          className="h-8 w-8 text-destructive"
-                          onClick={(event) => {
-                            event.stopPropagation();
-                            void handleDelete(item);
-                          }}
+                        <span
+                          title={kind === 'order' && items.length === 1
+                            ? t('sales.documents.items.errorDeleteLast', 'An order must contain at least one line item.')
+                            : undefined}
                         >
-                          <Trash2 className="h-4 w-4" />
-                        </Button>
+                          <Button
+                            size="icon"
+                            variant="ghost"
+                            className="h-8 w-8 text-destructive"
+                            aria-label={t('ui.actions.delete', 'Delete')}
+                            disabled={kind === 'order' && items.length === 1}
+                            onClick={(event) => {
+                              event.stopPropagation();
+                              void handleDelete(item);
+                            }}
+                          >
+                            <Trash2 className="h-4 w-4" />
+                          </Button>
+                        </span>
                       </div>
                     </td>
                   </tr>

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

@@ -272,7 +272,7 @@ type SnapshotEntity = {
 type SalesLineDialogProps = {
   open: boolean;
   kind: "order" | "quote";
-  documentId: string;
+  documentId?: string;
   currencyCode: string | null | undefined;
   documentUpdatedAt?: string | null;
   organizationId: string | null;
@@ -281,6 +281,7 @@ type SalesLineDialogProps = {
   shippedQuantity?: number;
   onOpenChange: (open: boolean) => void;
   onSaved?: () => Promise<void> | void;
+  onDraftSaved?: (payload: Record<string, unknown>, lineId: string | null) => Promise<void> | void;
 };
 
 const defaultForm = (currencyCode?: string | null): LineFormState => ({
@@ -476,6 +477,7 @@ export function LineItemDialog({
   shippedQuantity = 0,
   onOpenChange,
   onSaved,
+  onDraftSaved,
 }: SalesLineDialogProps) {
   const t = useT();
   const scope = useOrganizationScopeDetail();
@@ -1273,7 +1275,7 @@ export function LineItemDialog({
       const resolvedOrg = resolvedOrganizationId;
       const resolvedTenant = resolvedTenantId;
 
-      if (!resolvedOrg || !resolvedTenant || !resolvedDocumentId) {
+      if (!onDraftSaved && (!resolvedOrg || !resolvedTenant || !resolvedDocumentId)) {
         throw createCrudFormError(
           t(
             "sales.documents.items.errorScope",
@@ -1466,9 +1468,9 @@ export function LineItemDialog({
       };
 
       const payload: Record<string, unknown> = {
-        [documentKey]: String(resolvedDocumentId),
-        organizationId: String(resolvedOrg),
-        tenantId: String(resolvedTenant),
+        ...(resolvedDocumentId ? { [documentKey]: resolvedDocumentId } : {}),
+        ...(resolvedOrg ? { organizationId: resolvedOrg } : {}),
+        ...(resolvedTenant ? { tenantId: resolvedTenant } : {}),
         productId: isCustomLine
           ? undefined
           : values.productId
@@ -1508,6 +1510,11 @@ export function LineItemDialog({
       if (resolvedName) payload.name = resolvedName;
 
       try {
+        if (onDraftSaved) {
+          await onDraftSaved(payload, editingId);
+          closeDialog();
+          return;
+        }
         const action = editingId ? updateCrud : createCrud;
         const result = await withScopedApiRequestHeaders(
           buildOptimisticLockHeader(documentUpdatedAt),
@@ -1545,6 +1552,7 @@ export function LineItemDialog({
       documentKey,
       documentUpdatedAt,
       editingId,
+      onDraftSaved,
       priceOptions,
       productOption,
       resourcePath,

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

@@ -59,6 +59,7 @@ import {
 import { AddressEditor, type AddressEditorDraft } from '@open-mercato/core/modules/customers/components/AddressEditor'
 import { useSalesChannelsEnabled } from '../useSalesChannelsEnabled'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { SalesOrderDraftLines, createSalesOrderLineDraft, type SalesOrderLineDraft } from './SalesOrderDraftLines'
 
 const logger = createLogger('sales')
 
@@ -102,6 +103,7 @@ export type SalesDocumentFormValues = {
   shippingAddressDraft?: AddressDraft
   billingAddressDraft?: AddressDraft
   comments?: string | null
+  lines?: SalesOrderLineDraft[]
 } & Record<string, unknown>
 
 type InboxPreFill = {
@@ -805,6 +807,7 @@ function CustomerGroupComponent({ values, setValue, t, customers, setCustomers,
 
 export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind, inboxPreFill }: SalesDocumentFormProps) {
   const t = useT()
+  const { organizationId, tenantId } = useOrganizationScopeDetail()
   const { enabled: channelsEnabled } = useSalesChannelsEnabled()
   const [customers, setCustomers] = React.useState<CustomerOption[]>([])
   const [customerLoading, setCustomerLoading] = React.useState(false)
@@ -1305,14 +1308,19 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
       type: 'textarea',
     },
     {
-      id: 'infoNote',
+      id: 'lines',
       label: '',
       type: 'custom',
-      component: () => (
-        <div className="rounded-lg border bg-muted/50 p-3 text-sm text-muted-foreground">
-          {t('sales.documents.form.nextStep', 'After creation you will add items, prices, and fulfillment details.')}
-        </div>
-      ),
+      component: ({ value, error, values, setValue }) => values?.documentKind === 'order' ? (
+        <SalesOrderDraftLines
+          currencyCode={typeof values.currencyCode === 'string' ? values.currencyCode : defaultCurrency}
+          organizationId={organizationId ?? null}
+          tenantId={tenantId ?? null}
+          lines={Array.isArray(value) ? value as SalesOrderLineDraft[] : []}
+          error={error}
+          onChange={(lines) => setValue(lines)}
+        />
+      ) : null,
     },
   ], [
     addressFormat,
@@ -1321,6 +1329,9 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
     addressesLoading,
     channelsEnabled,
     currencyLabels,
+    defaultCurrency,
+    organizationId,
+    tenantId,
     fetchCurrencyOptions,
     loadAddresses,
     loadChannels,
@@ -1340,6 +1351,7 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
     },
     { id: 'channels-comments', title: '', column: 1, fields: channelsEnabled ? ['channelId', 'comments'] : ['comments'] },
     { id: 'currency', title: '', column: 2, fields: ['currencyCode'] },
+    { id: 'lines', title: '', column: 1, fields: ['lines'] },
     { 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' },
@@ -1361,6 +1373,21 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
       channelId: inboxPreFill?.channelId || undefined,
       customerEntityId: inboxPreFill?.customerEntityId || undefined,
       comments: inboxPreFill?.comments || undefined,
+      lines: (inboxPreFill?.lineItems ?? []).map((item, index) => {
+        const unitPrice = Number(item.unitPrice ?? item.unitPriceGross ?? item.unitPriceNet ?? 0)
+        const quantity = Number(item.quantity ?? 1)
+        return createSalesOrderLineDraft({
+          kind: item.kind || (item.productId ? 'product' : 'service'),
+          productId: typeof item.productId === 'string' ? item.productId : undefined,
+          productVariantId: typeof item.productVariantId === 'string' ? item.productVariantId : undefined,
+          name: item.productName || item.name || `Line ${index + 1}`,
+          quantity: Number.isFinite(quantity) ? quantity : 1,
+          currencyCode: inboxPreFill?.currencyCode || defaultCurrency,
+          unitPriceNet: Number.isFinite(unitPrice) ? unitPrice : 0,
+          unitPriceGross: Number.isFinite(unitPrice) ? unitPrice : 0,
+          metadata: item.productId ? undefined : { customLine: true, lineMode: 'custom' },
+        })
+      }),
       useCustomShipping: false,
       useCustomBilling: false,
       sameAsShipping: true,
@@ -1398,6 +1425,21 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
       }
       if (documentKind === 'order') {
         payload.orderNumber = documentNumber
+        const lines = Array.isArray(base.lines) ? base.lines : []
+        if (lines.length === 0) {
+          const message = t('sales.orders.linesRequired', 'Add at least one line item before creating the order.')
+          throw createCrudFormError(message, { lines: message })
+        }
+        payload.lines = lines.map((line) => {
+          const {
+            orderId: _orderId,
+            quoteId: _quoteId,
+            organizationId: _organizationId,
+            tenantId: _tenantId,
+            ...linePayload
+          } = line.payload
+          return { ...linePayload, currencyCode: linePayload.currencyCode || payload.currencyCode }
+        })
       } else {
         payload.quoteNumber = documentNumber
       }