@flowselections/floriday-verkoop-module 1.0.138 → 1.0.139
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +24 -22
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts +2 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.js +48 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +32 -5
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.js +2 -3
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +12 -2
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +3 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.js +13 -51
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +17 -3
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +168 -116
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +203 -89
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts +9 -0
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/CustomerName.js +16 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts +15 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/HoverTip.js +24 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/KpiTile.js +8 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts +7 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.js +127 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/RowMenu.js +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.js +45 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts +2 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.js +2 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +2 -0
- package/dist-lib/integrations/supabase/types.d.ts +431 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/buffer-carts.check.d.ts +2 -0
- package/dist-lib/lib/buffer-carts.check.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.check.js +23 -0
- package/dist-lib/lib/buffer-carts.d.ts +35 -0
- package/dist-lib/lib/buffer-carts.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts +12 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.js +18 -0
- package/dist-lib/lib/buffer-carts.js +41 -0
- package/dist-lib/lib/create-order.functions.d.ts +1 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +8 -1
- package/dist-lib/lib/floriday-public.functions.d.ts +1 -1
- package/dist-lib/lib/motion.d.ts +13 -0
- package/dist-lib/lib/motion.d.ts.map +1 -0
- package/dist-lib/lib/motion.js +36 -0
- package/dist-lib/lib/order-price-lock.check.js +21 -5
- package/dist-lib/lib/order-price-lock.d.ts +14 -6
- package/dist-lib/lib/order-price-lock.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.js +40 -8
- package/dist-lib/lib/order-price-lock.server.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.server.js +10 -0
- package/dist-lib/lib/order-progress.check.d.ts +2 -0
- package/dist-lib/lib/order-progress.check.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.check.js +83 -0
- package/dist-lib/lib/order-progress.d.ts +154 -0
- package/dist-lib/lib/order-progress.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.js +171 -0
- package/dist-lib/lib/order-progress.server.d.ts +41 -0
- package/dist-lib/lib/order-progress.server.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.server.js +136 -0
- package/dist-lib/lib/order-status.js +2 -2
- package/dist-lib/lib/period-range.check.d.ts +2 -0
- package/dist-lib/lib/period-range.check.d.ts.map +1 -0
- package/dist-lib/lib/period-range.check.js +63 -0
- package/dist-lib/lib/period-range.d.ts +66 -0
- package/dist-lib/lib/period-range.d.ts.map +1 -0
- package/dist-lib/lib/period-range.js +213 -0
- package/dist-lib/lib/plan-coverage.d.ts +17 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +24 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts +4 -2
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +5 -1
- package/dist-lib/lib/salesorders-list.server.d.ts +6 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +81 -18
- package/dist-lib/lib/salesorders-mapping.d.ts +18 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +19 -58
- package/dist-lib/lib/session-error.check.d.ts +2 -0
- package/dist-lib/lib/session-error.check.d.ts.map +1 -0
- package/dist-lib/lib/session-error.check.js +17 -0
- package/dist-lib/lib/session-error.d.ts +2 -0
- package/dist-lib/lib/session-error.d.ts.map +1 -0
- package/dist-lib/lib/session-error.js +10 -0
- package/dist-lib/lib/useBufferCarts.d.ts +6 -0
- package/dist-lib/lib/useBufferCarts.d.ts.map +1 -0
- package/dist-lib/lib/useBufferCarts.js +15 -0
- package/dist-lib/lib/useSalesOrdersQuery.d.ts +11 -2
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +75 -52
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buffer-carts.check.d.ts","sourceRoot":"","sources":["../../src/lib/buffer-carts.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
// Draai: bun src/lib/buffer-carts.check.ts
|
|
2
|
+
import { parseBufferCarts, ladingdragerSummary } from "./buffer-carts.js";
|
|
3
|
+
import { parsePlanCoverage, verouderdRegels, verouderdToon } from "./plan-coverage.js";
|
|
4
|
+
let failed = 0;
|
|
5
|
+
function eq(n, g, w) { const ok = JSON.stringify(g) === JSON.stringify(w); if (!ok)
|
|
6
|
+
failed++; console.log(`${ok ? "OK " : "FOUT"} ${n}: ${JSON.stringify(g)}`); }
|
|
7
|
+
const b = parseBufferCarts({ bufferId: "b", orders: ["HO-1"], karren: 5, ladingdragers: [{ ladingdrager: "Stapelwagen", aantal: 3 }, { ladingdrager: "Deense container", aantal: 1 }, { ladingdrager: null, aantal: 1 }],
|
|
8
|
+
carts: [{ cartId: "k1", seq: 1, pickDocument: { id: "p", documentNumber: "PB-AO-2601451-K4" } }], dubbeleDocumenten: [{ documentNumber: "PB-AO-2601451-K4", documenten: [{}, {}] }] });
|
|
9
|
+
eq("gemengde soorten apart", ladingdragerSummary(b), "3 × Stapelwagen, 1 × Deense container, 1 × Geen ladingdrager");
|
|
10
|
+
eq("karren uit Engine", b.karren, 5);
|
|
11
|
+
eq("dubbel document", b.dubbeleDocumenten, [{ documentNumber: "PB-AO-2601451-K4", aantal: 2 }]);
|
|
12
|
+
eq("ontbrekend antwoord → null (huidig gedrag)", parseBufferCarts(null), null);
|
|
13
|
+
const c = parsePlanCoverage({ state: "ingedeeld", carts: [{ cartId: "k", verouderdReden: "hoofd", verouderdRedenen: [{ code: "eerdere_buffer", tekst: "A" }, { code: "aantal", tekst: "B" }] }] }).carts[0];
|
|
14
|
+
eq("alle redenen uit lijst", verouderdRegels(c).map((r) => r.tekst), ["A", "B"]);
|
|
15
|
+
const old = parsePlanCoverage({ state: "ingedeeld", carts: [{ cartId: "k", verouderdReden: "hoofd" }] }).carts[0];
|
|
16
|
+
eq("oudere Engine → hoofdreden", verouderdRegels(old).map((r) => r.tekst), ["hoofd"]);
|
|
17
|
+
eq("aantal blokkeert", verouderdToon("aantal"), "blok");
|
|
18
|
+
eq("te_veel_lagen alleen melding", verouderdToon("te_veel_lagen"), "melding");
|
|
19
|
+
if (failed) {
|
|
20
|
+
console.error(`${failed} fout(en)`);
|
|
21
|
+
process.exit(1);
|
|
22
|
+
}
|
|
23
|
+
console.log("Alles OK");
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { type VerouderdReden } from "./plan-coverage.js";
|
|
2
|
+
export type BufferCart = {
|
|
3
|
+
cartId: string;
|
|
4
|
+
seq: number | null;
|
|
5
|
+
total: number | null;
|
|
6
|
+
ladingdrager: string | null;
|
|
7
|
+
carrierType: string | null;
|
|
8
|
+
verouderd: boolean;
|
|
9
|
+
verouderdReden: string | null;
|
|
10
|
+
verouderdRedenen: VerouderdReden[] | null;
|
|
11
|
+
pickDocument: {
|
|
12
|
+
id: string | null;
|
|
13
|
+
documentNumber: string | null;
|
|
14
|
+
printedAt: string | null;
|
|
15
|
+
} | null;
|
|
16
|
+
};
|
|
17
|
+
export type BufferCarts = {
|
|
18
|
+
bufferId: string;
|
|
19
|
+
orders: string[];
|
|
20
|
+
karren: number;
|
|
21
|
+
ladingdragers: Array<{
|
|
22
|
+
ladingdrager: string;
|
|
23
|
+
aantal: number;
|
|
24
|
+
}>;
|
|
25
|
+
carts: BufferCart[];
|
|
26
|
+
dubbeleDocumenten: Array<{
|
|
27
|
+
documentNumber: string;
|
|
28
|
+
aantal: number;
|
|
29
|
+
}>;
|
|
30
|
+
};
|
|
31
|
+
/** Leest het jsonb-antwoord; geen bruikbaar antwoord → null (dan blijft het huidige gedrag). */
|
|
32
|
+
export declare function parseBufferCarts(raw: unknown): BufferCarts | null;
|
|
33
|
+
/** "3 × Stapelwagen, 1 × Deense container" — elke soort apart, nooit één soort voor alles. */
|
|
34
|
+
export declare function ladingdragerSummary(b: Pick<BufferCarts, "ladingdragers">): string;
|
|
35
|
+
//# sourceMappingURL=buffer-carts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buffer-carts.d.ts","sourceRoot":"","sources":["../../src/lib/buffer-carts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,gBAAgB,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAC1C,YAAY,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CACrG,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,iBAAiB,EAAE,KAAK,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtE,CAAC;AAKF,gGAAgG;AAChG,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CA6BjE;AAED,8FAA8F;AAC9F,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG,MAAM,CAEjF"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type BufferCarts } from "./buffer-carts.js";
|
|
2
|
+
export declare const getBufferCarts: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
3
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
4
|
+
userId: string;
|
|
5
|
+
claims: import("@supabase/auth-js").User;
|
|
6
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
7
|
+
bufferId: string;
|
|
8
|
+
}, Promise<{
|
|
9
|
+
carts: BufferCarts | null;
|
|
10
|
+
error: string | null;
|
|
11
|
+
}>>;
|
|
12
|
+
//# sourceMappingURL=buffer-carts.functions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buffer-carts.functions.d.ts","sourceRoot":"","sources":["../../src/lib/buffer-carts.functions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpE,eAAO,MAAM,cAAc;;;;8CAED,OAAO;;;WACsB,WAAW,GAAG,IAAI;WAAS,MAAM,GAAG,IAAI;GAQ3F,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
// Buffertelling lezen via de Logistiek Engine (logistics_buffer_carts). Alleen lezen.
|
|
2
|
+
// Ontbreekt de functie (oudere Engine), dan { carts: null } en blijft het huidige gedrag.
|
|
3
|
+
import { createServerFn } from "@tanstack/react-start";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
6
|
+
import { parseBufferCarts } from "./buffer-carts.js";
|
|
7
|
+
export const getBufferCarts = createServerFn({ method: "GET" })
|
|
8
|
+
.middleware([requireSupabaseAuth])
|
|
9
|
+
.inputValidator((input) => z.object({ bufferId: z.string().uuid() }).parse(input))
|
|
10
|
+
.handler(async ({ data, context }) => {
|
|
11
|
+
const { data: raw, error } = await context.supabase.rpc("logistics_buffer_carts", { p_buffer_id: data.bufferId });
|
|
12
|
+
if (error) {
|
|
13
|
+
const code = String(error.code ?? "");
|
|
14
|
+
const missing = code === "PGRST202" || code === "42883" || /could not find the function|does not exist/i.test(String(error.message ?? ""));
|
|
15
|
+
return { carts: null, error: missing ? null : String(error.message ?? "onbekende fout") };
|
|
16
|
+
}
|
|
17
|
+
return { carts: parseBufferCarts(raw), error: null };
|
|
18
|
+
});
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
// Buffertelling van de Logistiek Engine (logistics_buffer_carts, Engine 1.0.220). Client-safe, puur.
|
|
2
|
+
// Verkoop telt niets zelf: kop, karindeling en pickdocumenten komen precies uit dit antwoord.
|
|
3
|
+
import { parseVerouderdRedenen } from "./plan-coverage.js";
|
|
4
|
+
const str = (v) => (typeof v === "string" && v.trim() ? v.trim() : null);
|
|
5
|
+
const num = (v) => (typeof v === "number" && Number.isFinite(v) ? v : null);
|
|
6
|
+
/** Leest het jsonb-antwoord; geen bruikbaar antwoord → null (dan blijft het huidige gedrag). */
|
|
7
|
+
export function parseBufferCarts(raw) {
|
|
8
|
+
const d = raw && typeof raw === "object" ? raw : null;
|
|
9
|
+
if (!d || !str(d.bufferId) || !Array.isArray(d.carts))
|
|
10
|
+
return null;
|
|
11
|
+
const carts = d.carts
|
|
12
|
+
.filter((c) => c && str(c.cartId))
|
|
13
|
+
.map((c) => ({
|
|
14
|
+
cartId: String(c.cartId),
|
|
15
|
+
seq: num(c.seq),
|
|
16
|
+
total: num(c.total),
|
|
17
|
+
ladingdrager: str(c.ladingdrager),
|
|
18
|
+
carrierType: str(c.carrierType),
|
|
19
|
+
verouderd: c.verouderd === true,
|
|
20
|
+
verouderdReden: str(c.verouderdReden),
|
|
21
|
+
verouderdRedenen: parseVerouderdRedenen(c.verouderdRedenen),
|
|
22
|
+
pickDocument: c.pickDocument && typeof c.pickDocument === "object"
|
|
23
|
+
? { id: str(c.pickDocument.id), documentNumber: str(c.pickDocument.documentNumber), printedAt: str(c.pickDocument.printedAt) }
|
|
24
|
+
: null,
|
|
25
|
+
}));
|
|
26
|
+
return {
|
|
27
|
+
bufferId: String(d.bufferId),
|
|
28
|
+
orders: Array.isArray(d.orders) ? d.orders.filter((x) => typeof x === "string") : [],
|
|
29
|
+
karren: num(d.karren) ?? carts.length,
|
|
30
|
+
ladingdragers: (Array.isArray(d.ladingdragers) ? d.ladingdragers : [])
|
|
31
|
+
.map((l) => ({ ladingdrager: str(l?.ladingdrager) ?? "Geen ladingdrager", aantal: num(l?.aantal) ?? 0 }))
|
|
32
|
+
.filter((l) => l.aantal > 0),
|
|
33
|
+
carts,
|
|
34
|
+
dubbeleDocumenten: (Array.isArray(d.dubbeleDocumenten) ? d.dubbeleDocumenten : [])
|
|
35
|
+
.map((g) => ({ documentNumber: str(g?.documentNumber) ?? "?", aantal: Array.isArray(g?.documenten) ? g.documenten.length : 0 })),
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
/** "3 × Stapelwagen, 1 × Deense container" — elke soort apart, nooit één soort voor alles. */
|
|
39
|
+
export function ladingdragerSummary(b) {
|
|
40
|
+
return b.ladingdragers.map((l) => `${l.aantal} × ${l.ladingdrager}`).join(", ");
|
|
41
|
+
}
|
|
@@ -222,6 +222,7 @@ export declare const getLocalOrderForEdit: import("@tanstack/start-client-core")
|
|
|
222
222
|
status: string | null;
|
|
223
223
|
planLockedAt: string | null;
|
|
224
224
|
canEditProducts: boolean;
|
|
225
|
+
shippedLock: string | null;
|
|
225
226
|
priceLock: string | null;
|
|
226
227
|
items: {
|
|
227
228
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GA2SpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AAkFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAmTL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAc7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAkDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;;;YA8B7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;;GAUpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuT7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAmBhE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import { stockError, stockErrorText } from "./stock-errors.js";
|
|
5
5
|
import { posOrNull, choosePacking } from "./packing-snapshot.js";
|
|
6
6
|
import { createServerFn } from "@tanstack/react-start";
|
|
7
|
+
import { shippedLockReason } from "./order-price-lock.js";
|
|
7
8
|
import { productNameForStorage } from "./product-name.js";
|
|
8
9
|
import { z } from "zod";
|
|
9
10
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
@@ -1377,6 +1378,7 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1377
1378
|
status: order.status,
|
|
1378
1379
|
planLockedAt: order.plan_locked_at ?? null,
|
|
1379
1380
|
canEditProducts: !order.plan_locked_at,
|
|
1381
|
+
shippedLock: shippedLockReason(order.status, false),
|
|
1380
1382
|
// Prijs wijzigen: null = mag; anders de reden (definitieve factuur / Twinfield).
|
|
1381
1383
|
priceLock: await (async () => {
|
|
1382
1384
|
try {
|
|
@@ -1428,7 +1430,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1428
1430
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
1429
1431
|
const { data: order, error: oErr } = await supabaseAdmin
|
|
1430
1432
|
.from("orders")
|
|
1431
|
-
.select("id, custom_fields, order_source, is_reservation, plan_locked_at, delivery_date")
|
|
1433
|
+
.select("id, custom_fields, order_source, is_reservation, plan_locked_at, delivery_date, status")
|
|
1432
1434
|
.eq("id", data.orderId)
|
|
1433
1435
|
.maybeSingle();
|
|
1434
1436
|
if (oErr)
|
|
@@ -1478,6 +1480,11 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1478
1480
|
if (!dateChanged)
|
|
1479
1481
|
data.deliveryDate = undefined;
|
|
1480
1482
|
const realChange = priceChanges.length > 0 || changedItems.length > 0 || removeIds.length > 0 || newItems.length > 0 || dateChanged;
|
|
1483
|
+
if (realChange) {
|
|
1484
|
+
const shipLock = shippedLockReason(order.status, false);
|
|
1485
|
+
if (shipLock)
|
|
1486
|
+
throw stockError(shipLock);
|
|
1487
|
+
}
|
|
1481
1488
|
// Producten wijzigen mag alleen zolang er nog niets is geprint in het
|
|
1482
1489
|
// Pickstation (orders.plan_locked_at).
|
|
1483
1490
|
if ((removeIds.length > 0 || newItems.length > 0) && order.plan_locked_at) {
|
|
@@ -8,7 +8,7 @@ export declare const getFlorydayCachedList: import("@tanstack/start-client-core"
|
|
|
8
8
|
limit?: number | undefined;
|
|
9
9
|
since?: string | undefined;
|
|
10
10
|
until?: string | undefined;
|
|
11
|
-
dateField?: "
|
|
11
|
+
dateField?: "delivery" | "ordered" | undefined;
|
|
12
12
|
}, Promise<{
|
|
13
13
|
entity: string;
|
|
14
14
|
rows: any;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export declare function prefersReducedMotion(): boolean;
|
|
2
|
+
/** Inschuiven/infaden: `y` px omhoog en van 0 naar 1 opacity. */
|
|
3
|
+
export declare function animateIn(el: Element | null, opts: {
|
|
4
|
+
duration: number;
|
|
5
|
+
y?: number;
|
|
6
|
+
}): void;
|
|
7
|
+
/** Korte achtergrondmarkering die in `duration` ms uitfadet (nieuwe rij). */
|
|
8
|
+
export declare function flashBackground(el: Element | null, color: string, duration?: number): void;
|
|
9
|
+
/** Inline transitie-stijl die wegvalt bij reduced motion. */
|
|
10
|
+
export declare function transitionStyle(props: string, ms: number): {
|
|
11
|
+
transition?: string;
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=motion.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"motion.d.ts","sourceRoot":"","sources":["../../src/lib/motion.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,IAAI,OAAO,CAG9C;AAID,iEAAiE;AACjE,wBAAgB,SAAS,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,QAUnF;AAED,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,SAAO,QAOjF;AAED,6DAA6D;AAC7D,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAGlF"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
// Subtiele animaties zonder bibliotheek of keyframes in CSS: de Web
|
|
2
|
+
// Animations API werkt in elke shell, ook als de shell de klassen van deze
|
|
3
|
+
// module niet meecompileert. Alles valt weg bij prefers-reduced-motion.
|
|
4
|
+
export function prefersReducedMotion() {
|
|
5
|
+
if (typeof window === "undefined" || !window.matchMedia)
|
|
6
|
+
return true;
|
|
7
|
+
return window.matchMedia("(prefers-reduced-motion: reduce)").matches;
|
|
8
|
+
}
|
|
9
|
+
const EASE_OUT = "cubic-bezier(0.16, 1, 0.3, 1)";
|
|
10
|
+
/** Inschuiven/infaden: `y` px omhoog en van 0 naar 1 opacity. */
|
|
11
|
+
export function animateIn(el, opts) {
|
|
12
|
+
if (!el || prefersReducedMotion() || typeof el.animate !== "function")
|
|
13
|
+
return;
|
|
14
|
+
const y = opts.y ?? 0;
|
|
15
|
+
el.animate([
|
|
16
|
+
{ opacity: 0, transform: `translateY(${y}px)` },
|
|
17
|
+
{ opacity: 1, transform: "translateY(0)" },
|
|
18
|
+
], { duration: opts.duration, easing: EASE_OUT });
|
|
19
|
+
}
|
|
20
|
+
/** Korte achtergrondmarkering die in `duration` ms uitfadet (nieuwe rij). */
|
|
21
|
+
export function flashBackground(el, color, duration = 2000) {
|
|
22
|
+
if (!el || typeof el.animate !== "function")
|
|
23
|
+
return;
|
|
24
|
+
if (prefersReducedMotion())
|
|
25
|
+
return;
|
|
26
|
+
el.animate([{ backgroundColor: color }, { backgroundColor: "transparent" }], {
|
|
27
|
+
duration,
|
|
28
|
+
easing: EASE_OUT,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
/** Inline transitie-stijl die wegvalt bij reduced motion. */
|
|
32
|
+
export function transitionStyle(props, ms) {
|
|
33
|
+
if (prefersReducedMotion())
|
|
34
|
+
return {};
|
|
35
|
+
return { transition: props.split(",").map((p) => `${p.trim()} ${ms}ms ${EASE_OUT}`).join(", ") };
|
|
36
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Draai: bun src/lib/order-price-lock.check.ts
|
|
2
|
-
import { orderUuid, priceLockReason, PRICE_LOCK_ERP_TEXT, PRICE_LOCK_FLORIDAY_TEXT, PRICE_LOCK_TWINFIELD_TEXT } from "./order-price-lock.js";
|
|
2
|
+
import { orderUuid, priceLockReason, shippedLockReason, SHIPPED_LOCK_TEXT, PRICE_LOCK_ERP_TEXT, PRICE_LOCK_FLORIDAY_TEXT, PRICE_LOCK_TWINFIELD_TEXT } from "./order-price-lock.js";
|
|
3
3
|
import { ownTransportDateDecision } from "./own-transport.js";
|
|
4
4
|
let failed = 0;
|
|
5
5
|
function check(name, got, want) {
|
|
@@ -9,11 +9,27 @@ function check(name, got, want) {
|
|
|
9
9
|
console.log(`${ok ? "OK " : "FOUT"} ${name}: ${JSON.stringify(got)}${ok ? "" : ` (verwacht ${JSON.stringify(want)})`}`);
|
|
10
10
|
}
|
|
11
11
|
check("Floriday-order geweigerd", priceLockReason({ isFloriday: true, erpInvoices: [], links: [] }), PRICE_LOCK_FLORIDAY_TEXT);
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
check(
|
|
12
|
+
const inv = (status, extra = {}) => ({ id: "A", invoice_number: "FS-1", kind: "factuur", status, total: 100, ...extra });
|
|
13
|
+
for (const st of ["verstuurd", "boeking_wacht", "boeking_wijkt_af", "boeking_afgewezen", "definitief", "geboekt"]) {
|
|
14
|
+
check(`factuur met nummer, status ${st} → geblokkeerd`, priceLockReason({ isFloriday: false, erpInvoices: [inv(st)], links: [] }), PRICE_LOCK_ERP_TEXT);
|
|
15
|
+
}
|
|
16
|
+
check("AO-2601452: boeking_afgewezen TEST-FS-2026-00001 → geblokkeerd", priceLockReason({ isFloriday: false, erpInvoices: [inv("boeking_afgewezen", { invoice_number: "TEST-FS-2026-00001" })], links: [] }), PRICE_LOCK_ERP_TEXT);
|
|
17
|
+
check("ERP-concept zonder nummer → toegestaan", priceLockReason({ isFloriday: false, erpInvoices: [{ id: "A", invoice_number: null, kind: "factuur", status: "concept", total: 100 }], links: [] }), null);
|
|
18
|
+
const credit = (extra = {}) => ({ id: "C", invoice_number: "FS-2", kind: "credit", status: "definitief", total: -100, original_invoice_id: "A", ...extra });
|
|
19
|
+
check("volledige credit naar de factuur → toegestaan", priceLockReason({ isFloriday: false, erpInvoices: [inv("geboekt"), credit()], links: [] }), null);
|
|
20
|
+
check("gedeeltelijke credit → geblokkeerd", priceLockReason({ isFloriday: false, erpInvoices: [inv("geboekt"), credit({ total: -40 })], links: [] }), PRICE_LOCK_ERP_TEXT);
|
|
21
|
+
check("credit zonder nummer → geblokkeerd", priceLockReason({ isFloriday: false, erpInvoices: [inv("geboekt"), credit({ invoice_number: null })], links: [] }), PRICE_LOCK_ERP_TEXT);
|
|
22
|
+
check("credit zonder verwijzing → geblokkeerd", priceLockReason({ isFloriday: false, erpInvoices: [inv("geboekt"), credit({ original_invoice_id: undefined })], links: [] }), PRICE_LOCK_ERP_TEXT);
|
|
23
|
+
check("factuur A gecrediteerd + nieuwe factuur B → geblokkeerd", priceLockReason({ isFloriday: false, erpInvoices: [inv("geboekt"), credit(), inv("verstuurd", { id: "B", invoice_number: "FS-3" })], links: [] }), PRICE_LOCK_ERP_TEXT);
|
|
24
|
+
for (const st of ["Verzonden", "Geleverd", "Gereed voor facturatie"])
|
|
25
|
+
check(`status ${st} → vergrendeld`, shippedLockReason(st, false), SHIPPED_LOCK_TEXT);
|
|
26
|
+
check("Nog te picken → niet vergrendeld", shippedLockReason("Nog te picken", false), null);
|
|
27
|
+
check("Floriday-order: verzonden-slot niet van toepassing", shippedLockReason("Verzonden", true), null);
|
|
28
|
+
check("AO-2601453 (Verzonden in zeta) → vergrendeld", shippedLockReason("Verzonden", false), SHIPPED_LOCK_TEXT);
|
|
29
|
+
check("HO-2601467 (Nog te picken in zeta) → te bewerken", shippedLockReason("Nog te picken", false), null);
|
|
30
|
+
check("status hoofdletterongevoelig (' verzonden ') → vergrendeld", shippedLockReason(" verzonden ", false), SHIPPED_LOCK_TEXT);
|
|
15
31
|
check("oude Twinfield-concept 40 (AO-2601453)", priceLockReason({ isFloriday: false, erpInvoices: [], links: [{ status: "sent", invoice_number: "40" }] }), PRICE_LOCK_TWINFIELD_TEXT);
|
|
16
|
-
check("link met ERP-nummer
|
|
32
|
+
check("link met ERP-nummer: ERP-melding, geen Twinfield-melding", priceLockReason({ isFloriday: false, erpInvoices: [{ invoice_number: "FS-1", kind: "factuur", status: "concept" }], links: [{ status: "sent", invoice_number: "FS-1" }] }), PRICE_LOCK_ERP_TEXT);
|
|
17
33
|
check("zonder Facturatie → toegestaan", priceLockReason({ isFloriday: false, erpInvoices: null, links: null }), null);
|
|
18
34
|
check("local:-id → uuid", orderUuid("local:6f1c2b9e-1111-4222-8333-944455556666"), "6f1c2b9e-1111-4222-8333-944455556666");
|
|
19
35
|
check("Floriday-id zonder uuid → null", orderUuid("FO-2601463"), null);
|
|
@@ -1,14 +1,22 @@
|
|
|
1
|
-
export declare const PRICE_LOCK_ERP_TEXT = "Er staat al een
|
|
1
|
+
export declare const PRICE_LOCK_ERP_TEXT = "Er staat al een factuur met nummer; eerst crediteren.";
|
|
2
2
|
export declare const PRICE_LOCK_TWINFIELD_TEXT = "Er staat al een factuur in Twinfield; verwijder of crediteer die eerst.";
|
|
3
3
|
export declare const PRICE_LOCK_FLORIDAY_TEXT = "Bij Floriday-orders blijft de prijs uit Floriday staan.";
|
|
4
|
+
export declare const SHIPPED_LOCK_TEXT = "Deze order is al verzonden; wijzigen kan niet meer.";
|
|
5
|
+
/** Verzonden/Geleverd/Gereed voor facturatie: leverdatum, aantallen en prijs vast. Floriday-orders: ongewijzigd gedrag. */
|
|
6
|
+
export declare function shippedLockReason(status: string | null | undefined, isFloriday: boolean): string | null;
|
|
7
|
+
export type ErpInvoiceLockRow = {
|
|
8
|
+
id?: string | null;
|
|
9
|
+
invoice_number: string | null;
|
|
10
|
+
kind: string | null;
|
|
11
|
+
status: string | null;
|
|
12
|
+
total?: number | string | null;
|
|
13
|
+
/** Bij creditfacturen: de gecrediteerde factuur. Ontbreekt → telt niet als credit (fail closed). */
|
|
14
|
+
original_invoice_id?: string | null;
|
|
15
|
+
};
|
|
4
16
|
export type PriceLockInput = {
|
|
5
17
|
isFloriday: boolean;
|
|
6
18
|
/** null = Facturatie niet aanwezig (functie of tabel ontbreekt). */
|
|
7
|
-
erpInvoices:
|
|
8
|
-
invoice_number: string | null;
|
|
9
|
-
kind: string | null;
|
|
10
|
-
status: string | null;
|
|
11
|
-
}> | null;
|
|
19
|
+
erpInvoices: ErpInvoiceLockRow[] | null;
|
|
12
20
|
/** null = koppeltabel niet aanwezig. */
|
|
13
21
|
links: Array<{
|
|
14
22
|
status: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-price-lock.d.ts","sourceRoot":"","sources":["../../src/lib/order-price-lock.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"order-price-lock.d.ts","sourceRoot":"","sources":["../../src/lib/order-price-lock.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,mBAAmB,0DAA0D,CAAC;AAC3F,eAAO,MAAM,yBAAyB,4EAA4E,CAAC;AACnH,eAAO,MAAM,wBAAwB,4DAA4D,CAAC;AAClG,eAAO,MAAM,iBAAiB,wDAAwD,CAAC;AAIvF,2HAA2H;AAC3H,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGvG;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC/B,oGAAoG;IACpG,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,oEAAoE;IACpE,WAAW,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IACxC,wCAAwC;IACxC,KAAK,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;CAC/E,CAAC;AA4BF,wBAAgB,eAAe,CAAC,CAAC,EAAE,cAAc,GAAG,MAAM,GAAG,IAAI,CAWhE;AAED,sDAAsD;AACtD,wBAAgB,SAAS,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGpD"}
|
|
@@ -1,18 +1,50 @@
|
|
|
1
1
|
// Mag de prijs van een bestaande order nog gewijzigd worden? (client-safe, puur)
|
|
2
2
|
// Alleen HO/AO/MO; Floriday-orders houden de prijs uit Floriday.
|
|
3
|
-
export const PRICE_LOCK_ERP_TEXT = "Er staat al een
|
|
3
|
+
export const PRICE_LOCK_ERP_TEXT = "Er staat al een factuur met nummer; eerst crediteren.";
|
|
4
4
|
export const PRICE_LOCK_TWINFIELD_TEXT = "Er staat al een factuur in Twinfield; verwijder of crediteer die eerst.";
|
|
5
5
|
export const PRICE_LOCK_FLORIDAY_TEXT = "Bij Floriday-orders blijft de prijs uit Floriday staan.";
|
|
6
|
-
const
|
|
6
|
+
export const SHIPPED_LOCK_TEXT = "Deze order is al verzonden; wijzigen kan niet meer.";
|
|
7
|
+
const SHIPPED_STATUSES = new Set(["verzonden", "geleverd", "gereed voor facturatie", "shipped", "delivered"]);
|
|
8
|
+
/** Verzonden/Geleverd/Gereed voor facturatie: leverdatum, aantallen en prijs vast. Floriday-orders: ongewijzigd gedrag. */
|
|
9
|
+
export function shippedLockReason(status, isFloriday) {
|
|
10
|
+
if (isFloriday)
|
|
11
|
+
return null;
|
|
12
|
+
return SHIPPED_STATUSES.has(String(status ?? "").trim().toLowerCase()) ? SHIPPED_LOCK_TEXT : null;
|
|
13
|
+
}
|
|
14
|
+
const hasNumber = (r) => !!String(r.invoice_number ?? "").trim();
|
|
15
|
+
const amount = (v) => {
|
|
16
|
+
if (v === null || v === undefined || v === "")
|
|
17
|
+
return null;
|
|
18
|
+
const n = Math.abs(Number(v));
|
|
19
|
+
return Number.isFinite(n) ? n : null;
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* Factuur (geen credit) met nummer die niet volledig gecrediteerd is.
|
|
23
|
+
* Gecrediteerd = creditfacturen met nummer die via original_invoice_id naar deze factuur
|
|
24
|
+
* verwijzen en samen het volledige bedrag dekken. Status maakt niet uit.
|
|
25
|
+
*/
|
|
26
|
+
function isOpenNumberedInvoice(r, all) {
|
|
27
|
+
if ((r.kind ?? "factuur") === "credit" || !hasNumber(r))
|
|
28
|
+
return false;
|
|
29
|
+
const total = amount(r.total);
|
|
30
|
+
if (!r.id || total === null)
|
|
31
|
+
return true;
|
|
32
|
+
let credited = 0;
|
|
33
|
+
for (const c of all) {
|
|
34
|
+
if (c.kind !== "credit" || !hasNumber(c) || !c.original_invoice_id || c.original_invoice_id !== r.id)
|
|
35
|
+
continue;
|
|
36
|
+
const a = amount(c.total);
|
|
37
|
+
if (a === null)
|
|
38
|
+
return true;
|
|
39
|
+
credited += a;
|
|
40
|
+
}
|
|
41
|
+
return credited + 0.005 < total;
|
|
42
|
+
}
|
|
7
43
|
export function priceLockReason(i) {
|
|
8
44
|
if (i.isFloriday)
|
|
9
45
|
return PRICE_LOCK_FLORIDAY_TEXT;
|
|
10
|
-
if (i.erpInvoices)
|
|
11
|
-
|
|
12
|
-
const credits = i.erpInvoices.filter((r) => r.kind === "credit" && FINAL.has(String(r.status ?? "").toLowerCase())).length;
|
|
13
|
-
if (finals > credits)
|
|
14
|
-
return PRICE_LOCK_ERP_TEXT;
|
|
15
|
-
}
|
|
46
|
+
if (i.erpInvoices && i.erpInvoices.some((r) => isOpenNumberedInvoice(r, i.erpInvoices)))
|
|
47
|
+
return PRICE_LOCK_ERP_TEXT;
|
|
16
48
|
if (i.links && i.erpInvoices) {
|
|
17
49
|
const known = new Set(i.erpInvoices.map((r) => String(r.invoice_number ?? "").trim()).filter(Boolean));
|
|
18
50
|
const legacy = i.links.some((l) => l.status === "sent" && !!String(l.invoice_number ?? "").trim() && !known.has(String(l.invoice_number).trim()));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-price-lock.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-price-lock.server.ts"],"names":[],"mappings":"AAIA,wBAAsB,aAAa,CAAC,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"order-price-lock.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-price-lock.server.ts"],"names":[],"mappings":"AAIA,wBAAsB,aAAa,CAAC,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsB7H"}
|
|
@@ -13,6 +13,16 @@ export async function loadPriceLock(userClient, admin, orderId, isFloriday) {
|
|
|
13
13
|
}
|
|
14
14
|
else
|
|
15
15
|
erp = Array.isArray(r.data) ? r.data : [];
|
|
16
|
+
// De RPC levert original_invoice_id niet mee; alleen-lezen aanvullen voor creditfacturen.
|
|
17
|
+
// Lukt dat niet, dan blijft het veld leeg en telt de credit niet mee (fail closed).
|
|
18
|
+
const creditIds = (erp ?? []).filter((x) => x.kind === "credit" && x.id).map((x) => x.id);
|
|
19
|
+
if (creditIds.length > 0) {
|
|
20
|
+
const o = await admin.from("erp_invoices").select("id, original_invoice_id").in("id", creditIds);
|
|
21
|
+
if (!o.error) {
|
|
22
|
+
const map = new Map((o.data ?? []).map((x) => [x.id, x.original_invoice_id ?? null]));
|
|
23
|
+
erp = (erp ?? []).map((x) => (map.has(x.id) ? { ...x, original_invoice_id: map.get(x.id) } : x));
|
|
24
|
+
}
|
|
25
|
+
}
|
|
16
26
|
let links = null;
|
|
17
27
|
const l = await admin.from("order_invoice_links").select("status, invoice_number").eq("order_id", orderId);
|
|
18
28
|
if (!l.error)
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-progress.check.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
// Draai: bun src/lib/order-progress.check.ts
|
|
2
|
+
import { detectSource, invoiceRoute, isInvoicedDone, limitMembers, rowSteps, toProgressMember, } from "./order-progress.js";
|
|
3
|
+
import { hasProblem } from "./order-progress.js";
|
|
4
|
+
import { loadInvoiceAndPickProgress, loadPickProgress, withTimeout } from "./order-progress.server.js";
|
|
5
|
+
let failed = 0;
|
|
6
|
+
function check(name, got, want) {
|
|
7
|
+
const g = JSON.stringify(got), w = JSON.stringify(want);
|
|
8
|
+
const ok = g === w;
|
|
9
|
+
if (!ok)
|
|
10
|
+
failed++;
|
|
11
|
+
console.log(`${ok ? "OK " : "FOUT"} ${name}: ${g}${ok ? "" : ` (verwacht ${w})`}`);
|
|
12
|
+
}
|
|
13
|
+
const F = { erpInvoices: true, pickProgress: true };
|
|
14
|
+
// Bron komt uit de gegevens, niet uit het ordernummer.
|
|
15
|
+
check("mailbox via custom_fields.source", detectSource({ rowKind: "order", orderSource: "manual", cfSource: "mailbox" }), "mailbox");
|
|
16
|
+
check("Floriday-rij", detectSource({ rowKind: "floriday" }), "floriday");
|
|
17
|
+
check("handmatig", detectSource({ rowKind: "order", orderSource: "manual" }), "manual");
|
|
18
|
+
check("onbekende bron blijft ruw", detectSource({ rowKind: "order", orderSource: "beurs" }), "beurs");
|
|
19
|
+
// Factuurroute zoals Facturatie.
|
|
20
|
+
check("route floriday via id", invoiceRoute({ floridaySalesOrderId: "x", orderSource: "manual" }), "floriday");
|
|
21
|
+
check("route erp", invoiceRoute({ orderSource: "manual" }), "erp");
|
|
22
|
+
// Floriday-factuur = afgemeld, niet isPaid.
|
|
23
|
+
const fo = toProgressMember({ orderNumber: "FO-1", stage: "shipped", invoiceRoute: "floriday", floridayIds: ["a"], floridayFulfilled: false, status: { isInvoiced: true } });
|
|
24
|
+
check("Floriday betaald maar niet afgemeld → niet gefactureerd", isInvoicedDone([fo], F), false);
|
|
25
|
+
const foDone = toProgressMember({ orderNumber: "FO-2", stage: "shipped", invoiceRoute: "floriday", floridayIds: ["a"], floridayFulfilled: true });
|
|
26
|
+
check("Floriday afgemeld → gefactureerd", isInvoicedDone([foDone], F), true);
|
|
27
|
+
// ERP: alleen status_group 'verstuurd' telt.
|
|
28
|
+
const erp = (g) => toProgressMember({ orderNumber: "HO-1", stage: "shipped", invoiceRoute: "erp", erpInvoice: { number: "1", status: g, statusGroup: g, sentAt: null, sentTo: null, total: null, lastError: null } });
|
|
29
|
+
check("ERP verstuurd", isInvoicedDone([erp("verstuurd")], F), true);
|
|
30
|
+
check("ERP in behandeling", isInvoicedDone([erp("in_behandeling")], F), false);
|
|
31
|
+
check("ERP-functie ontbreekt → icoon verborgen", rowSteps([erp("verstuurd")], { erpInvoices: false, pickProgress: false }).invoiced, "hidden");
|
|
32
|
+
// Buffer: pas gedaan als álle orders gedaan zijn.
|
|
33
|
+
const picked = toProgressMember({ orderNumber: "A", stage: "picked" });
|
|
34
|
+
const topick = toProgressMember({ orderNumber: "B", stage: "topick" });
|
|
35
|
+
check("buffer half gepickt → nog niet (grijs, geen stip)", rowSteps([picked, topick], F).picked, "todo");
|
|
36
|
+
check("buffer geheel gepickt", rowSteps([picked, picked], F).picked, "done");
|
|
37
|
+
// Fout alleen uit de vier eigen vlaggen + blocked uit pick_progress.
|
|
38
|
+
const blocked = toProgressMember({ orderNumber: "C", stage: "topick", pickProgress: { cartsTotal: 1, cartsPrinted: 0, cartsScanned: 0, firstPrintedAt: null, lastScannedAt: null, pickDate: null, blocked: true, blockedReason: "Te hoog", archived: false } });
|
|
39
|
+
check("blocked → fout", rowSteps([blocked], F).picked, "error");
|
|
40
|
+
// Prijs ontbreekt hoort bij icoon 4 (route ERP, nog niet gefactureerd), niet bij Gepickt.
|
|
41
|
+
check("missingPrice → Gepickt niet fout", rowSteps([toProgressMember({ orderNumber: "D", stage: "topick", missingPrice: true })], F).picked, "todo");
|
|
42
|
+
check("missingPrice ERP → factuur aandacht", rowSteps([toProgressMember({ orderNumber: "D", stage: "picked", invoiceRoute: "erp", missingPrice: true })], F).invoiced, "attention");
|
|
43
|
+
check("missingPrice Floriday → geen aandacht", rowSteps([toProgressMember({ orderNumber: "D", stage: "picked", invoiceRoute: "floriday", floridayIds: ["a"], missingPrice: true })], F).invoiced, "todo");
|
|
44
|
+
check("missingPrice maar factuur verstuurd → gedaan", rowSteps([toProgressMember({ orderNumber: "D", stage: "shipped", invoiceRoute: "erp", missingPrice: true, erpInvoice: { number: "1", status: "verstuurd", statusGroup: "verstuurd", sentAt: null, sentTo: null, total: null, lastError: null } })], F).invoiced, "done");
|
|
45
|
+
// Fout alleen zolang nog niet gepickt.
|
|
46
|
+
const blockedPicked = toProgressMember({ orderNumber: "C2", stage: "picked", karUnknown: true });
|
|
47
|
+
check("blokkade maar gepickt → gedaan", rowSteps([blockedPicked], F).picked, "done");
|
|
48
|
+
check("blokkade maar verzonden → gedaan", rowSteps([toProgressMember({ orderNumber: "C3", stage: "shipped", karUnknown: true })], F).picked, "done");
|
|
49
|
+
// KPI probleem: alleen open orders.
|
|
50
|
+
check("probleem: verzonden telt niet", hasProblem([toProgressMember({ orderNumber: "P1", stage: "shipped", missingPrice: true, karUnknown: true })]), false);
|
|
51
|
+
check("probleem: geannuleerd telt niet", hasProblem([toProgressMember({ orderNumber: "P2", stage: "cancelled", karUnknown: true })]), false);
|
|
52
|
+
check("probleem: open met blokkade telt", hasProblem([toProgressMember({ orderNumber: "P3", stage: "topick", karUnknown: true })]), true);
|
|
53
|
+
check("probleem: open ERP zonder prijs telt", hasProblem([toProgressMember({ orderNumber: "P4", stage: "picked", invoiceRoute: "erp", missingPrice: true })]), true);
|
|
54
|
+
check("achterstand → te laat", rowSteps([toProgressMember({ orderNumber: "E", stage: "topick", backlog: true })], F).picked, "late");
|
|
55
|
+
// Tooltip: eerste 5 en "+n meer" vanaf 7.
|
|
56
|
+
check("6 orders allemaal tonen", limitMembers([1, 2, 3, 4, 5, 6]).more, 0);
|
|
57
|
+
check("8 orders → 5 + 3 meer", limitMembers([1, 2, 3, 4, 5, 6, 7, 8]).more, 3);
|
|
58
|
+
// Leesfuncties: per 500, ontbrekende functie verbergt alleen dat onderdeel.
|
|
59
|
+
const calls = [];
|
|
60
|
+
const client = {
|
|
61
|
+
rpc(fn, args) {
|
|
62
|
+
calls.push({ fn, n: args.p_order_ids.length });
|
|
63
|
+
if (fn === "logistics_order_pick_progress")
|
|
64
|
+
return Promise.resolve({ data: null, error: { code: "PGRST202", message: "Could not find the function" } });
|
|
65
|
+
return Promise.resolve({ data: [], error: null });
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
const ids = Array.from({ length: 1201 }, (_, i) => `id-${i}`);
|
|
69
|
+
const res = await loadInvoiceAndPickProgress(client, ids);
|
|
70
|
+
check("factuur in 3 batches", calls.filter((c) => c.fn === "erp_invoice_status_for_orders").map((c) => c.n), [500, 500, 201]);
|
|
71
|
+
check("factuur beschikbaar", res.erpAvailable, true);
|
|
72
|
+
check("pickvoortgang ontbreekt → niet beschikbaar, één melding", [res.pickAvailable, res.warnings.length], [false, 1]);
|
|
73
|
+
// Tijdslimiet: een trage bijfunctie blokkeert de lijst niet.
|
|
74
|
+
const slow = { rpc: () => new Promise((r) => setTimeout(() => r({ data: [], error: null }), 400)) };
|
|
75
|
+
const t0 = Date.now();
|
|
76
|
+
const slowRes = await loadPickProgress(slow, ["a"], 100);
|
|
77
|
+
check("trage pickvoortgang → na limiet terugval", [slowRes.available, slowRes.warnings.length, Date.now() - t0 < 300], [false, 1, true]);
|
|
78
|
+
check("withTimeout op tijd", await withTimeout(Promise.resolve(5), 100), { value: 5, timedOut: false });
|
|
79
|
+
if (failed) {
|
|
80
|
+
console.error(`${failed} controle(s) mislukt`);
|
|
81
|
+
process.exit(1);
|
|
82
|
+
}
|
|
83
|
+
console.log("Alle controles geslaagd");
|