@flowselections/floriday-afhandeling-module 1.0.12 → 1.0.14

package/dist-lib/lib/cartControl.functions.js

@@ -17,7 +17,7 @@ async function loadControlPlanningSettings(supabase, userId) {
     const pickWeekdays = Array.isArray(settings?.pick_weekdays) && settings.pick_weekdays.length > 0
         ? settings.pick_weekdays
         : [1, 2, 3, 4, 5];
-    const minWorkdays = Math.max(1, Number(settings?.pick_days_before_transport ?? 1));
+    const minWorkdays = Math.max(0, Number(settings?.pick_days_before_transport ?? 1));
     return { pickWeekdays, minWorkdays };
 }
 /** Haal alle karren op die vandaag gepickt / klaargezet hadden moeten worden. */
@@ -39,6 +39,9 @@ export const getTodaysControlCarts = createServerFn({ method: "GET" })
         carrierName: o.carrierName,
         deliveryDate: o.deliveryDate,
         pickupDate: o.pickupDate,
+        pickupTime: o.pickupTime,
+        country: o.country,
+        cratesOnCart: o.cratesOnCart,
         pickDate: o.pickDate,
         printedCount: o.printedCount,
         status: o.status,

package/dist-lib/lib/cartRescheduling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cartRescheduling.d.ts","sourceRoot":"","sources":["../../src/lib/cartRescheduling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAUH,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,eAAe,EAAE,IAAI,CAAC;IACtB,gCAAgC;IAChC,YAAY,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,8CAA8C;IAC9C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,mFAAmF;IACnF,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;CACnB;AAED,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAgClC,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAsDtE"}
+{"version":3,"file":"cartRescheduling.d.ts","sourceRoot":"","sources":["../../src/lib/cartRescheduling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAUH,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,eAAe,EAAE,IAAI,CAAC;IACtB,gCAAgC;IAChC,YAAY,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,8CAA8C;IAC9C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,mFAAmF;IACnF,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;CACnB;AAED,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAgClC,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CA2DtE"}

package/dist-lib/lib/cartRescheduling.js

@@ -44,24 +44,26 @@ export function tryReschedule(input) {
         };
     }
     const newDate = nextAllowedPickDay(normalize(input.currentPickDate), allowed, input.holidays);
+    const minWorkdays = Math.max(0, input.minWorkdaysBeforeDelivery);
     // Uiterste pickdatum: minWorkdaysBeforeDelivery werkdagen vóór levering.
-    const latest = subtractWorkdays(delivery, Math.max(1, input.minWorkdaysBeforeDelivery), input.holidays);
+    const latest = subtractWorkdays(delivery, minWorkdays, input.holidays);
     if (newDate.getTime() > latest.getTime()) {
         return {
             ok: false,
             reason: `Volgende pickdag ${fmt(newDate)} valt na de uiterste pickdatum ${fmt(latest)} voor levering op ${fmt(delivery)}.`,
         };
     }
-    // Extra check: nieuwe pickdatum moet vóór leverdatum liggen.
-    if (newDate.getTime() >= delivery.getTime()) {
+    // Extra check: met 0 pickdagen mag picken op de leverdag; anders moet het ervoor liggen.
+    if ((minWorkdays === 0 && newDate.getTime() > delivery.getTime()) ||
+        (minWorkdays > 0 && newDate.getTime() >= delivery.getTime())) {
         return {
             ok: false,
             reason: `Nieuwe pickdatum ${fmt(newDate)} ligt niet vóór de leverdatum ${fmt(delivery)}.`,
         };
     }
-    // Sanity: hebben we wél minimaal 1 werkdag tussen pick en levering?
-    const minRequired = addWorkdays(newDate, 1, input.holidays);
-    if (minRequired.getTime() > delivery.getTime()) {
+    // Sanity: hebben we voldoende werkdagen tussen pick en levering?
+    const minRequired = addWorkdays(newDate, minWorkdays, input.holidays);
+    if (minWorkdays > 0 && minRequired.getTime() > delivery.getTime()) {
         return {
             ok: false,
             reason: `Onvoldoende werkdagen tussen pickdatum en leverdatum ${fmt(delivery)}.`,

package/dist-lib/lib/countries.d.ts

@@ -4,4 +4,6 @@ export interface Country {
 }
 export declare const COUNTRIES: Country[];
 export declare function countryName(code: string | null | undefined): string;
+/** Normaliseer een landwaarde (code of naam) naar ISO alpha-2, of null. */
+export declare function countryCode(value: string | null | undefined): string | null;
 //# sourceMappingURL=countries.d.ts.map

package/dist-lib/lib/countries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countries.d.ts","sourceRoot":"","sources":["../../src/lib/countries.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAeD,eAAO,MAAM,SAAS,EAAE,OAAO,EAAqB,CAAC;AAErD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAGnE"}
+{"version":3,"file":"countries.d.ts","sourceRoot":"","sources":["../../src/lib/countries.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAeD,eAAO,MAAM,SAAS,EAAE,OAAO,EAAqB,CAAC;AAErD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAGnE;AAgCD,2EAA2E;AAC3E,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAU3E"}

package/dist-lib/lib/countries.js

@@ -45,3 +45,54 @@ export function countryName(code) {
         return "";
     return COUNTRIES.find((c) => c.code === code)?.name ?? code;
 }
+// Build a name → ISO alpha-2 map (Dutch + English) once.
+const NAME_TO_CODE = (() => {
+    const map = {};
+    const add = (name, code) => {
+        if (!name)
+            return;
+        map[name.trim().toLowerCase()] = code;
+    };
+    let dnNl = null;
+    let dnEn = null;
+    try {
+        dnNl = new Intl.DisplayNames(["nl"], { type: "region" });
+    }
+    catch { /* ignore */ }
+    try {
+        dnEn = new Intl.DisplayNames(["en"], { type: "region" });
+    }
+    catch { /* ignore */ }
+    for (const code of CODES) {
+        add(dnNl?.of(code), code);
+        add(dnEn?.of(code), code);
+        add(code, code);
+    }
+    // Common aliases
+    add("holland", "NL");
+    add("the netherlands", "NL");
+    add("nederland", "NL");
+    add("belgië", "BE");
+    add("belgie", "BE");
+    add("duitsland", "DE");
+    add("frankrijk", "FR");
+    add("engeland", "GB");
+    add("verenigd koninkrijk", "GB");
+    add("groot-brittannië", "GB");
+    return map;
+})();
+/** Normaliseer een landwaarde (code of naam) naar ISO alpha-2, of null. */
+export function countryCode(value) {
+    if (!value)
+        return null;
+    const trimmed = value.trim();
+    if (!trimmed)
+        return null;
+    if (/^[A-Za-z]{2}$/.test(trimmed)) {
+        const up = trimmed.toUpperCase();
+        if (CODES.includes(up))
+            return up;
+    }
+    const hit = NAME_TO_CODE[trimmed.toLowerCase()];
+    return hit ?? null;
+}

package/dist-lib/lib/deliveryNotePrint.d.ts

@@ -0,0 +1,26 @@
+export interface DeliveryNoteItem {
+    id: string;
+    salesOrderId?: string | null;
+    deliveryOrderId?: string | null;
+    fulfillmentOrderId?: string | null;
+}
+/** Haalt de signed URL van een enkele afleverbrief op. */
+export declare function fetchDeliveryNoteUrl(salesOrderId: string): Promise<string>;
+/** Print een PDF vanaf een (signed) URL via een verborgen iframe. */
+export declare function printPdfFromUrl(url: string): Promise<void>;
+/** Haal en print één afleverbrief. */
+export declare function printDeliveryNote(salesOrderId: string): Promise<void>;
+export interface BulkPrintResult {
+    total: number;
+    success: number;
+    failed: Array<{
+        id: string;
+        error: string;
+    }>;
+}
+/**
+ * Print meerdere afleverbrieven als één samengevoegde PDF per chunk van 50.
+ * Bij ≤50 items: exact één printdialoog.
+ */
+export declare function printDeliveryNotesMerged(items: DeliveryNoteItem[]): Promise<BulkPrintResult>;
+//# sourceMappingURL=deliveryNotePrint.d.ts.map

package/dist-lib/lib/deliveryNotePrint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deliveryNotePrint.d.ts","sourceRoot":"","sources":["../../src/lib/deliveryNotePrint.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AA0FD,0DAA0D;AAC1D,wBAAsB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BhF;AAED,qEAAqE;AACrE,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhE;AAED,sCAAsC;AACtC,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;AAID,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC9C;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,gBAAgB,EAAE,GACxB,OAAO,CAAC,eAAe,CAAC,CAuD1B"}

package/dist-lib/lib/deliveryNotePrint.js

@@ -0,0 +1,172 @@
+// Client-side helpers voor het ophalen en printen van Floriday-afleverbrieven
+// via de gateway-endpoints van de Authenticatie-module.
+// De Authenticatie-module accepteert een Supabase Bearer-token en stuurt
+// CORS-headers, dus we bellen direct cross-origin — geen eigen proxy nodig.
+import { printPdfBase64 } from "../components/pickstation/printDocuments";
+import { supabase } from "../integrations/supabase/client";
+const GATEWAY_BASE = import.meta.env.VITE_AUTH_GATEWAY_URL?.replace(/\/$/, "") ??
+    "https://floriday-authenticatie-module.lovable.app";
+let floridayEnvironmentPromise = null;
+async function getFloridayEnvironment() {
+    floridayEnvironmentPromise ?? (floridayEnvironmentPromise = Promise.resolve(supabase.from("floriday_settings").select("active_environment").eq("id", 1).maybeSingle()).then(({ data, error }) => {
+        if (error) {
+            console.warn("[delivery-note-print] active Floriday environment ophalen mislukt", error);
+        }
+        return data?.active_environment ?? "live";
+    }));
+    return floridayEnvironmentPromise;
+}
+async function getAccessToken() {
+    const { data } = await supabase.auth.getSession();
+    const token = data.session?.access_token;
+    if (!token) {
+        throw new Error("Niet ingelogd — kan afleverbrief niet ophalen.");
+    }
+    return token;
+}
+async function postJson(path, body) {
+    const token = await getAccessToken();
+    const res = await fetch(`${GATEWAY_BASE}${path}`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify(body),
+    });
+    const ct = res.headers.get("content-type") ?? "";
+    if (!ct.includes("application/json")) {
+        throw new Error(`Gateway onbereikbaar (HTTP ${res.status}) — ontving ${ct || "onbekend content-type"}.`);
+    }
+    const text = await res.text();
+    let data = null;
+    try {
+        data = text ? JSON.parse(text) : null;
+    }
+    catch {
+        data = { ok: false, error: text };
+    }
+    return { status: res.status, data: data };
+}
+/**
+ * Zoekt delivery-order IDs in de lokale cache voor een gegeven sales-order.
+ * De gateway kan een delivery-note alleen genereren als er een delivery-order bestaat;
+ * door hier eerst zelf te resolven omzeilen we de "Geen delivery-order beschikbaar" fout
+ * wanneer de gateway de koppeling nog niet ziet.
+ */
+async function resolveDeliveryOrderIds(salesOrderId) {
+    const { data, error } = await supabase
+        .from("floriday_delivery_orders_cache")
+        .select("floriday_id, data")
+        .contains("data", { fulfillmentRequests: [{ salesOrderId }] });
+    if (error) {
+        console.warn("[delivery-note-print] delivery-order lookup mislukt", error);
+        return [];
+    }
+    const ids = new Set();
+    for (const row of (data ?? [])) {
+        const d = row.data;
+        if (d?.isDeleted)
+            continue;
+        if (d?.fulfillmentRequests?.some((f) => f.salesOrderId === salesOrderId)) {
+            ids.add(row.floriday_id);
+        }
+    }
+    return [...ids];
+}
+/** Haalt de signed URL van een enkele afleverbrief op. */
+export async function fetchDeliveryNoteUrl(salesOrderId) {
+    const environment = await getFloridayEnvironment();
+    const deliveryOrderIds = await resolveDeliveryOrderIds(salesOrderId);
+    if (deliveryOrderIds.length > 1) {
+        throw new Error("Deze verkooporder heeft meerdere afleverbrieven — gebruik de dag-print om ze samen af te drukken.");
+    }
+    const payload = {
+        environment,
+        kind: "delivery-note",
+        salesOrderId,
+    };
+    if (deliveryOrderIds[0])
+        payload.deliveryOrderId = deliveryOrderIds[0];
+    const { status, data } = await postJson("/api/public/gateway/pdf", payload);
+    if (status === 409) {
+        throw new Error("Deze verkooporder heeft meerdere afleverbrieven — gebruik de dag-print om ze samen af te drukken.");
+    }
+    if (!data?.ok || !data.url) {
+        throw new Error(data?.error ?? `Afleverbrief ophalen mislukt (HTTP ${status})`);
+    }
+    return data.url;
+}
+/** Print een PDF vanaf een (signed) URL via een verborgen iframe. */
+export async function printPdfFromUrl(url) {
+    const res = await fetch(url);
+    if (!res.ok)
+        throw new Error(`PDF download mislukt (HTTP ${res.status})`);
+    const buf = new Uint8Array(await res.arrayBuffer());
+    let binary = "";
+    const chunk = 0x8000;
+    for (let i = 0; i < buf.length; i += chunk) {
+        binary += String.fromCharCode(...buf.subarray(i, i + chunk));
+    }
+    const base64 = btoa(binary);
+    await printPdfBase64(base64);
+}
+/** Haal en print één afleverbrief. */
+export async function printDeliveryNote(salesOrderId) {
+    const url = await fetchDeliveryNoteUrl(salesOrderId);
+    await printPdfFromUrl(url);
+}
+const CHUNK_SIZE = 50;
+/**
+ * Print meerdere afleverbrieven als één samengevoegde PDF per chunk van 50.
+ * Bij ≤50 items: exact één printdialoog.
+ */
+export async function printDeliveryNotesMerged(items) {
+    const valid = items.filter((i) => i.salesOrderId || i.deliveryOrderId || i.fulfillmentOrderId);
+    const summary = { total: valid.length, success: 0, failed: [] };
+    if (valid.length === 0)
+        return summary;
+    const environment = await getFloridayEnvironment();
+    // Verrijk items met deliveryOrderId uit de lokale cache waar mogelijk,
+    // zodat de gateway niet meer op salesOrderId hoeft te zoeken.
+    const enriched = [];
+    for (const it of valid) {
+        if (it.deliveryOrderId || it.fulfillmentOrderId || !it.salesOrderId) {
+            enriched.push(it);
+            continue;
+        }
+        const ids = await resolveDeliveryOrderIds(it.salesOrderId);
+        if (ids.length === 0) {
+            enriched.push(it);
+        }
+        else {
+            for (const doId of ids)
+                enriched.push({ ...it, deliveryOrderId: doId });
+        }
+    }
+    for (let i = 0; i < enriched.length; i += CHUNK_SIZE) {
+        const chunk = enriched.slice(i, i + CHUNK_SIZE);
+        const { status, data } = await postJson("/api/public/gateway/pdf/bulk-merged", {
+            environment,
+            items: chunk.map((it) => ({
+                id: it.id,
+                ...(it.salesOrderId ? { salesOrderId: it.salesOrderId } : {}),
+                ...(it.deliveryOrderId ? { deliveryOrderId: it.deliveryOrderId } : {}),
+                ...(it.fulfillmentOrderId ? { fulfillmentOrderId: it.fulfillmentOrderId } : {}),
+            })),
+        });
+        if (!data?.ok || !data.pdfBase64) {
+            const err = data?.error ?? `HTTP ${status}`;
+            for (const it of chunk)
+                summary.failed.push({ id: it.id, error: err });
+            continue;
+        }
+        summary.success += data.success ?? chunk.length;
+        for (const r of data.results ?? []) {
+            if (!r.ok)
+                summary.failed.push({ id: r.id, error: r.error ?? "onbekende fout" });
+        }
+        await printPdfBase64(data.pdfBase64);
+    }
+    return summary;
+}