@flowselections/floriday-verkoop-module 1.0.159 → 1.0.161
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/OrderKarindelingCard.d.ts +1 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +7 -2
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +6 -4
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +7 -4
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +11 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.js +21 -6
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrdersList.js +3 -3
- package/dist-lib/integrations/supabase/types.d.ts +1860 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.d.ts +6 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +18 -8
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts +1 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders-now.js +26 -2
- package/dist-lib/lib/cron/sync-salesorders.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders.js +12 -0
- package/dist-lib/lib/engine-block-alerts.server.d.ts.map +1 -1
- package/dist-lib/lib/engine-block-alerts.server.js +3 -1
- package/dist-lib/lib/floriday-actual-carriers.d.ts +18 -0
- package/dist-lib/lib/floriday-actual-carriers.d.ts.map +1 -0
- package/dist-lib/lib/floriday-actual-carriers.js +26 -0
- package/dist-lib/lib/floriday-actual-carriers.server.d.ts +6 -0
- package/dist-lib/lib/floriday-actual-carriers.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-actual-carriers.server.js +31 -0
- package/dist-lib/lib/floriday-backfill.d.ts +26 -0
- package/dist-lib/lib/floriday-backfill.d.ts.map +1 -0
- package/dist-lib/lib/floriday-backfill.js +43 -0
- package/dist-lib/lib/floriday-backfill.server.d.ts +2 -0
- package/dist-lib/lib/floriday-backfill.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-backfill.server.js +32 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts +2 -1
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +30 -49
- package/dist-lib/lib/floriday-status.d.ts +9 -0
- package/dist-lib/lib/floriday-status.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.js +12 -0
- package/dist-lib/lib/invoice-timing.d.ts +9 -0
- package/dist-lib/lib/invoice-timing.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.js +15 -0
- package/dist-lib/lib/invoice-timing.server.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.server.js +8 -3
- package/dist-lib/lib/klok-labels.d.ts +4 -1
- package/dist-lib/lib/klok-labels.d.ts.map +1 -1
- package/dist-lib/lib/klok-labels.js +10 -1
- package/dist-lib/lib/list-own-rows.d.ts +9 -0
- package/dist-lib/lib/list-own-rows.d.ts.map +1 -0
- package/dist-lib/lib/list-own-rows.js +20 -0
- package/dist-lib/lib/order-departure.d.ts +1 -1
- package/dist-lib/lib/order-departure.d.ts.map +1 -1
- package/dist-lib/lib/order-departure.js +1 -1
- package/dist-lib/lib/order-status.d.ts +15 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +17 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +70 -4
- package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +12 -3
- package/dist-lib/lib/sync-melding.d.ts +11 -0
- package/dist-lib/lib/sync-melding.d.ts.map +1 -0
- package/dist-lib/lib/sync-melding.functions.d.ts +8 -0
- package/dist-lib/lib/sync-melding.functions.d.ts.map +1 -0
- package/dist-lib/lib/sync-melding.functions.js +19 -0
- package/dist-lib/lib/sync-melding.js +19 -0
- package/package.json +26 -1
- package/schema/verkoop.sql +929 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-status.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-status.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,qBAAqB,GACrB,WAAW,GACX,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB,EAAE;QAAE,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,mBAAmB,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IAC9H,iBAAiB,EAAE;QAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;IAClF,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,gFAAgF;AAChF,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC;IAClC,iEAAiE;IACjE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC;AAMD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,GAAG,GAAG,mBAAmB,GAAG,IAAI,CA6B7E;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,CAWpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,MAAM,CAUhF;AAED,yEAAyE;AACzE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQhH;AAED,6EAA6E;AAC7E,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,EAAE,iBAAiB,EAAE,OAAO,GAAG,OAAO,CAErG;AAED,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,uBAAuB,GAAG,gBAAgB,GAAG,IAAI,CAAC;AAElG;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,UAAU,GAAG,SAAS,EAC3B,QAAQ,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAC3D,iBAAiB,EAAE,OAAO,GACzB,gBAAgB,CAMlB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc9G"}
|
|
1
|
+
{"version":3,"file":"floriday-status.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,3 +123,15 @@ export function floridayInvoiceLine(raw, done, total) {
|
|
|
123
123
|
return total > 0 && done > 0 && done < total ? null : "Deels afgemeld in Floriday";
|
|
124
124
|
return total > 0 && done === 0 ? null : "Nog niet afgemeld in Floriday";
|
|
125
125
|
}
|
|
126
|
+
/**
|
|
127
|
+
* Eén toestand voor de Floriday-regel in de factuurkaart. Afgehandeld in
|
|
128
|
+
* Floriday gaat vóór de ruwe Floriday-status: nooit tegelijk "Nog niet
|
|
129
|
+
* afgemeld" en "Al afgehandeld".
|
|
130
|
+
*/
|
|
131
|
+
export function floridayInvoiceState(raw, done, total, external) {
|
|
132
|
+
if (external.full)
|
|
133
|
+
return "Afgehandeld in Floriday";
|
|
134
|
+
if (external.count > 0)
|
|
135
|
+
return `${external.count} bestelling${external.count === 1 ? "" : "en"} afgehandeld in Floriday`;
|
|
136
|
+
return floridayInvoiceLine(raw, done, total);
|
|
137
|
+
}
|
|
@@ -72,4 +72,13 @@ export declare function applyTime(date: Date, timeOfDay: string): Date;
|
|
|
72
72
|
*/
|
|
73
73
|
export declare function computeInvoiceDueAt(input: InvoiceAnchorInput, settings: InvoiceTimingSettings): string | null;
|
|
74
74
|
export declare function describeInvoiceTiming(settings: InvoiceTimingSettings, forPickup?: boolean): string;
|
|
75
|
+
/**
|
|
76
|
+
* Nooit automatisch vrijgeven: ingehaalde/herstelde orders (custom_fields.backfill,
|
|
77
|
+
* elke categorie) en orders met een leverdag vóór de startdatum van automatisch
|
|
78
|
+
* factureren (YYYY-MM-DD, Nederlandse dag). Zonder startdatum geldt alleen de backfill-regel.
|
|
79
|
+
*/
|
|
80
|
+
export declare function invoiceReleaseExcluded(row: {
|
|
81
|
+
custom_fields?: unknown;
|
|
82
|
+
delivery_date?: string | null;
|
|
83
|
+
}, startDate: string | null | undefined): string | null;
|
|
75
84
|
//# sourceMappingURL=invoice-timing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-timing.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"invoice-timing.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.ts"],"names":[],"mappings":"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"}
|
|
@@ -184,3 +184,18 @@ export function describeInvoiceTiming(settings, forPickup = false) {
|
|
|
184
184
|
: `${offset > 0 ? "+" : "−"}${Math.abs(offset)} ${businessOnly ? "werkdag(en)" : "dag(en)"}`;
|
|
185
185
|
return `${label} ${offset === 0 ? "" : days} om ${normalizeTimeOfDay(time)}`.replace(" ", " ");
|
|
186
186
|
}
|
|
187
|
+
/**
|
|
188
|
+
* Nooit automatisch vrijgeven: ingehaalde/herstelde orders (custom_fields.backfill,
|
|
189
|
+
* elke categorie) en orders met een leverdag vóór de startdatum van automatisch
|
|
190
|
+
* factureren (YYYY-MM-DD, Nederlandse dag). Zonder startdatum geldt alleen de backfill-regel.
|
|
191
|
+
*/
|
|
192
|
+
export function invoiceReleaseExcluded(row, startDate) {
|
|
193
|
+
const cf = row.custom_fields;
|
|
194
|
+
if (cf && typeof cf === "object" && "backfill" in cf)
|
|
195
|
+
return "ingehaalde of herstelde order";
|
|
196
|
+
const d = String(row.delivery_date ?? "").slice(0, 10);
|
|
197
|
+
const start = String(startDate ?? "").slice(0, 10);
|
|
198
|
+
if (/^\d{4}-\d{2}-\d{2}$/.test(start) && /^\d{4}-\d{2}-\d{2}$/.test(d) && d < start)
|
|
199
|
+
return "leverdag vóór start automatisch factureren";
|
|
200
|
+
return null;
|
|
201
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-timing.server.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.server.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"invoice-timing.server.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.server.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,YAAY,EAIjB,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAE1B,iGAAiG;AACjG,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAmB7F;AA6ED;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,GAAG,EACb,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GACpC,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAoD/C;AAID;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GACpF,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAqCpC;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,GAAG,EACb,KAAK,SAAM,GACV,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA6CpE;AAED,8DAA8D;AAC9D,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAMD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Server-side toepassing van het instelbare factuurmoment.
|
|
2
|
-
import { DEFAULT_INVOICE_TIMING, computeInvoiceDueAt, decideInvoiceRelease, normalizeTimeOfDay, } from "./invoice-timing.js";
|
|
2
|
+
import { DEFAULT_INVOICE_TIMING, computeInvoiceDueAt, decideInvoiceRelease, invoiceReleaseExcluded, normalizeTimeOfDay, } from "./invoice-timing.js";
|
|
3
3
|
/** Oude facturatiestatus; wordt niet meer gezet (vrijgave loopt via orders.invoice_ready_at). */
|
|
4
4
|
export const INVOICE_READY_STATUS = "Gereed voor facturatie";
|
|
5
5
|
export async function loadInvoiceTimingSettings(supabase) {
|
|
@@ -210,9 +210,13 @@ export async function releaseDueInvoices(supabase, limit = 200) {
|
|
|
210
210
|
if (!settings.enabled)
|
|
211
211
|
return { released: 0, waiting: 0, orderIds: [] };
|
|
212
212
|
const now = new Date();
|
|
213
|
+
const { data: st, error: stErr } = await supabase.from("invoice_timing_settings").select("start_date").limit(1).maybeSingle();
|
|
214
|
+
if (stErr)
|
|
215
|
+
throw new Error(`startdatum factureren lezen: ${stErr.message}`);
|
|
216
|
+
const startDate = st?.start_date ?? null;
|
|
213
217
|
const { data, error } = await supabase
|
|
214
218
|
.from("orders")
|
|
215
|
-
.select("id, status, order_source, floriday_sales_order_id, invoice_due_at")
|
|
219
|
+
.select("id, status, order_source, floriday_sales_order_id, invoice_due_at, custom_fields, delivery_date")
|
|
216
220
|
.is("deleted_at", null)
|
|
217
221
|
.is("cancelled_at", null)
|
|
218
222
|
.is("invoice_ready_at", null)
|
|
@@ -222,7 +226,8 @@ export async function releaseDueInvoices(supabase, limit = 200) {
|
|
|
222
226
|
if (error)
|
|
223
227
|
throw new Error(error.message);
|
|
224
228
|
const rows = (data ?? []).filter((r) => !r.floriday_sales_order_id &&
|
|
225
|
-
String(r.order_source ?? "").toLowerCase() !== "floriday"
|
|
229
|
+
String(r.order_source ?? "").toLowerCase() !== "floriday" &&
|
|
230
|
+
!invoiceReleaseExcluded(r, startDate));
|
|
226
231
|
const signoffs = await loadSignoffs(supabase, rows);
|
|
227
232
|
const orderIds = [];
|
|
228
233
|
let waiting = 0;
|
|
@@ -61,9 +61,12 @@ export declare function afleverbriefPdfBody(b: KlokAfleverbrief): {
|
|
|
61
61
|
auctionLetterCode?: undefined;
|
|
62
62
|
};
|
|
63
63
|
/** Weergave van een Floriday-keuzelijst: laden → Skeleton; alleen "geen koppeling" als de gereedheid dat zegt. */
|
|
64
|
+
export declare const KLOK_LIJST_FOUT_TEXT = "De lijsten van Floriday konden niet worden geladen. Er wordt automatisch opnieuw geprobeerd.";
|
|
65
|
+
/** Mislukte deellijst (veillocaties, verzendlocaties, veilgroepen, kwaliteiten): nooit stil leeg tonen. */
|
|
66
|
+
export declare function klokLijstenMislukt(l: any): boolean;
|
|
64
67
|
export declare function klokLijstWeergave(isLoading: boolean, gereed: {
|
|
65
68
|
koppeling_actief?: boolean;
|
|
66
|
-
} | null | undefined): "laden" | "geen_koppeling" | "lijst";
|
|
69
|
+
} | null | undefined, mislukt?: boolean): "laden" | "fout" | "geen_koppeling" | "lijst";
|
|
67
70
|
/** Veillocatie-knoppen: eerder gebruikt + gekozen blijven zichtbaar (aangevuld tot 3); de rest achter "Meer". */
|
|
68
71
|
export declare function klokLocatieKnoppen<T extends {
|
|
69
72
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"klok-labels.d.ts","sourceRoot":"","sources":["../../src/lib/klok-labels.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"klok-labels.d.ts","sourceRoot":"","sources":["../../src/lib/klok-labels.ts"],"names":[],"mappings":"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"}
|
|
@@ -150,7 +150,16 @@ export function afleverbriefPdfBody(b) {
|
|
|
150
150
|
: { kind: "auction-letter", clockSupplyId: b.clockSupplyId };
|
|
151
151
|
}
|
|
152
152
|
/** Weergave van een Floriday-keuzelijst: laden → Skeleton; alleen "geen koppeling" als de gereedheid dat zegt. */
|
|
153
|
-
export
|
|
153
|
+
export const KLOK_LIJST_FOUT_TEXT = "De lijsten van Floriday konden niet worden geladen. Er wordt automatisch opnieuw geprobeerd.";
|
|
154
|
+
/** Mislukte deellijst (veillocaties, verzendlocaties, veilgroepen, kwaliteiten): nooit stil leeg tonen. */
|
|
155
|
+
export function klokLijstenMislukt(l) {
|
|
156
|
+
if (!l?.gereed?.koppeling_actief)
|
|
157
|
+
return false;
|
|
158
|
+
return ["locaties", "verzend", "groepen", "kwaliteit"].some((k) => !!l?.[k]?.error);
|
|
159
|
+
}
|
|
160
|
+
export function klokLijstWeergave(isLoading, gereed, mislukt = false) {
|
|
161
|
+
if (mislukt)
|
|
162
|
+
return "fout";
|
|
154
163
|
if (isLoading || !gereed)
|
|
155
164
|
return "laden";
|
|
156
165
|
return gereed.koppeling_actief === false ? "geen_koppeling" : "lijst";
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare function floridayIdsZonderEigenOrder(localRows: {
|
|
2
|
+
floriday_sales_order_id?: string | null;
|
|
3
|
+
custom_fields?: any;
|
|
4
|
+
}[], floridayIds: string[]): string[];
|
|
5
|
+
/** Een samengevoegde order buiten het venster nooit als extra rij tonen. */
|
|
6
|
+
export declare const isSamengevoegd: (r: {
|
|
7
|
+
custom_fields?: any;
|
|
8
|
+
}) => boolean;
|
|
9
|
+
//# sourceMappingURL=list-own-rows.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list-own-rows.d.ts","sourceRoot":"","sources":["../../src/lib/list-own-rows.ts"],"names":[],"mappings":"AAGA,wBAAgB,2BAA2B,CACzC,SAAS,EAAE;IAAE,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,aAAa,CAAC,EAAE,GAAG,CAAA;CAAE,EAAE,EAC7E,WAAW,EAAE,MAAM,EAAE,GACpB,MAAM,EAAE,CAQV;AAED,4EAA4E;AAC5E,eAAO,MAAM,cAAc,GAAI,GAAG;IAAE,aAAa,CAAC,EAAE,GAAG,CAAA;CAAE,YAGxD,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// Lijst = detail: Floriday-rijen in het venster waarvan de eigen order niet
|
|
2
|
+
// in het periodevenster zat. Die eigen orders worden apart gelezen, zodat de
|
|
3
|
+
// lijst orders.status gebruikt (zelfde bron als het detail). Puur.
|
|
4
|
+
export function floridayIdsZonderEigenOrder(localRows, floridayIds) {
|
|
5
|
+
const known = new Set();
|
|
6
|
+
for (const r of localRows) {
|
|
7
|
+
if (r.floriday_sales_order_id)
|
|
8
|
+
known.add(String(r.floriday_sales_order_id));
|
|
9
|
+
const ids = (r.custom_fields ?? {})?.floriday_sales_order_ids;
|
|
10
|
+
if (Array.isArray(ids))
|
|
11
|
+
for (const v of ids)
|
|
12
|
+
known.add(String(v));
|
|
13
|
+
}
|
|
14
|
+
return Array.from(new Set(floridayIds.map(String).filter((id) => id && !known.has(id))));
|
|
15
|
+
}
|
|
16
|
+
/** Een samengevoegde order buiten het venster nooit als extra rij tonen. */
|
|
17
|
+
export const isSamengevoegd = (r) => {
|
|
18
|
+
const ids = (r.custom_fields ?? {})?.floriday_sales_order_ids;
|
|
19
|
+
return Array.isArray(ids) && ids.length > 1;
|
|
20
|
+
};
|
|
@@ -11,7 +11,7 @@ export interface OrderDeparture {
|
|
|
11
11
|
export declare function normalizeDeparture(raw: unknown): OrderDeparture | null;
|
|
12
12
|
/** "di 20 okt 15:00" in Nederlandse tijd. */
|
|
13
13
|
export declare function formatMoment(iso: string | null): string | null;
|
|
14
|
-
export declare const DEPARTURE_UNKNOWN = "Ophaalmoment nu niet bekend
|
|
14
|
+
export declare const DEPARTURE_UNKNOWN = "Ophaalmoment nu niet bekend; de planning geeft het nog niet door.";
|
|
15
15
|
export interface DepartureView {
|
|
16
16
|
/** Hoofdtekst, bv. "di 20 okt 15:00 ophalen · aanmelden di 20 okt 13:00". */
|
|
17
17
|
text: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-departure.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAQD,uEAAuE;AACvE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAYtE;AAED,6CAA6C;AAC7C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAS9D;AAED,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"order-departure.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAQD,uEAAuE;AACvE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAYtE;AAED,6CAA6C;AAC7C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAS9D;AAED,eAAO,MAAM,iBAAiB,sEAAsE,CAAC;AAErG,MAAM,WAAW,aAAa;IAC5B,6EAA6E;IAC7E,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,uDAAuD;IACvD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,2EAA2E;IAC3E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,GAAG,aAAa,CAenF"}
|
|
@@ -33,7 +33,7 @@ export function formatMoment(iso) {
|
|
|
33
33
|
const time = d.toLocaleTimeString("nl-NL", { timeZone: TIME_ZONE, hour: "2-digit", minute: "2-digit", hour12: false });
|
|
34
34
|
return `${date} ${time}`;
|
|
35
35
|
}
|
|
36
|
-
export const DEPARTURE_UNKNOWN = "Ophaalmoment nu niet bekend
|
|
36
|
+
export const DEPARTURE_UNKNOWN = "Ophaalmoment nu niet bekend; de planning geeft het nog niet door.";
|
|
37
37
|
export function departureView(dep) {
|
|
38
38
|
if (!dep)
|
|
39
39
|
return { text: null, short: null, lateSignup: false, reason: DEPARTURE_UNKNOWN };
|
|
@@ -4,7 +4,17 @@ export declare const ORDER_STAGES: {
|
|
|
4
4
|
label: string;
|
|
5
5
|
hint: string;
|
|
6
6
|
}[];
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* Bijzondere toestand naast de fase: "deleted" (orders.deleted_at gevuld) en
|
|
9
|
+
* "handled" (custom_fields.backfill: ingehaald of hersteld na samenvoegen).
|
|
10
|
+
* Altijd afgeleid uit de actuele rij; vervalt zodra de bron verdwijnt.
|
|
11
|
+
*/
|
|
12
|
+
export type StageNote = "deleted" | "handled" | null;
|
|
13
|
+
export declare function orderStageNote(input: {
|
|
14
|
+
deletedAt?: unknown;
|
|
15
|
+
customFields?: unknown;
|
|
16
|
+
}): StageNote;
|
|
17
|
+
export declare function orderStageLabel(stage: OrderStage, note?: StageNote): string;
|
|
8
18
|
/** Tailwind-klassen voor de statusbadge per fase. */
|
|
9
19
|
export declare function orderStageBadgeClass(stage: OrderStage): string;
|
|
10
20
|
export interface OrderStageInput {
|
|
@@ -17,6 +27,10 @@ export interface OrderStageInput {
|
|
|
17
27
|
cancelled?: boolean;
|
|
18
28
|
/** Reserveringen zijn altijd nog te verwerken. */
|
|
19
29
|
isReservation?: boolean;
|
|
30
|
+
/** Verwijderde order (deleted_at): nooit te picken; telt als vervallen. */
|
|
31
|
+
deleted?: boolean;
|
|
32
|
+
/** custom_fields.backfill: afgehandeld buiten het systeem; nooit te picken. */
|
|
33
|
+
backfill?: boolean;
|
|
20
34
|
}
|
|
21
35
|
/**
|
|
22
36
|
* De weergavestatus volgt uitsluitend de opgeslagen orderstatus en fysiek
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-status.d.ts","sourceRoot":"","sources":["../../src/lib/order-status.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;AAEpF,eAAO,MAAM,YAAY,EAAE;IAAE,EAAE,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAMzE,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"order-status.d.ts","sourceRoot":"","sources":["../../src/lib/order-status.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;AAEpF,eAAO,MAAM,YAAY,EAAE;IAAE,EAAE,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAMzE,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,IAAI,CAAC;AAErD,wBAAgB,cAAc,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAKhG;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,MAAM,CAI3E;AAED,qDAAqD;AACrD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAa9D;AAyBD,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iDAAiD;IACjD,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kDAAkD;IAClD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,CAUpE;AAID,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAM5D"}
|
|
@@ -8,7 +8,19 @@ export const ORDER_STAGES = [
|
|
|
8
8
|
{ id: "shipped", label: "Verzonden", hint: "Aangemeld/meegegeven aan vervoerder" },
|
|
9
9
|
{ id: "cancelled", label: "Geannuleerd", hint: "Vervallen orders" },
|
|
10
10
|
];
|
|
11
|
-
export function
|
|
11
|
+
export function orderStageNote(input) {
|
|
12
|
+
if (input.deletedAt)
|
|
13
|
+
return "deleted";
|
|
14
|
+
const cf = input.customFields;
|
|
15
|
+
if (cf && typeof cf === "object" && "backfill" in cf)
|
|
16
|
+
return "handled";
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
export function orderStageLabel(stage, note) {
|
|
20
|
+
if (note === "deleted")
|
|
21
|
+
return "Verwijderd";
|
|
22
|
+
if (note === "handled")
|
|
23
|
+
return "Afgehandeld";
|
|
12
24
|
return ORDER_STAGES.find((s) => s.id === stage)?.label ?? "Inkomende orders";
|
|
13
25
|
}
|
|
14
26
|
/** Tailwind-klassen voor de statusbadge per fase. */
|
|
@@ -56,8 +68,12 @@ const TOPICK = new Set([
|
|
|
56
68
|
*/
|
|
57
69
|
export function resolveOrderStage(input) {
|
|
58
70
|
const status = String(input.status ?? "").trim().toLowerCase();
|
|
71
|
+
if (input.deleted)
|
|
72
|
+
return "cancelled";
|
|
59
73
|
if (input.cancelled || CANCELLED.has(status))
|
|
60
74
|
return "cancelled";
|
|
75
|
+
if (input.backfill)
|
|
76
|
+
return "shipped";
|
|
61
77
|
if (input.shipped || SHIPPED.has(status))
|
|
62
78
|
return "shipped";
|
|
63
79
|
if (input.controlledAt || PICKED.has(status))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkD,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjG,OAAO,EAML,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAI1B,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;AAEjG,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,kEAAkE;IAClE,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AA6GD,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,GAAG,IAAW,QAEjE;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA+BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAg5CrB;AAyDD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACzC,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,qBAAqB,CAIvB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { floridayIdsZonderEigenOrder, isSamengevoegd } from "./list-own-rows.js";
|
|
1
2
|
import { groepSleutel } from "./order-cancel-view.js";
|
|
2
3
|
import { zonderGeannuleerd } from "./order-cancel-view.js";
|
|
3
4
|
import { composeLocalDelivery } from "./delivery-format.js";
|
|
@@ -20,7 +21,8 @@ import { loadPlanCoverage } from "./plan-coverage.server.js";
|
|
|
20
21
|
import { combineStages } from "./floriday-status.js";
|
|
21
22
|
import { combinedCartCount, mergeSummaries, summarize } from "./plan-coverage.js";
|
|
22
23
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
23
|
-
import { mergeStages, resolveOrderStage } from "./order-status.js";
|
|
24
|
+
import { mergeStages, resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
25
|
+
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
24
26
|
import { loadBacklogFlags } from "./order-backlog.server.js";
|
|
25
27
|
import { detectSource, hasProblem, invoiceRoute, isInvoicedDone, toProgressMember, } from "./order-progress.js";
|
|
26
28
|
import { loadInvoiceStatuses, loadPickProgress } from "./order-progress.server.js";
|
|
@@ -365,10 +367,41 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
365
367
|
});
|
|
366
368
|
// Vervoerdernamen: vaste referentiedata, 10 min in het servergeheugen.
|
|
367
369
|
const carrierNamesTask = loadCarrierNames(supabase, cacheKey);
|
|
368
|
-
const [{ environment, sellerFallback, foRows, truncated },
|
|
370
|
+
const [{ environment, sellerFallback, foRows, truncated }, periodLocalRows] = await Promise.all([
|
|
369
371
|
floridayTask,
|
|
370
372
|
localTask,
|
|
371
373
|
]);
|
|
374
|
+
// Lijst = detail: een Floriday-rij in het venster waarvan de eigen order
|
|
375
|
+
// buiten het venster valt (andere besteldatum/leverdatum) kreeg anders de
|
|
376
|
+
// Floriday-cachestatus i.p.v. orders.status (bv. "Afgehandeld in Floriday"
|
|
377
|
+
// in het detail maar "te picken" in de lijst). Die eigen orders erbij lezen.
|
|
378
|
+
const localOrderRows = [...periodLocalRows];
|
|
379
|
+
if (!params.localOrderId && foRows.length) {
|
|
380
|
+
const missing = floridayIdsZonderEigenOrder(periodLocalRows, foRows.map((r) => String(r?.floriday_id ?? "")));
|
|
381
|
+
const seen = new Set(periodLocalRows.map((r) => String(r.id)));
|
|
382
|
+
// Begrensd: hooguit 2000 ids (10 aanvragen) per lijstverzoek.
|
|
383
|
+
for (let i = 0; i < Math.min(missing.length, 2000); i += 200) {
|
|
384
|
+
const { data, error } = await supabase
|
|
385
|
+
.from("orders")
|
|
386
|
+
.select(localOrderSelect)
|
|
387
|
+
.is("deleted_at", null)
|
|
388
|
+
.in("floriday_sales_order_id", missing.slice(i, i + 200))
|
|
389
|
+
.order("created_at", { ascending: false });
|
|
390
|
+
if (error) {
|
|
391
|
+
console.error("[orderlijst] eigen orders buiten venster lezen mislukt:", error.message);
|
|
392
|
+
warnings.push("Van een deel van de Floriday-orders is de eigen stand nu niet bekend.");
|
|
393
|
+
break;
|
|
394
|
+
}
|
|
395
|
+
for (const r of (data ?? [])) {
|
|
396
|
+
if (isSamengevoegd(r))
|
|
397
|
+
continue;
|
|
398
|
+
if (seen.has(String(r.id)))
|
|
399
|
+
continue;
|
|
400
|
+
seen.add(String(r.id));
|
|
401
|
+
localOrderRows.push(r);
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
}
|
|
372
405
|
t.mark("1_3_bronnen");
|
|
373
406
|
// 12a-ophalen) Engine-overzicht start direct na de bronnen, tegelijk met de
|
|
374
407
|
// referentiegegevens (stap 5). Venster uit de ruwe leverdatums; toepassen
|
|
@@ -635,6 +668,31 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
635
668
|
/* vangnet is best-effort */
|
|
636
669
|
}
|
|
637
670
|
}
|
|
671
|
+
// 8c) Floriday-orders zonder actieve eigen order maar met een verwijderde:
|
|
672
|
+
// tonen als "Verwijderd", nooit terugvallen op de Floriday-status (die gaf
|
|
673
|
+
// "Nog te picken"). Komt deleted_at te vervallen, dan is de order weer actief.
|
|
674
|
+
const deletedFoIds = new Set();
|
|
675
|
+
{
|
|
676
|
+
const zonder = foRows
|
|
677
|
+
.map((r) => String(r.floriday_id))
|
|
678
|
+
.filter((fid) => fid && !groupedFoIds.has(fid) && !localRowByFoId.has(fid));
|
|
679
|
+
for (let i = 0; i < zonder.length; i += 500) {
|
|
680
|
+
const part = zonder.slice(i, i + 500);
|
|
681
|
+
const { data: del, error: delErr } = await supabase
|
|
682
|
+
.from("orders")
|
|
683
|
+
.select("floriday_sales_order_id")
|
|
684
|
+
.in("floriday_sales_order_id", part)
|
|
685
|
+
.not("deleted_at", "is", null);
|
|
686
|
+
if (delErr) {
|
|
687
|
+
console.error("[verkoop] verwijderde orders lezen mislukt:", delErr.message);
|
|
688
|
+
warnings.push("Van een deel van de orders is nu niet bekend of ze verwijderd zijn.");
|
|
689
|
+
break;
|
|
690
|
+
}
|
|
691
|
+
for (const d of (del ?? []))
|
|
692
|
+
if (d.floriday_sales_order_id)
|
|
693
|
+
deletedFoIds.add(String(d.floriday_sales_order_id));
|
|
694
|
+
}
|
|
695
|
+
}
|
|
638
696
|
// 9) Floriday-orders → DTO (zonder zware raw-payload richting browser).
|
|
639
697
|
const floridayOrders = foRows
|
|
640
698
|
.filter((r) => !groupedFoIds.has(String(r.floriday_id)))
|
|
@@ -668,7 +726,12 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
668
726
|
shipped: shipState?.shipped,
|
|
669
727
|
controlledAt: r.controlled_at ?? (shipState?.picked ? "picked" : null),
|
|
670
728
|
isReservation: localRow ? !!localRow.is_reservation : false,
|
|
729
|
+
deleted: !localRow && deletedFoIds.has(String(r.floriday_id)),
|
|
730
|
+
backfill: orderStageNote({ customFields: localRow?.custom_fields }) === "handled",
|
|
671
731
|
});
|
|
732
|
+
dto.stageNote = !localRow && deletedFoIds.has(String(r.floriday_id))
|
|
733
|
+
? "deleted"
|
|
734
|
+
: orderStageNote({ customFields: localRow?.custom_fields });
|
|
672
735
|
dto.invoiceState = localRow ? invoiceStateLabel(localRow) : null;
|
|
673
736
|
// Weergave: bron, klant-id, orders.id, factuurroute en verzendmoment.
|
|
674
737
|
dto.source = detectSource({
|
|
@@ -897,7 +960,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
897
960
|
shipped: shipmentStateByOrder.get(String(r.id))?.shipped,
|
|
898
961
|
controlledAt: shipmentStateByOrder.get(String(r.id))?.picked ? "picked" : null,
|
|
899
962
|
isReservation: !!r.is_reservation,
|
|
963
|
+
deleted: !!r.deleted_at,
|
|
964
|
+
backfill: orderStageNote({ customFields: cf }) === "handled",
|
|
900
965
|
}),
|
|
966
|
+
stageNote: orderStageNote({ deletedAt: r.deleted_at, customFields: cf }),
|
|
901
967
|
carrierName: cf.carrier ? (carrierNameById.get(String(cf.carrier)) ?? null) : null,
|
|
902
968
|
incomplete: [
|
|
903
969
|
...(r.customer_id || r.customer_name ? [] : ["geen klant gekoppeld"]),
|
|
@@ -907,7 +973,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
907
973
|
invoiceState: invoiceStateLabel(r),
|
|
908
974
|
invoiceNote: r.invoice_ready_note ?? null,
|
|
909
975
|
floridayFulfilled: Boolean(cf.floriday_fulfilled),
|
|
910
|
-
floridayExternalFulfilledAt: cf
|
|
976
|
+
floridayExternalFulfilledAt: handledAtForDisplay(cf),
|
|
911
977
|
floridayMissingLineKeyNotice: typeof cf.floriday_missing_line_key_notice === "string" ? cf.floriday_missing_line_key_notice : null,
|
|
912
978
|
customerReference: typeof cf.customer_reference === "string" && cf.customer_reference.trim() ? cf.customer_reference.trim() : null,
|
|
913
979
|
floridayExternalFulfilledIds: Array.isArray(cf.floriday_external_fulfilled_sales_order_ids) ? cf.floriday_external_fulfilled_sales_order_ids : [],
|
|
@@ -1388,7 +1454,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1388
1454
|
}
|
|
1389
1455
|
}
|
|
1390
1456
|
if (failed > 0) {
|
|
1391
|
-
warnings.push(`Van ${failed} order(s) is de karverdeling nu niet bekend
|
|
1457
|
+
warnings.push(`Van ${failed} order(s) is de karverdeling nu niet bekend; de planning geeft die nog niet door.`);
|
|
1392
1458
|
}
|
|
1393
1459
|
}));
|
|
1394
1460
|
}
|
|
@@ -89,6 +89,8 @@ export interface SalesOrderDTO {
|
|
|
89
89
|
floridayFulfilled?: boolean;
|
|
90
90
|
/** Tijdstip waarop de order in Floriday zelf (buiten het ERP om) is afgehandeld. */
|
|
91
91
|
floridayExternalFulfilledAt?: string | null;
|
|
92
|
+
/** "deleted" → "Verwijderd", "handled" → "Afgehandeld" (zie orderStageNote). */
|
|
93
|
+
stageNote?: import("./order-status.js").StageNote;
|
|
92
94
|
floridayMissingLineKeyNotice?: string | null;
|
|
93
95
|
/** Referentie van de klant (custom_fields.customer_reference), alleen lezen. */
|
|
94
96
|
customerReference?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAElE,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,iEAAiE;IACjE,MAAM,CAAC,EAAE,OAAO,kBAAkB,EAAE,SAAS,GAAG,IAAI,CAAC;IACrD,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mEAAmE;IACnE,YAAY,CAAC,EAAE,OAAO,kBAAkB,EAAE,YAAY,CAAC;IACvD,iFAAiF;IACjF,UAAU,CAAC,EAAE,OAAO,kBAAkB,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9D,8EAA8E;IAC9E,YAAY,CAAC,EAAE,OAAO,kBAAkB,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9D,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,uFAAuF;IACvF,eAAe,CAAC,EAAE,OAAO,kBAAkB,EAAE,cAAc,EAAE,CAAC;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,YAAY,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,wFAAwF;IACxF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4FAA4F;IAC5F,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,wFAAwF;IACxF,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yGAAyG;IACzG,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,6DAA6D;IAC7D,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,mEAAmE;IACnE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,0FAA0F;IAC1F,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yFAAyF;IACzF,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,sDAAsD;IACtD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sDAAsD;IACtD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,kEAAkE;IAClE,YAAY,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC;IAClC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oFAAoF;IACpF,2BAA2B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,4BAA4B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,gFAAgF;IAChF,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,4EAA4E;IAC5E,4BAA4B,CAAC,EAAE,MAAM,EAAE,CAAC;IACxC,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;OAGG;IACH,iBAAiB,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE,+EAA+E;IAC/E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uEAAuE;IACvE,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;IAElE,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,2EAA2E;IAC3E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,iBAAiB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEpE;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,2FAA2F;IAC3F,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,+DAA+D;IAC/D,cAAc,CAAC,EAAE,OAAO,mBAAmB,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC1E,oEAAoE;IACpE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,0EAA0E;IAC1E,UAAU,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oEAAoE;IACpE,YAAY,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;IACjD,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAGtB,oGAAoG;IACpG,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,+EAA+E;QAC/E,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;KACxB,CAAC;IACF,MAAM,EAAE;QACN,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,OAAO,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;KAC7B,CAAC;IAEF,GAAG,EAAE;QACH,KAAK,EAAE,GAAG,CAAC;QACX,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;QACrB,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC;KACvB,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AACD,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAE9D,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AACD,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AAWhE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,CAAC;AAmD9E;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,IAAI,CAmBpE;AAKD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAEpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED,wFAAwF;AACxF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAC;AAK7D,wBAAgB,eAAe,CAC7B,EAAE,EAAE,MAAM,GACT;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAa7C;AAED,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,GAAG,EACN,cAAc,CAAC,EAAE,cAAc,EAC/B,eAAe,CAAC,EAAE,eAAe,EACjC,wBAAwB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7C,aAAa,CAoGf;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAUxE;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACnE;AAGD,+EAA+E;AAC/E,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAGnF;AAED,uDAAuD;AACvD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAGlF;AAGD,wBAAgB,YAAY,CAC1B,MAAM,EAAE,aAAa,EAAE,EACvB,CAAC,EAAE,iBAAiB,GACnB,aAAa,EAAE,CAiCjB;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CA2CtF"}
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -273,7 +273,7 @@ export function ordersToCsv(orders) {
|
|
|
273
273
|
o.customer.postalCode,
|
|
274
274
|
o.customer.city,
|
|
275
275
|
o.deliveryAt,
|
|
276
|
-
orderStageLabel(o.stage ?? "incoming"),
|
|
276
|
+
orderStageLabel(o.stage ?? "incoming", o.stageNote ?? null),
|
|
277
277
|
]);
|
|
278
278
|
const escape = (v) => `"${String(v).replace(/"/g, '""')}"`;
|
|
279
279
|
const csv = [header, ...rows].map((r) => r.map(escape).join(";")).join("\n");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAkC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAqczB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
|
|
@@ -6,7 +6,8 @@ import { invoiceStateLabel } from "./invoice-timing.js";
|
|
|
6
6
|
import { z } from "zod";
|
|
7
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
8
8
|
import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
|
|
9
|
-
import { resolveOrderStage } from "./order-status.js";
|
|
9
|
+
import { resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
10
|
+
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
10
11
|
import { invoiceRoute } from "./order-progress.js";
|
|
11
12
|
import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
|
|
12
13
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
@@ -294,8 +295,11 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
294
295
|
try {
|
|
295
296
|
const ownRes = await supabase
|
|
296
297
|
.from("orders")
|
|
297
|
-
.select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, custom_fields, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
298
|
+
.select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, custom_fields, deleted_at, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
298
299
|
.eq("floriday_sales_order_id", data.id)
|
|
300
|
+
// Actieve order eerst; een verwijderde alleen als er geen actieve is.
|
|
301
|
+
.order("deleted_at", { ascending: true, nullsFirst: true })
|
|
302
|
+
.limit(1)
|
|
299
303
|
.maybeSingle();
|
|
300
304
|
const ownRow = ownRes.data ?? null;
|
|
301
305
|
// De order is leidend voor de belading. Ontbreekt hij in de cache-payload,
|
|
@@ -310,7 +314,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
310
314
|
status: ownRow ? ownRow.status : orderData?.status,
|
|
311
315
|
controlledAt: controlledAt,
|
|
312
316
|
isReservation: ownRow ? !!ownRow.is_reservation : false,
|
|
317
|
+
deleted: !!ownRow?.deleted_at,
|
|
318
|
+
backfill: orderStageNote({ customFields: ownRow?.custom_fields }) === "handled",
|
|
313
319
|
});
|
|
320
|
+
dto.stageNote = ownRow ? orderStageNote({ deletedAt: ownRow.deleted_at, customFields: ownRow.custom_fields }) : null;
|
|
314
321
|
dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
|
|
315
322
|
dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
|
|
316
323
|
// Zelfde factuurroute en ids als de lijst (salesorders-list.server).
|
|
@@ -320,7 +327,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
320
327
|
orderSource: ownRow?.order_source ?? "floriday",
|
|
321
328
|
});
|
|
322
329
|
dto.floridayFulfilled = Boolean((ownRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
323
|
-
dto.floridayExternalFulfilledAt = (ownRow?.custom_fields
|
|
330
|
+
dto.floridayExternalFulfilledAt = handledAtForDisplay(ownRow?.custom_fields);
|
|
324
331
|
{
|
|
325
332
|
const r = (ownRow?.custom_fields ?? {})?.customer_reference;
|
|
326
333
|
dto.customerReference = typeof r === "string" && r.trim() ? r.trim() : null;
|
|
@@ -515,7 +522,9 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
515
522
|
status: sLocal ? sLocal.status : sr.data?.status,
|
|
516
523
|
controlledAt: sr.controlled_at ?? null,
|
|
517
524
|
isReservation: sLocal ? !!sLocal.is_reservation : false,
|
|
525
|
+
backfill: orderStageNote({ customFields: sLocal?.custom_fields }) === "handled",
|
|
518
526
|
});
|
|
527
|
+
sDto.stageNote = sLocal ? orderStageNote({ customFields: sLocal.custom_fields }) : null;
|
|
519
528
|
sDto.floridayFulfilled = Boolean((sLocal?.custom_fields ?? {})?.floriday_fulfilled);
|
|
520
529
|
sDto.floridayExternalFulfilledIds = (sLocal?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
|
|
521
530
|
{
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface SyncMelding {
|
|
2
|
+
zichtbaar: boolean;
|
|
3
|
+
sinds?: string | null;
|
|
4
|
+
wachten?: number | null;
|
|
5
|
+
/** Nieuwe Floriday-orders komen als verwijderd binnen (soort verwijderd_binnen). */
|
|
6
|
+
verwijderd?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare const VERWIJDERD_MELDING = "Nieuwe orders worden als verwijderd opgeslagen; ze krijgen geen karindeling.";
|
|
9
|
+
/** Eén zin voor beheerders; technische details staan alleen in de installatiecontrole. */
|
|
10
|
+
export declare function syncMeldingTekst(m: SyncMelding | null | undefined, nu?: Date): string | null;
|
|
11
|
+
//# sourceMappingURL=sync-melding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-melding.d.ts","sourceRoot":"","sources":["../../src/lib/sync-melding.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oFAAoF;IACpF,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,kBAAkB,iFAAiF,CAAC;AAEjH,0FAA0F;AAC1F,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,EAAE,EAAE,GAAE,IAAiB,GAAG,MAAM,GAAG,IAAI,CAcxG"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { SyncMelding } from "./sync-melding.js";
|
|
2
|
+
/** Melding "Floriday-orders komen niet binnen": alleen admin/superadmin krijgen zichtbaar=true (besluit in de database). */
|
|
3
|
+
export declare const getVerkoopSyncMelding: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
4
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
5
|
+
userId: string;
|
|
6
|
+
claims: import("@supabase/auth-js").User;
|
|
7
|
+
}, undefined, undefined, undefined>], undefined, Promise<SyncMelding>>;
|
|
8
|
+
//# sourceMappingURL=sync-melding.functions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-melding.functions.d.ts","sourceRoot":"","sources":["../../src/lib/sync-melding.functions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,4HAA4H;AAC5H,eAAO,MAAM,qBAAqB;;;;sEAe9B,CAAC"}
|