@flowselections/floriday-verkoop-module 1.0.166 → 1.0.167
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 +132 -25
- 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/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +1 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +9 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +21 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +13 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +26 -4
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +8 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.js +107 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +19 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.js +26 -0
- package/dist-lib/integrations/supabase/types.d.ts +1139 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.d.ts +13 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.js +41 -0
- package/dist-lib/lib/create-order-form.d.ts +7 -1
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +17 -1
- package/dist-lib/lib/create-order.functions.d.ts +10 -7
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +88 -16
- package/dist-lib/lib/departure-preview.functions.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.functions.js +3 -1
- package/dist-lib/lib/floriday-carrier-notice.d.ts +28 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.js +44 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts +8 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.server.js +57 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +15 -11
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +58 -42
- package/dist-lib/lib/kar-handmatig.d.ts +5 -0
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +21 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts +20 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts.map +1 -0
- package/dist-lib/lib/order-bijwerken.server.js +31 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +33 -23
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +4 -13
- package/dist-lib/lib/order-cf-merge.d.ts +17 -0
- package/dist-lib/lib/order-cf-merge.d.ts.map +1 -0
- package/dist-lib/lib/order-cf-merge.js +51 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +20 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +26 -5
- package/dist-lib/lib/order-line-extras.d.ts +94 -0
- package/dist-lib/lib/order-line-extras.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts +55 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.js +117 -0
- package/dist-lib/lib/order-line-extras.js +171 -0
- package/dist-lib/lib/order-nav.d.ts +8 -0
- package/dist-lib/lib/order-nav.d.ts.map +1 -1
- package/dist-lib/lib/order-nav.js +13 -0
- package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-pickup.functions.js +5 -9
- package/dist-lib/lib/order-status.d.ts +9 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +8 -0
- package/dist-lib/lib/order-transport.functions.d.ts +9 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.functions.js +21 -3
- package/dist-lib/lib/order-transport.server.d.ts +1 -0
- package/dist-lib/lib/order-transport.server.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.server.js +15 -1
- package/dist-lib/lib/own-transport.d.ts +6 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +12 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -2
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +7 -2
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.js +2 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.js +7 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.js +5 -0
- package/dist-lib/lib/voorraad-vrij.d.ts +19 -0
- package/dist-lib/lib/voorraad-vrij.d.ts.map +1 -0
- package/dist-lib/lib/voorraad-vrij.js +34 -0
- package/package.json +4 -4
- package/schema/verkoop.sql +560 -0
|
@@ -646,21 +646,16 @@ async function mirrorUnlocked(limit, since, onlyIds = null, backfill = null) {
|
|
|
646
646
|
if (lErr)
|
|
647
647
|
throw new Error(`samenvoeglog schrijven: ${lErr.message}`);
|
|
648
648
|
if (ids.length > 0) {
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
.maybeSingle();
|
|
654
|
-
const cf = (o?.custom_fields ?? {});
|
|
655
|
-
await supabaseAdmin.from("orders")
|
|
656
|
-
.update({
|
|
657
|
-
custom_fields: {
|
|
658
|
-
...cf,
|
|
649
|
+
// Samenvoegen in de database (nooit custom_fields vervangen).
|
|
650
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
651
|
+
const qr = await orderBijwerken(supabaseAdmin, args.orderId, {
|
|
652
|
+
zet: {
|
|
659
653
|
needs_manual_review: true,
|
|
660
654
|
manual_review_reason: `${ids.length} orderregel(s) in quarantaine: ${args.reason}`,
|
|
661
655
|
},
|
|
662
|
-
})
|
|
663
|
-
|
|
656
|
+
});
|
|
657
|
+
if (!qr.ok)
|
|
658
|
+
console.error(`[floriday-mirror] quarantainemelding op order ${args.orderId} niet gezet: ${qr.fout}`);
|
|
664
659
|
}
|
|
665
660
|
};
|
|
666
661
|
// Terugkerend falen per Floriday-bestelling, om zichtbaar te markeren.
|
|
@@ -827,22 +822,28 @@ async function mirrorUnlocked(limit, since, onlyIds = null, backfill = null) {
|
|
|
827
822
|
continue; // niets door de koper gewijzigd
|
|
828
823
|
if (cf.floriday_change_signature === signature)
|
|
829
824
|
continue; // al gemeld
|
|
830
|
-
|
|
831
|
-
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
|
|
825
|
+
let revErr = null;
|
|
826
|
+
try {
|
|
827
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
828
|
+
const rv = await orderBijwerken(supabaseAdmin, String(fo.id), {
|
|
829
|
+
kolommen: { updated_at: new Date().toISOString() },
|
|
830
|
+
zet: {
|
|
831
|
+
floriday_change_after_completion: true,
|
|
832
|
+
floriday_change_detected_at: new Date().toISOString(),
|
|
833
|
+
floriday_change_signature: signature,
|
|
834
|
+
needs_manual_review: true,
|
|
835
|
+
floriday_change_summary: changes,
|
|
836
|
+
manual_review_reason: `Wijziging door de koper na afronding: ${changes.join("; ")} — handmatige beoordeling nodig`,
|
|
837
|
+
},
|
|
838
|
+
});
|
|
839
|
+
if (!rv.ok)
|
|
840
|
+
revErr = rv.fout;
|
|
841
|
+
}
|
|
842
|
+
catch (e) {
|
|
843
|
+
revErr = e.message;
|
|
844
|
+
}
|
|
844
845
|
if (revErr) {
|
|
845
|
-
console.warn(`[floriday-mirror] beoordelingsmarkering zetten faalde voor ${fo.id}: ${revErr
|
|
846
|
+
console.warn(`[floriday-mirror] beoordelingsmarkering zetten faalde voor ${fo.id}: ${revErr}`);
|
|
846
847
|
}
|
|
847
848
|
}
|
|
848
849
|
skipped += group.length;
|
|
@@ -1083,24 +1084,31 @@ async function mirrorUnlocked(limit, since, onlyIds = null, backfill = null) {
|
|
|
1083
1084
|
orderId = target.id;
|
|
1084
1085
|
handledOrderIds.add(orderId);
|
|
1085
1086
|
if (changedKeys.length > 0) {
|
|
1086
|
-
// Alleen gewijzigde velden
|
|
1087
|
-
//
|
|
1088
|
-
|
|
1089
|
-
|
|
1087
|
+
// Alleen gewijzigde velden; custom_fields alleen als verschil en in de
|
|
1088
|
+
// database samengevoegd (jsonb ||, nooit vervangen; transporteurvelden
|
|
1089
|
+
// van de Floriday-koppeling blijven staan). Is in de database niets
|
|
1090
|
+
// anders, dan schrijft verkoop_order_bijwerken niets.
|
|
1091
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
1092
|
+
const kolommen = {};
|
|
1090
1093
|
for (const k of changedKeys)
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
.
|
|
1096
|
-
|
|
1097
|
-
|
|
1094
|
+
if (k !== "custom_fields")
|
|
1095
|
+
kolommen[k] = patch[k];
|
|
1096
|
+
const res = await orderBijwerken(supabaseAdmin, orderId, {
|
|
1097
|
+
kolommen,
|
|
1098
|
+
...(changedKeys.includes("custom_fields")
|
|
1099
|
+
? { vorigeCf: target.custom_fields ?? {}, nieuweCf: mergedCf }
|
|
1100
|
+
: {}),
|
|
1101
|
+
});
|
|
1102
|
+
if (!res.ok)
|
|
1103
|
+
throw new Error(`order ${orderId} niet bijgewerkt (${res.fout})`);
|
|
1098
1104
|
updated++;
|
|
1099
1105
|
changedOrderIds.push(orderId);
|
|
1100
1106
|
for (const k of changedKeys)
|
|
1101
1107
|
noteChange(orderId, k);
|
|
1102
1108
|
// Volgende bestelling in dezelfde ronde ziet de net geschreven waarden.
|
|
1103
1109
|
Object.assign(target, patch);
|
|
1110
|
+
if (res.customFields)
|
|
1111
|
+
target.custom_fields = res.customFields;
|
|
1104
1112
|
}
|
|
1105
1113
|
else {
|
|
1106
1114
|
unchanged++;
|
|
@@ -1411,6 +1419,7 @@ async function mirrorUnlocked(limit, since, onlyIds = null, backfill = null) {
|
|
|
1411
1419
|
if (!row)
|
|
1412
1420
|
continue;
|
|
1413
1421
|
const cf = { ...(row.custom_fields ?? {}) };
|
|
1422
|
+
const vorigeCf = { ...cf };
|
|
1414
1423
|
const failures = { ...(cf.mirror_failures ?? {}) };
|
|
1415
1424
|
const prev = failures[foId];
|
|
1416
1425
|
const prevCount = Number(prev?.count ?? 0);
|
|
@@ -1424,11 +1433,18 @@ async function mirrorUnlocked(limit, since, onlyIds = null, backfill = null) {
|
|
|
1424
1433
|
cf.manual_review_source = "mirror_failure";
|
|
1425
1434
|
cf.manual_review_reason = `Floriday-wijziging kan niet worden verwerkt: ${msg.slice(0, 160)}`;
|
|
1426
1435
|
}
|
|
1427
|
-
|
|
1428
|
-
|
|
1429
|
-
|
|
1436
|
+
let fErr = null;
|
|
1437
|
+
try {
|
|
1438
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
1439
|
+
const fr = await orderBijwerken(supabaseAdmin, String(row.id), { vorigeCf, nieuweCf: cf });
|
|
1440
|
+
if (!fr.ok)
|
|
1441
|
+
fErr = fr.fout;
|
|
1442
|
+
}
|
|
1443
|
+
catch (e) {
|
|
1444
|
+
fErr = e.message;
|
|
1445
|
+
}
|
|
1430
1446
|
if (fErr)
|
|
1431
|
-
console.warn(`[floriday-mirror] foutteller bijwerken faalde voor ${row.id}: ${fErr
|
|
1447
|
+
console.warn(`[floriday-mirror] foutteller bijwerken faalde voor ${row.id}: ${fErr}`);
|
|
1432
1448
|
}
|
|
1433
1449
|
// Annuleringen uit Floriday afhandelen (koppelprompt 1.0.77).
|
|
1434
1450
|
// Afgehandeld in Floriday (buiten het ERP om) — na de ronde, per order.
|
|
@@ -49,4 +49,9 @@ export interface RouterMetMatch {
|
|
|
49
49
|
getMatchedRoutes?: (pathname: string) => unknown;
|
|
50
50
|
}
|
|
51
51
|
export declare function artikelPad(router: RouterMetMatch | null | undefined, productId: string | null | undefined): string | null;
|
|
52
|
+
/**
|
|
53
|
+
* Interne link naar de klantpagina in de module Klanten (/klanten/$id), voor
|
|
54
|
+
* "Sticker toevoegen". Alleen als die route in de shell bestaat; anders null.
|
|
55
|
+
*/
|
|
56
|
+
export declare function klantPad(router: RouterMetMatch | null | undefined, customerId: string | null | undefined): string | null;
|
|
52
57
|
//# sourceMappingURL=kar-handmatig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kar-handmatig.d.ts","sourceRoot":"","sources":["../../src/lib/kar-handmatig.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,OAAO;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAID,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAShF;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,qBAAqB,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,GAAG,IAAI,CAG/H;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,IAAI,CAG9E;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAE9D;AAED,eAAO,MAAM,iBAAiB,yFAAyF,CAAC;AAExH,oGAAoG;AACpG,wBAAgB,YAAY,CAAC,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;SAAE,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,GAAG,MAAM,EAAE,CAI7H;AAED,gHAAgH;AAChH,wBAAgB,MAAM,CAAC,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,MAAM,CAOjI;AAED,+FAA+F;AAC/F,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAM3E;AAaD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG5F;AAED,MAAM,WAAW,UAAU;IAAG,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAEhH,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAIjF;AAED,wEAAwE;AACxE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAQrD;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AACD,wBAAgB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAiBzH"}
|
|
1
|
+
{"version":3,"file":"kar-handmatig.d.ts","sourceRoot":"","sources":["../../src/lib/kar-handmatig.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,OAAO;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAID,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAShF;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,qBAAqB,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,GAAG,IAAI,CAG/H;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,IAAI,CAG9E;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAE9D;AAED,eAAO,MAAM,iBAAiB,yFAAyF,CAAC;AAExH,oGAAoG;AACpG,wBAAgB,YAAY,CAAC,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;SAAE,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,GAAG,MAAM,EAAE,CAI7H;AAED,gHAAgH;AAChH,wBAAgB,MAAM,CAAC,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,MAAM,CAOjI;AAED,+FAA+F;AAC/F,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAM3E;AAaD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG5F;AAED,MAAM,WAAW,UAAU;IAAG,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAEhH,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAIjF;AAED,wEAAwE;AACxE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAQrD;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AACD,wBAAgB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAiBzH;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAiBxH"}
|
|
@@ -104,3 +104,24 @@ export function artikelPad(router, productId) {
|
|
|
104
104
|
return null;
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Interne link naar de klantpagina in de module Klanten (/klanten/$id), voor
|
|
109
|
+
* "Sticker toevoegen". Alleen als die route in de shell bestaat; anders null.
|
|
110
|
+
*/
|
|
111
|
+
export function klantPad(router, customerId) {
|
|
112
|
+
if (!customerId)
|
|
113
|
+
return null;
|
|
114
|
+
if (!router || typeof router.getMatchedRoutes !== "function")
|
|
115
|
+
return null;
|
|
116
|
+
const pad = `/klanten/${encodeURIComponent(customerId)}`;
|
|
117
|
+
try {
|
|
118
|
+
const res = router.getMatchedRoutes(pad);
|
|
119
|
+
const found = Array.isArray(res) ? res[2] : res?.foundRoute;
|
|
120
|
+
const full = found?.fullPath ?? "";
|
|
121
|
+
return /^\/klanten\/\$[^/]+\/?$/.test(full) ? pad : null;
|
|
122
|
+
}
|
|
123
|
+
catch (e) {
|
|
124
|
+
console.error("[verkoop] klantPad: route-controle mislukt", e);
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { type CfWijziging } from "./order-cf-merge.js";
|
|
2
|
+
export type OrderBijwerkenInvoer = {
|
|
3
|
+
/** Gewone kolommen (alleen de toegestane lijst in verkoop_order_bijwerken). */
|
|
4
|
+
kolommen?: Record<string, unknown>;
|
|
5
|
+
/** Gelezen custom_fields + gewenste custom_fields: alleen het verschil gaat mee. */
|
|
6
|
+
vorigeCf?: Record<string, unknown> | null;
|
|
7
|
+
nieuweCf?: Record<string, unknown> | null;
|
|
8
|
+
/** Of direct: sleutels zetten / wissen. */
|
|
9
|
+
zet?: Record<string, unknown>;
|
|
10
|
+
weg?: string[];
|
|
11
|
+
};
|
|
12
|
+
export type OrderBijwerkenUitkomst = {
|
|
13
|
+
ok: boolean;
|
|
14
|
+
gewijzigd: boolean;
|
|
15
|
+
fout: string | null;
|
|
16
|
+
customFields: Record<string, any> | null;
|
|
17
|
+
};
|
|
18
|
+
export declare function wijzigingUitInvoer(inv: OrderBijwerkenInvoer): CfWijziging;
|
|
19
|
+
export declare function orderBijwerken(client: any, orderId: string, inv: OrderBijwerkenInvoer): Promise<OrderBijwerkenUitkomst>;
|
|
20
|
+
//# sourceMappingURL=order-bijwerken.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-bijwerken.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-bijwerken.server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgC,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAElF,MAAM,MAAM,oBAAoB,GAAG;IACjC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,oFAAoF;IACpF,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1C,2CAA2C;IAC3C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,oBAAoB,GAAG,WAAW,CAGzE;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,sBAAsB,CAAC,CAkBjC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
// Server-only: ordervelden en custom_fields bijwerken via verkoop_order_bijwerken.
|
|
2
|
+
// custom_fields worden in de database samengevoegd (jsonb ||), nooit vervangen;
|
|
3
|
+
// transporteurvelden van de Floriday-koppeling blijven altijd staan.
|
|
4
|
+
// Een ontbrekende functie is een echte fout: nooit terugvallen op vervangen.
|
|
5
|
+
import { cfWijziging, zonderBeschermd } from "./order-cf-merge.js";
|
|
6
|
+
export function wijzigingUitInvoer(inv) {
|
|
7
|
+
const basis = inv.nieuweCf !== undefined ? cfWijziging(inv.vorigeCf ?? {}, inv.nieuweCf ?? {}) : { zet: {}, weg: [] };
|
|
8
|
+
return zonderBeschermd({ zet: { ...basis.zet, ...(inv.zet ?? {}) }, weg: [...basis.weg, ...(inv.weg ?? [])] });
|
|
9
|
+
}
|
|
10
|
+
export async function orderBijwerken(client, orderId, inv) {
|
|
11
|
+
const w = wijzigingUitInvoer(inv);
|
|
12
|
+
const kolommen = {};
|
|
13
|
+
for (const [k, v] of Object.entries(inv.kolommen ?? {}))
|
|
14
|
+
if (v !== undefined)
|
|
15
|
+
kolommen[k] = v;
|
|
16
|
+
const { data, error } = await client.rpc("verkoop_order_bijwerken", {
|
|
17
|
+
p_order_id: orderId,
|
|
18
|
+
p_kolommen: kolommen,
|
|
19
|
+
p_cf_zet: w.zet,
|
|
20
|
+
p_cf_weg: w.weg,
|
|
21
|
+
});
|
|
22
|
+
if (error)
|
|
23
|
+
throw new Error(`Order bijwerken mislukt: ${error.message}`);
|
|
24
|
+
const res = (data ?? {});
|
|
25
|
+
return {
|
|
26
|
+
ok: res.ok === true,
|
|
27
|
+
gewijzigd: res.gewijzigd === true,
|
|
28
|
+
fout: res.ok === true ? null : String(res.fout ?? "onbekend"),
|
|
29
|
+
customFields: res.custom_fields ?? null,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-cancel.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-cancel.server.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,GAAG,EACP,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,WAAW,CAAC,CASxC;AAED,oFAAoF;AACpF,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,yFAAyF;IACzF,MAAM,EAAE,GAAG,CAAC;IACZ,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,CAAA;CAAE,CAAC,CA2D/H;AAED,eAAO,MAAM,sBAAsB,wCAAwC,CAAC;AAC5E,eAAO,MAAM,8BAA8B,6DACiB,CAAC;AAE7D;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,gBAAgB,GAAG,cAAc,GAAG,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"order-cancel.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-cancel.server.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,GAAG,EACP,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,WAAW,CAAC,CASxC;AAED,oFAAoF;AACpF,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,yFAAyF;IACzF,MAAM,EAAE,GAAG,CAAC;IACZ,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,CAAA;CAAE,CAAC,CA2D/H;AAED,eAAO,MAAM,sBAAsB,wCAAwC,CAAC;AAC5E,eAAO,MAAM,8BAA8B,6DACiB,CAAC;AAE7D;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,gBAAgB,GAAG,cAAc,GAAG,mBAAmB,CAAC,CAqFhF"}
|
|
@@ -123,39 +123,49 @@ export async function handleFloridayCancellation(orderId) {
|
|
|
123
123
|
const reason = picked === true
|
|
124
124
|
? FLORIDAY_CANCEL_PICKED_MESSAGE
|
|
125
125
|
: `${FLORIDAY_CANCEL_REASON}; pickstand onbekend bij de Logistiek Engine — niet geannuleerd`;
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
126
|
+
// Samenvoegen in de database (jsonb ||), nooit custom_fields vervangen.
|
|
127
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
128
|
+
const mr = await orderBijwerken(supabaseAdmin, orderId, {
|
|
129
|
+
kolommen: { updated_at: new Date().toISOString() },
|
|
130
|
+
zet: {
|
|
130
131
|
needs_manual_review: true,
|
|
131
132
|
manual_review_source: "floriday_cancel",
|
|
132
133
|
manual_review_reason: reason,
|
|
133
134
|
floriday_change_detected_at: new Date().toISOString(),
|
|
134
135
|
},
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
.
|
|
136
|
+
});
|
|
137
|
+
if (!mr.ok)
|
|
138
|
+
console.error(`[floriday-cancel] beoordelingsmelding op order ${orderId} niet gezet: ${mr.fout}`);
|
|
138
139
|
return picked === true ? "already_picked" : "pick_unknown";
|
|
139
140
|
}
|
|
140
141
|
// Geen gebruiker bij een annulering uit Floriday (minuutronde): beheerclient.
|
|
141
142
|
await voorraadOrderTerugdraaien(supabaseAdmin, orderId, `Bestelling geannuleerd — ${FLORIDAY_CANCEL_REASON}`);
|
|
142
|
-
const {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
143
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
144
|
+
let uErr = null;
|
|
145
|
+
try {
|
|
146
|
+
const cr = await orderBijwerken(supabaseAdmin, orderId, {
|
|
147
|
+
kolommen: {
|
|
148
|
+
status: CANCELLED_STATUS,
|
|
149
|
+
cancelled_at: new Date().toISOString(),
|
|
150
|
+
cancel_reason: FLORIDAY_CANCEL_REASON,
|
|
151
|
+
invoice_due_at: null,
|
|
152
|
+
buffer_id: null,
|
|
153
|
+
status_sync_token: globalThis.crypto.randomUUID(),
|
|
154
|
+
},
|
|
155
|
+
// Samenvoegen in de database (jsonb ||), nooit custom_fields vervangen.
|
|
156
|
+
zet: {
|
|
157
|
+
floriday_cancelled_at: new Date().toISOString(),
|
|
158
|
+
floriday_cancel_notice: FLORIDAY_CANCEL_REASON,
|
|
159
|
+
},
|
|
160
|
+
});
|
|
161
|
+
if (!cr.ok)
|
|
162
|
+
uErr = cr.fout;
|
|
163
|
+
}
|
|
164
|
+
catch (e) {
|
|
165
|
+
uErr = e.message;
|
|
166
|
+
}
|
|
157
167
|
if (uErr)
|
|
158
|
-
throw stockError(`Annuleren faalde: ${uErr
|
|
168
|
+
throw stockError(`Annuleren faalde: ${uErr}`);
|
|
159
169
|
try {
|
|
160
170
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
161
171
|
await notifyEngineOrder(orderId, "order.changed", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-carrier.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-carrier.functions.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAqBD,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;GAsB7B,CAAC;AAEL,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;
|
|
1
|
+
{"version":3,"file":"order-carrier.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-carrier.functions.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAqBD,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;GAsB7B,CAAC;AAEL,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;GAoE7B,CAAC"}
|
|
@@ -94,19 +94,10 @@ export const setOrderCarrier = createServerFn({ method: "POST" })
|
|
|
94
94
|
legacyMode = true;
|
|
95
95
|
}
|
|
96
96
|
// Oude Engine: bestaande opslag als terugval.
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
delete cf.carrier;
|
|
102
|
-
const { data: updated, error } = await supabase
|
|
103
|
-
.from("orders")
|
|
104
|
-
.update({ custom_fields: cf })
|
|
105
|
-
.eq("id", t.id)
|
|
106
|
-
.select("id");
|
|
107
|
-
if (error)
|
|
108
|
-
throw new Error(error.message);
|
|
109
|
-
assertRowsAffected(updated, "Vervoerder opslaan");
|
|
97
|
+
// Alleen de sleutel carrier, samengevoegd in de database (nooit custom_fields vervangen).
|
|
98
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
99
|
+
const res = await orderBijwerken(supabase, t.id, data.carrierId ? { zet: { carrier: data.carrierId } } : { weg: ["carrier"] });
|
|
100
|
+
assertRowsAffected(res.ok ? [t.id] : [], "Vervoerder opslaan");
|
|
110
101
|
results.push({ orderId: t.id, orderNumber: t.order_number, ok: true, error: null });
|
|
111
102
|
}
|
|
112
103
|
catch (e) {
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/** Transporteurvelden die de Floriday-koppeling schrijft; Verkoop zet of wist ze nooit. */
|
|
2
|
+
export declare const FLORIDAY_CARRIER_CF_KEYS: readonly ["floriday_carrier_gln", "floriday_carrier_name", "floriday_carrier_organization_id"];
|
|
3
|
+
export type CfWijziging = {
|
|
4
|
+
zet: Record<string, unknown>;
|
|
5
|
+
weg: string[];
|
|
6
|
+
};
|
|
7
|
+
/** Zonder beschermde sleutels (ook als iemand ze per ongeluk meegeeft). */
|
|
8
|
+
export declare function zonderBeschermd(w: CfWijziging): CfWijziging;
|
|
9
|
+
/**
|
|
10
|
+
* Verschil tussen de gelezen custom_fields en de gewenste: alleen gewijzigde of
|
|
11
|
+
* nieuwe sleutels in `zet`, verdwenen sleutels in `weg`. Beschermde sleutels nooit.
|
|
12
|
+
*/
|
|
13
|
+
export declare function cfWijziging(vorige: Record<string, unknown> | null | undefined, gewenst: Record<string, unknown> | null | undefined): CfWijziging;
|
|
14
|
+
/** Zelfde samenvoeging als de database: (cf - weg) || zet, beschermde sleutels ongemoeid. */
|
|
15
|
+
export declare function pasCfWijzigingToe(huidig: Record<string, unknown> | null | undefined, w: CfWijziging): Record<string, unknown>;
|
|
16
|
+
export declare const isLeegCfWijziging: (w: CfWijziging) => boolean;
|
|
17
|
+
//# sourceMappingURL=order-cf-merge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-cf-merge.d.ts","sourceRoot":"","sources":["../../src/lib/order-cf-merge.ts"],"names":[],"mappings":"AAOA,2FAA2F;AAC3F,eAAO,MAAM,wBAAwB,gGAI3B,CAAC;AAIX,MAAM,MAAM,WAAW,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE1E,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAI3D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAClD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAClD,WAAW,CAab;AAED,6FAA6F;AAC7F,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAClD,CAAC,EAAE,WAAW,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKzB;AAED,eAAO,MAAM,iBAAiB,GAAI,GAAG,WAAW,YAA0D,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
// Bijwerken van orders.custom_fields: altijd samenvoegen (jsonb ||), nooit vervangen.
|
|
2
|
+
// Alleen de sleutels die echt anders zijn gaan naar de database; daar worden ze
|
|
3
|
+
// in één keer samengevoegd met de actuele rij (verkoop_order_bijwerken), zodat
|
|
4
|
+
// sleutels van andere modules die intussen zijn geschreven blijven staan.
|
|
5
|
+
// Pure code, veilig voor scherm en server.
|
|
6
|
+
import { sameJson } from "./order-patch.js";
|
|
7
|
+
/** Transporteurvelden die de Floriday-koppeling schrijft; Verkoop zet of wist ze nooit. */
|
|
8
|
+
export const FLORIDAY_CARRIER_CF_KEYS = [
|
|
9
|
+
"floriday_carrier_gln",
|
|
10
|
+
"floriday_carrier_name",
|
|
11
|
+
"floriday_carrier_organization_id",
|
|
12
|
+
];
|
|
13
|
+
const BESCHERMD = new Set(FLORIDAY_CARRIER_CF_KEYS);
|
|
14
|
+
/** Zonder beschermde sleutels (ook als iemand ze per ongeluk meegeeft). */
|
|
15
|
+
export function zonderBeschermd(w) {
|
|
16
|
+
const zet = {};
|
|
17
|
+
for (const [k, v] of Object.entries(w.zet))
|
|
18
|
+
if (!BESCHERMD.has(k) && v !== undefined)
|
|
19
|
+
zet[k] = v;
|
|
20
|
+
return { zet, weg: Array.from(new Set(w.weg.filter((k) => !BESCHERMD.has(k) && !(k in zet)))) };
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Verschil tussen de gelezen custom_fields en de gewenste: alleen gewijzigde of
|
|
24
|
+
* nieuwe sleutels in `zet`, verdwenen sleutels in `weg`. Beschermde sleutels nooit.
|
|
25
|
+
*/
|
|
26
|
+
export function cfWijziging(vorige, gewenst) {
|
|
27
|
+
const prev = (vorige ?? {});
|
|
28
|
+
const next = (gewenst ?? {});
|
|
29
|
+
const zet = {};
|
|
30
|
+
const weg = [];
|
|
31
|
+
for (const [k, v] of Object.entries(next)) {
|
|
32
|
+
if (v === undefined)
|
|
33
|
+
continue;
|
|
34
|
+
if (!(k in prev) || !sameJson(prev[k], v))
|
|
35
|
+
zet[k] = v;
|
|
36
|
+
}
|
|
37
|
+
for (const k of Object.keys(prev)) {
|
|
38
|
+
if (!(k in next) || next[k] === undefined)
|
|
39
|
+
weg.push(k);
|
|
40
|
+
}
|
|
41
|
+
return zonderBeschermd({ zet, weg });
|
|
42
|
+
}
|
|
43
|
+
/** Zelfde samenvoeging als de database: (cf - weg) || zet, beschermde sleutels ongemoeid. */
|
|
44
|
+
export function pasCfWijzigingToe(huidig, w) {
|
|
45
|
+
const { zet, weg } = zonderBeschermd(w);
|
|
46
|
+
const out = { ...(huidig ?? {}) };
|
|
47
|
+
for (const k of weg)
|
|
48
|
+
delete out[k];
|
|
49
|
+
return { ...out, ...zet };
|
|
50
|
+
}
|
|
51
|
+
export const isLeegCfWijziging = (w) => Object.keys(w.zet).length === 0 && w.weg.length === 0;
|
|
@@ -19,6 +19,25 @@ export interface OrderItemPackingRow {
|
|
|
19
19
|
cratesPerLayer: number | null;
|
|
20
20
|
layersPerCart: number | null;
|
|
21
21
|
} | null;
|
|
22
|
+
/** Prijs per stuk op de regel (null = geen prijs). */
|
|
23
|
+
unitPrice: number | null;
|
|
24
|
+
/** Regelgegevens (verkoop_orderregel_extra); null = nog niets vastgelegd. */
|
|
25
|
+
lineNote: string | null;
|
|
26
|
+
lineFields: {
|
|
27
|
+
key: string;
|
|
28
|
+
label: string;
|
|
29
|
+
value: string;
|
|
30
|
+
}[];
|
|
31
|
+
productStickerId: string | null;
|
|
32
|
+
fustStickerId: string | null;
|
|
33
|
+
}
|
|
34
|
+
export interface OrderItemPackingOrder {
|
|
35
|
+
id: string;
|
|
36
|
+
customerId: string | null;
|
|
37
|
+
/** Floriday-order: regelgegevens wijzig je in Floriday. */
|
|
38
|
+
floriday: boolean;
|
|
39
|
+
/** false = tabel regelgegevens ontbreekt nog in deze database. */
|
|
40
|
+
extrasAvailable: boolean;
|
|
22
41
|
}
|
|
23
42
|
/**
|
|
24
43
|
* Belading per bestelregel van één order, inclusief de handmatige
|
|
@@ -33,6 +52,7 @@ export declare const listOrderItemPacking: import("@tanstack/start-client-core")
|
|
|
33
52
|
orderId: string;
|
|
34
53
|
}, Promise<{
|
|
35
54
|
items: OrderItemPackingRow[];
|
|
55
|
+
order: OrderItemPackingOrder | null;
|
|
36
56
|
}>>;
|
|
37
57
|
export interface PackingPreview {
|
|
38
58
|
/** false = oudere Engine zonder voorbeeldfunctie. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-item-packing.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-item-packing.functions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"order-item-packing.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-item-packing.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ import { z } from "zod";
|
|
|
14
14
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
15
15
|
import { resolveOrderRow } from "./order-row.server.js";
|
|
16
16
|
import { parseActies } from "./plan-coverage.js";
|
|
17
|
+
import { normRegelVelden } from "./order-line-extras.js";
|
|
17
18
|
/**
|
|
18
19
|
* Belading per bestelregel van één order, inclusief de handmatige
|
|
19
20
|
* "vastgezet"-markering. `orderId` mag een lokale orders.id of een
|
|
@@ -34,19 +35,28 @@ export const listOrderItemPacking = createServerFn({ method: "GET" })
|
|
|
34
35
|
orderRowId = null;
|
|
35
36
|
}
|
|
36
37
|
if (!orderRowId)
|
|
37
|
-
return { items: [] };
|
|
38
|
-
// Regels en
|
|
39
|
-
const [{ data: rows, error }, { data: ord }] = await Promise.all([
|
|
38
|
+
return { items: [], order: null };
|
|
39
|
+
// Regels, order en regelgegevens tegelijk lezen (één ronde; belading in één keer).
|
|
40
|
+
const [{ data: rows, error }, { data: ord }, extrasRes] = await Promise.all([
|
|
40
41
|
supabase
|
|
41
42
|
.from("order_items")
|
|
42
|
-
.select("id, product_name, quantity, plants_per_crate, crates_per_layer, layers_per_cart, packing_locked_at, packing_locked_by, needs_sticker, source_line_key, packing_source, product_id")
|
|
43
|
+
.select("id, product_name, quantity, unit_price, plants_per_crate, crates_per_layer, layers_per_cart, packing_locked_at, packing_locked_by, needs_sticker, source_line_key, packing_source, product_id")
|
|
43
44
|
.eq("order_id", orderRowId)
|
|
44
45
|
.is("quarantined_at", null)
|
|
45
46
|
.order("product_name", { ascending: true }),
|
|
46
|
-
supabase.from("orders").select("custom_fields").eq("id", orderRowId).maybeSingle(),
|
|
47
|
+
supabase.from("orders").select("custom_fields, customer_id, order_source, floriday_sales_order_id").eq("id", orderRowId).maybeSingle(),
|
|
48
|
+
supabase
|
|
49
|
+
.from("verkoop_orderregel_extra")
|
|
50
|
+
.select("order_item_id, line_note, line_fields, product_sticker_id, fust_sticker_id")
|
|
51
|
+
.eq("order_id", orderRowId),
|
|
47
52
|
]);
|
|
48
53
|
if (error)
|
|
49
54
|
throw new Error(`Bestelregels laden faalde: ${error.message}`);
|
|
55
|
+
const extrasErr = extrasRes?.error;
|
|
56
|
+
const extrasMissing = !!extrasErr && (["42P01", "PGRST205"].includes(String(extrasErr.code ?? "")) || /could not find the table|relation .* does not exist/i.test(String(extrasErr.message ?? "")));
|
|
57
|
+
if (extrasErr && !extrasMissing)
|
|
58
|
+
console.error("[regelgegevens] lezen mislukt:", extrasErr.message);
|
|
59
|
+
const extraById = new Map(((extrasErr ? [] : extrasRes?.data) ?? []).map((x) => [String(x.order_item_id), x]));
|
|
50
60
|
// Floriday-belading per bestelling (custom_fields.floriday_lines).
|
|
51
61
|
const floridayBySid = new Map();
|
|
52
62
|
{
|
|
@@ -89,7 +99,18 @@ export const listOrderItemPacking = createServerFn({ method: "GET" })
|
|
|
89
99
|
packingSource: r.packing_source ?? null,
|
|
90
100
|
productId: r.product_id ?? null,
|
|
91
101
|
floridayPacking: r.source_line_key ? floridayBySid.get(String(r.source_line_key)) ?? null : null,
|
|
102
|
+
unitPrice: r.unit_price == null || !Number.isFinite(Number(r.unit_price)) ? null : Number(r.unit_price),
|
|
103
|
+
lineNote: extraById.get(String(r.id))?.line_note ?? null,
|
|
104
|
+
lineFields: normRegelVelden(extraById.get(String(r.id))?.line_fields),
|
|
105
|
+
productStickerId: extraById.get(String(r.id))?.product_sticker_id ?? null,
|
|
106
|
+
fustStickerId: extraById.get(String(r.id))?.fust_sticker_id ?? null,
|
|
92
107
|
})),
|
|
108
|
+
order: {
|
|
109
|
+
id: orderRowId,
|
|
110
|
+
customerId: ord?.customer_id ? String(ord.customer_id) : null,
|
|
111
|
+
floriday: !!ord?.floriday_sales_order_id || ["floriday", "fo"].includes(String(ord?.order_source ?? "").toLowerCase()),
|
|
112
|
+
extrasAvailable: !extrasMissing,
|
|
113
|
+
},
|
|
93
114
|
};
|
|
94
115
|
});
|
|
95
116
|
const packingSchema = z.object({
|