@open-mercato/core 0.6.6-develop.6089.1.a7ed560528 → 0.6.6-develop.6121.1.5797a901b3

package/src/modules/catalog/backend/catalog/products/[productId]/variants/[variantId]/page.tsx

@@ -345,6 +345,18 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
             name: typeof record.name === 'string' ? record.name : '',
             sku: typeof record.sku === 'string' ? record.sku : '',
             barcode: typeof record.barcode === 'string' ? record.barcode : '',
+            gtinType:
+              typeof record.gtin_type === 'string'
+                ? record.gtin_type
+                : typeof record.gtinType === 'string'
+                  ? record.gtinType
+                  : null,
+            hsCode:
+              typeof record.hs_code === 'string'
+                ? record.hs_code
+                : typeof record.hsCode === 'string'
+                  ? record.hsCode
+                  : '',
             isDefault: record.is_default === true || record.isDefault === true,
             isActive: record.is_active !== false && record.isActive !== false,
             optionValues: normalizedOptionValues,
@@ -600,6 +612,8 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
               name,
               sku: values.sku?.trim() || undefined,
               barcode: values.barcode?.trim() || undefined,
+              gtinType: values.gtinType ?? null,
+              hsCode: values.hsCode?.trim() || null,
               isDefault: Boolean(values.isDefault),
               isActive: values.isActive !== false,
               optionValues: Object.keys(values.optionValues ?? {}).length ? values.optionValues : undefined,

package/src/modules/catalog/backend/catalog/products/[productId]/variants/create/page.tsx

@@ -367,6 +367,8 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
               name,
               sku: values.sku?.trim() || undefined,
               barcode: values.barcode?.trim() || undefined,
+              gtinType: values.gtinType ?? null,
+              hsCode: values.hsCode?.trim() || null,
               isDefault: Boolean(values.isDefault),
               isActive: values.isActive !== false,
               optionValues: Object.keys(values.optionValues ?? {}).length ? values.optionValues : undefined,

package/src/modules/catalog/backend/catalog/products/create/page.tsx

@@ -77,6 +77,7 @@ import {
   updateDimensionValue,
   updateWeightValue,
   isConfigurableProductType,
+  buildComplianceProductPayload,
 } from "@open-mercato/core/modules/catalog/components/products/productForm";
 import { CATALOG_PRODUCT_TYPES } from "@open-mercato/core/modules/catalog/data/types";
 import {
@@ -84,6 +85,7 @@ import {
   slugifyAttachmentFileName,
 } from "@open-mercato/core/modules/attachments/lib/imageUrls";
 import { ProductUomSection } from "@open-mercato/core/modules/catalog/components/products/ProductUomSection";
+import { ProductComplianceSection } from "@open-mercato/core/modules/catalog/components/products/ProductComplianceSection";
 import { canonicalizeUnitCode } from "@open-mercato/core/modules/catalog/lib/unitCodes";
 import {
   UNIT_PRICE_REFERENCE_UNITS,
@@ -150,6 +152,33 @@ const STEP_FIELD_MATCHERS: Record<
     matchField("unitPriceBaseQuantity"),
     matchPrefix("unitConversions"),
   ],
+  compliance: [
+    matchField("countryOfOriginCode"),
+    matchField("pkwiuCode"),
+    matchField("cnCode"),
+    matchField("hsCode"),
+    matchField("taxClassificationCode"),
+    matchField("gtuCodes"),
+    matchField("ageMin"),
+    matchField("isExciseGood"),
+    matchField("exciseCategory"),
+    matchField("requiresPrescription"),
+    matchPrefix("hazmat"),
+    matchField("unNumber"),
+    matchField("containsLithiumBattery"),
+    matchField("launchAt"),
+    matchField("endOfLifeAt"),
+    matchField("availableFrom"),
+    matchField("availableUntil"),
+    matchField("minOrderQty"),
+    matchField("maxOrderQty"),
+    matchField("orderQtyIncrement"),
+    matchField("requiresShipping"),
+    matchField("isQuoteOnly"),
+    matchField("seoTitle"),
+    matchField("seoDescription"),
+    matchField("canonicalUrl"),
+  ],
   variants: [
     matchField("hasVariants"),
     matchPrefix("options"),
@@ -542,6 +571,7 @@ export default function CreateCatalogProductPage() {
               unitPriceBaseQuantity: unitPriceEnabled
                 ? unitPriceBaseQuantity
                 : undefined,
+              ...buildComplianceProductPayload(formValues),
             };
             if (optionSchemaDefinition) {
               productPayload.optionSchema = optionSchemaDefinition;
@@ -1312,6 +1342,8 @@ function ProductBuilder({
               t("catalog.products.create.steps.organize", "Organize")}
             {step === "uom" &&
               t("catalog.products.uom.title", "Units of measure")}
+            {step === "compliance" &&
+              t("catalog.products.compliance.title", "Compliance & commerce")}
             {step === "variants" &&
               t("catalog.products.create.steps.variants", "Variants")}
             {(stepErrors[step]?.length ?? 0) > 0 ? (
@@ -1434,6 +1466,15 @@ function ProductBuilder({
         />
       ) : null}
 
+      {currentStepKey === "compliance" ? (
+        <ProductComplianceSection
+          values={values as ProductFormValues}
+          setValue={setValue}
+          errors={errors}
+          embedded
+        />
+      ) : null}
+
       {currentStepKey === "variants" ? (
         <div className="space-y-6">
           <label className="flex items-center gap-2 text-sm font-medium">

package/src/modules/catalog/commands/products.ts

@@ -52,6 +52,8 @@ import {
   type ProductUpdateInput,
 } from "../data/validators";
 import type {
+  CatalogExciseCategory,
+  CatalogHazmatPackingGroup,
   CatalogProductOptionSchema,
   CatalogProductType,
 } from "../data/types";
@@ -105,6 +107,32 @@ type ProductSnapshot = {
   weightValue: string | null;
   weightUnit: string | null;
   dimensions: Record<string, unknown> | null;
+  countryOfOriginCode: string | null;
+  pkwiuCode: string | null;
+  cnCode: string | null;
+  hsCode: string | null;
+  taxClassificationCode: string | null;
+  gtuCodes: string[] | null;
+  ageMin: number | null;
+  isExciseGood: boolean;
+  exciseCategory: CatalogExciseCategory | null;
+  requiresPrescription: boolean;
+  hazmatClass: string | null;
+  unNumber: string | null;
+  hazmatPackingGroup: CatalogHazmatPackingGroup | null;
+  containsLithiumBattery: boolean;
+  launchAt: string | null;
+  endOfLifeAt: string | null;
+  availableFrom: string | null;
+  availableUntil: string | null;
+  minOrderQty: number | null;
+  maxOrderQty: number | null;
+  orderQtyIncrement: number | null;
+  requiresShipping: boolean;
+  isQuoteOnly: boolean;
+  seoTitle: string | null;
+  seoDescription: string | null;
+  canonicalUrl: string | null;
   optionSchemaId: string | null;
   customFieldsetCode: string | null;
   metadata: Record<string, unknown> | null;
@@ -1154,6 +1182,36 @@ async function loadProductSnapshot(
     weightValue,
     weightUnit,
     dimensions,
+    countryOfOriginCode: record.countryOfOriginCode ?? null,
+    pkwiuCode: record.pkwiuCode ?? null,
+    cnCode: record.cnCode ?? null,
+    hsCode: record.hsCode ?? null,
+    taxClassificationCode: record.taxClassificationCode ?? null,
+    gtuCodes: record.gtuCodes?.length ? [...record.gtuCodes] : null,
+    ageMin: record.ageMin ?? null,
+    isExciseGood: record.isExciseGood ?? false,
+    exciseCategory: record.exciseCategory ?? null,
+    requiresPrescription: record.requiresPrescription ?? false,
+    hazmatClass: record.hazmatClass ?? null,
+    unNumber: record.unNumber ?? null,
+    hazmatPackingGroup: record.hazmatPackingGroup ?? null,
+    containsLithiumBattery: record.containsLithiumBattery ?? false,
+    launchAt: record.launchAt ? record.launchAt.toISOString() : null,
+    endOfLifeAt: record.endOfLifeAt ? record.endOfLifeAt.toISOString() : null,
+    availableFrom: record.availableFrom
+      ? record.availableFrom.toISOString()
+      : null,
+    availableUntil: record.availableUntil
+      ? record.availableUntil.toISOString()
+      : null,
+    minOrderQty: record.minOrderQty ?? null,
+    maxOrderQty: record.maxOrderQty ?? null,
+    orderQtyIncrement: record.orderQtyIncrement ?? null,
+    requiresShipping: record.requiresShipping ?? true,
+    isQuoteOnly: record.isQuoteOnly ?? false,
+    seoTitle: record.seoTitle ?? null,
+    seoDescription: record.seoDescription ?? null,
+    canonicalUrl: record.canonicalUrl ?? null,
     customFieldsetCode: record.customFieldsetCode ?? null,
     metadata,
     isConfigurable: record.isConfigurable,
@@ -1198,6 +1256,36 @@ function productSeedFromSnapshot(
     weightValue: snapshot.weightValue ?? null,
     weightUnit: snapshot.weightUnit ?? null,
     dimensions: snapshot.dimensions ? cloneJson(snapshot.dimensions) : null,
+    countryOfOriginCode: snapshot.countryOfOriginCode ?? null,
+    pkwiuCode: snapshot.pkwiuCode ?? null,
+    cnCode: snapshot.cnCode ?? null,
+    hsCode: snapshot.hsCode ?? null,
+    taxClassificationCode: snapshot.taxClassificationCode ?? null,
+    gtuCodes: snapshot.gtuCodes ? [...snapshot.gtuCodes] : null,
+    ageMin: snapshot.ageMin ?? null,
+    isExciseGood: snapshot.isExciseGood ?? false,
+    exciseCategory: snapshot.exciseCategory ?? null,
+    requiresPrescription: snapshot.requiresPrescription ?? false,
+    hazmatClass: snapshot.hazmatClass ?? null,
+    unNumber: snapshot.unNumber ?? null,
+    hazmatPackingGroup: snapshot.hazmatPackingGroup ?? null,
+    containsLithiumBattery: snapshot.containsLithiumBattery ?? false,
+    launchAt: snapshot.launchAt ? new Date(snapshot.launchAt) : null,
+    endOfLifeAt: snapshot.endOfLifeAt ? new Date(snapshot.endOfLifeAt) : null,
+    availableFrom: snapshot.availableFrom
+      ? new Date(snapshot.availableFrom)
+      : null,
+    availableUntil: snapshot.availableUntil
+      ? new Date(snapshot.availableUntil)
+      : null,
+    minOrderQty: snapshot.minOrderQty ?? null,
+    maxOrderQty: snapshot.maxOrderQty ?? null,
+    orderQtyIncrement: snapshot.orderQtyIncrement ?? null,
+    requiresShipping: snapshot.requiresShipping ?? true,
+    isQuoteOnly: snapshot.isQuoteOnly ?? false,
+    seoTitle: snapshot.seoTitle ?? null,
+    seoDescription: snapshot.seoDescription ?? null,
+    canonicalUrl: snapshot.canonicalUrl ?? null,
     metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
     customFieldsetCode: snapshot.customFieldsetCode ?? null,
     isConfigurable: snapshot.isConfigurable,
@@ -1239,6 +1327,38 @@ function applyProductSnapshot(
   record.dimensions = snapshot.dimensions
     ? cloneJson(snapshot.dimensions)
     : null;
+  record.countryOfOriginCode = snapshot.countryOfOriginCode ?? null;
+  record.pkwiuCode = snapshot.pkwiuCode ?? null;
+  record.cnCode = snapshot.cnCode ?? null;
+  record.hsCode = snapshot.hsCode ?? null;
+  record.taxClassificationCode = snapshot.taxClassificationCode ?? null;
+  record.gtuCodes = snapshot.gtuCodes ? [...snapshot.gtuCodes] : null;
+  record.ageMin = snapshot.ageMin ?? null;
+  record.isExciseGood = snapshot.isExciseGood ?? false;
+  record.exciseCategory = snapshot.exciseCategory ?? null;
+  record.requiresPrescription = snapshot.requiresPrescription ?? false;
+  record.hazmatClass = snapshot.hazmatClass ?? null;
+  record.unNumber = snapshot.unNumber ?? null;
+  record.hazmatPackingGroup = snapshot.hazmatPackingGroup ?? null;
+  record.containsLithiumBattery = snapshot.containsLithiumBattery ?? false;
+  record.launchAt = snapshot.launchAt ? new Date(snapshot.launchAt) : null;
+  record.endOfLifeAt = snapshot.endOfLifeAt
+    ? new Date(snapshot.endOfLifeAt)
+    : null;
+  record.availableFrom = snapshot.availableFrom
+    ? new Date(snapshot.availableFrom)
+    : null;
+  record.availableUntil = snapshot.availableUntil
+    ? new Date(snapshot.availableUntil)
+    : null;
+  record.minOrderQty = snapshot.minOrderQty ?? null;
+  record.maxOrderQty = snapshot.maxOrderQty ?? null;
+  record.orderQtyIncrement = snapshot.orderQtyIncrement ?? null;
+  record.requiresShipping = snapshot.requiresShipping ?? true;
+  record.isQuoteOnly = snapshot.isQuoteOnly ?? false;
+  record.seoTitle = snapshot.seoTitle ?? null;
+  record.seoDescription = snapshot.seoDescription ?? null;
+  record.canonicalUrl = snapshot.canonicalUrl ?? null;
   record.metadata = snapshot.metadata ? cloneJson(snapshot.metadata) : null;
   record.customFieldsetCode = snapshot.customFieldsetCode ?? null;
   record.optionSchemaTemplate = snapshot.optionSchemaId
@@ -1332,6 +1452,32 @@ const createProductCommand: CommandHandler<
       weightValue,
       weightUnit,
       dimensions,
+      countryOfOriginCode: parsed.countryOfOriginCode ?? null,
+      pkwiuCode: parsed.pkwiuCode ?? null,
+      cnCode: parsed.cnCode ?? null,
+      hsCode: parsed.hsCode ?? null,
+      taxClassificationCode: parsed.taxClassificationCode ?? null,
+      gtuCodes: parsed.gtuCodes ?? null,
+      ageMin: parsed.ageMin ?? null,
+      isExciseGood: parsed.isExciseGood ?? false,
+      exciseCategory: parsed.exciseCategory ?? null,
+      requiresPrescription: parsed.requiresPrescription ?? false,
+      hazmatClass: parsed.hazmatClass ?? null,
+      unNumber: parsed.unNumber ?? null,
+      hazmatPackingGroup: parsed.hazmatPackingGroup ?? null,
+      containsLithiumBattery: parsed.containsLithiumBattery ?? false,
+      launchAt: parsed.launchAt ?? null,
+      endOfLifeAt: parsed.endOfLifeAt ?? null,
+      availableFrom: parsed.availableFrom ?? null,
+      availableUntil: parsed.availableUntil ?? null,
+      minOrderQty: parsed.minOrderQty ?? null,
+      maxOrderQty: parsed.maxOrderQty ?? null,
+      orderQtyIncrement: parsed.orderQtyIncrement ?? null,
+      requiresShipping: parsed.requiresShipping ?? true,
+      isQuoteOnly: parsed.isQuoteOnly ?? false,
+      seoTitle: parsed.seoTitle ?? null,
+      seoDescription: parsed.seoDescription ?? null,
+      canonicalUrl: parsed.canonicalUrl ?? null,
       metadata,
       customFieldsetCode: parsed.customFieldsetCode ?? null,
       isConfigurable: parsed.isConfigurable ?? false,
@@ -1551,6 +1697,75 @@ const updateProductCommand: CommandHandler<
     ensureTenantScope(ctx, tenantId);
     ensureOrganizationScope(ctx, organizationId);
     ensureSameScope(record, organizationId, tenantId);
+    // Re-validate range constraints against the merged record state: a partial
+    // update may carry only one half of a (min, max) or (from, until) pair
+    // while the other half is stored — payload-level zod cannot see it.
+    const mergedRangeViolation = (() => {
+      const minOrderQty =
+        parsed.minOrderQty !== undefined
+          ? (parsed.minOrderQty ?? null)
+          : (record.minOrderQty ?? null);
+      const maxOrderQty =
+        parsed.maxOrderQty !== undefined
+          ? (parsed.maxOrderQty ?? null)
+          : (record.maxOrderQty ?? null);
+      if (minOrderQty != null && maxOrderQty != null && maxOrderQty < minOrderQty) {
+        return {
+          field: "maxOrderQty",
+          key: "catalog.products.validation.orderQtyRange",
+          fallback: "Maximum order quantity cannot be lower than the minimum.",
+        };
+      }
+      const launchAt =
+        parsed.launchAt !== undefined
+          ? (parsed.launchAt ?? null)
+          : (record.launchAt ?? null);
+      const endOfLifeAt =
+        parsed.endOfLifeAt !== undefined
+          ? (parsed.endOfLifeAt ?? null)
+          : (record.endOfLifeAt ?? null);
+      if (launchAt && endOfLifeAt && endOfLifeAt < launchAt) {
+        return {
+          field: "endOfLifeAt",
+          key: "catalog.products.validation.lifecycleDateRange",
+          fallback: "End of life cannot be before the launch date.",
+        };
+      }
+      const availableFrom =
+        parsed.availableFrom !== undefined
+          ? (parsed.availableFrom ?? null)
+          : (record.availableFrom ?? null);
+      const availableUntil =
+        parsed.availableUntil !== undefined
+          ? (parsed.availableUntil ?? null)
+          : (record.availableUntil ?? null);
+      if (availableFrom && availableUntil && availableUntil < availableFrom) {
+        return {
+          field: "availableUntil",
+          key: "catalog.products.validation.availabilityDateRange",
+          fallback: "Available until cannot be before available from.",
+        };
+      }
+      return null;
+    })();
+    if (mergedRangeViolation) {
+      const message = translate(
+        mergedRangeViolation.key,
+        mergedRangeViolation.fallback,
+      );
+      throw new CrudHttpError(400, {
+        error: message,
+        fieldErrors: { [mergedRangeViolation.field]: message },
+        details: [
+          {
+            path: [mergedRangeViolation.field],
+            message,
+            code: "invalid",
+            origin: "validation",
+          },
+        ],
+      });
+    }
     const dataEngine = ctx.container.resolve("dataEngine") as DataEngine;
     const lookupEm = em.fork();
     const taxRateProvided =
@@ -1717,6 +1932,55 @@ const updateProductCommand: CommandHandler<
     if (parsed.isConfigurable !== undefined)
       record.isConfigurable = parsed.isConfigurable;
     if (parsed.isActive !== undefined) record.isActive = parsed.isActive;
+    if (parsed.countryOfOriginCode !== undefined)
+      record.countryOfOriginCode = parsed.countryOfOriginCode ?? null;
+    if (parsed.pkwiuCode !== undefined)
+      record.pkwiuCode = parsed.pkwiuCode ?? null;
+    if (parsed.cnCode !== undefined) record.cnCode = parsed.cnCode ?? null;
+    if (parsed.hsCode !== undefined) record.hsCode = parsed.hsCode ?? null;
+    if (parsed.taxClassificationCode !== undefined)
+      record.taxClassificationCode = parsed.taxClassificationCode ?? null;
+    if (parsed.gtuCodes !== undefined)
+      record.gtuCodes = parsed.gtuCodes ?? null;
+    if (parsed.ageMin !== undefined) record.ageMin = parsed.ageMin ?? null;
+    if (parsed.isExciseGood !== undefined)
+      record.isExciseGood = parsed.isExciseGood;
+    if (parsed.exciseCategory !== undefined)
+      record.exciseCategory = parsed.exciseCategory ?? null;
+    if (parsed.requiresPrescription !== undefined)
+      record.requiresPrescription = parsed.requiresPrescription;
+    if (parsed.hazmatClass !== undefined)
+      record.hazmatClass = parsed.hazmatClass ?? null;
+    if (parsed.unNumber !== undefined)
+      record.unNumber = parsed.unNumber ?? null;
+    if (parsed.hazmatPackingGroup !== undefined)
+      record.hazmatPackingGroup = parsed.hazmatPackingGroup ?? null;
+    if (parsed.containsLithiumBattery !== undefined)
+      record.containsLithiumBattery = parsed.containsLithiumBattery;
+    if (parsed.launchAt !== undefined)
+      record.launchAt = parsed.launchAt ?? null;
+    if (parsed.endOfLifeAt !== undefined)
+      record.endOfLifeAt = parsed.endOfLifeAt ?? null;
+    if (parsed.availableFrom !== undefined)
+      record.availableFrom = parsed.availableFrom ?? null;
+    if (parsed.availableUntil !== undefined)
+      record.availableUntil = parsed.availableUntil ?? null;
+    if (parsed.minOrderQty !== undefined)
+      record.minOrderQty = parsed.minOrderQty ?? null;
+    if (parsed.maxOrderQty !== undefined)
+      record.maxOrderQty = parsed.maxOrderQty ?? null;
+    if (parsed.orderQtyIncrement !== undefined)
+      record.orderQtyIncrement = parsed.orderQtyIncrement ?? null;
+    if (parsed.requiresShipping !== undefined)
+      record.requiresShipping = parsed.requiresShipping;
+    if (parsed.isQuoteOnly !== undefined)
+      record.isQuoteOnly = parsed.isQuoteOnly;
+    if (parsed.seoTitle !== undefined)
+      record.seoTitle = parsed.seoTitle ?? null;
+    if (parsed.seoDescription !== undefined)
+      record.seoDescription = parsed.seoDescription ?? null;
+    if (parsed.canonicalUrl !== undefined)
+      record.canonicalUrl = parsed.canonicalUrl ?? null;
     try {
       await withAtomicFlush(
         em,
@@ -1757,6 +2021,19 @@ const updateProductCommand: CommandHandler<
     const after = snapshots.after as ProductSnapshot | undefined;
     if (!before || !after) return null;
     const { translate } = await resolveTranslations();
+    // buildChanges compares with strict !== — array fields need a serialized
+    // comparison or every update would emit a phantom gtuCodes diff.
+    const beforeGtuCodes = (before.gtuCodes ?? []).join(",");
+    const afterGtuCodes = (after.gtuCodes ?? []).join(",");
+    const gtuCodesChange =
+      beforeGtuCodes !== afterGtuCodes
+        ? {
+            gtuCodes: {
+              from: before.gtuCodes ?? null,
+              to: after.gtuCodes ?? null,
+            },
+          }
+        : null;
     return {
       actionLabel: translate(
         "catalog.audit.products.update",
@@ -1766,7 +2043,8 @@ const updateProductCommand: CommandHandler<
       resourceId: before.id,
       tenantId: before.tenantId,
       organizationId: before.organizationId,
-      changes: buildChanges(before, after, [
+      changes: {
+        ...buildChanges(before, after, [
         "title",
         "sku",
         "productType",
@@ -1779,7 +2057,34 @@ const updateProductCommand: CommandHandler<
         "unitPriceReferenceUnit",
         "unitPriceBaseQuantity",
         "isActive",
-      ]),
+        "countryOfOriginCode",
+        "pkwiuCode",
+        "cnCode",
+        "hsCode",
+        "taxClassificationCode",
+        "ageMin",
+        "isExciseGood",
+        "exciseCategory",
+        "requiresPrescription",
+        "hazmatClass",
+        "unNumber",
+        "hazmatPackingGroup",
+        "containsLithiumBattery",
+        "launchAt",
+        "endOfLifeAt",
+        "availableFrom",
+        "availableUntil",
+        "minOrderQty",
+        "maxOrderQty",
+        "orderQtyIncrement",
+        "requiresShipping",
+        "isQuoteOnly",
+        "seoTitle",
+        "seoDescription",
+        "canonicalUrl",
+        ]),
+        ...gtuCodesChange,
+      },
       snapshotBefore: before,
       snapshotAfter: after,
       payload: {

package/src/modules/catalog/commands/variants.ts

@@ -25,6 +25,8 @@ import {
   type VariantCreateInput,
   type VariantUpdateInput,
 } from '../data/validators'
+import { isValidGtin, normalizeGtinValue } from '../lib/gtin'
+import type { CatalogGtinType } from '../data/types'
 import {
   cloneJson,
   commandActorScope,
@@ -59,6 +61,8 @@ type VariantSnapshot = {
   name: string | null
   sku: string | null
   barcode: string | null
+  gtinType: CatalogGtinType | null
+  hsCode: string | null
   statusEntryId: string | null
   isDefault: boolean
   isActive: boolean
@@ -86,6 +90,8 @@ const VARIANT_CHANGE_KEYS = [
   'name',
   'sku',
   'barcode',
+  'gtinType',
+  'hsCode',
   'statusEntryId',
   'isDefault',
   'isActive',
@@ -127,6 +133,8 @@ async function loadVariantSnapshot(
     name: record.name ?? null,
     sku: record.sku ?? null,
     barcode: record.barcode ?? null,
+    gtinType: record.gtinType ?? null,
+    hsCode: record.hsCode ?? null,
     statusEntryId: record.statusEntryId ?? null,
     isDefault: record.isDefault,
     isActive: record.isActive,
@@ -154,6 +162,8 @@ function variantSeedFromSnapshot(snapshot: VariantSnapshot): Record<string, unkn
     name: snapshot.name ?? null,
     sku: snapshot.sku ?? null,
     barcode: snapshot.barcode ?? null,
+    gtinType: snapshot.gtinType ?? null,
+    hsCode: snapshot.hsCode ?? null,
     statusEntryId: snapshot.statusEntryId ?? null,
     isDefault: snapshot.isDefault,
     isActive: snapshot.isActive,
@@ -176,6 +186,8 @@ function applyVariantSnapshot(record: CatalogProductVariant, snapshot: VariantSn
   record.name = snapshot.name ?? null
   record.sku = snapshot.sku ?? null
   record.barcode = snapshot.barcode ?? null
+  record.gtinType = snapshot.gtinType ?? null
+  record.hsCode = snapshot.hsCode ?? null
   record.statusEntryId = snapshot.statusEntryId ?? null
   record.isDefault = snapshot.isDefault
   record.isActive = snapshot.isActive
@@ -592,6 +604,12 @@ const createVariantCommand: CommandHandler<VariantCreateInput, { variantId: stri
     const resolvedOptionValues =
       parsed.optionValues ?? (metadataSplit.hadOptionValues ? metadataSplit.optionValues : null)
 
+    const gtinType = parsed.gtinType ?? null
+    const barcode =
+      gtinType && parsed.barcode
+        ? normalizeGtinValue(gtinType, parsed.barcode)
+        : (parsed.barcode ?? null)
+
     const now = new Date()
     const record = em.create(CatalogProductVariant, {
       organizationId: product.organizationId,
@@ -599,7 +617,9 @@ const createVariantCommand: CommandHandler<VariantCreateInput, { variantId: stri
       product,
       name: parsed.name ?? null,
       sku: parsed.sku ?? null,
-      barcode: parsed.barcode ?? null,
+      barcode,
+      gtinType,
+      hsCode: parsed.hsCode ?? null,
       statusEntryId: parsed.statusEntryId ?? null,
       isDefault: parsed.isDefault ?? false,
       isActive: parsed.isActive ?? true,
@@ -812,6 +832,27 @@ const updateVariantCommand: CommandHandler<VariantUpdateInput, { variantId: stri
       ? await resolveVariantTaxRate(em, product, parsed.taxRateId ?? null, parsed.taxRate)
       : null
 
+    // Re-validate GTIN against the merged record state: a partial update may
+    // carry only one of (gtinType, barcode) while the other half is stored.
+    let normalizedGtinBarcode: string | null = null
+    if (parsed.gtinType !== undefined || parsed.barcode !== undefined) {
+      const effectiveGtinType =
+        parsed.gtinType !== undefined ? (parsed.gtinType ?? null) : (record.gtinType ?? null)
+      if (effectiveGtinType) {
+        const effectiveBarcode =
+          parsed.barcode !== undefined ? (parsed.barcode ?? null) : (record.barcode ?? null)
+        if (!effectiveBarcode || !effectiveBarcode.trim().length) {
+          await throwGtinBarcodeRequiredError()
+        } else {
+          const normalized = normalizeGtinValue(effectiveGtinType, effectiveBarcode)
+          if (!isValidGtin(effectiveGtinType, normalized)) {
+            await throwInvalidGtinError()
+          }
+          normalizedGtinBarcode = normalized
+        }
+      }
+    }
+
     let previousDefaultVariantId: string | null = null
     try {
       await withAtomicFlush(
@@ -821,6 +862,9 @@ const updateVariantCommand: CommandHandler<VariantUpdateInput, { variantId: stri
             if (parsed.name !== undefined) record.name = parsed.name ?? null
             if (parsed.sku !== undefined) record.sku = parsed.sku ?? null
             if (parsed.barcode !== undefined) record.barcode = parsed.barcode ?? null
+            if (parsed.gtinType !== undefined) record.gtinType = parsed.gtinType ?? null
+            if (parsed.hsCode !== undefined) record.hsCode = parsed.hsCode ?? null
+            if (normalizedGtinBarcode !== null) record.barcode = normalizedGtinBarcode
             if (parsed.statusEntryId !== undefined) record.statusEntryId = parsed.statusEntryId ?? null
             if (parsed.isDefault !== undefined) record.isDefault = parsed.isDefault
             if (parsed.isActive !== undefined) record.isActive = parsed.isActive
@@ -1159,6 +1203,45 @@ async function throwDuplicateVariantSkuError(): Promise<never> {
   })
 }
 
+async function throwDuplicateVariantGtinError(): Promise<never> {
+  const { translate } = await resolveTranslations()
+  const message = translate(
+    'catalog.variants.errors.gtinExists',
+    'Another variant already uses this identifier.',
+  )
+  throw new CrudHttpError(400, {
+    error: message,
+    fieldErrors: { barcode: message },
+    details: [{ path: ['barcode'], message, code: 'duplicate', origin: 'validation' }],
+  })
+}
+
+async function throwGtinBarcodeRequiredError(): Promise<never> {
+  const { translate } = await resolveTranslations()
+  const message = translate(
+    'catalog.variants.validation.gtinBarcodeRequired',
+    'A barcode value is required when an identifier type is set.',
+  )
+  throw new CrudHttpError(400, {
+    error: message,
+    fieldErrors: { barcode: message },
+    details: [{ path: ['barcode'], message, code: 'invalid', origin: 'validation' }],
+  })
+}
+
+async function throwInvalidGtinError(): Promise<never> {
+  const { translate } = await resolveTranslations()
+  const message = translate(
+    'catalog.variants.validation.gtinChecksum',
+    'The barcode does not match the selected identifier type.',
+  )
+  throw new CrudHttpError(400, {
+    error: message,
+    fieldErrors: { barcode: message },
+    details: [{ path: ['barcode'], message, code: 'invalid', origin: 'validation' }],
+  })
+}
+
 async function rethrowVariantUniqueConstraint(error: unknown): Promise<never> {
   if (error instanceof UniqueConstraintViolationException) {
     const constraint = getErrorConstraint(error)
@@ -1169,6 +1252,12 @@ async function rethrowVariantUniqueConstraint(error: unknown): Promise<never> {
     ) {
       await throwDuplicateVariantSkuError()
     }
+    if (
+      constraint === 'catalog_product_variants_gtin_scope_unique' ||
+      message.includes('catalog_product_variants_gtin_scope_unique')
+    ) {
+      await throwDuplicateVariantGtinError()
+    }
   }
   throw error
 }