@flowselections/floriday-afhandeling-module 1.0.63 → 1.0.66

package/dist-lib/lib/serverRoutes/dispatchCarrierSignups.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatchCarrierSignups.handler.d.ts","sourceRoot":"","sources":["../../../src/lib/serverRoutes/dispatchCarrierSignups.handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AA+G5D,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAgVnB"}
+{"version":3,"file":"dispatchCarrierSignups.handler.d.ts","sourceRoot":"","sources":["../../../src/lib/serverRoutes/dispatchCarrierSignups.handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,cAAc,GACzB,OAAO,CAAC,QAAQ,CAAC,CAKnB"}

package/dist-lib/lib/serverRoutes/dispatchCarrierSignups.handler.js

@@ -1,326 +1,3 @@
-import { DEFAULT_PICKUP_MOMENT, getSignupDeadline, selectPickupMoment, subtractWorkdays, } from "../planning";
-import { buildCarrierSignupMail } from "../carrierSignupMail.server";
-import { pickCarrierForAddress } from "../carrierMatch.server";
-function normalizeMoments(raw) {
-    if (!Array.isArray(raw) || raw.length === 0)
-        return [DEFAULT_PICKUP_MOMENT];
-    return raw.map((m) => {
-        const r = (m ?? {});
-        return {
-            signup_days: Number(r.signup_days ?? DEFAULT_PICKUP_MOMENT.signup_days),
-            signup_time: String(r.signup_time ?? DEFAULT_PICKUP_MOMENT.signup_time),
-            pickup_days: Number(r.pickup_days ?? DEFAULT_PICKUP_MOMENT.pickup_days),
-            pickup_time: String(r.pickup_time ?? DEFAULT_PICKUP_MOMENT.pickup_time),
-            delivery_days: Number(r.delivery_days ?? DEFAULT_PICKUP_MOMENT.delivery_days),
-            delivery_time: String(r.delivery_time ?? DEFAULT_PICKUP_MOMENT.delivery_time),
-        };
-    });
-}
-function momentKey(m) {
-    return `${m.pickup_days}@${m.pickup_time}|${m.signup_days}@${m.signup_time}`;
-}
-function ymd(d) {
-    const y = d.getFullYear();
-    const mo = String(d.getMonth() + 1).padStart(2, "0");
-    const da = String(d.getDate()).padStart(2, "0");
-    return `${y}-${mo}-${da}`;
-}
-function cartsFor(items) {
-    let carts = 0;
-    let plants = 0;
-    for (const it of items ?? []) {
-        const qty = Number(it.quantity ?? 0);
-        if (!Number.isFinite(qty) || qty <= 0)
-            continue;
-        plants += qty;
-        const p = Array.isArray(it.products) ? it.products[0] : it.products;
-        const perCart = p && p.plants_per_crate && p.crates_per_layer && p.layers_per_cart
-            ? Number(p.plants_per_crate) * Number(p.crates_per_layer) * Number(p.layers_per_cart)
-            : 0;
-        if (perCart > 0)
-            carts += Math.ceil(qty / perCart);
-    }
-    return { carts, plants };
-}
-export async function handleDispatchCarrierSignups(request, injected) {
-    const apikey = request.headers.get("apikey") ?? request.headers.get("x-api-key");
-    const expected = process.env.SUPABASE_PUBLISHABLE_KEY;
-    if (!expected || !apikey || apikey !== expected) {
-        return new Response("Unauthorized", { status: 401 });
-    }
-    let admin;
-    if (injected) {
-        admin = injected;
-    }
-    else {
-        const { supabaseAdmin } = await import("../../integrations/supabase/client.server");
-        admin = supabaseAdmin;
-    }
-    const startedAt = new Date();
-    const logRun = async (payload) => {
-        try {
-            await admin.from("carrier_signup_dispatch_runs").insert({
-                started_at: startedAt.toISOString(),
-                finished_at: new Date().toISOString(),
-                ok: payload.ok,
-                sent: payload.sent ?? 0,
-                groups: payload.groups ?? 0,
-                skipped: payload.skipped ?? [],
-                unassigned: payload.unassigned ?? [],
-                reason: payload.reason ?? null,
-                error: payload.error ?? null,
-                detail: payload.detail ?? null,
-            });
-        }
-        catch (e) {
-            console.error("[dispatch-carrier-signups] run-log insert failed", e);
-        }
-    };
-    try {
-        const { data: settingsRows, error: settingsErr } = await admin
-            .from("afhandeling_settings")
-            .select("signup_mail_enabled, signup_mail_lead_minutes, signup_mail_purpose")
-            .eq("signup_mail_enabled", true)
-            .limit(1);
-        if (settingsErr) {
-            await logRun({ ok: false, reason: "settings_error", error: settingsErr.message });
-            return Response.json({ ok: false, error: settingsErr.message }, { status: 500 });
-        }
-        const settings = settingsRows?.[0] ?? null;
-        if (!settings) {
-            await logRun({ ok: true, reason: "mail_disabled" });
-            return Response.json({ ok: true, skipped: "disabled", sent: 0 });
-        }
-        const leadMin = settings.signup_mail_lead_minutes ?? 60;
-        const purpose = settings.signup_mail_purpose ?? "afhandeling_carrier_signup";
-        const { data: purposeConnections, error: purposeErr } = await admin.rpc("email_auth_for_purpose", {
-            _direction: "send",
-            _purpose: purpose,
-        });
-        if (purposeErr)
-            throw purposeErr;
-        const connectionId = (purposeConnections ?? []).find((c) => c?.needs_reauth !== true && c?.status === "connected")?.id ?? null;
-        if (!connectionId) {
-            await logRun({
-                ok: false,
-                sent: 0,
-                groups: 0,
-                reason: "no_active_send_connection",
-                error: `Geen actief send-adres voor doeleinde ${purpose}`,
-                detail: { purpose },
-            });
-            return new Response(JSON.stringify({ ok: false, reason: "no_active_send_connection", purpose }), { status: 500, headers: { "content-type": "application/json" } });
-        }
-        const { data: allCarriers, error: carriersErr } = await admin
-            .from("carriers")
-            .select("id, name, email, is_default, sort_order, service_countries, service_provinces, service_cities, pickup_moments, pickup_weekdays, delivery_weekdays");
-        if (carriersErr) {
-            await logRun({ ok: false, reason: "carriers_error", error: carriersErr.message });
-            return Response.json({ ok: false, error: carriersErr.message }, { status: 500 });
-        }
-        const carriers = (allCarriers ?? []).filter((c) => !!c.email);
-        if (carriers.length === 0) {
-            await logRun({ ok: true, reason: "no_carrier_with_email" });
-            return Response.json({ ok: true, skipped: "no_carrier_with_email", sent: 0 });
-        }
-        const now = new Date();
-        const horizon = new Date(now);
-        horizon.setDate(horizon.getDate() + 14);
-        const { data: orders } = await admin
-            .from("orders")
-            .select("id, order_number, customer_name, customer_id, order_date, delivery_date, notes, created_at, custom_fields, order_items(product_name, quantity, unit, products(plants_per_crate, crates_per_layer, layers_per_cart, location))")
-            .is("deleted_at", null)
-            .gte("delivery_date", ymd(now))
-            .lte("delivery_date", ymd(horizon))
-            .limit(2000);
-        const rawOrders = orders ?? [];
-        const customerIds = Array.from(new Set(rawOrders.map((o) => o.customer_id).filter((v) => !!v)));
-        const dlIds = Array.from(new Set(rawOrders
-            .map((o) => o.custom_fields?.delivery_location ?? null)
-            .filter((v) => !!v)));
-        const customerMap = new Map();
-        if (customerIds.length > 0) {
-            const { data: cs } = await admin
-                .from("customers")
-                .select("id, company_name, email, phone, contact_person, external_id")
-                .in("id", customerIds);
-            for (const c of cs ?? []) {
-                customerMap.set(c.id, c);
-            }
-        }
-        const dlMap = new Map();
-        if (dlIds.length > 0) {
-            const { data: ds } = await admin
-                .from("customer_delivery_locations")
-                .select("id, name, street, house_number, postal_code, city, province, country")
-                .in("id", dlIds);
-            for (const d of ds ?? []) {
-                dlMap.set(d.id, d);
-            }
-        }
-        const groups = new Map();
-        const unassigned = [];
-        for (const raw of rawOrders) {
-            if (!raw.delivery_date)
-                continue;
-            const delivery = new Date(raw.delivery_date);
-            if (Number.isNaN(delivery.getTime()))
-                continue;
-            const dlId = raw.custom_fields?.delivery_location ?? null;
-            const dl = dlId ? dlMap.get(dlId) : undefined;
-            const carrier = pickCarrierForAddress(carriers, {
-                country: dl?.country ?? null,
-                province: dl?.province ?? null,
-                city: dl?.city ?? null,
-            });
-            if (!carrier) {
-                unassigned.push(raw.order_number ?? raw.id);
-                continue;
-            }
-            const moments = normalizeMoments(carrier.pickup_moments);
-            const created = raw.created_at ? new Date(raw.created_at) : now;
-            const moment = selectPickupMoment(delivery, created, moments);
-            const pickupDate = subtractWorkdays(delivery, moment.pickup_days);
-            const signupDeadline = getSignupDeadline(delivery, moment);
-            const key = `${carrier.id}::${ymd(pickupDate)}::${momentKey(moment)}`;
-            const { carts, plants } = cartsFor(raw.order_items);
-            const cust = raw.customer_id ? customerMap.get(raw.customer_id) : undefined;
-            const pickupLocations = Array.from(new Set((raw.order_items ?? [])
-                .map((it) => {
-                const p = Array.isArray(it.products) ? it.products[0] : it.products;
-                return p?.location ?? null;
-            })
-                .filter((v) => !!v && v.trim() !== "")));
-            const row = {
-                orderNumber: raw.order_number ?? "—",
-                orderDate: raw.order_date,
-                deliveryDate: raw.delivery_date,
-                deliveryType: "Mailbox",
-                notes: raw.notes,
-                cartCount: carts || null,
-                plantCount: plants || null,
-                customer: {
-                    name: cust?.company_name ?? raw.customer_name ?? "—",
-                    contactPerson: cust?.contact_person ?? null,
-                    email: cust?.email ?? null,
-                    phone: cust?.phone ?? null,
-                    customerNumber: cust?.external_id ?? null,
-                },
-                deliveryLocation: dl
-                    ? {
-                        name: dl.name,
-                        street: dl.street,
-                        houseNumber: dl.house_number,
-                        postalCode: dl.postal_code,
-                        city: dl.city,
-                        province: dl.province,
-                        country: dl.country,
-                    }
-                    : null,
-                pickupLocations,
-                items: (raw.order_items ?? []).map((it) => ({
-                    name: it.product_name ?? "—",
-                    quantity: it.quantity === null ? null : Number(it.quantity),
-                    unit: it.unit,
-                })),
-            };
-            const g = groups.get(key);
-            if (g) {
-                g.rows.push(row);
-                g.totalCarts += carts;
-            }
-            else {
-                groups.set(key, {
-                    carrier,
-                    pickupDate,
-                    moment,
-                    signupDeadline,
-                    rows: [row],
-                    totalCarts: carts,
-                });
-            }
-        }
-        const leadMs = leadMin * 60 * 1000;
-        let sent = 0;
-        const skipped = [];
-        for (const [key, g] of groups) {
-            const triggerAt = g.signupDeadline.getTime() - leadMs;
-            if (now.getTime() < triggerAt)
-                continue;
-            if (now.getTime() > g.signupDeadline.getTime() + 72 * 60 * 60 * 1000)
-                continue;
-            const pickupDateKey = ymd(g.pickupDate);
-            const mKey = momentKey(g.moment);
-            const { data: existing } = await admin
-                .from("carrier_signup_dispatches")
-                .select("id")
-                .eq("carrier_id", g.carrier.id)
-                .eq("pickup_date", pickupDateKey)
-                .eq("pickup_moment_key", mKey)
-                .maybeSingle();
-            if (existing) {
-                skipped.push(`${key}=already`);
-                continue;
-            }
-            const mail = buildCarrierSignupMail({
-                carrierName: g.carrier.name,
-                pickupDate: g.pickupDate,
-                pickupTime: g.moment.pickup_time,
-                signupDeadline: g.signupDeadline,
-                orders: g.rows,
-            });
-            const { data: outbox, error: outErr } = await admin
-                .from("email_auth_outbox")
-                .insert({
-                purpose,
-                connection_id: connectionId,
-                to_addresses: [g.carrier.email],
-                cc_addresses: [],
-                bcc_addresses: [],
-                subject: mail.subject,
-                html_body: mail.html,
-                text_body: mail.text,
-                headers: {},
-                scheduled_at: new Date().toISOString(),
-                status: "queued",
-            })
-                .select("id")
-                .single();
-            if (outErr) {
-                skipped.push(`${key}=outbox_err:${outErr.message}`);
-                continue;
-            }
-            await admin.from("carrier_signup_dispatches").insert({
-                carrier_id: g.carrier.id,
-                pickup_date: pickupDateKey,
-                pickup_moment_key: mKey,
-                signup_deadline: g.signupDeadline.toISOString(),
-                order_count: g.rows.length,
-                cart_count: mail.totalCarts,
-                outbox_id: outbox?.id ?? null,
-            });
-            sent++;
-        }
-        await logRun({
-            ok: true,
-            sent,
-            groups: groups.size,
-            skipped,
-            unassigned,
-            reason: sent === 0 ? "no_group_in_window" : null,
-        });
-        return Response.json({
-            ok: true,
-            sent,
-            groups: groups.size,
-            skipped,
-            unassigned,
-        });
-    }
-    catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
-        console.error("[dispatch-carrier-signups] unhandled error", e);
-        await logRun({ ok: false, reason: "unhandled_exception", error: msg });
-        return Response.json({ ok: false, error: msg }, { status: 500 });
-    }
+export async function handleDispatchCarrierSignups(_request, _injected) {
+    return Response.json({ ok: false, code: "gone", error: "De aanmeldmail wordt door de database zelf verstuurd; deze route is vervallen." }, { status: 410 });
 }

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

@@ -0,0 +1,4 @@
+export declare function signupReasonText(reason: string | null | undefined): string | null;
+export declare function fmtTime(iso: string | null | undefined, tz: string | null): string;
+export declare function fmtDayTime(iso: string | null | undefined, tz: string | null): string;
+//# sourceMappingURL=signupMailText.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signupMailText.d.ts","sourceRoot":"","sources":["../../src/lib/signupMailText.ts"],"names":[],"mappings":"AACA,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAyBjF;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGjF;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGpF"}

package/dist-lib/lib/signupMailText.js

@@ -0,0 +1,37 @@
+// Gebruikersteksten voor de aanmeldmail (geen techniek).
+export function signupReasonText(reason) {
+    switch (reason) {
+        case null:
+        case undefined:
+        case "":
+            return null;
+        case "no_send_connection":
+            return "Er is nog geen verzendadres gekoppeld aan ‘Aanmeldmail vervoerders’. Koppel er een bij E-mailkoppeling.";
+        case "send_connection_needs_reauth":
+            return "Het verzendadres voor ‘Aanmeldmail vervoerders’ moet opnieuw worden gekoppeld bij E-mailkoppeling.";
+        case "no_timezone":
+            return "De tijdzone van de vestiging ontbreekt. Stel die in bij Werktijden; tot dan gaan er geen aanmeldmails weg.";
+        case "no_pick_workdays":
+            return "Er zijn geen werkdagen ingesteld bij Werktijden; de aanmeldmail kan niet worden berekend.";
+        case "mail_disabled":
+            return "De aanmeldmail staat uit.";
+        case "group_not_found":
+            return "Dit ophaalmoment heeft geen orders meer.";
+        case "after_pickup":
+            return "De ophaaltijd is al voorbij.";
+        case "already_sent":
+            return "Deze stand is al verstuurd.";
+        default:
+            return "De aanmeldmail kon niet worden gecontroleerd.";
+    }
+}
+export function fmtTime(iso, tz) {
+    if (!iso || !tz)
+        return "—";
+    return new Intl.DateTimeFormat("nl-NL", { timeZone: tz, hour: "2-digit", minute: "2-digit" }).format(new Date(iso));
+}
+export function fmtDayTime(iso, tz) {
+    if (!iso || !tz)
+        return "—";
+    return new Intl.DateTimeFormat("nl-NL", { timeZone: tz, weekday: "short", day: "numeric", month: "short", hour: "2-digit", minute: "2-digit" }).format(new Date(iso));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-afhandeling-module",
-  "version": "1.0.63",
+  "version": "1.0.66",
   "private": false,
   "sideEffects": false,
   "type": "module",