@flowselections/floriday-voorraad 1.0.131 → 1.0.135

package/dist-lib/components/voorraad/ArtikelWizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArtikelWizard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ArtikelWizard.tsx"],"names":[],"mappings":"AA2DA,OAAO,EAUL,KAAK,UAAU,EAMhB,MAAM,4BAA4B,CAAC;AA2DpC,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMpF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,UAAU,CA0BrF;AAiED,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EAAE,cAAc,EACvB,WAAW,EACX,SAAS,EACT,WAAW,EACX,OAAO,GACR,GAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,aAAa,CAAC;CACpB,+BAo2EL"}
+{"version":3,"file":"ArtikelWizard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ArtikelWizard.tsx"],"names":[],"mappings":"AA2DA,OAAO,EAUL,KAAK,UAAU,EAMhB,MAAM,4BAA4B,CAAC;AA4DpC,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMpF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,UAAU,CA0BrF;AAiED,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EAAE,cAAc,EACvB,WAAW,EACX,SAAS,EACT,WAAW,EACX,OAAO,GACR,GAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,aAAa,CAAC;CACpB,+BAi4EL"}

package/dist-lib/components/voorraad/ArtikelWizard.js

@@ -22,6 +22,7 @@ import { saveFloridayVbnRequired } from "../../lib/floriday-vbn-required.functio
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { fetchFloridayWriteMode } from "../../lib/floriday-write-mode.js";
 import { editTargetText } from "../../lib/publish-status.js";
+import { compareAfterUpdate, verifyDifferenceMessage } from "../../lib/publish-verify.js";
 import { articleCodeProblem } from "../../lib/article-code.js";
 import { useCodeList, useTradeItemFormSchema } from "../../hooks/useFloriday.js";
 import { useFloridayPriceGroups } from "../../hooks/useFloridayPriceGroups.js";
@@ -1584,6 +1585,7 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
                 }, stepOpts);
             }
             // 6) Controle achteraf --------------------------------------------------
+            let verifyMismatch = null;
             if (resolvedTradeItemId) {
                 const verify = await runPublishStep(jobId, "verify", async () => {
                     const res = (await gatewayReadFn({
@@ -1628,13 +1630,32 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
                     if (!confirmedPacking) {
                         warnings.push("Floriday heeft nog geen belading voor dit artikel");
                     }
-                    const remoteName = item?.tradeItemName ?? item?.name;
-                    if (remoteName && data.name && remoteName !== data.name) {
-                        warnings.push("De artikelnaam wijkt af");
+                    // Naam, VBN of hoofdverpakking die afwijkt van wat het ERP stuurde
+                    // = de wijziging is niet aangekomen: stap (en job) mislukt.
+                    let expectedPacking = null;
+                    try {
+                        const pb = buildPrimaryPackingBase(data);
+                        expectedPacking = {
+                            piecesPerPackage: pb.piecesPerPackage,
+                            packagesPerLayer: pb.packagesPerLayer,
+                            layersPerLoadCarrier: pb.layersPerLoadCarrier,
+                            vbnPackageCode: pb.customPackageId ? null : pb.vbnPackageCode,
+                            loadCarrier: pb.loadCarrier,
+                        };
+                    }
+                    catch {
+                        expectedPacking = null;
+                    }
+                    const diffs = compareAfterUpdate({ name: data.name, vbnCode: data.vbnCode, packing: confirmedPacking ? expectedPacking : null }, item);
+                    if (diffs.length > 0) {
+                        throw new Error(`VERIFY_MISMATCH:${verifyDifferenceMessage(diffs)}`);
                     }
                     return { warnings };
                 }, stepOpts);
-                if (!verify.ok) {
+                if (!verify.ok && verify.error?.code === "VERIFY_MISMATCH") {
+                    verifyMismatch = verify.error.message;
+                }
+                else if (!verify.ok) {
                     toast.warning("Gepubliceerd; de controle achteraf lukte niet", {
                         description: `${verify.error?.message ?? "Onbekende reden"} — het artikel staat wel in Floriday.`,
                     });
@@ -1642,10 +1663,19 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
             }
             const status = jobId ? await finishPublishJob(jobId, {
                 tradeItemId: resolvedTradeItemId,
-            }) : "succeeded";
+            }) : verifyMismatch ? "failed" : "succeeded";
             if (jobId)
                 await reloadPublishJob(jobId);
-            if (status === "succeeded") {
+            if (status === "failed" && verifyMismatch) {
+                if (draftId) {
+                    await markLocalSyncStatus(draftId, {
+                        dirty: true,
+                        last_error: verifyMismatch,
+                    }).catch(() => { });
+                }
+                toast.error("Wijziging niet aangekomen in Floriday", { description: verifyMismatch });
+            }
+            else if (status === "succeeded") {
                 if (draftId) {
                     await markLocalSyncStatus(draftId, {
                         dirty: false,

package/dist-lib/hooks/useLocalTradeItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalTradeItems.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalTradeItems.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAwB,KAAK,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIvG;;;;;GAKG;AAEH,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AA0ED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;;;;EA0B9D;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA4BrF;AAED,MAAM,WAAW,SAAS;IACxB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC;CACpC;AAED,0FAA0F;AAC1F,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAWjF;AAqBD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,iFAAiF;IACjF,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuGlB;AAED,wEAAwE;AACxE,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAqBf;AAGD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhF;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpE"}
+{"version":3,"file":"useLocalTradeItems.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalTradeItems.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAwB,KAAK,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIvG;;;;;GAKG;AAEH,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AA0ED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;;;;EA0B9D;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA4BrF;AAED,MAAM,WAAW,SAAS;IACxB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC;CACpC;AAED,0FAA0F;AAC1F,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAWjF;AAqBD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,iFAAiF;IACjF,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0GlB;AAED,wEAAwE;AACxE,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAqBf;AAGD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhF;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpE"}

package/dist-lib/hooks/useLocalTradeItems.js

@@ -188,6 +188,9 @@ export async function upsertLocalTradeItem(params) {
     }
     if (payload.name)
         productPatch.product = payload.name;
+    // Eén prijsbron: de basisprijs uit het artikelscherm is products.sale_price.
+    if (Number(payload.salePricePerPiece) > 0)
+        productPatch.sale_price = Number(payload.salePricePerPiece);
     if (payload.articleCode)
         productPatch.article_number = payload.articleCode;
     if (payload.gtin)
@@ -228,6 +231,7 @@ export async function upsertLocalTradeItem(params) {
         batch: "-",
         location: "onbekend",
         quantity: 0,
+        ...(Number(payload.salePricePerPiece) > 0 ? { sale_price: Number(payload.salePricePerPiece) } : {}),
         unit: "stuks",
         article_number: payload.articleCode || null,
         barcode: payload.gtin || null,

package/dist-lib/hooks/useVoorraadData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useVoorraadData.d.ts","sourceRoot":"","sources":["../../src/hooks/useVoorraadData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsB5E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;;EA2U1D"}
+{"version":3,"file":"useVoorraadData.d.ts","sourceRoot":"","sources":["../../src/hooks/useVoorraadData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsB5E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;;EA2U1D"}

package/dist-lib/hooks/useVoorraadData.js

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { hideMirrorItems } from "../lib/mirror-products.js";
 import { createBundler, pageRequestGuard } from "../lib/request-guard.js";
 import { supabase } from "../integrations/supabase/client.js";
 import { normaliseTradeItem } from "../lib/floriday-client.js";
@@ -295,7 +296,7 @@ export function useVoorraadData(connectionId) {
     };
     // Stabiele identiteit: alleen een nieuwe lijst als de onderliggende data verandert.
     const merged = useMemo(() => [
-        ...localItems.map((i) => applyProductGroupReservation(classify(attachFloriday(applyStock(i, lookupStock(stockMap, {
+        ...hideMirrorItems(localItems).map((i) => applyProductGroupReservation(classify(attachFloriday(applyStock(i, lookupStock(stockMap, {
             tradeItemKey: i.tradeItemKey ?? null,
             floridayId: i.floridayId ?? null,
             productId: i.productId ?? null,

package/dist-lib/integrations/supabase/types.d.ts

@@ -26195,6 +26195,9 @@ export type Database = {
             };
             trade_item_stock: {
                 Row: {
+                    archived_at: string | null;
+                    archived_into: string | null;
+                    archived_reason: string | null;
                     change_source: string;
                     connection_id: string;
                     created_at: string;
@@ -26209,6 +26212,9 @@ export type Database = {
                     user_id: string;
                 };
                 Insert: {
+                    archived_at?: string | null;
+                    archived_into?: string | null;
+                    archived_reason?: string | null;
                     change_source?: string;
                     connection_id: string;
                     created_at?: string;
@@ -26223,6 +26229,9 @@ export type Database = {
                     user_id?: string;
                 };
                 Update: {
+                    archived_at?: string | null;
+                    archived_into?: string | null;
+                    archived_reason?: string | null;
                     change_source?: string;
                     connection_id?: string;
                     created_at?: string;
@@ -31855,6 +31864,14 @@ export type Database = {
                 };
                 Returns: string[];
             };
+            _print_label_maat_uit_code: {
+                Args: {
+                    _formaten: Json;
+                    _invoer: string;
+                    _papierformaat: string;
+                };
+                Returns: Json;
+            };
             _print_meld_stilstand: {
                 Args: {
                     _reden: string;
@@ -37069,6 +37086,14 @@ export type Database = {
                     uitleg: string;
                 }[];
             };
+            logistics_install_check_215: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
             logistics_is_beheer: {
                 Args: never;
                 Returns: boolean;
@@ -44712,10 +44737,35 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            voorraad_artikel_prijs: {
+                Args: {
+                    p_id: string;
+                };
+                Returns: {
+                    product_id: string;
+                    sale_price: number;
+                    unit: string;
+                }[];
+            };
             voorraad_can_write: {
                 Args: never;
                 Returns: boolean;
             };
+            voorraad_canoniek_artikel: {
+                Args: {
+                    p_id: string;
+                };
+                Returns: {
+                    product_id: string;
+                    trade_item_key: string;
+                }[];
+            };
+            voorraad_canoniek_sleutel: {
+                Args: {
+                    p_product_id: string;
+                };
+                Returns: string;
+            };
             voorraad_cleanup_old_rows: {
                 Args: never;
                 Returns: Json;
@@ -44803,12 +44853,28 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            voorraad_correctie_1131: {
+                Args: {
+                    p_uitvoeren?: boolean;
+                };
+                Returns: Json;
+            };
+            voorraad_correctie_1132: {
+                Args: {
+                    p_uitvoeren?: boolean;
+                };
+                Returns: Json;
+            };
             voorraad_correctie_status: {
                 Args: {
                     p_correctie?: string;
                 };
                 Returns: Json;
             };
+            voorraad_dubbele_voorraadregels: {
+                Args: never;
+                Returns: Json;
+            };
             voorraad_external_fulfilled_ids: {
                 Args: {
                     p_cf: Json;
@@ -44897,6 +44963,12 @@ export type Database = {
                 };
                 Returns: boolean;
             };
+            voorraad_orderregel_sleutel: {
+                Args: {
+                    p_ref: string;
+                };
+                Returns: string;
+            };
             voorraad_packing_from_floriday: {
                 Args: {
                     p_product_id: string;