@flowselections/floriday-verkoop-module 1.0.118 → 1.0.123
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/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +41 -26
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -1
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.js +4 -2
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +13 -7
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +9 -3
- package/dist-lib/components/verkoop/SearchableSelect.d.ts +2 -0
- package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.js +1 -1
- package/dist-lib/integrations/supabase/types.d.ts +745 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/carrier-resolve.d.ts.map +1 -1
- package/dist-lib/lib/carrier-resolve.js +4 -1
- package/dist-lib/lib/create-order.functions.d.ts +4 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +50 -32
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +5 -3
- package/dist-lib/lib/floriday-fulfillment-status.server.d.ts +4 -2
- package/dist-lib/lib/floriday-fulfillment-status.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-fulfillment-status.server.js +59 -58
- package/dist-lib/lib/floriday-mirror.functions.d.ts +1 -1
- package/dist-lib/lib/floriday-mirror.functions.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.functions.js +34 -7
- package/dist-lib/lib/floriday-write-mode.d.ts +2 -0
- package/dist-lib/lib/floriday-write-mode.d.ts.map +1 -0
- package/dist-lib/lib/floriday-write-mode.functions.d.ts +9 -0
- package/dist-lib/lib/floriday-write-mode.functions.d.ts.map +1 -0
- package/dist-lib/lib/floriday-write-mode.functions.js +17 -0
- package/dist-lib/lib/floriday-write-mode.js +11 -0
- package/dist-lib/lib/logistics-engine.functions.js +1 -1
- package/dist-lib/lib/logistics-engine.server.d.ts +13 -3
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +48 -8
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +13 -12
- package/dist-lib/lib/order-shipments.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-shipments.functions.js +2 -1
- package/dist-lib/lib/plan-coverage.server.d.ts +9 -0
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +20 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +6 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -0
- package/dist-lib/lib/salesorders-mapping.d.ts +4 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts +14 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +84 -2
- package/dist-lib/lib/stock-errors.check.d.ts +2 -0
- package/dist-lib/lib/stock-errors.check.d.ts.map +1 -0
- package/dist-lib/lib/stock-errors.check.js +15 -0
- package/dist-lib/lib/stock-errors.d.ts +6 -0
- package/dist-lib/lib/stock-errors.d.ts.map +1 -0
- package/dist-lib/lib/stock-errors.js +15 -0
- package/dist-lib/lib/sync-watermark.check.d.ts +2 -0
- package/dist-lib/lib/sync-watermark.check.d.ts.map +1 -0
- package/dist-lib/lib/sync-watermark.check.js +22 -0
- package/dist-lib/lib/sync-watermark.d.ts +26 -0
- package/dist-lib/lib/sync-watermark.d.ts.map +1 -0
- package/dist-lib/lib/sync-watermark.js +29 -0
- package/dist-lib/lib/testronde-1119.check.d.ts +2 -0
- package/dist-lib/lib/testronde-1119.check.d.ts.map +1 -0
- package/dist-lib/lib/testronde-1119.check.js +20 -0
- package/dist-lib/lib/useFloridayWriteMode.d.ts +3 -0
- package/dist-lib/lib/useFloridayWriteMode.d.ts.map +1 -0
- package/dist-lib/lib/useFloridayWriteMode.js +15 -0
- package/dist-lib/lib/zero-price-write-mode.check.d.ts +2 -0
- package/dist-lib/lib/zero-price-write-mode.check.d.ts.map +1 -0
- package/dist-lib/lib/zero-price-write-mode.check.js +18 -0
- package/dist-lib/lib/zero-price.d.ts +9 -0
- package/dist-lib/lib/zero-price.d.ts.map +1 -0
- package/dist-lib/lib/zero-price.js +9 -0
- package/package.json +1 -1
- package/schema/verkoop.sql +265 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carrier-resolve.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,kHASlB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAE5F,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iDAAiD;IACjD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAaD,wBAAgB,WAAW,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAE3D;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAI/D;AAMD,4DAA4D;AAC5D,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG9E;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,eAAe,CAc5I;AAED,0FAA0F;AAC1F,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,CAkBtE;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"carrier-resolve.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,kHASlB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAE5F,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iDAAiD;IACjD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAaD,wBAAgB,WAAW,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAE3D;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAI/D;AAMD,4DAA4D;AAC5D,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG9E;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,eAAe,CAc5I;AAED,0FAA0F;AAC1F,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,CAkBtE;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAchF;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAItD"}
|
|
@@ -81,8 +81,11 @@ export function normalizeResolvedMany(raw) {
|
|
|
81
81
|
if (Array.isArray(raw)) {
|
|
82
82
|
for (const row of raw) {
|
|
83
83
|
const id = str(row?.order_id);
|
|
84
|
+
// Engine levert {order_id, resultaat}; oudere vorm had de velden plat op de rij.
|
|
85
|
+
const r = row;
|
|
86
|
+
const payload = r && typeof r.resultaat === "object" && r.resultaat !== null ? r.resultaat : r;
|
|
84
87
|
if (id)
|
|
85
|
-
out.set(id, normalizeResolvedCarrier(
|
|
88
|
+
out.set(id, normalizeResolvedCarrier(payload));
|
|
86
89
|
}
|
|
87
90
|
}
|
|
88
91
|
else if (raw && typeof raw === "object") {
|
|
@@ -157,15 +157,18 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
|
|
|
157
157
|
source?: "manual" | "mailbox" | undefined;
|
|
158
158
|
customerReference?: string | null | undefined;
|
|
159
159
|
ownTransport?: boolean | undefined;
|
|
160
|
+
confirmZeroPrice?: boolean | undefined;
|
|
160
161
|
ownTransportPickupAt?: string | null | undefined;
|
|
161
162
|
}, Promise<{
|
|
162
163
|
ok: true;
|
|
163
164
|
orderId: string;
|
|
164
165
|
alreadyExisted: true;
|
|
166
|
+
engineWarning?: undefined;
|
|
165
167
|
carrierAdminNotice?: undefined;
|
|
166
168
|
} | {
|
|
167
169
|
ok: true;
|
|
168
170
|
orderId: string;
|
|
171
|
+
engineWarning: string | null;
|
|
169
172
|
carrierAdminNotice: "Logistieke Engine 1.0.184 of hoger nodig" | null;
|
|
170
173
|
alreadyExisted?: undefined;
|
|
171
174
|
}>>;
|
|
@@ -262,6 +265,7 @@ export declare const updateLocalOrder: import("@tanstack/start-client-core").Opt
|
|
|
262
265
|
}[] | undefined;
|
|
263
266
|
}, Promise<{
|
|
264
267
|
ok: true;
|
|
268
|
+
engineWarning: string | null;
|
|
265
269
|
}>>;
|
|
266
270
|
export declare const getEffectivePrices: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
267
271
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -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":"AAeA,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;;GAkSpD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAoRL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAY7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAgDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;YAmB7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;GASpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAahE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Server functions voor de handmatige "Nieuwe bestelling" flow.
|
|
2
2
|
// Deelt DB-queries met de Mailbox-module zodat beide manieren van
|
|
3
3
|
// orderinvoer identieke lijsten, validaties en berekeningen gebruiken.
|
|
4
|
+
import { stockError, stockErrorText } from "./stock-errors.js";
|
|
4
5
|
import { posOrNull, choosePacking } from "./packing-snapshot.js";
|
|
5
6
|
import { createServerFn } from "@tanstack/react-start";
|
|
6
7
|
import { productNameForStorage } from "./product-name.js";
|
|
@@ -676,6 +677,9 @@ function snapshotForLine(l) {
|
|
|
676
677
|
};
|
|
677
678
|
}
|
|
678
679
|
function friendlyCreateError(msg) {
|
|
680
|
+
const vr = stockErrorText(msg);
|
|
681
|
+
if (vr)
|
|
682
|
+
return `De bestelling is niet aangemaakt: ${vr} Er is niets bewaard.`;
|
|
679
683
|
if (/De bestelling is niet aangemaakt/.test(msg))
|
|
680
684
|
return msg;
|
|
681
685
|
return `De bestelling is niet aangemaakt (${msg}). Er is niets bewaard; probeer het opnieuw.`;
|
|
@@ -707,12 +711,20 @@ const CreateManualOrderInput = z.object({
|
|
|
707
711
|
customerReference: z.string().trim().max(100).nullable().optional(),
|
|
708
712
|
// Eigen vervoer / zelf afleveren: geen vervoerder, bewuste keuze.
|
|
709
713
|
ownTransport: z.boolean().optional(),
|
|
714
|
+
// Prijs € 0 op een regel moet uitdrukkelijk bevestigd zijn.
|
|
715
|
+
confirmZeroPrice: z.boolean().optional(),
|
|
710
716
|
ownTransportPickupAt: z.string().regex(/(Z|[+-]\d{2}:\d{2})$/, "Tijd zonder tijdzone").nullable().optional(),
|
|
711
717
|
});
|
|
712
718
|
export const createManualOrder = createServerFn({ method: "POST" })
|
|
713
719
|
.middleware([requireSupabaseAuth])
|
|
714
720
|
.inputValidator((input) => CreateManualOrderInput.parse(input))
|
|
715
721
|
.handler(async ({ data, context }) => {
|
|
722
|
+
{
|
|
723
|
+
const { zeroPriceRefusal } = await import("./zero-price.js");
|
|
724
|
+
const refusal = zeroPriceRefusal(data.lines, data.confirmZeroPrice);
|
|
725
|
+
if (refusal)
|
|
726
|
+
throw stockError(refusal);
|
|
727
|
+
}
|
|
716
728
|
// Voorraadcontrole van de Engine — die beslist of een order met producten
|
|
717
729
|
// zonder voorraad aangemaakt mag worden.
|
|
718
730
|
{
|
|
@@ -735,7 +747,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
735
747
|
let lateSignup = null;
|
|
736
748
|
if (!data.isReservation) {
|
|
737
749
|
if (!data.deliveryDate)
|
|
738
|
-
throw
|
|
750
|
+
throw stockError("Leverdatum ontbreekt.");
|
|
739
751
|
const { loadDeparturePreview, deliveryTimeForMoment } = await import("./departure-preview.server.js");
|
|
740
752
|
const { decidePreview } = await import("./departure-preview.js");
|
|
741
753
|
const preview = await loadDeparturePreview(context.supabase, {
|
|
@@ -747,10 +759,10 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
747
759
|
});
|
|
748
760
|
const d = decidePreview(preview);
|
|
749
761
|
if (d.kind === "blocked")
|
|
750
|
-
throw
|
|
762
|
+
throw stockError(d.reason);
|
|
751
763
|
// Vervoerder al vertrokken: nooit aanmaken, ook niet met "toch aanmaken".
|
|
752
764
|
if (d.kind === "departed") {
|
|
753
|
-
throw
|
|
765
|
+
throw stockError(d.firstDate ? `${d.reason} De eerstvolgende leverdatum is ${d.firstDate}.` : d.reason);
|
|
754
766
|
}
|
|
755
767
|
if (ownTransport) {
|
|
756
768
|
const by = context.claims?.email ?? null;
|
|
@@ -763,7 +775,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
763
775
|
}
|
|
764
776
|
if (d.kind === "late") {
|
|
765
777
|
if (!data.acceptLateSignup) {
|
|
766
|
-
throw
|
|
778
|
+
throw stockError(d.firstDate
|
|
767
779
|
? `${d.reason} De eerste haalbare leverdatum is ${d.firstDate}.`
|
|
768
780
|
: d.reason);
|
|
769
781
|
}
|
|
@@ -880,7 +892,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
880
892
|
if (toInsert.length > 0) {
|
|
881
893
|
const { error: prodErr } = await supabaseAdmin.from("products").insert(toInsert);
|
|
882
894
|
if (prodErr)
|
|
883
|
-
throw
|
|
895
|
+
throw stockError(`Product aanmaken faalde: ${prodErr.message}`);
|
|
884
896
|
}
|
|
885
897
|
}
|
|
886
898
|
const total = data.lines.reduce((s, l) => s + (Number(l.unit_price ?? 0) * Number(l.quantity)), 0);
|
|
@@ -908,6 +920,9 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
908
920
|
...(lateSignup ? { late_signup_override: lateSignup } : {}),
|
|
909
921
|
...(ownTransportInfo ? { own_transport: ownTransportInfo } : {}),
|
|
910
922
|
...(data.customerReference ? { customer_reference: data.customerReference } : {}),
|
|
923
|
+
...(data.lines.some((l) => !(Number(l.unit_price) > 0))
|
|
924
|
+
? { zero_price_confirmed: { by: context.userId ?? "server", at: new Date().toISOString(), lines: data.lines.filter((l) => !(Number(l.unit_price) > 0)).length } }
|
|
925
|
+
: {}),
|
|
911
926
|
is_reservation: !!data.isReservation,
|
|
912
927
|
load_carrier_type: loadCarrierType,
|
|
913
928
|
},
|
|
@@ -940,9 +955,9 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
940
955
|
p_idempotency_key: data.idempotencyKey,
|
|
941
956
|
});
|
|
942
957
|
if (rpcErr)
|
|
943
|
-
throw
|
|
958
|
+
throw stockError(friendlyCreateError(rpcErr.message));
|
|
944
959
|
if (!rpcRes?.ok)
|
|
945
|
-
throw
|
|
960
|
+
throw stockError(rpcRes?.reason ?? "De bestelling is niet aangemaakt. Er is niets bewaard.");
|
|
946
961
|
const order = { id: rpcRes.order_id, order_number: rpcRes.order_number };
|
|
947
962
|
if (rpcRes.already_existed) {
|
|
948
963
|
return { ok: true, orderId: order.id, alreadyExisted: true };
|
|
@@ -950,9 +965,10 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
950
965
|
// Karindeling wordt door de Logistiek Engine gedaan (eigen minuut-cron);
|
|
951
966
|
// deze module stoot dat niet zelf meer aan.
|
|
952
967
|
// Logistics Engine informeren (schaduwmodus): Engine plant de keten.
|
|
968
|
+
let engineWarning = null;
|
|
953
969
|
try {
|
|
954
970
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
955
|
-
await notifyEngineOrder(order.id, "order.received");
|
|
971
|
+
engineWarning = (await notifyEngineOrder(order.id, "order.received", context.userId)).warning;
|
|
956
972
|
}
|
|
957
973
|
catch (err) {
|
|
958
974
|
console.warn("[createManualOrder] engine-event faalde:", err);
|
|
@@ -960,6 +976,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
960
976
|
return {
|
|
961
977
|
ok: true,
|
|
962
978
|
orderId: order.id,
|
|
979
|
+
engineWarning,
|
|
963
980
|
carrierAdminNotice: rpcRes.carrier_fallback ? "Logistieke Engine 1.0.184 of hoger nodig" : null,
|
|
964
981
|
};
|
|
965
982
|
});
|
|
@@ -995,13 +1012,13 @@ export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
|
995
1012
|
.eq("id", data.orderId)
|
|
996
1013
|
.maybeSingle();
|
|
997
1014
|
if (oErr)
|
|
998
|
-
throw
|
|
1015
|
+
throw stockError(oErr.message);
|
|
999
1016
|
if (!order)
|
|
1000
|
-
throw
|
|
1017
|
+
throw stockError("Bestelling niet gevonden");
|
|
1001
1018
|
const cf = order.custom_fields ?? {};
|
|
1002
1019
|
const src = String(cf?.source ?? order.order_source ?? "").toLowerCase();
|
|
1003
1020
|
if (src === "floriday" || src === "fo") {
|
|
1004
|
-
throw
|
|
1021
|
+
throw stockError("Floriday-orders annuleer of wijzig je in Floriday.");
|
|
1005
1022
|
}
|
|
1006
1023
|
// Voorraadmutaties terugdraaien.
|
|
1007
1024
|
const { data: mutations, error: mErr } = await supabaseAdmin
|
|
@@ -1009,7 +1026,7 @@ export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
|
1009
1026
|
.select("trade_item_key, qty_delta, physical_before, physical_after, reserved_before, reserved_after")
|
|
1010
1027
|
.eq("order_id", data.orderId);
|
|
1011
1028
|
if (mErr)
|
|
1012
|
-
throw
|
|
1029
|
+
throw stockError(`Voorraadmutaties ophalen faalde: ${mErr.message}`);
|
|
1013
1030
|
const perKey = new Map();
|
|
1014
1031
|
for (const m of mutations ?? []) {
|
|
1015
1032
|
const key = m.trade_item_key;
|
|
@@ -1045,7 +1062,7 @@ export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
|
1045
1062
|
})
|
|
1046
1063
|
.eq("id", s.id);
|
|
1047
1064
|
if (uErr)
|
|
1048
|
-
throw
|
|
1065
|
+
throw stockError(`Voorraad terugdraaien faalde: ${uErr.message}`);
|
|
1049
1066
|
reversalRows.push({
|
|
1050
1067
|
trade_item_key: key,
|
|
1051
1068
|
connection_id: s.connection_id,
|
|
@@ -1065,7 +1082,7 @@ export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
|
1065
1082
|
if (reversalRows.length > 0) {
|
|
1066
1083
|
const { error: lErr } = await supabaseAdmin.from("stock_mutation_log").insert(reversalRows);
|
|
1067
1084
|
if (lErr)
|
|
1068
|
-
throw
|
|
1085
|
+
throw stockError(`Reversal-log schrijven faalde: ${lErr.message}`);
|
|
1069
1086
|
}
|
|
1070
1087
|
// Eerst order_items verwijderen — de AFTER DELETE trigger op order_items
|
|
1071
1088
|
// enqueue't naar cart_replan_queue met order_id, dus de orders-rij moet
|
|
@@ -1078,7 +1095,7 @@ export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
|
1078
1095
|
.delete()
|
|
1079
1096
|
.eq("id", data.orderId);
|
|
1080
1097
|
if (dErr)
|
|
1081
|
-
throw
|
|
1098
|
+
throw stockError(`Bestelling verwijderen faalde: ${dErr.message}`);
|
|
1082
1099
|
return {
|
|
1083
1100
|
ok: true,
|
|
1084
1101
|
reversedKeys: perKey.size,
|
|
@@ -1357,13 +1374,13 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1357
1374
|
.eq("id", data.orderId)
|
|
1358
1375
|
.maybeSingle();
|
|
1359
1376
|
if (oErr)
|
|
1360
|
-
throw
|
|
1377
|
+
throw stockError(oErr.message);
|
|
1361
1378
|
if (!order)
|
|
1362
|
-
throw
|
|
1379
|
+
throw stockError("Bestelling niet gevonden");
|
|
1363
1380
|
const cf = order.custom_fields ?? {};
|
|
1364
1381
|
const src = String(cf?.source ?? order.order_source ?? "").toLowerCase();
|
|
1365
1382
|
if (src === "floriday" || src === "fo") {
|
|
1366
|
-
throw
|
|
1383
|
+
throw stockError("Floriday-orders annuleer of wijzig je in Floriday.");
|
|
1367
1384
|
}
|
|
1368
1385
|
const removeIds = data.removeItemIds ?? [];
|
|
1369
1386
|
const newItems = data.newItems ?? [];
|
|
@@ -1375,7 +1392,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1375
1392
|
.select("id, quantity, needs_sticker")
|
|
1376
1393
|
.eq("order_id", data.orderId);
|
|
1377
1394
|
if (cErr)
|
|
1378
|
-
throw
|
|
1395
|
+
throw stockError(cErr.message);
|
|
1379
1396
|
const currentById = new Map((currentRows ?? []).map((r) => [
|
|
1380
1397
|
r.id,
|
|
1381
1398
|
{ quantity: Number(r.quantity ?? 0), needsSticker: r.needs_sticker === true },
|
|
@@ -1398,7 +1415,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1398
1415
|
// Producten wijzigen mag alleen zolang er nog niets is geprint in het
|
|
1399
1416
|
// Pickstation (orders.plan_locked_at).
|
|
1400
1417
|
if ((removeIds.length > 0 || newItems.length > 0) && order.plan_locked_at) {
|
|
1401
|
-
throw
|
|
1418
|
+
throw stockError("Producten kunnen niet meer gewijzigd worden: deze bestelling is al geprint in het Pickstation.");
|
|
1402
1419
|
}
|
|
1403
1420
|
// Valideer per regel dat het nieuwe aantal niet onder de reeds geleverde
|
|
1404
1421
|
// of geplande hoeveelheid zakt — anders zouden bezorgmomenten negatief
|
|
@@ -1426,7 +1443,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1426
1443
|
const min = minByItem.get(it.itemId) ?? 0;
|
|
1427
1444
|
if (it.quantity < min) {
|
|
1428
1445
|
const name = nameById.get(it.itemId) ?? "Regel";
|
|
1429
|
-
throw
|
|
1446
|
+
throw stockError(`"${name}" kan niet naar ${it.quantity} — er is al ${min} gepland/geleverd op bezorgmomenten. Verwijder of verlaag eerst een bezorgmoment.`);
|
|
1430
1447
|
}
|
|
1431
1448
|
}
|
|
1432
1449
|
}
|
|
@@ -1463,7 +1480,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1463
1480
|
for (const r of sRows ?? []) {
|
|
1464
1481
|
const st = r.order_shipments?.status;
|
|
1465
1482
|
if (st === "shipped" || st === "planned") {
|
|
1466
|
-
throw
|
|
1483
|
+
throw stockError("Een regel met een gepland of geleverd bezorgmoment kan niet verwijderd worden.");
|
|
1467
1484
|
}
|
|
1468
1485
|
}
|
|
1469
1486
|
const { error: dErr } = await supabaseAdmin
|
|
@@ -1472,7 +1489,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1472
1489
|
.eq("order_id", data.orderId)
|
|
1473
1490
|
.in("id", removeIds);
|
|
1474
1491
|
if (dErr)
|
|
1475
|
-
throw
|
|
1492
|
+
throw stockError(`Regel verwijderen faalde: ${dErr.message}`);
|
|
1476
1493
|
}
|
|
1477
1494
|
// Nieuwe productregels toevoegen. Productgroepen krijgen product_id = null
|
|
1478
1495
|
// en de naam "[Groep] <naam>", net als bij het aanmaken van een order.
|
|
@@ -1501,7 +1518,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1501
1518
|
});
|
|
1502
1519
|
const { error: nErr } = await supabaseAdmin.from("order_items").insert(rowsToInsert);
|
|
1503
1520
|
if (nErr)
|
|
1504
|
-
throw
|
|
1521
|
+
throw stockError(`Regel toevoegen faalde: ${nErr.message}`);
|
|
1505
1522
|
}
|
|
1506
1523
|
// Leverdatum bijwerken (alleen als niet-reservering).
|
|
1507
1524
|
if (data.deliveryDate && !order.is_reservation) {
|
|
@@ -1521,14 +1538,14 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1521
1538
|
});
|
|
1522
1539
|
const d = decidePreview(preview);
|
|
1523
1540
|
if (d.kind === "blocked")
|
|
1524
|
-
throw
|
|
1541
|
+
throw stockError(d.reason);
|
|
1525
1542
|
// Vervoerder al vertrokken: ook bij wijzigen nooit doorlaten.
|
|
1526
1543
|
if (d.kind === "departed") {
|
|
1527
|
-
throw
|
|
1544
|
+
throw stockError(d.firstDate ? `${d.reason} De eerstvolgende leverdatum is ${d.firstDate}.` : d.reason);
|
|
1528
1545
|
}
|
|
1529
1546
|
if (d.kind === "late") {
|
|
1530
1547
|
if (!data.acceptLateSignup) {
|
|
1531
|
-
throw
|
|
1548
|
+
throw stockError(d.firstDate ? `${d.reason} De eerste haalbare leverdatum is ${d.firstDate}.` : d.reason);
|
|
1532
1549
|
}
|
|
1533
1550
|
const by = context.claims?.email ?? null;
|
|
1534
1551
|
lateOverride = {
|
|
@@ -1548,7 +1565,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1548
1565
|
})
|
|
1549
1566
|
.eq("id", data.orderId);
|
|
1550
1567
|
if (uErr)
|
|
1551
|
-
throw
|
|
1568
|
+
throw stockError(`Leverdatum bijwerken faalde: ${uErr.message}`);
|
|
1552
1569
|
}
|
|
1553
1570
|
if (data.items && data.items.length > 0) {
|
|
1554
1571
|
for (const it of data.items) {
|
|
@@ -1559,7 +1576,7 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1559
1576
|
.eq("id", it.itemId)
|
|
1560
1577
|
.eq("order_id", data.orderId);
|
|
1561
1578
|
if (iErr)
|
|
1562
|
-
throw
|
|
1579
|
+
throw stockError(`Aantal bijwerken faalde: ${iErr.message}`);
|
|
1563
1580
|
}
|
|
1564
1581
|
}
|
|
1565
1582
|
if ((data.items?.length ?? 0) > 0 || removeIds.length > 0 || newItems.length > 0) {
|
|
@@ -1581,20 +1598,21 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1581
1598
|
.eq("id", st.itemId)
|
|
1582
1599
|
.eq("order_id", data.orderId);
|
|
1583
1600
|
if (sErr)
|
|
1584
|
-
throw
|
|
1601
|
+
throw stockError(`Sticker bijwerken faalde: ${sErr.message}`);
|
|
1585
1602
|
}
|
|
1586
1603
|
// Karindeling: de Logistiek Engine plant opnieuw in haar eigen ronde.
|
|
1587
1604
|
// Alleen melden bij een echte wijziging (niet bij alleen het stickervinkje).
|
|
1605
|
+
let engineWarning = null;
|
|
1588
1606
|
if (realChange) {
|
|
1589
1607
|
try {
|
|
1590
1608
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
1591
|
-
await notifyEngineOrder(data.orderId, "order.changed");
|
|
1609
|
+
engineWarning = (await notifyEngineOrder(data.orderId, "order.changed", context.userId)).warning;
|
|
1592
1610
|
}
|
|
1593
1611
|
catch (err) {
|
|
1594
1612
|
console.warn("[updateLocalOrder] engine-event faalde:", err);
|
|
1595
1613
|
}
|
|
1596
1614
|
}
|
|
1597
|
-
return { ok: true };
|
|
1615
|
+
return { ok: true, engineWarning };
|
|
1598
1616
|
});
|
|
1599
1617
|
// ─── Prijs uit prijsgroep of artikel ────────────────────────────────────────
|
|
1600
1618
|
// Leest per product de geldende prijs via local_effective_price (prijsgroep,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,CAkFzC;AAED,qGAAqG;AACrG,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQ3D"}
|
|
@@ -21,11 +21,13 @@ export async function handleFloridayExternalFulfillment(orderId, states) {
|
|
|
21
21
|
: cf.floriday_sales_order_id ? [String(cf.floriday_sales_order_id)] : [];
|
|
22
22
|
if (soIds.length === 0)
|
|
23
23
|
return "none";
|
|
24
|
-
// Ontbrekende bestellingen in de meegegeven stand:
|
|
24
|
+
// Ontbrekende bestellingen in de meegegeven stand: gericht uit de kleine index
|
|
25
|
+
// lezen (geen volledige cache-scan; fail closed = niet afgehandeld).
|
|
25
26
|
let map = states ?? new Map();
|
|
26
|
-
|
|
27
|
+
const missing = soIds.filter((id) => !map.has(id));
|
|
28
|
+
if (missing.length > 0) {
|
|
27
29
|
const { loadFloridayFulfillmentStates } = await import("./floriday-fulfillment-status.server.js");
|
|
28
|
-
const fresh = await loadFloridayFulfillmentStates(supabaseAdmin,
|
|
30
|
+
const fresh = await loadFloridayFulfillmentStates(supabaseAdmin, missing);
|
|
29
31
|
map = new Map([...map, ...fresh]);
|
|
30
32
|
}
|
|
31
33
|
const decision = decideExternalFulfillment({
|
|
@@ -15,8 +15,10 @@ export interface FloridayFulfillmentState {
|
|
|
15
15
|
external: boolean;
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
|
-
* Bouwt een map salesOrderId -> afhandelstatus
|
|
19
|
-
*
|
|
18
|
+
* Bouwt een map salesOrderId -> afhandelstatus, alleen voor de gevraagde ids.
|
|
19
|
+
* Leest uit de kleine index `verkoop_fulfillment_index` (bijgehouden door een
|
|
20
|
+
* trigger op de Floriday-afhandelingen); nooit een volledige cache-scan.
|
|
21
|
+
* Zonder ids: lege map. Ontbreekt de index: fout (fail closed).
|
|
20
22
|
*/
|
|
21
23
|
export declare function loadFloridayFulfillmentStates(supabase: SupabaseClient, salesOrderIds?: string[]): Promise<Map<string, FloridayFulfillmentState>>;
|
|
22
24
|
/** Aantal fust dat een Floriday-verkooporder in totaal zou moeten bevatten. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-fulfillment-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fulfillment-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kFAAkF;IAClF,YAAY,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,QAAQ,EAAE,OAAO,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"floriday-fulfillment-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fulfillment-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kFAAkF;IAClF,YAAY,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,QAAQ,EAAE,OAAO,CAAC;CACnB;AAMD;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,cAAc,EACxB,aAAa,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CA8DhD;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAIhE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,wBAAwB,GAAG,SAAS,EAC3C,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT"}
|
|
@@ -1,74 +1,75 @@
|
|
|
1
1
|
const ACCEPTED_STATUSES = new Set(["ACCEPTED", "RECEIVED", "COMPLETED", "DELIVERED"]);
|
|
2
|
+
const CHUNK = 200;
|
|
2
3
|
/**
|
|
3
|
-
* Bouwt een map salesOrderId -> afhandelstatus
|
|
4
|
-
*
|
|
4
|
+
* Bouwt een map salesOrderId -> afhandelstatus, alleen voor de gevraagde ids.
|
|
5
|
+
* Leest uit de kleine index `verkoop_fulfillment_index` (bijgehouden door een
|
|
6
|
+
* trigger op de Floriday-afhandelingen); nooit een volledige cache-scan.
|
|
7
|
+
* Zonder ids: lege map. Ontbreekt de index: fout (fail closed).
|
|
5
8
|
*/
|
|
6
9
|
export async function loadFloridayFulfillmentStates(supabase, salesOrderIds) {
|
|
7
|
-
const wanted = salesOrderIds && salesOrderIds.length > 0 ? new Set(salesOrderIds) : null;
|
|
8
10
|
const result = new Map();
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
const ids = Array.from(new Set((salesOrderIds ?? []).map(String).filter(Boolean)));
|
|
12
|
+
if (ids.length === 0)
|
|
13
|
+
return result;
|
|
14
|
+
const rows = [];
|
|
15
|
+
for (let i = 0; i < ids.length; i += CHUNK) {
|
|
16
|
+
const { data, error } = await supabase
|
|
17
|
+
.from("verkoop_fulfillment_index")
|
|
18
|
+
.select("fulfillment_id, sales_order_id, status, packages, received, received_at, delivery_note_codes")
|
|
19
|
+
.in("sales_order_id", ids.slice(i, i + CHUNK))
|
|
20
|
+
.eq("is_deleted", false);
|
|
21
|
+
if (error)
|
|
22
|
+
throw new Error(`Floriday-afhandelingen lezen faalde: ${error.message}`);
|
|
23
|
+
rows.push(...(data ?? []));
|
|
24
|
+
}
|
|
25
|
+
const accepted = rows.filter((r) => ACCEPTED_STATUSES.has(String(r.status ?? "").toUpperCase()));
|
|
26
|
+
if (accepted.length === 0)
|
|
27
|
+
return result;
|
|
28
|
+
// Herkomst (door het ERP gemaakt?) alleen voor de gevonden afhandelingen.
|
|
16
29
|
const erpFulfillmentIds = new Set();
|
|
30
|
+
const fIds = Array.from(new Set(accepted.map((r) => String(r.fulfillment_id))));
|
|
17
31
|
try {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
32
|
+
for (let i = 0; i < fIds.length; i += CHUNK) {
|
|
33
|
+
const { data: logRows } = await supabase
|
|
34
|
+
.from("floriday_auto_fulfillment_log")
|
|
35
|
+
.select("fulfillment_order_id")
|
|
36
|
+
.in("fulfillment_order_id", fIds.slice(i, i + CHUNK));
|
|
37
|
+
for (const r of (logRows ?? [])) {
|
|
38
|
+
if (r.fulfillment_order_id)
|
|
39
|
+
erpFulfillmentIds.add(String(r.fulfillment_order_id));
|
|
40
|
+
}
|
|
26
41
|
}
|
|
27
42
|
}
|
|
28
43
|
catch {
|
|
29
44
|
/* herkomst is optioneel */
|
|
30
45
|
}
|
|
31
|
-
for (const
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
createdByErp: false,
|
|
53
|
-
external: false,
|
|
54
|
-
};
|
|
55
|
-
prev.fulfilled = true;
|
|
56
|
-
prev.packages += Number(item?.numberOfPackages ?? 0) || 0;
|
|
57
|
-
if (carrier?.isReceived === true || carrier?.receiptDateTime) {
|
|
58
|
-
prev.received = true;
|
|
59
|
-
prev.receivedAt = prev.receivedAt ?? (carrier?.receiptDateTime ?? null);
|
|
60
|
-
}
|
|
61
|
-
const code = item?.deliveryNoteCode ?? carrier?.documentReference ?? null;
|
|
62
|
-
if (code && !prev.deliveryNoteCodes.includes(String(code))) {
|
|
63
|
-
prev.deliveryNoteCodes.push(String(code));
|
|
64
|
-
}
|
|
65
|
-
if (byErp)
|
|
66
|
-
prev.createdByErp = true;
|
|
67
|
-
else
|
|
68
|
-
prev.external = true;
|
|
69
|
-
result.set(soId, prev);
|
|
70
|
-
}
|
|
46
|
+
for (const r of accepted) {
|
|
47
|
+
const soId = String(r.sales_order_id);
|
|
48
|
+
const prev = result.get(soId) ??
|
|
49
|
+
{
|
|
50
|
+
fulfilled: false,
|
|
51
|
+
packages: 0,
|
|
52
|
+
received: false,
|
|
53
|
+
receivedAt: null,
|
|
54
|
+
deliveryNoteCodes: [],
|
|
55
|
+
createdByErp: false,
|
|
56
|
+
external: false,
|
|
57
|
+
};
|
|
58
|
+
prev.fulfilled = true;
|
|
59
|
+
prev.packages += Number(r.packages ?? 0) || 0;
|
|
60
|
+
if (r.received) {
|
|
61
|
+
prev.received = true;
|
|
62
|
+
prev.receivedAt = prev.receivedAt ?? (r.received_at ?? null);
|
|
63
|
+
}
|
|
64
|
+
for (const code of (r.delivery_note_codes ?? [])) {
|
|
65
|
+
if (code && !prev.deliveryNoteCodes.includes(String(code)))
|
|
66
|
+
prev.deliveryNoteCodes.push(String(code));
|
|
71
67
|
}
|
|
68
|
+
if (erpFulfillmentIds.has(String(r.fulfillment_id)))
|
|
69
|
+
prev.createdByErp = true;
|
|
70
|
+
else
|
|
71
|
+
prev.external = true;
|
|
72
|
+
result.set(soId, prev);
|
|
72
73
|
}
|
|
73
74
|
return result;
|
|
74
75
|
}
|
|
@@ -15,7 +15,7 @@ interface MirrorResult {
|
|
|
15
15
|
errors: string[];
|
|
16
16
|
skipped_reason?: string;
|
|
17
17
|
}
|
|
18
|
-
export declare function mirrorFloridayOrdersFromCron(limit?: number): Promise<MirrorResult>;
|
|
18
|
+
export declare function mirrorFloridayOrdersFromCron(limit?: number, since?: string | null): Promise<MirrorResult>;
|
|
19
19
|
export declare const mirrorFloridayOrders: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
20
20
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
21
21
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"AA0KA,UAAU,YAAY;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;
|
|
1
|
+
{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"AA0KA,UAAU,YAAY;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AA24CD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,yBAEpG;AAED,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;yBAG0C,CAAC"}
|
|
@@ -154,7 +154,7 @@ function pickString(value) {
|
|
|
154
154
|
// terwijl ze dit spiegelen aanroept). Faalt gesloten: geen slot = geen ronde.
|
|
155
155
|
const MIRROR_LOCK_KEY = "verkoop:floriday-mirror";
|
|
156
156
|
const MIRROR_LOCK_SECONDS = 600;
|
|
157
|
-
async function mirrorInternal(limit) {
|
|
157
|
+
async function mirrorInternal(limit, since = null) {
|
|
158
158
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
159
159
|
const empty = (reason, ok) => ({
|
|
160
160
|
ok, processed: 0, inserted: 0, updated: 0, skipped: 0, failed: 0, errors: ok ? [] : [reason], skipped_reason: reason,
|
|
@@ -165,7 +165,7 @@ async function mirrorInternal(limit) {
|
|
|
165
165
|
if (acquired !== true)
|
|
166
166
|
return empty("already-running", true);
|
|
167
167
|
try {
|
|
168
|
-
return await mirrorUnlocked(limit);
|
|
168
|
+
return await mirrorUnlocked(limit, since);
|
|
169
169
|
}
|
|
170
170
|
finally {
|
|
171
171
|
try {
|
|
@@ -176,20 +176,47 @@ async function mirrorInternal(limit) {
|
|
|
176
176
|
}
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
|
-
async function mirrorUnlocked(limit) {
|
|
179
|
+
async function mirrorUnlocked(limit, since) {
|
|
180
180
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
181
181
|
const { loadFloridayFulfillmentStates, expectedPackagesFromSalesOrder, isFullyFulfilled, } = await import("./floriday-fulfillment-status.server.js");
|
|
182
182
|
const cutoffIso = new Date(Date.now() - LOOKBACK_DAYS * 24 * 60 * 60 * 1000).toISOString();
|
|
183
183
|
// Recente/toekomstige FO's uit de cache.
|
|
184
|
-
|
|
184
|
+
// Met watermerk (minuutronde): alleen salesorders die sinds `since` gewijzigd
|
|
185
|
+
// zijn, plus salesorders waarvan de afhandeling (index) sindsdien wijzigde.
|
|
186
|
+
let cacheQuery = supabaseAdmin
|
|
185
187
|
.from("floriday_salesorders_cache")
|
|
186
188
|
.select("floriday_id, data, updated_at, buyer_organization_id")
|
|
187
189
|
.eq("is_deleted", false)
|
|
188
|
-
.gte("data->delivery->>latestDeliveryDateTime", cutoffIso)
|
|
190
|
+
.gte("data->delivery->>latestDeliveryDateTime", cutoffIso);
|
|
191
|
+
if (since)
|
|
192
|
+
cacheQuery = cacheQuery.gt("updated_at", since);
|
|
193
|
+
const { data: baseRows, error: cacheErr } = await cacheQuery
|
|
189
194
|
.order("updated_at", { ascending: false })
|
|
190
195
|
.limit(limit);
|
|
191
196
|
if (cacheErr)
|
|
192
197
|
throw new Error(cacheErr.message);
|
|
198
|
+
let cacheRows = (baseRows ?? []);
|
|
199
|
+
if (since) {
|
|
200
|
+
const { data: idxRows, error: idxErr } = await supabaseAdmin
|
|
201
|
+
.from("verkoop_fulfillment_index")
|
|
202
|
+
.select("sales_order_id")
|
|
203
|
+
.gt("changed_at", since)
|
|
204
|
+
.limit(limit);
|
|
205
|
+
if (idxErr)
|
|
206
|
+
throw new Error(`afhandelingsindex lezen: ${idxErr.message}`);
|
|
207
|
+
const have = new Set(cacheRows.map((r) => String(r.floriday_id)));
|
|
208
|
+
const extra = Array.from(new Set((idxRows ?? []).map((r) => String(r.sales_order_id)))).filter((id) => !have.has(id));
|
|
209
|
+
for (let i = 0; i < extra.length; i += 200) {
|
|
210
|
+
const { data: more, error: mErr } = await supabaseAdmin
|
|
211
|
+
.from("floriday_salesorders_cache")
|
|
212
|
+
.select("floriday_id, data, updated_at, buyer_organization_id")
|
|
213
|
+
.eq("is_deleted", false)
|
|
214
|
+
.in("floriday_id", extra.slice(i, i + 200));
|
|
215
|
+
if (mErr)
|
|
216
|
+
throw new Error(mErr.message);
|
|
217
|
+
cacheRows = cacheRows.concat((more ?? []));
|
|
218
|
+
}
|
|
219
|
+
}
|
|
193
220
|
const rows = (cacheRows ?? []);
|
|
194
221
|
if (rows.length === 0) {
|
|
195
222
|
// Ook zonder nieuwe Floriday-gegevens: orders koppelen aan klanten die
|
|
@@ -1445,8 +1472,8 @@ async function mirrorUnlocked(limit) {
|
|
|
1445
1472
|
errors: errors.slice(0, 20),
|
|
1446
1473
|
};
|
|
1447
1474
|
}
|
|
1448
|
-
export async function mirrorFloridayOrdersFromCron(limit = DEFAULT_BATCH) {
|
|
1449
|
-
return mirrorInternal(limit);
|
|
1475
|
+
export async function mirrorFloridayOrdersFromCron(limit = DEFAULT_BATCH, since = null) {
|
|
1476
|
+
return mirrorInternal(limit, since);
|
|
1450
1477
|
}
|
|
1451
1478
|
export const mirrorFloridayOrders = createServerFn({ method: "POST" })
|
|
1452
1479
|
.middleware([requireSupabaseAuth])
|