@flowselections/floriday-verkoop-module 1.0.17 → 1.0.18

package/dist-lib/lib/order-shipments.functions.js

@@ -0,0 +1,178 @@
+// Bezorgmomenten / deelleveringen voor bestellingen (m.n. reserveringen).
+// - listOrderShipments   : haalt shipments + items + totalen per order-item op
+// - createShipment       : maakt een nieuw bezorgmoment aan
+// - updateShipmentItem   : wijzigt aantallen van een geplande levering
+// - deleteShipment       : annuleert een geplande levering
+// - markShipmentShipped  : boekt voorraad af via RPC (fysiek + gereserveerd)
+import { createServerFn } from "@tanstack/react-start";
+import { z } from "zod";
+import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
+const ShipmentItemInput = z.object({
+    orderItemId: z.string().uuid(),
+    productId: z.string().uuid().nullable().optional(),
+    productName: z.string().min(1),
+    quantity: z.number().positive(),
+});
+const CreateShipmentInput = z.object({
+    orderId: z.string().uuid(),
+    deliveryDate: z.string().min(1).nullable().optional(),
+    carrierId: z.string().uuid().nullable().optional(),
+    deliveryLocationId: z.string().uuid().nullable().optional(),
+    notes: z.string().max(2000).nullable().optional(),
+    items: z.array(ShipmentItemInput).min(1),
+});
+async function assertRemainingCapacity(supabase, orderId, incoming, ignoreShipmentId) {
+    const { data: items } = await supabase
+        .from("order_items")
+        .select("id, product_name, quantity")
+        .eq("order_id", orderId);
+    const orderMap = new Map();
+    for (const it of items ?? []) {
+        orderMap.set(String(it.id), {
+            name: String(it.product_name ?? ""),
+            qty: Number(it.quantity ?? 0),
+        });
+    }
+    const orderItemIds = Array.from(orderMap.keys());
+    if (orderItemIds.length === 0)
+        throw new Error("Bestelling heeft geen regels.");
+    const { data: existing } = await supabase
+        .from("order_shipment_items")
+        .select("order_item_id, quantity, shipment_id, order_shipments!inner(id, status)")
+        .in("order_item_id", orderItemIds);
+    const already = new Map();
+    for (const row of existing ?? []) {
+        const st = row.order_shipments?.status;
+        if (st === "cancelled")
+            continue;
+        if (ignoreShipmentId && row.shipment_id === ignoreShipmentId)
+            continue;
+        const k = String(row.order_item_id);
+        already.set(k, (already.get(k) ?? 0) + Number(row.quantity ?? 0));
+    }
+    for (const inc of incoming) {
+        const meta = orderMap.get(inc.orderItemId);
+        if (!meta)
+            throw new Error(`Order-regel ${inc.orderItemId} niet gevonden.`);
+        const used = already.get(inc.orderItemId) ?? 0;
+        const remaining = Math.max(0, meta.qty - used);
+        if (inc.quantity > remaining + 1e-6) {
+            throw new Error(`Te leveren aantal voor "${meta.name}" (${inc.quantity}) overschrijdt het openstaande aantal (${remaining}).`);
+        }
+    }
+}
+export const listOrderShipments = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((input) => z.object({ orderId: z.string().uuid() }).parse(input))
+    .handler(async ({ data, context }) => {
+    const { data: shipments } = await context.supabase
+        .from("order_shipments")
+        .select("id, order_id, shipment_number, delivery_date, carrier_id, delivery_location_id, status, shipped_at, notes, created_at, order_shipment_items(id, order_item_id, product_id, product_name, quantity)")
+        .eq("order_id", data.orderId)
+        .order("shipment_number");
+    const { data: items } = await context.supabase
+        .from("order_items")
+        .select("id, product_id, product_name, quantity, unit, products(plants_per_crate)")
+        .eq("order_id", data.orderId);
+    // Totalen per order-item: besteld, geleverd (shipped), gepland (planned).
+    const shipped = new Map();
+    const planned = new Map();
+    for (const s of shipments ?? []) {
+        const status = s.status;
+        const rows = s.order_shipment_items ?? [];
+        for (const r of rows) {
+            const k = String(r.order_item_id);
+            const q = Number(r.quantity ?? 0);
+            if (status === "shipped")
+                shipped.set(k, (shipped.get(k) ?? 0) + q);
+            else if (status === "planned")
+                planned.set(k, (planned.get(k) ?? 0) + q);
+        }
+    }
+    const totals = (items ?? []).map((it) => {
+        const id = String(it.id);
+        const ordered = Number(it.quantity ?? 0);
+        const del = shipped.get(id) ?? 0;
+        const pln = planned.get(id) ?? 0;
+        const ppc = Math.max(1, Number(it.products?.plants_per_crate ?? 1));
+        return {
+            order_item_id: id,
+            product_id: it.product_id,
+            product_name: String(it.product_name ?? ""),
+            unit: String(it.unit ?? "stuks"),
+            plants_per_crate: ppc,
+            ordered,
+            shipped: del,
+            planned: pln,
+            remaining: Math.max(0, ordered - del - pln),
+            outstanding: Math.max(0, ordered - del),
+        };
+    });
+    return { shipments: shipments ?? [], totals };
+});
+export const createShipment = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((input) => CreateShipmentInput.parse(input))
+    .handler(async ({ data, context }) => {
+    await assertRemainingCapacity(context.supabase, data.orderId, data.items.map((i) => ({ orderItemId: i.orderItemId, quantity: i.quantity })));
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { data: shipment, error } = await supabaseAdmin.from("order_shipments")
+        .insert({
+        order_id: data.orderId,
+        delivery_date: data.deliveryDate ?? null,
+        carrier_id: data.carrierId ?? null,
+        delivery_location_id: data.deliveryLocationId ?? null,
+        notes: data.notes ?? null,
+        status: "planned",
+    })
+        .select("id")
+        .single();
+    if (error)
+        throw new Error(error.message);
+    const rows = data.items.map((i) => ({
+        shipment_id: shipment.id,
+        order_item_id: i.orderItemId,
+        product_id: i.productId ?? null,
+        product_name: i.productName,
+        quantity: i.quantity,
+    }));
+    const { error: itemsErr } = await supabaseAdmin.from("order_shipment_items").insert(rows);
+    if (itemsErr) {
+        await supabaseAdmin.from("order_shipments").delete().eq("id", shipment.id);
+        throw new Error(itemsErr.message);
+    }
+    return { ok: true, shipmentId: shipment.id };
+});
+export const markShipmentShipped = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((input) => z.object({ shipmentId: z.string().uuid() }).parse(input))
+    .handler(async ({ data }) => {
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { error } = await supabaseAdmin.rpc("mark_shipment_shipped", {
+        p_shipment_id: data.shipmentId,
+    });
+    if (error)
+        throw new Error(error.message);
+    return { ok: true };
+});
+export const cancelShipment = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((input) => z.object({ shipmentId: z.string().uuid() }).parse(input))
+    .handler(async ({ data, context }) => {
+    // Alleen planned mag geannuleerd / verwijderd worden — shipped is definitief.
+    const { data: s } = await context.supabase
+        .from("order_shipments")
+        .select("status")
+        .eq("id", data.shipmentId)
+        .maybeSingle();
+    if (!s)
+        throw new Error("Bezorgmoment niet gevonden.");
+    if (s.status === "shipped") {
+        throw new Error("Reeds verzonden bezorgmomenten kunnen niet worden geannuleerd.");
+    }
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { error } = await supabaseAdmin.from("order_shipments").delete().eq("id", data.shipmentId);
+    if (error)
+        throw new Error(error.message);
+    return { ok: true };
+});

package/dist-lib/lib/salesorders-mapping.d.ts

@@ -16,6 +16,7 @@ export interface SalesOrderDTO {
     karCount: number;
     totalPieces: number;
     isLocal?: boolean;
+    isReservation?: boolean;
     customer: {
         name: string;
         postalCode: string;

package/dist-lib/lib/salesorders-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}