@flowselections/floriday-voorraad 1.0.22 → 1.0.26

package/dist-lib/lib/floriday-payload.js

@@ -107,11 +107,11 @@ export const stepSchemas = {
     }),
     beschikbaarheid: z
         .object({
-        yearRound: z.boolean(),
+        availabilityMode: z.enum(["YEAR_ROUND", "SPECIFIC", "UNSPECIFIED"]),
         weeks: z.array(z.number().int().min(1).max(53)),
     })
-        .refine((v) => v.yearRound || v.weeks.length > 0, {
-        message: "Kies jaarrond of selecteer minstens één week",
+        .refine((v) => v.availabilityMode !== "SPECIFIC" || v.weeks.length > 0, {
+        message: "Selecteer minstens één week of kies jaarrond/niet gespecificeerd",
         path: ["weeks"],
     }),
     aanbieden: z
@@ -265,11 +265,18 @@ export function buildPackingConfigPayload(p, primary = false) {
     if (!vbnPackageCode && !customPackageId) {
         throw new Error(`Fusttype ontbreekt voor beladingsconfiguratie "${p.id}" — kies een VBN-fust of een custom package.`);
     }
+    // Floriday's `package`-union accepteert exact één tak. Bij SUPPLIER met een
+    // geldige custom package heeft die voorrang; anders vallen we terug op VBN.
     const pkg = {};
-    if (vbnPackageCode)
+    if (customPackageId && p.source === "SUPPLIER") {
+        pkg.customPackageId = customPackageId;
+    }
+    else if (vbnPackageCode) {
         pkg.vbnPackageCode = vbnPackageCode;
-    if (customPackageId)
+    }
+    else if (customPackageId) {
         pkg.customPackageId = customPackageId;
+    }
     const payload = {
         primary: Boolean(primary),
         piecesPerPackage: Math.max(1, Math.min(9999, Number(p.unitsPerPackage) || 1)),
@@ -277,7 +284,7 @@ export function buildPackingConfigPayload(p, primary = false) {
         packagesPerLayer: Math.max(1, Math.min(9999, Number(p.packagesPerLayer) || 1)),
         layersPerLoadCarrier: Math.max(1, Math.min(9999, Number(p.layersPerLoadCarrier) || 1)),
         loadCarrier: normaliseLoadCarrier(p.loadCarrier),
-        isHiddenForDirectSales: false,
+        isHiddenForDirectSales: Boolean(p.isHiddenForDirectSales),
     };
     // Alleen geldige VRS-packaging UUIDs meesturen; supplierId-string uit de
     // hardcoded lijst is GEEN uuid en hoort niet in de Floriday-payload.
@@ -285,7 +292,9 @@ export function buildPackingConfigPayload(p, primary = false) {
         payload.floricodeVrsPackagingId = p.packagingSupplierId;
     }
     if (p.isCustomerSpecific && p.customerOrganizationIds.length > 0) {
-        payload.allowedCustomerOrganizationIds = p.customerOrganizationIds;
+        const uuids = p.customerOrganizationIds.filter(isUuid);
+        if (uuids.length > 0)
+            payload.allowedCustomerOrganizationIds = uuids;
     }
     if (p.photoUrl)
         payload.photoUrl = p.photoUrl;
@@ -416,18 +425,24 @@ export function buildAddTradeItemPayload(d) {
         tradeItemName: { nl: tradeItemNameNl },
         characteristics,
         customerOrganizationIds: isCustomerSpecific ? d.customerOrganizationIds : [],
-        seasonalPeriods: d.yearRound
+        seasonalPeriods: d.availabilityMode === "YEAR_ROUND"
             ? [{ startWeek: 1, endWeek: 53 }]
-            : weeksToSeasonalPeriods(d.weeks),
+            : d.availabilityMode === "UNSPECIFIED"
+                ? []
+                : (() => {
+                    const p = weeksToSeasonalPeriods(d.weeks);
+                    if (p.length === 0) {
+                        throw new Error("Kies minstens één week voor 'Specifieke periode', of kies jaarrond/niet gespecificeerd.");
+                    }
+                    return p;
+                })(),
         photos,
         warehouseId,
         packingConfigurations,
-        botanicalNames: botanicalNames.length ? botanicalNames : undefined,
-        countryOfOriginIsoCodes: countryOfOriginIsoCodes.length ? countryOfOriginIsoCodes : undefined,
-        additionalPackagingMaterialIds: additionalPackagingMaterialIds.length
-            ? additionalPackagingMaterialIds
-            : undefined,
-        isHiddenInCatalog: isCustomerSpecific ? true : !d.visibleInExplorer,
+        botanicalNames,
+        countryOfOriginIsoCodes,
+        additionalPackagingMaterialIds,
+        isHiddenInCatalog: !d.visibleInExplorer,
     };
 }
 /**
@@ -461,29 +476,74 @@ export const emptyWizardData = {
     warehouseId: "",
     packingConfigurations: [],
     additionalPackaging: [],
-    yearRound: true,
+    availabilityMode: "YEAR_ROUND",
     weeks: [],
     offerForSale: true,
     salePricePerPiece: 0,
     saleStockPieces: 0,
     offerStartDate: new Date().toISOString().slice(0, 10),
+    priceGroupPrices: {},
+    vatRate: null,
+    vatCode: null,
 };
 // -------- Reverse mapper: Floriday cache row -> WizardData ----------------
 // Used by the detail/edit page to hydrate the wizard from an existing
 // published trade item.
-function productGroupFromVbn(vbnProductCode) {
-    const n = Number(vbnProductCode);
-    if (!Number.isFinite(n) || n <= 0)
+function productGroupFromFloricodePrefix(raw) {
+    const text = String(raw ?? "").trim();
+    if (!/^\d+$/.test(text))
         return null;
-    const s = String(Math.floor(n));
-    if (s.startsWith("10"))
+    if (text.startsWith("10") || text.startsWith("11"))
         return "CUT_FLOWER";
-    if (s.startsWith("20"))
+    if (text.startsWith("20") || text.startsWith("21") || text.startsWith("29"))
         return "POT_PLANT";
-    if (s.startsWith("30"))
+    if (text.startsWith("30") || text.startsWith("31"))
         return "GARDEN_PLANT";
     return null;
 }
+function productGroupFromVbn(vbnProductCode) {
+    return productGroupFromFloricodePrefix(vbnProductCode);
+}
+export function normalizeFloridayProductGroup(raw) {
+    if (!raw)
+        return null;
+    if (typeof raw === "object") {
+        const o = raw;
+        const candidates = [
+            o.productGroup,
+            o.productGroupId,
+            o.product_group_id,
+            o.vbnProductGroup,
+            o.vbnProductGroupId,
+            o.vbn_product_group_id,
+            o.code,
+            o.id,
+            o.name,
+            o.description,
+            o.value,
+        ];
+        for (const candidate of candidates) {
+            const group = normalizeFloridayProductGroup(candidate);
+            if (group)
+                return group;
+        }
+        return null;
+    }
+    const prefixed = productGroupFromFloricodePrefix(raw);
+    if (prefixed)
+        return prefixed;
+    const s = String(raw).trim().toUpperCase().replace(/[\s-]+/g, "_");
+    if (s === "CUT_FLOWER" || s === "POT_PLANT" || s === "GARDEN_PLANT") {
+        return s;
+    }
+    if (s.includes("TUIN") || s.includes("GARDEN"))
+        return "GARDEN_PLANT";
+    if (s.includes("SNIJ") || s.includes("CUT") || s.includes("FLOWER"))
+        return "CUT_FLOWER";
+    if (s.includes("KAMER") || s.includes("POT"))
+        return "POT_PLANT";
+    return null;
+}
 function pickName(value) {
     if (!value)
         return "";
@@ -512,15 +572,44 @@ function expandSeasonalPeriods(periods) {
         const e = Number(p?.endWeek ?? p?.startWeek);
         if (!Number.isFinite(s) || !Number.isFinite(e))
             continue;
-        for (let w = Math.max(1, s); w <= Math.min(53, e); w++)
-            out.add(w);
+        const sc = Math.max(1, Math.min(53, s));
+        const ec = Math.max(1, Math.min(53, e));
+        if (ec >= sc) {
+            for (let w = sc; w <= ec; w++)
+                out.add(w);
+        }
+        else {
+            // Wrap-around (bv. week 50..3) — Floriday interpreteert dit als
+            // [start..53] + [1..end].
+            for (let w = sc; w <= 53; w++)
+                out.add(w);
+            for (let w = 1; w <= ec; w++)
+                out.add(w);
+        }
     }
     return [...out].sort((a, b) => a - b);
 }
 export function floridayCacheToWizardData(raw) {
     if (!raw || typeof raw !== "object")
         return { ...emptyWizardData };
-    const vbn = raw.vbnProductCode ?? raw.vbnCode ?? "";
+    const vbn = raw.vbnProductCode ??
+        raw.vbnCode ??
+        raw.vbnProduct?.code ??
+        raw.vbnProduct?.vbnCode ??
+        raw.vbnProductCodeId ??
+        "";
+    const vbnNameHint = (typeof raw.vbnProduct?.name === "object"
+        ? (raw.vbnProduct.name?.nl ?? raw.vbnProduct.name?.en)
+        : raw.vbnProduct?.name) ?? "";
+    const productGroup = normalizeFloridayProductGroup(raw.productGroup) ??
+        normalizeFloridayProductGroup(raw.productGroupId) ??
+        normalizeFloridayProductGroup(raw.product_group_id) ??
+        normalizeFloridayProductGroup(raw.vbnProductGroup) ??
+        normalizeFloridayProductGroup(raw.vbnProductGroupId) ??
+        normalizeFloridayProductGroup(raw.vbn_product_group_id) ??
+        normalizeFloridayProductGroup(raw.vbnProduct) ??
+        normalizeFloridayProductGroup(raw.product) ??
+        productGroupFromVbn(vbn);
     const characteristics = Array.isArray(raw.characteristics) ? raw.characteristics : [];
     const features = {};
     for (const c of characteristics) {
@@ -540,6 +629,7 @@ export function floridayCacheToWizardData(raw) {
         url: p.url,
         primary: i === primaryPhotoIdxNorm,
         sortOrder: p.sortIndex ?? i,
+        type: p?.type ?? "WEBSHOPFRIENDLY",
     }));
     const packings = Array.isArray(raw.packingConfigurations)
         ? raw.packingConfigurations
@@ -550,24 +640,31 @@ export function floridayCacheToWizardData(raw) {
     })();
     const packingConfigurations = packings.map((p, i) => {
         const vrsId = p?.floricodeVrsPackagingId ?? p?.packagingSupplierId ?? undefined;
+        const customPkgId = p?.package?.customPackageId ?? p?.packagingSupplierMaterialId ?? undefined;
         const allowed = Array.isArray(p?.allowedCustomerOrganizationIds)
             ? p.allowedCustomerOrganizationIds
             : Array.isArray(p?.customerOrganizationIds)
                 ? p.customerOrganizationIds
                 : [];
+        const hasSupplier = Boolean(vrsId) || Boolean(customPkgId);
         return {
             id: `existing-${i}`,
-            source: vrsId ? "SUPPLIER" : "VBN",
+            floridayId: p?.packingConfigurationId ?? p?.id ?? undefined,
+            source: hasSupplier ? "SUPPLIER" : "VBN",
             packagingType: String(p?.package?.vbnPackageCode ?? ""),
-            loadCarrier: String(p?.loadCarrier ?? "NONE"),
+            loadCarrier: String(p?.loadCarrier ?? ""),
             packagingSupplierId: vrsId ?? undefined,
-            packagingMaterialId: p?.package?.customPackageId ?? p?.packagingSupplierMaterialId ?? undefined,
+            packagingSupplierName: p?.packagingSupplierName ?? undefined,
+            packagingMaterialId: customPkgId ?? undefined,
+            packagingMaterialName: p?.packagingMaterialName ?? undefined,
             unitsPerPackage: Number(p?.piecesPerPackage ?? 1),
             packagesPerLayer: Number(p?.packagesPerLayer ?? 1),
             layersPerLoadCarrier: Number(p?.layersPerLoadCarrier ?? 1),
+            photoUrl: typeof p?.photoUrl === "string" ? p.photoUrl : undefined,
             isCustomerSpecific: allowed.length > 0,
             customerOrganizationIds: allowed,
             isPrimary: i === primaryPackingIdxNorm,
+            isHiddenForDirectSales: Boolean(p?.isHiddenForDirectSales),
         };
     });
     const customerOrgIds = Array.isArray(raw.customerOrganizationIds)
@@ -583,10 +680,25 @@ export function floridayCacheToWizardData(raw) {
         ? raw.seasonalPeriods
         : [];
     const weeks = expandSeasonalPeriods(seasonalPeriods);
+    // Sync S62 (Land van herkomst characteristic) met stap-3 land-van-oorsprong.
+    // Floriday kan één van beide leeg laten; wij houden ze deterministisch gelijk
+    // zodat de PUT-payload nooit afhangt van welke stap laatst is geopend.
+    const firstCountry = countries
+        .map((c) => String(c ?? "").trim().toUpperCase())
+        .find((c) => /^[A-Z]{2}$/.test(c));
+    const existingS62 = String(features["S62"] ?? "").trim().toUpperCase();
+    if (!existingS62 && firstCountry) {
+        features["S62"] = firstCountry;
+    }
+    const hydratedCountryOfOrigin = countries.length
+        ? countries.join(",")
+        : existingS62
+            ? existingS62
+            : firstCountry ?? "";
     return {
-        productGroup: productGroupFromVbn(vbn),
+        productGroup,
         vbnCode: vbn ? String(vbn) : "",
-        vbnName: "",
+        vbnName: vbnNameHint ? String(vbnNameHint) : "",
         articleCode: String(raw.supplierArticleCode ?? raw.articleCode ?? ""),
         name: pickName(raw.tradeItemName ?? raw.name),
         nameEn: pickNameEn(raw.tradeItemName ?? raw.name),
@@ -595,7 +707,7 @@ export function floridayCacheToWizardData(raw) {
         articleType: customerOrgIds.length > 0 ? "CUSTOMER_SPECIFIC" : "REGULAR",
         visibleInExplorer: !raw.isHiddenInCatalog,
         botanicalName: botanicalNames.join("; "),
-        countryOfOrigin: countries.join(","),
+        countryOfOrigin: hydratedCountryOfOrigin,
         producerCode: "",
         lotNumber: "",
         features,
@@ -604,13 +716,34 @@ export function floridayCacheToWizardData(raw) {
         warehouseId: String(raw.warehouseId ?? raw.warehouse?.warehouseId ?? ""),
         packingConfigurations,
         additionalPackaging: [],
-        yearRound: weeks.length === 0 || weeks.length >= 52,
-        weeks: weeks.length >= 52 ? [] : weeks,
+        availabilityMode: (() => {
+            if (seasonalPeriods.length === 0)
+                return "UNSPECIFIED";
+            if (seasonalPeriods.length === 1 &&
+                Number(seasonalPeriods[0]?.startWeek) === 1 &&
+                (Number(seasonalPeriods[0]?.endWeek) === 53 ||
+                    Number(seasonalPeriods[0]?.endWeek) === 52)) {
+                return "YEAR_ROUND";
+            }
+            return "SPECIFIC";
+        })(),
+        weeks: (() => {
+            if (seasonalPeriods.length === 0)
+                return [];
+            if (seasonalPeriods.length === 1 &&
+                Number(seasonalPeriods[0]?.startWeek) === 1 &&
+                (Number(seasonalPeriods[0]?.endWeek) === 53 ||
+                    Number(seasonalPeriods[0]?.endWeek) === 52)) {
+                return [];
+            }
+            return weeks;
+        })(),
         // Reeds gepubliceerd via de wizard — commerciële velden staan uit voor edit,
         // want een bestaand CustomerOffer wordt hier niet opnieuw aangemaakt.
         offerForSale: false,
         salePricePerPiece: 0,
         saleStockPieces: 0,
         offerStartDate: new Date().toISOString().slice(0, 10),
+        priceGroupPrices: {},
     };
 }