@flowselections/floriday-verkoop-module 1.0.132 → 1.0.134
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 +4 -1
- package/dist-lib/components/verkoop/InvoiceSignoffSettings.d.ts +2 -0
- package/dist-lib/components/verkoop/InvoiceSignoffSettings.d.ts.map +1 -0
- package/dist-lib/components/verkoop/InvoiceSignoffSettings.js +31 -0
- package/dist-lib/components/verkoop/OrderInvoiceCard.d.ts +4 -0
- package/dist-lib/components/verkoop/OrderInvoiceCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/OrderInvoiceCard.js +62 -0
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +3 -2
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -2
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +2 -0
- package/dist-lib/integrations/supabase/types.d.ts +18 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/delivery-location.server.d.ts.map +1 -1
- package/dist-lib/lib/delivery-location.server.js +56 -13
- package/dist-lib/lib/erp-invoice-view.check.d.ts +2 -0
- package/dist-lib/lib/erp-invoice-view.check.d.ts.map +1 -0
- package/dist-lib/lib/erp-invoice-view.check.js +32 -0
- package/dist-lib/lib/erp-invoice-view.d.ts +29 -0
- package/dist-lib/lib/erp-invoice-view.d.ts.map +1 -0
- package/dist-lib/lib/erp-invoice-view.js +53 -0
- package/dist-lib/lib/invoice-release.check.d.ts +2 -0
- package/dist-lib/lib/invoice-release.check.d.ts.map +1 -0
- package/dist-lib/lib/invoice-release.check.js +21 -0
- package/dist-lib/lib/invoice-signoff-payload.check.d.ts +2 -0
- package/dist-lib/lib/invoice-signoff-payload.check.d.ts.map +1 -0
- package/dist-lib/lib/invoice-signoff-payload.check.js +27 -0
- package/dist-lib/lib/invoice-signoff-payload.d.ts +4 -0
- package/dist-lib/lib/invoice-signoff-payload.d.ts.map +1 -0
- package/dist-lib/lib/invoice-signoff-payload.js +5 -0
- package/dist-lib/lib/invoice-timing.d.ts +35 -0
- package/dist-lib/lib/invoice-timing.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.functions.d.ts +16 -2
- package/dist-lib/lib/invoice-timing.functions.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.functions.js +33 -2
- package/dist-lib/lib/invoice-timing.js +29 -0
- package/dist-lib/lib/invoice-timing.server.d.ts +19 -3
- package/dist-lib/lib/invoice-timing.server.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.server.js +75 -11
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/plan-coverage-v204.check.js +2 -0
- package/dist-lib/lib/plan-coverage.d.ts +9 -2
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +15 -3
- package/dist-lib/lib/product-oordeel.d.ts +12 -0
- package/dist-lib/lib/product-oordeel.d.ts.map +1 -0
- package/dist-lib/lib/product-oordeel.js +24 -0
- package/dist-lib/lib/product-plannable.functions.d.ts +2 -0
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +15 -9
- package/dist-lib/lib/salesorders-list.functions.d.ts +1 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +6 -1
- 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.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +4 -1
- package/package.json +1 -1
- package/schema/verkoop.sql +5 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Server-side toepassing van het instelbare factuurmoment.
|
|
2
|
-
import { DEFAULT_INVOICE_TIMING, computeInvoiceDueAt, normalizeTimeOfDay, } from "./invoice-timing.js";
|
|
3
|
-
/**
|
|
2
|
+
import { DEFAULT_INVOICE_TIMING, computeInvoiceDueAt, decideInvoiceRelease, normalizeTimeOfDay, } from "./invoice-timing.js";
|
|
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) {
|
|
6
6
|
const { data } = await supabase
|
|
@@ -20,6 +20,7 @@ export async function loadInvoiceTimingSettings(supabase) {
|
|
|
20
20
|
pickupOffsetDays: Number(data.pickup_offset_days ?? 0),
|
|
21
21
|
pickupBusinessDaysOnly: !!data.pickup_business_days_only,
|
|
22
22
|
pickupTimeOfDay: normalizeTimeOfDay(data.pickup_time_of_day),
|
|
23
|
+
invoiceWithoutSignoff: data.invoice_without_signoff === true,
|
|
23
24
|
};
|
|
24
25
|
}
|
|
25
26
|
function isSelfPickup(customFields) {
|
|
@@ -115,6 +116,7 @@ export async function recomputeInvoiceDueDates(supabase, options = {}) {
|
|
|
115
116
|
else {
|
|
116
117
|
query = query
|
|
117
118
|
.is("cancelled_at", null)
|
|
119
|
+
.is("invoice_ready_at", null)
|
|
118
120
|
.not("status", "in", `(${INVOICED_STATUSES.map((s) => `"${s}"`).join(",")})`)
|
|
119
121
|
.order("id", { ascending: true })
|
|
120
122
|
.limit(CHUNK);
|
|
@@ -150,37 +152,99 @@ export async function recomputeInvoiceDueDates(supabase, options = {}) {
|
|
|
150
152
|
}
|
|
151
153
|
return { updated, checked };
|
|
152
154
|
}
|
|
153
|
-
|
|
155
|
+
const MANUAL_DELIVERED = ["geleverd", "delivered", "verzonden", "shipped"];
|
|
156
|
+
/**
|
|
157
|
+
* Afmeldbronnen per order (alleen lezen):
|
|
158
|
+
* a. logistics_control_scan (order_id, cart_id, approved_at, status) — elke kar uit de
|
|
159
|
+
* Engine-indeling (logistics_order_plan_coverage[_list]) moet een goedgekeurde scan hebben.
|
|
160
|
+
* b. order_shipments.shipped_at, of voor FO verkoop_fulfillment_index (sales_order_id, niet is_deleted).
|
|
161
|
+
* c. orders.status handmatig op geleverd/verzonden.
|
|
162
|
+
*/
|
|
163
|
+
export async function loadSignoffs(supabase, rows) {
|
|
164
|
+
const ids = rows.map((r) => String(r.id));
|
|
165
|
+
const out = new Map();
|
|
166
|
+
if (!ids.length)
|
|
167
|
+
return out;
|
|
168
|
+
const sids = rows.map((r) => r.floriday_sales_order_id).filter(Boolean);
|
|
169
|
+
const [scans, ships, fi] = await Promise.all([
|
|
170
|
+
supabase.from("logistics_control_scan").select("order_id, cart_id, approved_at, status").in("order_id", ids),
|
|
171
|
+
supabase.from("order_shipments").select("order_id, shipped_at").in("order_id", ids).not("shipped_at", "is", null),
|
|
172
|
+
sids.length
|
|
173
|
+
? supabase.from("verkoop_fulfillment_index").select("sales_order_id").in("sales_order_id", sids).eq("is_deleted", false)
|
|
174
|
+
: Promise.resolve({ data: [] }),
|
|
175
|
+
]);
|
|
176
|
+
const { loadPlanCoverage } = await import("./plan-coverage.server.js");
|
|
177
|
+
const coverage = await loadPlanCoverage(supabase, ids, "list");
|
|
178
|
+
const approvedCarts = new Map();
|
|
179
|
+
for (const s of (scans.data ?? [])) {
|
|
180
|
+
if (!s.approved_at || s.status === "geannuleerd" || !s.cart_id)
|
|
181
|
+
continue;
|
|
182
|
+
const k = String(s.order_id);
|
|
183
|
+
if (!approvedCarts.has(k))
|
|
184
|
+
approvedCarts.set(k, new Set());
|
|
185
|
+
approvedCarts.get(k).add(String(s.cart_id));
|
|
186
|
+
}
|
|
187
|
+
const shipped = new Set((ships.data ?? []).map((x) => String(x.order_id)));
|
|
188
|
+
const reported = new Set((fi.data ?? []).map((x) => String(x.sales_order_id)));
|
|
189
|
+
for (const r of rows) {
|
|
190
|
+
const id = String(r.id);
|
|
191
|
+
const cov = coverage.get(id);
|
|
192
|
+
const known = !!cov && cov.state !== "onbekend";
|
|
193
|
+
const carts = known ? cov.carts.map((c) => c.cartId) : [];
|
|
194
|
+
const appr = approvedCarts.get(id) ?? new Set();
|
|
195
|
+
out.set(id, {
|
|
196
|
+
allCartsScanned: carts.length > 0 && carts.every((c) => appr.has(c)),
|
|
197
|
+
reportedOrShipped: shipped.has(id) || (!!r.floriday_sales_order_id && reported.has(r.floriday_sales_order_id)),
|
|
198
|
+
manualDelivered: MANUAL_DELIVERED.includes(String(r.status ?? "").trim().toLowerCase()),
|
|
199
|
+
hasCarts: known ? carts.length > 0 : null,
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
return out;
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Geeft orders vrij voor facturatie door orders.invoice_ready_at te vullen.
|
|
206
|
+
* Laat orders.status ONGEMOEID (de logistieke stand blijft zichtbaar).
|
|
207
|
+
*/
|
|
154
208
|
export async function releaseDueInvoices(supabase, limit = 200) {
|
|
155
209
|
const settings = await loadInvoiceTimingSettings(supabase);
|
|
156
210
|
if (!settings.enabled)
|
|
157
|
-
return { released: 0, orderIds: [] };
|
|
211
|
+
return { released: 0, waiting: 0, orderIds: [] };
|
|
212
|
+
const now = new Date();
|
|
158
213
|
const { data, error } = await supabase
|
|
159
214
|
.from("orders")
|
|
160
|
-
.select("id, status, order_source, floriday_sales_order_id")
|
|
215
|
+
.select("id, status, order_source, floriday_sales_order_id, invoice_due_at")
|
|
161
216
|
.is("deleted_at", null)
|
|
162
217
|
.is("cancelled_at", null)
|
|
218
|
+
.is("invoice_ready_at", null)
|
|
163
219
|
.not("invoice_due_at", "is", null)
|
|
164
|
-
.lte("invoice_due_at",
|
|
165
|
-
.neq("status", INVOICE_READY_STATUS)
|
|
220
|
+
.lte("invoice_due_at", now.toISOString())
|
|
166
221
|
.limit(limit);
|
|
167
222
|
if (error)
|
|
168
223
|
throw new Error(error.message);
|
|
169
224
|
const rows = (data ?? []).filter((r) => !r.floriday_sales_order_id &&
|
|
170
225
|
String(r.order_source ?? "").toLowerCase() !== "floriday");
|
|
226
|
+
const signoffs = await loadSignoffs(supabase, rows);
|
|
171
227
|
const orderIds = [];
|
|
228
|
+
let waiting = 0;
|
|
172
229
|
for (const r of rows) {
|
|
173
|
-
|
|
230
|
+
const so = signoffs.get(String(r.id));
|
|
231
|
+
if (!so)
|
|
232
|
+
continue;
|
|
233
|
+
const d = decideInvoiceRelease(r.invoice_due_at, now, so, !!settings.invoiceWithoutSignoff);
|
|
234
|
+
if (!d.release) {
|
|
235
|
+
waiting++;
|
|
236
|
+
continue;
|
|
237
|
+
}
|
|
174
238
|
const { data: done, error: upErr } = await supabase
|
|
175
239
|
.from("orders")
|
|
176
|
-
.update({
|
|
240
|
+
.update({ invoice_ready_at: now.toISOString(), invoice_ready_note: d.note })
|
|
177
241
|
.eq("id", r.id)
|
|
178
|
-
.
|
|
242
|
+
.is("invoice_ready_at", null)
|
|
179
243
|
.select("id");
|
|
180
244
|
if (!upErr && (done ?? []).length > 0)
|
|
181
245
|
orderIds.push(String(r.id));
|
|
182
246
|
}
|
|
183
|
-
return { released: orderIds.length, orderIds };
|
|
247
|
+
return { released: orderIds.length, waiting, orderIds };
|
|
184
248
|
}
|
|
185
249
|
/** Volledige cyclus: eerst herberekenen, daarna vrijgeven. */
|
|
186
250
|
export async function runInvoiceTimingCycle() {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.134";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -16,6 +16,8 @@ eq("layersUsed", c.lagen, 6.6);
|
|
|
16
16
|
eq("vulgraadPct", c.vulgraad, 83);
|
|
17
17
|
eq("bron", c.capaciteitBron, "product");
|
|
18
18
|
eq("tekst", cartSummary(c), "Deense container + 6 platen · 6,6 van 8 lagen (capaciteit van het product) · 83 %");
|
|
19
|
+
eq("geen dubbele tekst", cartSummary({ ...c, ladingdragerTekst: "Deense container + 6 platen (6,6 lagen, 83 %)" }), "Deense container + 6 platen · 6,6 van 8 lagen (capaciteit van het product) · 83 %");
|
|
20
|
+
eq("karTekst voorrang", cartSummary(parsePlanCoverage({ state: "ingedeeld", carts: [{ cartId: "k", karTekst: "7 lagen · DC + 6 platen · 86 %", maxLayers: 8, vulgraadPct: 86 }] }).carts[0]), "7 lagen · DC + 6 platen · 86 %");
|
|
19
21
|
eq("onbekende bron", parsePlanCoverage({ state: "ingedeeld", carts: [{ cartId: "k", capaciteitBron: "anders" }] }).carts[0].capaciteitBron, null);
|
|
20
22
|
eq("oude naam genegeerd", parsePlanCoverage({ state: "ingedeeld", carts: [{ cartId: "k", capaciteit: 5 }] }).carts[0].capaciteit, null);
|
|
21
23
|
eq("regels", cov.geenIndeling?.regels, ["a", "b"]);
|
|
@@ -24,6 +24,8 @@ export interface PlanCoverageCart {
|
|
|
24
24
|
additionalLayers: number | null;
|
|
25
25
|
/** Leesbare ladingdrager-tekst van de Engine (1.0.201+), bv. "Deense container + 1 plaat (2 lagen, 20 %)". */
|
|
26
26
|
ladingdragerTekst: string | null;
|
|
27
|
+
/** Volledige karregel van de Engine (carts[].karTekst); voorrang boven samengestelde tekst. */
|
|
28
|
+
karTekst: string | null;
|
|
27
29
|
/** Kar te hoog volgens de Engine (1.0.201+); null = niet geleverd. */
|
|
28
30
|
teHoog: boolean | null;
|
|
29
31
|
/** Blokkade op deze kar volgens de Engine (1.0.201+). */
|
|
@@ -105,8 +107,13 @@ export interface IndelingVerouderd {
|
|
|
105
107
|
}
|
|
106
108
|
/** Leest indelingVerouderd: null | { verouderd, producten[], vastliggendeKarren, tekst } (Engine 1.0.204). */
|
|
107
109
|
export declare function parseIndelingVerouderd(v: unknown): IndelingVerouderd | null;
|
|
108
|
-
/**
|
|
109
|
-
|
|
110
|
+
/**
|
|
111
|
+
* Eén karregel. Voorkeur: karTekst van de Engine. Anders samengesteld, maar lagen/% niet
|
|
112
|
+
* herhalen als ladingdragerTekst die al bevat (gaf dubbele tekst).
|
|
113
|
+
*/
|
|
114
|
+
export declare function cartSummary(c: Pick<PlanCoverageCart, "ladingdragerTekst" | "capaciteit" | "lagen" | "capaciteitBron" | "vulgraad"> & {
|
|
115
|
+
karTekst?: string | null;
|
|
116
|
+
}): string;
|
|
110
117
|
/** Lijst met korte tekstregels; alles anders genegeerd. */
|
|
111
118
|
export declare function parseRegels(v: unknown): string[];
|
|
112
119
|
/** Alleen interne paden binnen de shell; volledige adressen of "//host" worden genegeerd. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-coverage.d.ts","sourceRoot":"","sources":["../../src/lib/plan-coverage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plan-coverage.d.ts","sourceRoot":"","sources":["../../src/lib/plan-coverage.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,11 +33,22 @@ export function parseIndelingVerouderd(v) {
|
|
|
33
33
|
}
|
|
34
34
|
const intOrNull = (v) => (typeof v === "number" && Number.isInteger(v) && v >= 0 ? v : null);
|
|
35
35
|
const numOrNull = (v) => (typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : null);
|
|
36
|
-
/**
|
|
36
|
+
/**
|
|
37
|
+
* Eén karregel. Voorkeur: karTekst van de Engine. Anders samengesteld, maar lagen/% niet
|
|
38
|
+
* herhalen als ladingdragerTekst die al bevat (gaf dubbele tekst).
|
|
39
|
+
*/
|
|
37
40
|
export function cartSummary(c) {
|
|
41
|
+
if (c.karTekst)
|
|
42
|
+
return c.karTekst;
|
|
38
43
|
const parts = [];
|
|
39
|
-
|
|
40
|
-
|
|
44
|
+
let ldt = c.ladingdragerTekst ?? null;
|
|
45
|
+
const ldtHasInfo = !!ldt && /lagen|laag|%/.test(ldt);
|
|
46
|
+
if (ldt && ldtHasInfo && (c.capaciteit != null || c.vulgraad != null)) {
|
|
47
|
+
// Haal "(6,6 lagen, 83 %)" weg; we tonen lagen/% hieronder één keer.
|
|
48
|
+
ldt = ldt.replace(/\s*\([^)]*(lagen|laag|%)[^)]*\)\s*$/, "").trim() || null;
|
|
49
|
+
}
|
|
50
|
+
if (ldt)
|
|
51
|
+
parts.push(ldt);
|
|
41
52
|
if (c.capaciteit != null) {
|
|
42
53
|
const bron = c.capaciteitBron ? ` (capaciteit van ${c.capaciteitBron === "product" ? "het product" : "de ladingdrager"})` : "";
|
|
43
54
|
const lagen = c.lagen != null ? `${c.lagen.toLocaleString("nl-NL", { maximumFractionDigits: 1 })} van ` : "";
|
|
@@ -155,6 +166,7 @@ export function parsePlanCoverage(raw) {
|
|
|
155
166
|
carrierType: str(c.carrierType),
|
|
156
167
|
additionalLayers: parseAdditionalLayers(c.additionalLayers),
|
|
157
168
|
ladingdragerTekst: str(c.ladingdragerTekst),
|
|
169
|
+
karTekst: str(c.karTekst),
|
|
158
170
|
teHoog: typeof c.teHoog === "boolean" ? c.teHoog : null,
|
|
159
171
|
blokkade: parseBlokkade(c.blokkade),
|
|
160
172
|
capaciteitBron: c.capaciteitBron === "product" || c.capaciteitBron === "ladingdrager" ? c.capaciteitBron : null,
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export type OordeelRegelInput = {
|
|
2
|
+
productId: string;
|
|
3
|
+
plantsPerCrate: number | null;
|
|
4
|
+
cratesPerLayer: number | null;
|
|
5
|
+
layersPerCart: number | null;
|
|
6
|
+
carrierCode?: string | null;
|
|
7
|
+
};
|
|
8
|
+
/** p_regels voor logistics_product_oordeel_belading; carrier_code alleen als die er is, ongewijzigd. */
|
|
9
|
+
export declare function buildOordeelRegel(r: OordeelRegelInput): Record<string, unknown>;
|
|
10
|
+
export type OordeelKind = "blokkade" | "zacht" | null;
|
|
11
|
+
export declare function classifyOordeel(oordeel: unknown): OordeelKind;
|
|
12
|
+
//# sourceMappingURL=product-oordeel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"product-oordeel.d.ts","sourceRoot":"","sources":["../../src/lib/product-oordeel.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,wGAAwG;AACxG,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAU/E;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,IAAI,CAAC;AAEtD,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAK7D"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
// Client-veilige helpers voor het productoordeel van de Engine per orderregel.
|
|
2
|
+
// Verkoop beoordeelt nooit zelf; dit verdeelt alleen het Engine-oordeel over
|
|
3
|
+
// blokkade (onmogelijk) en zachte melding (mist_gegevens).
|
|
4
|
+
/** p_regels voor logistics_product_oordeel_belading; carrier_code alleen als die er is, ongewijzigd. */
|
|
5
|
+
export function buildOordeelRegel(r) {
|
|
6
|
+
const out = {
|
|
7
|
+
product_id: r.productId,
|
|
8
|
+
plants_per_crate: r.plantsPerCrate,
|
|
9
|
+
crates_per_layer: r.cratesPerLayer,
|
|
10
|
+
layers_per_cart: r.layersPerCart,
|
|
11
|
+
};
|
|
12
|
+
const code = typeof r.carrierCode === "string" ? r.carrierCode.trim() : "";
|
|
13
|
+
if (code)
|
|
14
|
+
out.carrier_code = r.carrierCode.trim();
|
|
15
|
+
return out;
|
|
16
|
+
}
|
|
17
|
+
export function classifyOordeel(oordeel) {
|
|
18
|
+
const o = String(oordeel ?? "").toLowerCase();
|
|
19
|
+
if (o === "onmogelijk")
|
|
20
|
+
return "blokkade";
|
|
21
|
+
if (o === "mist_gegevens")
|
|
22
|
+
return "zacht";
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
@@ -11,11 +11,13 @@ export declare const getProductPlannability: import("@tanstack/start-client-core
|
|
|
11
11
|
cratesPerLayer: number | null;
|
|
12
12
|
layersPerCart: number | null;
|
|
13
13
|
isDefault: boolean;
|
|
14
|
+
carrierCode?: string | null | undefined;
|
|
14
15
|
}[] | undefined;
|
|
15
16
|
}, Promise<{
|
|
16
17
|
impossible: Record<string, string>;
|
|
17
18
|
missing: Record<string, string>;
|
|
18
19
|
impossibleByLine: Record<string, string>;
|
|
20
|
+
missingByLine: Record<string, string>;
|
|
19
21
|
available: boolean;
|
|
20
22
|
oordeelAvailable: boolean;
|
|
21
23
|
perLine: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;;;;;;;;;;GAkF7B,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
// - missing: ontbrekende gegevens via logistics_product_maten.missing_reason.
|
|
8
8
|
import { createServerFn } from "@tanstack/react-start";
|
|
9
9
|
import { z } from "zod";
|
|
10
|
+
import { buildOordeelRegel, classifyOordeel } from "./product-oordeel.js";
|
|
10
11
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
11
12
|
export const getProductPlannability = createServerFn({ method: "POST" })
|
|
12
13
|
.middleware([requireSupabaseAuth])
|
|
@@ -22,6 +23,8 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
22
23
|
cratesPerLayer: z.number().int().positive().nullable(),
|
|
23
24
|
layersPerCart: z.number().int().positive().nullable(),
|
|
24
25
|
isDefault: z.boolean(),
|
|
26
|
+
/** Ladingdrager van de regel of standaardverpakking, ongewijzigd (Beheer- of Floriday-code). */
|
|
27
|
+
carrierCode: z.string().max(80).nullable().optional(),
|
|
25
28
|
}))
|
|
26
29
|
.max(200)
|
|
27
30
|
.optional(),
|
|
@@ -32,8 +35,10 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
32
35
|
const missing = {};
|
|
33
36
|
/** Oordeel per regel (sleutel = regels[].key). */
|
|
34
37
|
const impossibleByLine = {};
|
|
38
|
+
/** Zachte melding per regel (Engine-oordeel mist_gegevens), geen blokkade. */
|
|
39
|
+
const missingByLine = {};
|
|
35
40
|
if (!data.productIds.length)
|
|
36
|
-
return { impossible, missing, impossibleByLine, available: true, oordeelAvailable: true, perLine: false };
|
|
41
|
+
return { impossible, missing, impossibleByLine, missingByLine, available: true, oordeelAvailable: true, perLine: false };
|
|
37
42
|
const sb = context.supabase;
|
|
38
43
|
const regels = data.regels ?? [];
|
|
39
44
|
const [oordeel, maten, perRegel] = await Promise.all([
|
|
@@ -41,12 +46,7 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
41
46
|
sb.rpc("logistics_product_maten", { p_product_ids: data.productIds }),
|
|
42
47
|
regels.length
|
|
43
48
|
? sb.rpc("logistics_product_oordeel_belading", {
|
|
44
|
-
p_regels: regels.map((r) => (
|
|
45
|
-
product_id: r.productId,
|
|
46
|
-
plants_per_crate: r.plantsPerCrate,
|
|
47
|
-
crates_per_layer: r.cratesPerLayer,
|
|
48
|
-
layers_per_cart: r.layersPerCart,
|
|
49
|
-
})),
|
|
49
|
+
p_regels: regels.map((r) => buildOordeelRegel(r)),
|
|
50
50
|
})
|
|
51
51
|
: Promise.resolve({ data: null, error: { code: "SKIP" } }),
|
|
52
52
|
]);
|
|
@@ -59,7 +59,13 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
59
59
|
const regel = regels[i];
|
|
60
60
|
if (!regel || String(r?.product_id ?? "") !== regel.productId)
|
|
61
61
|
return;
|
|
62
|
-
|
|
62
|
+
const kind = classifyOordeel(r?.oordeel);
|
|
63
|
+
if (kind === "zacht") {
|
|
64
|
+
const t = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "";
|
|
65
|
+
missingByLine[regel.key] = t || (regel.carrierCode ? "gegevens ontbreken voor de Engine" : "ladingdrager ontbreekt");
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
if (kind !== "blokkade")
|
|
63
69
|
return;
|
|
64
70
|
const tekst = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "De Engine noemt deze belading onmogelijk.";
|
|
65
71
|
const extra = Array.isArray(r.regels) ? r.regels.filter((x) => typeof x === "string" && x.trim()) : [];
|
|
@@ -86,5 +92,5 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
86
92
|
missing[String(r.product_id)] = r.missing_reason.trim();
|
|
87
93
|
}
|
|
88
94
|
}
|
|
89
|
-
return { impossible, missing, impossibleByLine, available: !maten.error, oordeelAvailable: !oordeel.error, perLine };
|
|
95
|
+
return { impossible, missing, impossibleByLine, missingByLine, available: !maten.error, oordeelAvailable: !oordeel.error, perLine };
|
|
90
96
|
});
|
|
@@ -4,7 +4,7 @@ export declare const listSalesOrders: import("@tanstack/start-client-core").Opti
|
|
|
4
4
|
claims: import("@supabase/auth-js").User;
|
|
5
5
|
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
6
6
|
dateField: "ordered" | "delivery";
|
|
7
|
-
tab: "
|
|
7
|
+
tab: "picked" | "shipped" | "incoming" | "topick" | "cancelled" | "backlog" | "all" | "not_reported";
|
|
8
8
|
page: number;
|
|
9
9
|
pageSize: number;
|
|
10
10
|
since?: string | undefined;
|
|
@@ -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":"AAiBA,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,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,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,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;CACrB;AAqHD,wBAAgB,wBAAwB,SAIvC;AAkBD,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;AA8BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAutCrB;AA0DD,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 { invoiceStateLabel } from "./invoice-timing.js";
|
|
1
2
|
import { loadReviewDismissals, isReviewDismissed } from "./review-dismissals.server.js";
|
|
2
3
|
import { orderFust } from "./order-fust.js";
|
|
3
4
|
import { posOrNull } from "./packing-snapshot.js";
|
|
@@ -303,7 +304,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
303
304
|
return { environment, sellerFallback, foRows, truncated };
|
|
304
305
|
});
|
|
305
306
|
// 3) Lokale orders binnen hetzelfde venster.
|
|
306
|
-
const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, status_origin, status_changed_at, total, custom_fields, order_source, created_at, is_reservation, plan_locked_at, buffer_id, floriday_sales_order_id, floriday_order_group_key, order_items(id, product_id, product_name, source_line_key, quantity, unit, unit_price, quarantined_at, plants_per_crate, crates_per_layer, layers_per_cart, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
|
|
307
|
+
const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, status_origin, status_changed_at, total, custom_fields, order_source, created_at, is_reservation, invoice_due_at, invoice_ready_at, invoice_ready_note, plan_locked_at, buffer_id, floriday_sales_order_id, floriday_order_group_key, order_items(id, product_id, product_name, source_line_key, quantity, unit, unit_price, quarantined_at, plants_per_crate, crates_per_layer, layers_per_cart, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
|
|
307
308
|
const localTask = t.time("3_lokaal", async () => {
|
|
308
309
|
if (params.localOrderId) {
|
|
309
310
|
const primaryRes = await supabase
|
|
@@ -636,6 +637,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
636
637
|
controlledAt: r.controlled_at ?? (shipState?.picked ? "picked" : null),
|
|
637
638
|
isReservation: localRow ? !!localRow.is_reservation : false,
|
|
638
639
|
});
|
|
640
|
+
dto.invoiceState = localRow ? invoiceStateLabel(localRow) : null;
|
|
641
|
+
dto.invoiceNote = localRow?.invoice_ready_note ?? null;
|
|
639
642
|
dto.floridayFulfilled = Boolean((localRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
640
643
|
dto.notReportedToFloriday = isNotReportedLocally(dto.stage, dto.floridayFulfilled);
|
|
641
644
|
const reviewCf = (localRow?.custom_fields ?? {});
|
|
@@ -850,6 +853,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
850
853
|
...(r.delivery_date ? [] : ["geen leverdatum"]),
|
|
851
854
|
],
|
|
852
855
|
packingSource: localPackingSource,
|
|
856
|
+
invoiceState: invoiceStateLabel(r),
|
|
857
|
+
invoiceNote: r.invoice_ready_note ?? null,
|
|
853
858
|
floridayFulfilled: Boolean(cf.floriday_fulfilled),
|
|
854
859
|
floridayExternalFulfilledAt: cf.floriday_external_fulfilled_at ?? null,
|
|
855
860
|
floridayMissingLineKeyNotice: typeof cf.floriday_missing_line_key_notice === "string" ? cf.floriday_missing_line_key_notice : null,
|
|
@@ -38,6 +38,10 @@ export interface SalesOrderDTO {
|
|
|
38
38
|
totalPieces: number;
|
|
39
39
|
isLocal?: boolean;
|
|
40
40
|
isReservation?: boolean;
|
|
41
|
+
/** "factuur wacht op levering" / "klaar voor facturatie sinds …" (invoice-timing.ts). */
|
|
42
|
+
invoiceState?: string | null;
|
|
43
|
+
/** Toelichting bij vrijgave, bv. "geen afmelding gevonden, gefactureerd op leverdatum". */
|
|
44
|
+
invoiceNote?: string | null;
|
|
41
45
|
bufferId?: string | null;
|
|
42
46
|
bufferSize?: number;
|
|
43
47
|
bufferKey?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"
|
|
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;AAgC/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;CACjC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAkazB,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"}
|
|
@@ -2,6 +2,7 @@ import { unlinkedFloridayProducts } from "./floriday-unlinked-products.js";
|
|
|
2
2
|
// Sales orders sync (Floriday sequence-pattern) + write actions.
|
|
3
3
|
// Alle Floriday HTTP-calls lopen via floriday-gateway.server.
|
|
4
4
|
import { createServerFn } from "@tanstack/react-start";
|
|
5
|
+
import { invoiceStateLabel } from "./invoice-timing.js";
|
|
5
6
|
import { z } from "zod";
|
|
6
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
7
8
|
import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
|
|
@@ -290,7 +291,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
290
291
|
try {
|
|
291
292
|
const ownRes = await supabase
|
|
292
293
|
.from("orders")
|
|
293
|
-
.select("id, buffer_id, status, is_reservation, custom_fields, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
294
|
+
.select("id, buffer_id, status, is_reservation, 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)")
|
|
294
295
|
.eq("floriday_sales_order_id", data.id)
|
|
295
296
|
.maybeSingle();
|
|
296
297
|
const ownRow = ownRes.data ?? null;
|
|
@@ -307,6 +308,8 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
307
308
|
controlledAt: controlledAt,
|
|
308
309
|
isReservation: ownRow ? !!ownRow.is_reservation : false,
|
|
309
310
|
});
|
|
311
|
+
dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
|
|
312
|
+
dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
|
|
310
313
|
dto.floridayFulfilled = Boolean((ownRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
311
314
|
dto.floridayExternalFulfilledAt = (ownRow?.custom_fields ?? {})?.floriday_external_fulfilled_at ?? null;
|
|
312
315
|
{
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -156,6 +156,11 @@ ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS pickup_busin
|
|
|
156
156
|
ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS pickup_time_of_day time without time zone DEFAULT '18:00:00'::time without time zone;
|
|
157
157
|
ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS created_at timestamp with time zone DEFAULT now();
|
|
158
158
|
ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS updated_at timestamp with time zone DEFAULT now();
|
|
159
|
+
ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS invoice_without_signoff boolean NOT NULL DEFAULT false;
|
|
160
|
+
-- Gedeeld met Facturatie: definitie exact gelijk houden (timestamptz, geen standaardwaarde).
|
|
161
|
+
ALTER TABLE public.orders ADD COLUMN IF NOT EXISTS invoice_ready_at timestamptz;
|
|
162
|
+
ALTER TABLE public.orders ADD COLUMN IF NOT EXISTS invoice_ready_note text;
|
|
163
|
+
CREATE INDEX IF NOT EXISTS orders_invoice_due_pending_idx ON public.orders (invoice_due_at) WHERE invoice_ready_at IS NULL AND deleted_at IS NULL AND cancelled_at IS NULL;
|
|
159
164
|
CREATE TABLE IF NOT EXISTS public.job_locks (
|
|
160
165
|
lock_key text NOT NULL,
|
|
161
166
|
locked_until timestamp with time zone NOT NULL,
|