@flowselections/floriday-voorraad 1.0.135 → 1.0.137

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;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"}
+{"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,+BA+3EL"}

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

@@ -21,7 +21,7 @@ import { useFloridayVbnRequired } from "../../hooks/useFloridayVbnRequired.js";
 import { saveFloridayVbnRequired } from "../../lib/floriday-vbn-required.functions.js";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { fetchFloridayWriteMode } from "../../lib/floriday-write-mode.js";
-import { editTargetText } from "../../lib/publish-status.js";
+import { editTargetText, formSalePrice, syncAfterPublish } 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";
@@ -564,9 +564,7 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
                             ? barcode
                             : (payload.gtin ?? ""),
                     // M26: de verkoopprijs van het artikel is leidend (zelfde veld als "Prijs opslaan").
-                    salePricePerPiece: Number(product.sale_price) > 0
-                        ? Number(product.sale_price)
-                        : Number(customFields.sale_price ?? customFields.salePrice ?? payload.salePricePerPiece) || 0,
+                    salePricePerPiece: formSalePrice(product.sale_price, customFields.sale_price ?? customFields.salePrice ?? payload.salePricePerPiece),
                     // Voorkeur: werkelijke voorraad uit trade_item_stock.
                     // Fallback: opgeslagen payload-waarde. `products.quantity` wordt
                     // bewust NIET meer gelezen — die staat structureel op 0.
@@ -824,9 +822,8 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
                     if (r.price_group_id) {
                         groupPrices[r.price_group_id] = Number(r.price_per_piece);
                     }
-                    else if (!(d.salePricePerPiece > 0)) {
-                        next.salePricePerPiece = Number(r.price_per_piece);
-                    }
+                    // 1.0.136: de basisprijs komt NOOIT uit trade_item_prices; die volgt
+                    // products.sale_price en wordt nooit teruggeschreven naar het artikel.
                 }
                 next.priceGroupPrices = groupPrices;
                 return next;
@@ -1210,7 +1207,9 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
         // Zijn de productregels (schema) nog niet binnen? Dan publiceren we niet,
         // maar bewaren we de wijziging ALTIJD lokaal en markeren we hem als
         // "nog niet doorgegeven aan Floriday".
-        if (wantsPublish && !schemaQuery.isSuccess) {
+        // 1.0.136: alleen bij AANMAKEN. Een update van een bestaand Floriday-artikel
+        // heeft de productregels niet nodig en mag daar nooit op vastlopen.
+        if (wantsPublish && !schemaQuery.isSuccess && !isEditingPublished) {
             setSubmitting(true);
             try {
                 const localId = await upsertLocalTradeItem({
@@ -1668,18 +1667,14 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
                 await reloadPublishJob(jobId);
             if (status === "failed" && verifyMismatch) {
                 if (draftId) {
-                    await markLocalSyncStatus(draftId, {
-                        dirty: true,
-                        last_error: verifyMismatch,
-                    }).catch(() => { });
+                    await markLocalSyncStatus(draftId, syncAfterPublish(status, verifyMismatch)).catch(() => { });
                 }
                 toast.error("Wijziging niet aangekomen in Floriday", { description: verifyMismatch });
             }
             else if (status === "succeeded") {
                 if (draftId) {
                     await markLocalSyncStatus(draftId, {
-                        dirty: false,
-                        last_error: null,
+                        ...syncAfterPublish(status, null),
                         last_synced_at: new Date().toISOString(),
                     }).catch(() => { });
                 }
@@ -1690,8 +1685,7 @@ export function ArtikelWizard({ draftId: initialDraftId, tradeItemId, productId,
             else if (status === "succeeded_with_warnings") {
                 if (draftId) {
                     await markLocalSyncStatus(draftId, {
-                        dirty: false,
-                        last_error: null,
+                        ...syncAfterPublish(status, null),
                         last_synced_at: new Date().toISOString(),
                     }).catch(() => { });
                 }

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

@@ -1 +1 @@
-{"version":3,"file":"FloridayInfoCard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/FloridayInfoCard.tsx"],"names":[],"mappings":"AAYA,UAAU,KAAK;IACb,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,8EAA8E;IAC9E,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACtB,CAAC;CACH;AA6DD,wBAAgB,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,KAAK,EAAE,EAAE,KAAK,sCAoRrE"}
+{"version":3,"file":"FloridayInfoCard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/FloridayInfoCard.tsx"],"names":[],"mappings":"AAaA,UAAU,KAAK;IACb,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,8EAA8E;IAC9E,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACtB,CAAC;CACH;AA6DD,wBAAgB,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,KAAK,EAAE,EAAE,KAAK,sCAoSrE"}

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

@@ -5,6 +5,7 @@ import { AlertTriangle, ChevronDown, ChevronRight, ExternalLink } from "lucide-r
 import { supabase } from "../../integrations/supabase/client.js";
 import { floridayInfoFromCache, } from "../../lib/floriday-info.js";
 import { useLoadCarriers } from "../../hooks/useLoadCarriers.js";
+import { gatewayReadFn } from "../../lib/floriday-gateway.functions.js";
 const floridayLogo = "/flowselections-assets/Voorraad/floriday-logo.png";
 function formatDate(iso) {
     if (!iso)
@@ -47,6 +48,24 @@ export function FloridayInfoCard({ floridayTradeItemId, local }) {
         setNotFound(false);
         (async () => {
             try {
+                // 1.0.136: eerst live uit Floriday (via floriday-get), zodat een net
+                // verstuurde wijziging direct zichtbaar is; de kopie is alleen terugval.
+                try {
+                    const live = (await gatewayReadFn({
+                        data: { path: `/suppliers-api-2026v1/trade-items/${floridayTradeItemId}` },
+                    }));
+                    if (cancelled)
+                        return;
+                    if (live?.data && typeof live.data === "object") {
+                        setInfo(floridayInfoFromCache({ ...live.data, id: floridayTradeItemId }));
+                        setNotFound(false);
+                        setActivePhoto(0);
+                        return;
+                    }
+                }
+                catch {
+                    /* terugval op de kopie */
+                }
                 const { data, error } = await supabase
                     .from("floriday_trade_items_cache")
                     .select("data,floriday_id")

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

@@ -11025,6 +11025,7 @@ export type Database = {
                     invoice_date: string;
                     invoice_number: string | null;
                     note: string | null;
+                    paid_at: string | null;
                     payment_term_days: number;
                     reference: string | null;
                     sent_at: string | null;
@@ -11058,6 +11059,7 @@ export type Database = {
                     invoice_date?: string;
                     invoice_number?: string | null;
                     note?: string | null;
+                    paid_at?: string | null;
                     payment_term_days?: number;
                     reference?: string | null;
                     sent_at?: string | null;
@@ -11091,6 +11093,7 @@ export type Database = {
                     invoice_date?: string;
                     invoice_number?: string | null;
                     note?: string | null;
+                    paid_at?: string | null;
                     payment_term_days?: number;
                     reference?: string | null;
                     sent_at?: string | null;
@@ -11157,6 +11160,30 @@ export type Database = {
                     }
                 ];
             };
+            itk_cost_settings: {
+                Row: {
+                    created_at: string;
+                    labour_cost_cents_per_hour: number | null;
+                    singleton: boolean;
+                    travel_cost_cents_per_hour: number | null;
+                    updated_at: string;
+                };
+                Insert: {
+                    created_at?: string;
+                    labour_cost_cents_per_hour?: number | null;
+                    singleton?: boolean;
+                    travel_cost_cents_per_hour?: number | null;
+                    updated_at?: string;
+                };
+                Update: {
+                    created_at?: string;
+                    labour_cost_cents_per_hour?: number | null;
+                    singleton?: boolean;
+                    travel_cost_cents_per_hour?: number | null;
+                    updated_at?: string;
+                };
+                Relationships: [];
+            };
             itk_customer_dynamic_values: {
                 Row: {
                     created_at: string;
@@ -17538,6 +17565,7 @@ export type Database = {
             };
             monteur_contracten: {
                 Row: {
+                    bruto_uurloon: number | null;
                     contract_type: string;
                     created_at: string;
                     days_per_week: number;
@@ -17549,6 +17577,7 @@ export type Database = {
                     vacation_days_per_year: number;
                 };
                 Insert: {
+                    bruto_uurloon?: number | null;
                     contract_type?: string;
                     created_at?: string;
                     days_per_week?: number;
@@ -17560,6 +17589,7 @@ export type Database = {
                     vacation_days_per_year?: number;
                 };
                 Update: {
+                    bruto_uurloon?: number | null;
                     contract_type?: string;
                     created_at?: string;
                     days_per_week?: number;
@@ -29984,6 +30014,27 @@ export type Database = {
                     }
                 ];
             };
+            werkbon_package_settings: {
+                Row: {
+                    avg_mechanic_rate_cents: number;
+                    created_at: string;
+                    id: number;
+                    updated_at: string;
+                };
+                Insert: {
+                    avg_mechanic_rate_cents?: number;
+                    created_at?: string;
+                    id?: number;
+                    updated_at?: string;
+                };
+                Update: {
+                    avg_mechanic_rate_cents?: number;
+                    created_at?: string;
+                    id?: number;
+                    updated_at?: string;
+                };
+                Relationships: [];
+            };
             werkbon_packages: {
                 Row: {
                     active: boolean;
@@ -30484,6 +30535,7 @@ export type Database = {
                     signature_accepted_at: string | null;
                     signature_by_user_id: string | null;
                     signature_image_path: string | null;
+                    signature_missing_reason: string | null;
                     signature_name: string | null;
                     source_email_meta: Json | null;
                     source_mailbox_message_id: string | null;
@@ -30533,6 +30585,7 @@ export type Database = {
                     signature_accepted_at?: string | null;
                     signature_by_user_id?: string | null;
                     signature_image_path?: string | null;
+                    signature_missing_reason?: string | null;
                     signature_name?: string | null;
                     source_email_meta?: Json | null;
                     source_mailbox_message_id?: string | null;
@@ -30582,6 +30635,7 @@ export type Database = {
                     signature_accepted_at?: string | null;
                     signature_by_user_id?: string | null;
                     signature_image_path?: string | null;
+                    signature_missing_reason?: string | null;
                     signature_name?: string | null;
                     source_email_meta?: Json | null;
                     source_mailbox_message_id?: string | null;
@@ -32278,6 +32332,12 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            afh_signup_sender: {
+                Args: {
+                    p_purpose: string;
+                };
+                Returns: Json;
+            };
             afh_subtract_workdays: {
                 Args: {
                     _date: string;
@@ -33458,6 +33518,7 @@ export type Database = {
                     invoice_date: string;
                     invoice_number: string;
                     kind: string;
+                    original_invoice_id: string;
                     payment_status: string;
                     source: string;
                     status: string;
@@ -34826,9 +34887,29 @@ export type Database = {
                     afgerond: number;
                     bezig: number;
                     customer_id: string;
+                    gem_betaaltermijn_dagen: number;
                     klussen: number;
+                    materiaal_kosten_cents: number;
                     omzet_cents: number;
                     open: number;
+                    reis_minuten: number;
+                    te_laat: number;
+                    te_laat_open: number;
+                    werk_minuten: number;
+                }[];
+            };
+            itk_month_trend: {
+                Args: {
+                    _today: string;
+                };
+                Returns: {
+                    materiaal_kosten_cents: number;
+                    omzet_cents: number;
+                    periode: string;
+                    reis_minuten: number;
+                    tot: string;
+                    van: string;
+                    werk_minuten: number;
                 }[];
             };
             itk_offerte_naar_werkbon: {
@@ -35290,6 +35371,18 @@ export type Database = {
                 };
                 Returns: boolean;
             };
+            logistics_allocation_stale: {
+                Args: {
+                    p_order_item_id: string;
+                };
+                Returns: boolean;
+            };
+            logistics_allocation_stale_reden: {
+                Args: {
+                    p_order_item_id: string;
+                };
+                Returns: string;
+            };
             logistics_allowed_load_carriers: {
                 Args: {
                     p_strategy_id?: string;
@@ -35332,6 +35425,19 @@ export type Database = {
                 };
                 Returns: boolean;
             };
+            logistics_archive_stale_buffer_carts: {
+                Args: {
+                    p_uitvoeren?: boolean;
+                };
+                Returns: Json;
+            };
+            logistics_archive_stale_buffer_carts_core: {
+                Args: {
+                    p_buffer: string;
+                    p_uitvoeren: boolean;
+                };
+                Returns: Json;
+            };
             logistics_archived_orders: {
                 Args: never;
                 Returns: {
@@ -35528,6 +35634,12 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_buffer_carts: {
+                Args: {
+                    p_buffer_id: string;
+                };
+                Returns: Json;
+            };
             logistics_buffer_closed_for_join: {
                 Args: {
                     p_buffer: string;
@@ -35639,6 +35751,16 @@ export type Database = {
                 };
                 Returns: number;
             };
+            logistics_canon_ref: {
+                Args: {
+                    p_ref: string;
+                };
+                Returns: {
+                    pid: string;
+                    reden: string;
+                    tkey: string;
+                }[];
+            };
             logistics_capacity_day_check: {
                 Args: {
                     p_from?: string;
@@ -35646,6 +35768,26 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_capacity_day_load: {
+                Args: {
+                    p_from: string;
+                    p_settings: Json;
+                    p_to: string;
+                    p_user: string;
+                };
+                Returns: {
+                    carts: number;
+                    d: string;
+                    required: number;
+                    zonder_kar: number;
+                }[];
+            };
+            logistics_capacity_day_orders: {
+                Args: {
+                    p_date: string;
+                };
+                Returns: Json;
+            };
             logistics_capacity_plan_day: {
                 Args: {
                     p_date: string;
@@ -35823,6 +35965,12 @@ export type Database = {
                 Args: never;
                 Returns: Json;
             };
+            logistics_cart_eerdere_buffer: {
+                Args: {
+                    p_cart_id: string;
+                };
+                Returns: Json;
+            };
             logistics_cart_extra_fields: {
                 Args: {
                     p_cart_id: string;
@@ -36102,6 +36250,18 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_cart_verouderd_redenen: {
+                Args: {
+                    p_cart_id: string;
+                };
+                Returns: Json;
+            };
+            logistics_cart_vervoer_gemengd: {
+                Args: {
+                    p_cart_id: string;
+                };
+                Returns: Json;
+            };
             logistics_cart_vulgraad_core: {
                 Args: {
                     p_cart_id: string;
@@ -37094,6 +37254,38 @@ export type Database = {
                     uitleg: string;
                 }[];
             };
+            logistics_install_check_217: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
+            logistics_install_check_218: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
+            logistics_install_check_220: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
+            logistics_install_check_221: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
             logistics_is_beheer: {
                 Args: never;
                 Returns: boolean;
@@ -37472,6 +37664,13 @@ export type Database = {
                 };
                 Returns: string[];
             };
+            logistics_order_dag: {
+                Args: {
+                    p_delivery_date: string;
+                    p_planned_start: string;
+                };
+                Returns: string;
+            };
             logistics_order_date: {
                 Args: {
                     p: string;
@@ -37713,6 +37912,12 @@ export type Database = {
                     status: string;
                 }[];
             };
+            logistics_order_own_transport: {
+                Args: {
+                    p_custom_fields: Json;
+                };
+                Returns: boolean;
+            };
             logistics_order_pick_day: {
                 Args: {
                     p_order_ref: string;
@@ -37821,6 +38026,12 @@ export type Database = {
                     order_id: string;
                 }[];
             };
+            logistics_order_transport_group: {
+                Args: {
+                    p_order: Json;
+                };
+                Returns: string;
+            };
             logistics_order_unit_carts: {
                 Args: {
                     p_order_ids: string[];
@@ -37878,6 +38089,13 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_own_transport_carrier: {
+                Args: {
+                    p_order: Json;
+                    p_skip_manual: boolean;
+                };
+                Returns: Json;
+            };
             logistics_own_transport_departure: {
                 Args: {
                     p_delivery_date: string;
@@ -38038,6 +38256,12 @@ export type Database = {
                 };
                 Returns: number;
             };
+            logistics_pick_queue_fix_cancelled_status: {
+                Args: {
+                    p_uitvoeren?: boolean;
+                };
+                Returns: Json;
+            };
             logistics_pick_start_estimate: {
                 Args: {
                     p_order: Json;
@@ -38702,6 +38926,19 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_reservation_repair_stale: {
+                Args: {
+                    p_uitvoeren?: boolean;
+                };
+                Returns: Json;
+            };
+            logistics_reservation_repair_stale_core: {
+                Args: {
+                    p_order_item_ids: string[];
+                    p_uitvoeren: boolean;
+                };
+                Returns: Json;
+            };
             logistics_reserved_fast_skip: {
                 Args: {
                     p_key: string;
@@ -39142,6 +39379,23 @@ export type Database = {
                 };
                 Returns: undefined;
             };
+            logistics_stale_buffer_carts: {
+                Args: {
+                    p_buffer?: string;
+                };
+                Returns: {
+                    actieve_order: boolean;
+                    afgerond: boolean;
+                    besluit: string;
+                    cart_id: string;
+                    geprint: boolean;
+                    gescand: boolean;
+                    karnummer: number;
+                    nieuwe_buffer: string;
+                    orders: string;
+                    oude_buffer: string;
+                }[];
+            };
             logistics_startlijst: {
                 Args: never;
                 Returns: Json;
@@ -44865,6 +45119,12 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            voorraad_correctie_1136: {
+                Args: {
+                    p_uitvoeren?: boolean;
+                };
+                Returns: Json;
+            };
             voorraad_correctie_status: {
                 Args: {
                     p_correctie?: string;
@@ -45038,6 +45298,15 @@ export type Database = {
                 };
                 Returns: number;
             };
+            werkbon_arbeidskosten_schatting: {
+                Args: {
+                    _werkbon_id: string;
+                };
+                Returns: {
+                    estimated_labor_cents: number;
+                    labor_minutes: number;
+                }[];
+            };
             werkbon_format_project_number: {
                 Args: {
                     _parent_project_number?: string;
@@ -45173,6 +45442,14 @@ export type Database = {
                 };
                 Returns: string;
             };
+            wo_planner_contacten: {
+                Args: never;
+                Returns: {
+                    naam: string;
+                    telefoon: string;
+                    user_id: string;
+                }[];
+            };
             wo_process_offerte_request: {
                 Args: {
                     _queue_id: string;