@flowselections/floriday-verkoop-module 1.0.174 → 1.0.175
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/AnalyticsCards.d.ts +1 -1
- package/dist-lib/components/verkoop/AnalyticsCards.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CartAssignmentWizard.d.ts +1 -1
- package/dist-lib/components/verkoop/CartAssignmentWizard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CartLayersDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/CartLayersDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/ConfirmDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/ConfirmDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/DiagnoseConnectionDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/DiagnoseConnectionDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts +1 -1
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EngineBufferCard.d.ts +1 -1
- package/dist-lib/components/verkoop/EngineBufferCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts +2 -2
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/InvoiceSignoffSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/InvoiceSignoffSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/InvoiceTimingSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/InvoiceTimingSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarSlotMelding.d.ts +1 -1
- package/dist-lib/components/verkoop/KarSlotMelding.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KlokAanvoerRow.d.ts +11 -0
- package/dist-lib/components/verkoop/KlokAanvoerRow.d.ts.map +1 -0
- package/dist-lib/components/verkoop/KlokAanvoerRow.js +31 -0
- package/dist-lib/components/verkoop/OrderAfleverbrievenCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderAfleverbrievenCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderInvoiceCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderInvoiceCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +2 -2
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +8 -7
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +1 -1
- package/dist-lib/components/verkoop/PickupLocationsSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/PickupLocationsSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/PlanCoverageBadge.d.ts +1 -1
- package/dist-lib/components/verkoop/PlanCoverageBadge.d.ts.map +1 -1
- package/dist-lib/components/verkoop/ProductDimensionsSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/ProductDimensionsSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SafeSvg.d.ts +1 -1
- package/dist-lib/components/verkoop/SafeSvg.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +13 -13
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +29 -11
- package/dist-lib/components/verkoop/SalesOrdersFilterPanel.d.ts +2 -2
- package/dist-lib/components/verkoop/SalesOrdersFilterPanel.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/StockConsumptionAlertsBanner.d.ts +1 -1
- package/dist-lib/components/verkoop/StockConsumptionAlertsBanner.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/WeekCalendar.d.ts +1 -1
- package/dist-lib/components/verkoop/WeekCalendar.d.ts.map +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts.map +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts.map +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts.map +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts +1 -1
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts +1 -1
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts +1 -1
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokNotice.d.ts +1 -1
- package/dist-lib/components/verkoop/klok/KlokNotice.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.js +51 -11
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts +3 -3
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrdersList.js +1 -1
- package/dist-lib/components/verkoop/klok/KlokPage.d.ts +1 -1
- package/dist-lib/components/verkoop/klok/KlokPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokPage.js +10 -1
- package/dist-lib/components/verkoop/klok/KlokStatusBadge.d.ts +1 -1
- package/dist-lib/components/verkoop/klok/KlokStatusBadge.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/useKlok.d.ts +2 -2
- package/dist-lib/components/verkoop/klok/useKlok.d.ts.map +1 -1
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +1 -1
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +1 -1
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -1
- package/dist-lib/components/verkoop/regel/StickerKeuzeRegels.d.ts +1 -1
- package/dist-lib/components/verkoop/regel/StickerKeuzeRegels.d.ts.map +1 -1
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts +1 -1
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts +1 -1
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts +2 -2
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/ArticlesHover.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/ArticlesHover.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/EmptyState.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/EmptyState.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/FilterChip.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/FilterChip.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/InfoCard.d.ts +3 -3
- package/dist-lib/components/verkoop/v3/InfoCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/NavigationTooltip.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/NavigationTooltip.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/NoticeBar.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/NoticeBar.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderProgress.js +6 -0
- package/dist-lib/components/verkoop/v3/OrderStepper.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/OrderStepper.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderStepper.js +7 -3
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/ShortcutHelp.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/ShortcutHelp.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts +1 -1
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/client.js +1 -1
- package/dist-lib/integrations/supabase/client.server.js +1 -1
- package/dist-lib/integrations/supabase/types.d.ts +1315 -3
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +31 -0
- package/dist-lib/lib/klok-aanvoer.server.d.ts +18 -0
- package/dist-lib/lib/klok-aanvoer.server.d.ts.map +1 -0
- package/dist-lib/lib/klok-aanvoer.server.js +42 -0
- package/dist-lib/lib/klok-floriday.d.ts +93 -0
- package/dist-lib/lib/klok-floriday.d.ts.map +1 -0
- package/dist-lib/lib/klok-floriday.js +212 -0
- package/dist-lib/lib/klok-floriday.server.d.ts +17 -0
- package/dist-lib/lib/klok-floriday.server.d.ts.map +1 -0
- package/dist-lib/lib/klok-floriday.server.js +349 -0
- package/dist-lib/lib/klok-form.d.ts +6 -0
- package/dist-lib/lib/klok-form.d.ts.map +1 -1
- package/dist-lib/lib/klok-form.js +10 -0
- package/dist-lib/lib/klok-payload.d.ts +0 -1
- package/dist-lib/lib/klok-payload.d.ts.map +1 -1
- package/dist-lib/lib/klok-payload.js +2 -2
- package/dist-lib/lib/klok-sales.server.d.ts.map +1 -1
- package/dist-lib/lib/klok-sales.server.js +11 -17
- package/dist-lib/lib/klok.functions.d.ts +40 -1
- package/dist-lib/lib/klok.functions.d.ts.map +1 -1
- package/dist-lib/lib/klok.functions.js +111 -10
- package/dist-lib/lib/klok.server.d.ts +38 -0
- package/dist-lib/lib/klok.server.d.ts.map +1 -1
- package/dist-lib/lib/klok.server.js +82 -62
- package/dist-lib/lib/klokverkoop.d.ts +32 -0
- package/dist-lib/lib/klokverkoop.d.ts.map +1 -0
- package/dist-lib/lib/klokverkoop.js +86 -0
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +9 -0
- package/dist-lib/lib/order-cart-count.server.d.ts +8 -0
- package/dist-lib/lib/order-cart-count.server.d.ts.map +1 -0
- package/dist-lib/lib/order-cart-count.server.js +69 -0
- package/dist-lib/lib/order-progress.d.ts +9 -0
- package/dist-lib/lib/order-progress.d.ts.map +1 -1
- package/dist-lib/lib/order-progress.js +27 -4
- package/dist-lib/lib/order-status.d.ts +7 -2
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +8 -2
- package/dist-lib/lib/order-transport.functions.d.ts +1 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- 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 +13 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +34 -9
- package/dist-lib/lib/salesorders-mapping.d.ts +6 -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 +14 -3
- package/dist-lib/lib/tradeitems.functions.d.ts +1117 -12
- package/dist-lib/lib/tradeitems.functions.d.ts.map +1 -1
- package/dist-lib/lib/useBufferCarts.d.ts +2 -2
- package/dist-lib/lib/useBufferCarts.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.d.ts +2 -2
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts +2 -2
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/usePickupMoment.d.ts +2 -2
- package/dist-lib/lib/usePickupMoment.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.d.ts +1 -1
- package/package.json +1 -1
- package/schema/verkoop.sql +834 -0
- package/dist-lib/components/floriday/FlorydaySyncHealthBanner.d.ts +0 -9
- package/dist-lib/components/floriday/FlorydaySyncHealthBanner.d.ts.map +0 -1
- package/dist-lib/components/floriday/FlorydaySyncHealthBanner.js +0 -26
- package/dist-lib/components/karindeling/AfmetingenTab.d.ts +0 -6
- package/dist-lib/components/karindeling/AfmetingenTab.d.ts.map +0 -1
- package/dist-lib/components/karindeling/AfmetingenTab.js +0 -128
- package/dist-lib/components/karindeling/KarindelingPage.d.ts +0 -2
- package/dist-lib/components/karindeling/KarindelingPage.d.ts.map +0 -1
- package/dist-lib/components/karindeling/KarindelingPage.js +0 -102
- package/dist-lib/components/ui/dropdown-menu.d.ts +0 -9
- package/dist-lib/components/ui/dropdown-menu.d.ts.map +0 -1
- package/dist-lib/components/ui/dropdown-menu.js +0 -14
- package/dist-lib/components/verkoop/AutoFulfillmentStatusCard.d.ts +0 -4
- package/dist-lib/components/verkoop/AutoFulfillmentStatusCard.d.ts.map +0 -1
- package/dist-lib/components/verkoop/AutoFulfillmentStatusCard.js +0 -95
- package/dist-lib/components/verkoop/CreateOrderDialog.d.ts +0 -5
- package/dist-lib/components/verkoop/CreateOrderDialog.d.ts.map +0 -1
- package/dist-lib/components/verkoop/CreateOrderDialog.js +0 -33
- package/dist-lib/lib/cron/mirror-floriday-orders.d.ts +0 -4
- package/dist-lib/lib/cron/mirror-floriday-orders.d.ts.map +0 -1
- package/dist-lib/lib/cron/mirror-floriday-orders.js +0 -23
- package/dist-lib/lib/cron/push-order-statuses.d.ts +0 -4
- package/dist-lib/lib/cron/push-order-statuses.d.ts.map +0 -1
- package/dist-lib/lib/cron/push-order-statuses.js +0 -23
- package/dist-lib/lib/floriday/floriday.server.d.ts +0 -14
- package/dist-lib/lib/floriday/floriday.server.d.ts.map +0 -1
- package/dist-lib/lib/floriday/floriday.server.js +0 -92
- package/dist-lib/lib/floriday/sales-orders.functions.d.ts +0 -4736
- package/dist-lib/lib/floriday/sales-orders.functions.d.ts.map +0 -1
- package/dist-lib/lib/floriday/sales-orders.functions.js +0 -193
- package/dist-lib/lib/floriday-auto-fulfillment.functions.d.ts +0 -77581
- package/dist-lib/lib/floriday-auto-fulfillment.functions.d.ts.map +0 -1
- package/dist-lib/lib/floriday-auto-fulfillment.functions.js +0 -65
- package/dist-lib/lib/floriday-auto-fulfillment.server.d.ts +0 -21
- package/dist-lib/lib/floriday-auto-fulfillment.server.d.ts.map +0 -1
- package/dist-lib/lib/floriday-auto-fulfillment.server.js +0 -352
- package/dist-lib/lib/floriday-status-sync.server.d.ts +0 -14
- package/dist-lib/lib/floriday-status-sync.server.d.ts.map +0 -1
- package/dist-lib/lib/floriday-status-sync.server.js +0 -130
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export interface OrderCartInfo {
|
|
2
|
+
count: number;
|
|
3
|
+
carrierTypes: string[];
|
|
4
|
+
sharedCount: number;
|
|
5
|
+
cartIds: string[];
|
|
6
|
+
}
|
|
7
|
+
export declare function loadCartsByOrder(supabase: any, orderIds: string[]): Promise<Map<string, OrderCartInfo>>;
|
|
8
|
+
//# sourceMappingURL=order-cart-count.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-cart-count.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-cart-count.server.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAID,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CA2DrC"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// Alleen-lezen telling van karren per order via de KARREGELS.
|
|
2
|
+
//
|
|
3
|
+
// Een order in een buffer ligt op gedeelde karren waarvan order_carts.order_id
|
|
4
|
+
// LEEG is (de kar hoort bij order_carts.buffer_id). Tellen op order_id geeft
|
|
5
|
+
// dan 0. Daarom: actieve order_items -> order_cart_items -> order_carts.
|
|
6
|
+
// Schrijft nooit iets; de indeling is van de Logistiek Engine.
|
|
7
|
+
const CHUNK = 200;
|
|
8
|
+
export async function loadCartsByOrder(supabase, orderIds) {
|
|
9
|
+
const out = new Map();
|
|
10
|
+
const ids = Array.from(new Set(orderIds.filter(Boolean)));
|
|
11
|
+
if (ids.length === 0)
|
|
12
|
+
return out;
|
|
13
|
+
// 1) actieve regels
|
|
14
|
+
const itemOrder = new Map();
|
|
15
|
+
for (let i = 0; i < ids.length; i += CHUNK) {
|
|
16
|
+
const { data, error } = await supabase
|
|
17
|
+
.from("order_items")
|
|
18
|
+
.select("id, order_id")
|
|
19
|
+
.in("order_id", ids.slice(i, i + CHUNK))
|
|
20
|
+
.is("quarantined_at", null);
|
|
21
|
+
if (error)
|
|
22
|
+
throw new Error(`orderregels lezen: ${error.message}`);
|
|
23
|
+
for (const r of (data ?? []))
|
|
24
|
+
itemOrder.set(String(r.id), String(r.order_id));
|
|
25
|
+
}
|
|
26
|
+
const itemIds = Array.from(itemOrder.keys());
|
|
27
|
+
// 2) karregels
|
|
28
|
+
const cartsPerOrder = new Map();
|
|
29
|
+
for (let i = 0; i < itemIds.length; i += CHUNK) {
|
|
30
|
+
const { data, error } = await supabase
|
|
31
|
+
.from("order_cart_items")
|
|
32
|
+
.select("order_item_id, cart_id")
|
|
33
|
+
.in("order_item_id", itemIds.slice(i, i + CHUNK));
|
|
34
|
+
if (error)
|
|
35
|
+
throw new Error(`karregels lezen: ${error.message}`);
|
|
36
|
+
for (const r of (data ?? [])) {
|
|
37
|
+
const oid = itemOrder.get(String(r.order_item_id));
|
|
38
|
+
if (!oid || !r.cart_id)
|
|
39
|
+
continue;
|
|
40
|
+
const s = cartsPerOrder.get(oid) ?? new Set();
|
|
41
|
+
s.add(String(r.cart_id));
|
|
42
|
+
cartsPerOrder.set(oid, s);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// 3) karren zelf (type + gedeeld)
|
|
46
|
+
const allCartIds = Array.from(new Set([...cartsPerOrder.values()].flatMap((s) => [...s])));
|
|
47
|
+
const cartRow = new Map();
|
|
48
|
+
for (let i = 0; i < allCartIds.length; i += CHUNK) {
|
|
49
|
+
const { data, error } = await supabase
|
|
50
|
+
.from("order_carts")
|
|
51
|
+
.select("id, order_id, carrier_type")
|
|
52
|
+
.in("id", allCartIds.slice(i, i + CHUNK));
|
|
53
|
+
if (error)
|
|
54
|
+
throw new Error(`karren lezen: ${error.message}`);
|
|
55
|
+
for (const r of (data ?? []))
|
|
56
|
+
cartRow.set(String(r.id), { order_id: r.order_id ?? null, carrier_type: r.carrier_type ?? null });
|
|
57
|
+
}
|
|
58
|
+
for (const oid of ids) {
|
|
59
|
+
const set = cartsPerOrder.get(oid);
|
|
60
|
+
const cartIds = set ? [...set].filter((c) => cartRow.has(c)) : [];
|
|
61
|
+
out.set(oid, {
|
|
62
|
+
count: cartIds.length,
|
|
63
|
+
cartIds,
|
|
64
|
+
carrierTypes: cartIds.map((c) => String(cartRow.get(c)?.carrier_type ?? "")),
|
|
65
|
+
sharedCount: cartIds.filter((c) => cartRow.get(c)?.order_id !== oid).length,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return out;
|
|
69
|
+
}
|
|
@@ -73,6 +73,12 @@ export interface ProgressMember {
|
|
|
73
73
|
floridayTotal: number;
|
|
74
74
|
floridayDone: number;
|
|
75
75
|
isPaid: boolean;
|
|
76
|
+
/** orders.klokverkoop: geen picken/aanmelden; factuur via de veiling. */
|
|
77
|
+
klokverkoop: boolean;
|
|
78
|
+
/** Floriday-status (custom_fields.floriday_status), voor de factuurstap bij klokverkoop. */
|
|
79
|
+
floridayRawStatus: string | null;
|
|
80
|
+
/** Floriday paymentProvider (RFH/VRM), alleen tekst. */
|
|
81
|
+
paymentProvider: string | null;
|
|
76
82
|
}
|
|
77
83
|
/** Welke leesfuncties van andere modules beschikbaar waren. */
|
|
78
84
|
export interface ProgressFeatures {
|
|
@@ -115,6 +121,9 @@ export interface ProgressSourceRow {
|
|
|
115
121
|
floridayFulfilled?: boolean;
|
|
116
122
|
floridayExternalFulfilledIds?: string[];
|
|
117
123
|
id?: string;
|
|
124
|
+
klokverkoop?: boolean;
|
|
125
|
+
floridayRawStatus?: string | null;
|
|
126
|
+
paymentProvider?: string | null;
|
|
118
127
|
}
|
|
119
128
|
/**
|
|
120
129
|
* Blokkades voor het Gepickt-icoon ("fout"), alleen deze vlaggen:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-progress.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"order-progress.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,+DAA+D;AAC/D,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAY7F;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;IACnD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG,SAAS,CASZ;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,KAAK,CAAC;AAE9C;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG,YAAY,CAIf;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,yEAAyE;IACzE,WAAW,EAAE,OAAO,CAAC;IACrB,4FAA4F;IAC5F,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,wDAAwD;IACxD,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,+DAA+D;AAC/D,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,iFAAiF;AACjF,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACvE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,4BAA4B,CAAC,EAAE,MAAM,EAAE,CAAC;IACxC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,iBAAiB,GAAG,MAAM,EAAE,CAkB/D;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,GAAG,cAAc,CAyCvE;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,QAAQ,CAAC;AAEpF,eAAO,MAAM,cAAc,GAAI,GAAG,cAAc,YAAsC,CAAC;AACvF,eAAO,MAAM,YAAY,GAAI,GAAG,cAAc,YACqB,CAAC;AACpE,eAAO,MAAM,aAAa,GAAI,GAAG,cAAc,YAA0B,CAAC;AAE1E,uDAAuD;AACvD,wBAAgB,aAAa,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAc/E;AAED,qFAAqF;AACrF,wBAAgB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAGtF;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,SAAS,CAAC;IACnB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,mFAAmF;AACnF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,gBAAgB,GAAG,QAAQ,CA8BjF;AAED,sDAAsD;AACtD,eAAO,MAAM,UAAU,GAAI,GAAG,cAAc,YAA0C,CAAC;AAEvF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,cAAc,EAAE,YAKjD,CAAC;AAEJ,qEAAqE;AACrE,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAGvE;AAED,mCAAmC;AACnC,eAAO,MAAM,aAAa,GAAI,GAAG,MAAM,WAAgD,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { klokverkoopAfgerekend } from "./klokverkoop.js";
|
|
1
2
|
const MAILBOX_SOURCES = new Set([
|
|
2
3
|
"mailbox",
|
|
3
4
|
"mailbox_order",
|
|
@@ -51,6 +52,15 @@ export function memberProblems(row) {
|
|
|
51
52
|
if (row.stage === "cancelled")
|
|
52
53
|
return [];
|
|
53
54
|
const out = [];
|
|
55
|
+
// Klokverkoop: geen logistieke blokkades (indeling, karren); wel ongekoppeld artikel en handmatige controle.
|
|
56
|
+
if (row.klokverkoop) {
|
|
57
|
+
if (row.needsManualReview)
|
|
58
|
+
out.push(row.needsManualReview.reason || "Handmatige beoordeling nodig");
|
|
59
|
+
if ((row.unlinkedProducts?.length ?? 0) > 0) {
|
|
60
|
+
out.push(`Artikel niet gekoppeld: ${row.unlinkedProducts.map((u) => u.name).join(", ")}`);
|
|
61
|
+
}
|
|
62
|
+
return out;
|
|
63
|
+
}
|
|
54
64
|
if (row.pickProgress?.blocked)
|
|
55
65
|
out.push(row.pickProgress.blockedReason || "Kan niet worden ingedeeld");
|
|
56
66
|
if (row.karUnknown)
|
|
@@ -98,6 +108,9 @@ export function toProgressMember(row) {
|
|
|
98
108
|
floridayTotal,
|
|
99
109
|
floridayDone,
|
|
100
110
|
isPaid: route === "floriday" && row.status?.isInvoiced === true,
|
|
111
|
+
klokverkoop: row.klokverkoop === true,
|
|
112
|
+
floridayRawStatus: row.floridayRawStatus ?? null,
|
|
113
|
+
paymentProvider: row.paymentProvider ?? null,
|
|
101
114
|
};
|
|
102
115
|
}
|
|
103
116
|
export const memberReceived = (m) => !m.isReservation && !m.isProposal;
|
|
@@ -105,6 +118,9 @@ export const memberPicked = (m) => !!m.controlledAt || m.stage === "picked" || m
|
|
|
105
118
|
export const memberShipped = (m) => m.stage === "shipped";
|
|
106
119
|
/** Factuurstand per order volgens zijn eigen route. */
|
|
107
120
|
export function memberInvoice(m, f) {
|
|
121
|
+
// Klokverkoop: de veiling rekent zelf af bij de koop → klaar zodra Floriday COMMITTED meldt.
|
|
122
|
+
if (m.klokverkoop)
|
|
123
|
+
return klokverkoopAfgerekend(m.floridayRawStatus) ? "done" : "todo";
|
|
108
124
|
if (m.invoiceRoute === "floriday") {
|
|
109
125
|
if (m.floridayTotal > 0 && m.floridayDone >= m.floridayTotal)
|
|
110
126
|
return "done";
|
|
@@ -133,16 +149,23 @@ export function rowSteps(members, f) {
|
|
|
133
149
|
const list = members.filter((m) => !m.cancelled);
|
|
134
150
|
const all = (fn) => list.length > 0 && list.every(fn);
|
|
135
151
|
const received = all(memberReceived) ? "done" : "todo";
|
|
152
|
+
// Picken en aanmelden gelden alleen voor orders met logistiek: klokverkopen
|
|
153
|
+
// tellen niet mee; bestaat de rij alleen uit klokverkopen, dan geen icoon.
|
|
154
|
+
const logi = list.filter((m) => !m.klokverkoop);
|
|
155
|
+
const allLogi = (fn) => logi.length > 0 && logi.every(fn);
|
|
156
|
+
const geenLogistiek = list.length > 0 && logi.length === 0;
|
|
136
157
|
// "Fout" alleen zolang een order nog niet gepickt is; gepickt/verzonden is
|
|
137
158
|
// gewoon gedaan. Deels gepickt in een buffer = "nog niet" (geen stip).
|
|
138
|
-
let picked =
|
|
159
|
+
let picked = allLogi(memberPicked) ? "done" : "todo";
|
|
139
160
|
if (picked !== "done") {
|
|
140
|
-
if (
|
|
161
|
+
if (logi.some((m) => !memberPicked(m) && m.problems.length > 0))
|
|
141
162
|
picked = "error";
|
|
142
|
-
else if (
|
|
163
|
+
else if (logi.some((m) => m.backlog && !memberPicked(m)))
|
|
143
164
|
picked = "late";
|
|
144
165
|
}
|
|
145
|
-
|
|
166
|
+
if (geenLogistiek)
|
|
167
|
+
picked = "hidden";
|
|
168
|
+
const shipped = geenLogistiek ? "hidden" : allLogi(memberShipped) ? "done" : "todo";
|
|
146
169
|
const inv = list.map((m) => memberInvoice(m, f));
|
|
147
170
|
let invoiced;
|
|
148
171
|
if (inv.length === 0 || inv.every((s) => s === "hidden"))
|
|
@@ -22,9 +22,14 @@ export declare function orderStageNote(input: {
|
|
|
22
22
|
deletedAt?: unknown;
|
|
23
23
|
customFields?: unknown;
|
|
24
24
|
}): StageNote;
|
|
25
|
-
export declare function orderStageLabel(stage: OrderStage, note?: StageNote
|
|
25
|
+
export declare function orderStageLabel(stage: OrderStage, note?: StageNote, opts?: {
|
|
26
|
+
klokverkoop?: boolean;
|
|
27
|
+
klokverkoopSoort?: "klok" | "voorverkoop" | null;
|
|
28
|
+
}): string;
|
|
26
29
|
/** Tailwind-klassen voor de statusbadge per fase. */
|
|
27
|
-
export declare function orderStageBadgeClass(stage: OrderStage
|
|
30
|
+
export declare function orderStageBadgeClass(stage: OrderStage, opts?: {
|
|
31
|
+
klokverkoop?: boolean;
|
|
32
|
+
}): string;
|
|
28
33
|
export interface OrderStageInput {
|
|
29
34
|
/** Ruwe statuswaarde zoals opgeslagen (orders.status is leidend). */
|
|
30
35
|
status?: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-status.d.ts","sourceRoot":"","sources":["../../src/lib/order-status.ts"],"names":[],"mappings":"AAMA,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;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,IAAI,CAAC;AAEpE,sGAAsG;AACtG,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,SAAS,CAGrH;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAIhG;AAED,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"order-status.d.ts","sourceRoot":"","sources":["../../src/lib/order-status.ts"],"names":[],"mappings":"AAMA,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;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,IAAI,CAAC;AAEpE,sGAAsG;AACtG,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,SAAS,CAGrH;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAIhG;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,IAAI,CAAC,EAAE,SAAS,EAChB,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAAA;CAAE,GACjF,MAAM,CASR;AAED,qDAAqD;AACrD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAchG;AAiCD,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"}
|
|
@@ -22,9 +22,13 @@ export function orderStageNote(input) {
|
|
|
22
22
|
return "handled";
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
25
|
-
export function orderStageLabel(stage, note) {
|
|
25
|
+
export function orderStageLabel(stage, note, opts) {
|
|
26
26
|
if (note === "deleted")
|
|
27
27
|
return "Verwijderd";
|
|
28
|
+
// Klokverkoop (orders.klokverkoop): alleen weergave; orders.status blijft ongewijzigd.
|
|
29
|
+
if (opts?.klokverkoop && stage !== "cancelled") {
|
|
30
|
+
return opts.klokverkoopSoort === "voorverkoop" ? "Verkocht via klokvoorverkoop" : "Verkocht via de klok";
|
|
31
|
+
}
|
|
28
32
|
if (note === "handled")
|
|
29
33
|
return "Afgehandeld";
|
|
30
34
|
if (note === "processing")
|
|
@@ -32,7 +36,9 @@ export function orderStageLabel(stage, note) {
|
|
|
32
36
|
return ORDER_STAGES.find((s) => s.id === stage)?.label ?? "Inkomende orders";
|
|
33
37
|
}
|
|
34
38
|
/** Tailwind-klassen voor de statusbadge per fase. */
|
|
35
|
-
export function orderStageBadgeClass(stage) {
|
|
39
|
+
export function orderStageBadgeClass(stage, opts) {
|
|
40
|
+
if (opts?.klokverkoop && stage !== "cancelled")
|
|
41
|
+
return "bg-primary/10 text-primary";
|
|
36
42
|
switch (stage) {
|
|
37
43
|
case "cancelled":
|
|
38
44
|
return "bg-destructive/10 text-destructive";
|
|
@@ -10,6 +10,7 @@ export declare const getOrderTransport: import("@tanstack/start-client-core").Op
|
|
|
10
10
|
carrier: import("./carrier-resolve.js").ResolvedCarrier;
|
|
11
11
|
carrierGln: string | null;
|
|
12
12
|
floridayCarrierNotice: string | null;
|
|
13
|
+
klokVervoerOnzeker: string | null;
|
|
13
14
|
own: boolean;
|
|
14
15
|
ownKind: string | null;
|
|
15
16
|
ownPickup: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-transport.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.functions.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB;;;;0CAER,OAAO
|
|
1
|
+
{"version":3,"file":"order-transport.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.functions.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB;;;;0CAER,OAAO;;;;;;;;;;;;;;;;;;GAIzB,CAAC;AAIL,4FAA4F;AAC5F,MAAM,MAAM,mBAAmB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG,qGAAqG;AACrG,eAAO,MAAM,qBAAqB;;;;0CAEZ,OAAO;;;;gCAiCzB,CAAC;AAEL,2GAA2G;AAC3G,eAAO,MAAM,yBAAyB;;;;0CAEhB,OAAO;;+EAIzB,CAAC"}
|
|
@@ -4,6 +4,7 @@ export declare function loadOrderTransport(supabase: any, rawOrderId: string): P
|
|
|
4
4
|
carrier: import("./carrier-resolve.js").ResolvedCarrier;
|
|
5
5
|
carrierGln: string | null;
|
|
6
6
|
floridayCarrierNotice: string | null;
|
|
7
|
+
klokVervoerOnzeker: string | null;
|
|
7
8
|
own: boolean;
|
|
8
9
|
ownKind: string | null;
|
|
9
10
|
ownPickup: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-transport.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.server.ts"],"names":[],"mappings":"AAMA,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"order-transport.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.server.ts"],"names":[],"mappings":"AAMA,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;gBAuD9C,MAAM;kBAC2D,MAAM,GAAG,IAAI;;;;;;;;;;;;;;GAYzG;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC"}
|
|
@@ -37,6 +37,18 @@ export async function loadOrderTransport(supabase, rawOrderId) {
|
|
|
37
37
|
gekozen: { state: carrier.state, name: carrier.carrierName, gln: carrier.carrierId ? glns.get(carrier.carrierId) ?? null : null },
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
+
// Veilbrieforder van een Floriday-veilbrief: vervoer is onzeker zolang niemand het handmatig koos.
|
|
41
|
+
let klokVervoerOnzeker = null;
|
|
42
|
+
if (cf.order_kind === "klok" && typeof cf.klok_order_id === "string") {
|
|
43
|
+
const { data: kv, error: kvErr } = await supabase
|
|
44
|
+
.from("verkoop_klok_orders").select("herkomst, vervoer_bron").eq("id", cf.klok_order_id).maybeSingle();
|
|
45
|
+
if (kvErr)
|
|
46
|
+
console.error("[order-transport] veilbrief lezen mislukt:", kvErr.message);
|
|
47
|
+
if (kv?.herkomst === "floriday" && kv?.vervoer_bron !== "handmatig") {
|
|
48
|
+
const { KLOK_VERVOER_ONZEKER_TEXT } = await import("./klok-floriday.js");
|
|
49
|
+
klokVervoerOnzeker = KLOK_VERVOER_ONZEKER_TEXT;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
40
52
|
const { loadPickProgress } = await import("./order-progress.server.js");
|
|
41
53
|
// Ruimere wachttijd dan de lijst: een te korte wachttijd gaf "onbekend" en vergrendelde het veld onterecht.
|
|
42
54
|
const pick = await loadPickProgress(supabase, [order.id], 10000);
|
|
@@ -49,6 +61,7 @@ export async function loadOrderTransport(supabase, rawOrderId) {
|
|
|
49
61
|
carrier,
|
|
50
62
|
carrierGln,
|
|
51
63
|
floridayCarrierNotice,
|
|
64
|
+
klokVervoerOnzeker,
|
|
52
65
|
own,
|
|
53
66
|
ownKind: own ? (isOwnTransportKind(carrier.carrierKind) ? carrier.carrierKind : "eigen_vervoer") : null,
|
|
54
67
|
ownPickup: own ? parseOwnPickupMoment(cf.pickup_moment) : null,
|
|
@@ -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":"AAyBA,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,EAA2B,MAAM,gBAAgB,CAAC;AAG1H,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,CAo8CrB;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 { klokverkoopSoort } from "./klokverkoop.js";
|
|
1
2
|
import { floridayIdsZonderEigenOrder, isSamengevoegd } from "./list-own-rows.js";
|
|
2
3
|
import { groepSleutel } from "./order-cancel-view.js";
|
|
3
4
|
import { zonderGeannuleerd } from "./order-cancel-view.js";
|
|
@@ -316,7 +317,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
316
317
|
return { environment, sellerFallback, foRows, truncated };
|
|
317
318
|
});
|
|
318
319
|
// 3) Lokale orders binnen hetzelfde venster.
|
|
319
|
-
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))";
|
|
320
|
+
const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, status_origin, klokverkoop, 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))";
|
|
320
321
|
const localTask = t.time("3_lokaal", async () => {
|
|
321
322
|
if (params.localOrderId) {
|
|
322
323
|
const primaryRes = await supabase
|
|
@@ -761,6 +762,14 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
761
762
|
: null;
|
|
762
763
|
dto.mixedDeliveryDates = Boolean(reviewCf?.floriday_mixed_delivery_dates);
|
|
763
764
|
dto.unlinkedProducts = localRow ? unlinkedFloridayProducts(localRow) : [];
|
|
765
|
+
// Klokverkoop: alleen het vastgelegde kenmerk (orders.klokverkoop), nooit zelf afleiden.
|
|
766
|
+
dto.klokverkoop = localRow?.klokverkoop === true;
|
|
767
|
+
dto.klokverkoopSoort = dto.klokverkoop ? (klokverkoopSoort(r.data) ?? "klok") : null;
|
|
768
|
+
dto.paymentProvider = typeof r.data?.paymentProvider === "string" ? r.data.paymentProvider : null;
|
|
769
|
+
{
|
|
770
|
+
const fs = (localRow?.custom_fields ?? {})?.floriday_status;
|
|
771
|
+
dto.floridayRawStatus = typeof fs === "string" ? fs : null;
|
|
772
|
+
}
|
|
764
773
|
dto.incomplete = [
|
|
765
774
|
...(dto.customer.name && dto.customer.name !== "Onbekende klant" ? [] : ["geen klant gekoppeld"]),
|
|
766
775
|
...(dto.deliveryAt ? [] : ["geen leverdatum"]),
|
|
@@ -915,6 +924,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
915
924
|
shippedAt: shipmentStateByOrder.get(String(r.id))?.shippedAt ?? null,
|
|
916
925
|
mixedDeliveryDates: Boolean(r.custom_fields?.floriday_mixed_delivery_dates),
|
|
917
926
|
unlinkedProducts: unlinkedFloridayProducts(r),
|
|
927
|
+
klokverkoop: r.klokverkoop === true,
|
|
928
|
+
floridayRawStatus: typeof cf.floriday_status === "string" ? cf.floriday_status : null,
|
|
918
929
|
orderNumber: centralOrderNumber(r.order_number),
|
|
919
930
|
productName: firstProduct
|
|
920
931
|
? lineItems.length > 1
|
|
@@ -1161,6 +1172,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1161
1172
|
engineCounts: members.some((m) => m.engineCounts),
|
|
1162
1173
|
planCoverage: mergeSummaries(members.map((m) => m.planCoverage)),
|
|
1163
1174
|
missingPrice: members.some((m) => m.missingPrice),
|
|
1175
|
+
klokverkoop: members.every((m) => m.klokverkoop === true),
|
|
1164
1176
|
floridayStatus: mergeFloridayStatus(members.map((m) => m.floridayStatus)),
|
|
1165
1177
|
shifted: members.some((m) => m.shifted),
|
|
1166
1178
|
printedAt: members.map((m) => m.printedAt).find((v) => !!v) ?? null,
|
|
@@ -1296,8 +1308,12 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1296
1308
|
return true;
|
|
1297
1309
|
}
|
|
1298
1310
|
};
|
|
1311
|
+
// Klokverkoop (orders.klokverkoop): geen logistiek, dus nooit in Te picken,
|
|
1312
|
+
// Gepickt, Aangemeld of Achterstand. Gemengde rij: alleen als álle orders klokverkoop zijn.
|
|
1313
|
+
const isKlokverkoopGroup = (members) => members.length > 0 && members.every((m) => m.klokverkoop === true);
|
|
1314
|
+
const LOGISTIEKE_TABS = new Set(["topick", "picked", "shipped"]);
|
|
1299
1315
|
// Achterstand is een weergave-categorie binnen "Te picken", geen eigen status.
|
|
1300
|
-
const isBacklogGroup = (members) => stageOf(members) === "topick" && members.some((m) => m.backlog);
|
|
1316
|
+
const isBacklogGroup = (members) => !isKlokverkoopGroup(members) && stageOf(members) === "topick" && members.some((m) => m.backlog);
|
|
1301
1317
|
// Verzonden in het ERP, nog niet afgemeld bij Floriday (eigen kenmerk).
|
|
1302
1318
|
const isNotReportedGroup = (members) => members.some((m) => m.notReportedToFloriday);
|
|
1303
1319
|
// Gefactureerd: elke order klaar volgens zijn eigen route (ERP "verstuurd",
|
|
@@ -1316,6 +1332,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1316
1332
|
if (params.tab === "problem")
|
|
1317
1333
|
return isProblemGroup(members);
|
|
1318
1334
|
// "Te picken" toont alle te picken orders, ook te laat.
|
|
1335
|
+
if (LOGISTIEKE_TABS.has(params.tab) && isKlokverkoopGroup(members))
|
|
1336
|
+
return false;
|
|
1319
1337
|
return stageOf(members) === params.tab;
|
|
1320
1338
|
};
|
|
1321
1339
|
const withoutTab = groups.filter((g) => matchesSearch(g) && matchesStatusFilter(g));
|
|
@@ -1376,7 +1394,9 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1376
1394
|
// orders.id per zichtbare order (ook bij Floriday-orders), voor het factuurblok.
|
|
1377
1395
|
for (const o of visible)
|
|
1378
1396
|
o.orderRowId = idFor(o);
|
|
1379
|
-
|
|
1397
|
+
// Klokverkoop: geen vertrek, vervoerder, karren of afleverlocatie opvragen.
|
|
1398
|
+
const logistiek = visible.filter((o) => !o.klokverkoop);
|
|
1399
|
+
const ids = logistiek.map(idFor).filter((v) => !!v);
|
|
1380
1400
|
if (ids.length) {
|
|
1381
1401
|
// Ophaalmoment uit de Engine (nooit zelf rekenen).
|
|
1382
1402
|
enrichTasks.push(t.time("14a_vertrek", async () => {
|
|
@@ -1384,7 +1404,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1384
1404
|
const { loadOrderDepartures } = await import("./order-departure.server.js");
|
|
1385
1405
|
const { departureView } = await import("./order-departure.js");
|
|
1386
1406
|
const deps = await loadOrderDepartures(supabase, ids);
|
|
1387
|
-
for (const o of
|
|
1407
|
+
for (const o of logistiek) {
|
|
1388
1408
|
const oid = idFor(o);
|
|
1389
1409
|
if (!oid)
|
|
1390
1410
|
continue;
|
|
@@ -1397,7 +1417,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1397
1417
|
}
|
|
1398
1418
|
}
|
|
1399
1419
|
catch {
|
|
1400
|
-
for (const o of
|
|
1420
|
+
for (const o of logistiek)
|
|
1401
1421
|
if (idFor(o))
|
|
1402
1422
|
o.pickupLabel = "onbekend";
|
|
1403
1423
|
}
|
|
@@ -1405,7 +1425,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1405
1425
|
// Vervoerder + bron uit de Engine (contract vervoerder), één aanroep per blok.
|
|
1406
1426
|
enrichTasks.push(t.time("14b_vervoerder", async () => {
|
|
1407
1427
|
const { resolveCarriersMany } = await import("./carrier-resolve.server.js");
|
|
1408
|
-
const reqs =
|
|
1428
|
+
const reqs = logistiek
|
|
1409
1429
|
.map((o) => ({ o, id: idFor(o) }))
|
|
1410
1430
|
.filter((x) => !!x.id);
|
|
1411
1431
|
const res = await resolveCarriersMany(supabase, reqs.map(({ o, id }) => ({ id, legacyCarrierId: o.carrierName ? "oud" : null, legacyCarrierName: o.carrierName ?? null })));
|
|
@@ -1426,7 +1446,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1426
1446
|
enrichTasks.push(t.time("14d_afleverlocatie", async () => {
|
|
1427
1447
|
const { loadDeliveryLocations, deliveryLocationLabel } = await import("./delivery-location.server.js");
|
|
1428
1448
|
const locs = await loadDeliveryLocations(supabase, ids);
|
|
1429
|
-
for (const o of
|
|
1449
|
+
for (const o of logistiek) {
|
|
1430
1450
|
const oid = idFor(o);
|
|
1431
1451
|
const l = oid ? locs.get(oid) : undefined;
|
|
1432
1452
|
o.deliveryLocationLabel = deliveryLocationLabel(l) ?? null;
|
|
@@ -1447,7 +1467,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1447
1467
|
enrichTasks.push(t.time("14c_dekking", async () => {
|
|
1448
1468
|
const coverage = await loadPlanCoverage(supabase, ids, "list");
|
|
1449
1469
|
let failed = 0;
|
|
1450
|
-
for (const o of
|
|
1470
|
+
for (const o of logistiek) {
|
|
1451
1471
|
const oid = idFor(o);
|
|
1452
1472
|
const c = oid ? coverage.get(oid) : undefined;
|
|
1453
1473
|
if (!c)
|
|
@@ -1477,6 +1497,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1477
1497
|
for (const g of pageGroups) {
|
|
1478
1498
|
if (g.length < 2 && !((g[0]?.bufferSize ?? 1) > 1 && g[0]?.bufferId))
|
|
1479
1499
|
continue;
|
|
1500
|
+
if (isKlokverkoopGroup(g))
|
|
1501
|
+
continue;
|
|
1480
1502
|
const covs = g
|
|
1481
1503
|
.map((m) => { const id = idFor(m); return id ? coverage.get(id) : undefined; })
|
|
1482
1504
|
.filter((x) => !!x && x.state !== "onbekend");
|
|
@@ -1557,7 +1579,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1557
1579
|
if (isProblemGroup(g))
|
|
1558
1580
|
statusCounts.problem++;
|
|
1559
1581
|
// Onbekende achterstand valt hier vanzelf terug onder "Te picken".
|
|
1560
|
-
|
|
1582
|
+
const st = stageOf(g);
|
|
1583
|
+
if (LOGISTIEKE_TABS.has(st) && isKlokverkoopGroup(g))
|
|
1584
|
+
continue;
|
|
1585
|
+
statusCounts[st]++;
|
|
1561
1586
|
}
|
|
1562
1587
|
const rows = pageGroups.map((g) => {
|
|
1563
1588
|
const row = mergeGroup(g);
|
|
@@ -143,6 +143,12 @@ export interface SalesOrderDTO {
|
|
|
143
143
|
floridayIds?: string[];
|
|
144
144
|
/** Echte Floriday-status van de order (custom_fields.floriday_status), alleen weergave. */
|
|
145
145
|
floridayRawStatus?: string | null;
|
|
146
|
+
/** orders.klokverkoop (klokverkoop.ts): geen indeling, picken, vervoer of afmelden. */
|
|
147
|
+
klokverkoop?: boolean;
|
|
148
|
+
/** Alleen bij klokverkoop: "voorverkoop" (klokvoorverkoop uit de aanvoer) of "klok"; alleen weergave. */
|
|
149
|
+
klokverkoopSoort?: "klok" | "voorverkoop" | null;
|
|
150
|
+
/** Floriday paymentProvider (RFH, VRM, …), alleen weergave. */
|
|
151
|
+
paymentProvider?: string | null;
|
|
146
152
|
/** Floriday-stand uit het statusoverzicht; alleen weergave. */
|
|
147
153
|
floridayStatus?: import("./floriday-status.js").FloridayStatusSummary | null;
|
|
148
154
|
/** Lijst: ids waarvoor het scherm de Floriday-stand los nalaadt. */
|
|
@@ -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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"}
|
|
@@ -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", o.stageNote ?? null),
|
|
276
|
+
orderStageLabel(o.stage ?? "incoming", o.stageNote ?? null, { klokverkoop: o.klokverkoop === true, klokverkoopSoort: o.klokverkoopSoort ?? 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;AAmC/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;;mCA4dzB,CAAC;AAML,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"}
|
|
@@ -9,6 +9,7 @@ import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./sa
|
|
|
9
9
|
import { resolveOrderStage, orderStageNote, floridayZonderOrderNote } from "./order-status.js";
|
|
10
10
|
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
11
11
|
import { invoiceRoute } from "./order-progress.js";
|
|
12
|
+
import { klokverkoopSoort } from "./klokverkoop.js";
|
|
12
13
|
import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
|
|
13
14
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
14
15
|
const CANONICAL_ENTITY_TYPE = "sales-orders";
|
|
@@ -204,7 +205,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
204
205
|
customerOrgId
|
|
205
206
|
? supabase
|
|
206
207
|
.from("customers")
|
|
207
|
-
.select("id, company_name, commercial_name, city, postal_code, logo_url, floriday_organization_id, phone,
|
|
208
|
+
.select("id, company_name, commercial_name, city, postal_code, logo_url, floriday_organization_id, phone, contact_person, custom_fields, gln, street, country")
|
|
208
209
|
.eq("floriday_organization_id", customerOrgId)
|
|
209
210
|
.limit(1)
|
|
210
211
|
.then((r) => r)
|
|
@@ -231,6 +232,9 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
231
232
|
resolveOrderNumbers(supabase, [data.id]).catch(() => new Map()),
|
|
232
233
|
]);
|
|
233
234
|
// 4) Bouw lookups met precies één klant en één trade-item.
|
|
235
|
+
if (customerLocalRes?.error) {
|
|
236
|
+
console.error("[getSalesOrderDetail] lokale klant opvragen faalde:", customerLocalRes.error?.message ?? customerLocalRes.error);
|
|
237
|
+
}
|
|
234
238
|
const customerLookup = new Map();
|
|
235
239
|
const localC = (customerLocalRes?.data ?? null);
|
|
236
240
|
if (localC) {
|
|
@@ -295,7 +299,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
295
299
|
try {
|
|
296
300
|
const ownRes = await supabase
|
|
297
301
|
.from("orders")
|
|
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)")
|
|
302
|
+
.select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, klokverkoop, 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)")
|
|
299
303
|
.eq("floriday_sales_order_id", data.id)
|
|
300
304
|
// Actieve order eerst; een verwijderde alleen als er geen actieve is.
|
|
301
305
|
.order("deleted_at", { ascending: true, nullsFirst: true })
|
|
@@ -346,6 +350,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
346
350
|
const fs = (ownRow?.custom_fields ?? {})?.floriday_status;
|
|
347
351
|
dto.floridayRawStatus = typeof fs === "string" ? fs : null;
|
|
348
352
|
}
|
|
353
|
+
// Klokverkoop: alleen het vastgelegde kenmerk (orders.klokverkoop).
|
|
354
|
+
dto.klokverkoop = ownRow?.klokverkoop === true;
|
|
355
|
+
dto.klokverkoopSoort = dto.klokverkoop ? (klokverkoopSoort(orderData) ?? "klok") : null;
|
|
356
|
+
dto.paymentProvider = typeof orderData?.paymentProvider === "string" ? orderData.paymentProvider : null;
|
|
349
357
|
const reviewCf = (ownRow?.custom_fields ?? {});
|
|
350
358
|
dto.mixedDeliveryDates = Boolean(reviewCf?.floriday_mixed_delivery_dates);
|
|
351
359
|
dto.unlinkedProducts = ownRow ? unlinkedFloridayProducts(ownRow) : [];
|
|
@@ -414,7 +422,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
414
422
|
dto.bufferId = bufferId;
|
|
415
423
|
const sibRes = await supabase
|
|
416
424
|
.from("orders")
|
|
417
|
-
.select("id, floriday_sales_order_id, status, is_reservation, order_source, custom_fields")
|
|
425
|
+
.select("id, floriday_sales_order_id, status, is_reservation, order_source, klokverkoop, custom_fields")
|
|
418
426
|
.eq("buffer_id", bufferId)
|
|
419
427
|
.not("floriday_sales_order_id", "is", null);
|
|
420
428
|
const sibLocalByFoId = new Map();
|
|
@@ -536,6 +544,9 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
536
544
|
const fs = (sLocal?.custom_fields ?? {})?.floriday_status;
|
|
537
545
|
sDto.floridayRawStatus = typeof fs === "string" ? fs : null;
|
|
538
546
|
}
|
|
547
|
+
sDto.klokverkoop = sLocal?.klokverkoop === true;
|
|
548
|
+
sDto.klokverkoopSoort = sDto.klokverkoop ? (klokverkoopSoort(sr.data) ?? "klok") : null;
|
|
549
|
+
sDto.paymentProvider = typeof sr.data?.paymentProvider === "string" ? sr.data.paymentProvider : null;
|
|
539
550
|
sDto.orderRowId = sLocal?.id ? String(sLocal.id) : null;
|
|
540
551
|
sDto.invoiceRoute = invoiceRoute({
|
|
541
552
|
floridaySalesOrderId: String(sr.floriday_id),
|