@propeller-commerce/propeller-v2-react-ui 0.23.0 → 0.24.0

package/dist/index.d.cts

@@ -1542,9 +1542,9 @@ interface QuickOrderMatch {
     name: string;
     /** The product SKU/code (canonical, from the API). */
     sku: string;
-    /** Net (excl. VAT) unit price. */
+    /** Unit price incl. VAT. */
     netPrice: number;
-    /** Gross (incl. VAT) unit price. */
+    /** Unit price excl. VAT. */
     grossPrice: number;
     /** Minimum order quantity (defaults to 1). */
     minQuantity: number;
@@ -5926,6 +5926,8 @@ interface QuickOrderProps {
     };
     /** Tax zone for price calculation. Defaults to `'NL'`. */
     taxZone?: string;
+    /** Show tax-inclusive prices. Resolves from `<PropellerProvider>`. */
+    includeTax?: boolean;
     /** Orderlist (contract) ids to scope the catalogue by. */
     orderlistIds?: number[];
     /** Set `false` to ignore `orderlistIds`. Defaults to true when ids are given. */
@@ -5976,6 +5978,7 @@ interface QuickOrderProps {
         colCode?: string;
         colName?: string;
         colPrice?: string;
+        colPriceInclVat?: string;
         colQuantity?: string;
         colTotal?: string;
         addRow?: string;

package/dist/index.d.ts

@@ -1542,9 +1542,9 @@ interface QuickOrderMatch {
     name: string;
     /** The product SKU/code (canonical, from the API). */
     sku: string;
-    /** Net (excl. VAT) unit price. */
+    /** Unit price incl. VAT. */
     netPrice: number;
-    /** Gross (incl. VAT) unit price. */
+    /** Unit price excl. VAT. */
     grossPrice: number;
     /** Minimum order quantity (defaults to 1). */
     minQuantity: number;
@@ -5926,6 +5926,8 @@ interface QuickOrderProps {
     };
     /** Tax zone for price calculation. Defaults to `'NL'`. */
     taxZone?: string;
+    /** Show tax-inclusive prices. Resolves from `<PropellerProvider>`. */
+    includeTax?: boolean;
     /** Orderlist (contract) ids to scope the catalogue by. */
     orderlistIds?: number[];
     /** Set `false` to ignore `orderlistIds`. Defaults to true when ids are given. */
@@ -5976,6 +5978,7 @@ interface QuickOrderProps {
         colCode?: string;
         colName?: string;
         colPrice?: string;
+        colPriceInclVat?: string;
         colQuantity?: string;
         colTotal?: string;
         addRow?: string;

package/dist/index.js

@@ -2787,7 +2787,8 @@ function machineLanguageCandidates(machineLanguage, language, extra) {
 async function resolveMachineAcrossLanguages(candidates, fetchOne) {
   for (const language of candidates) {
     try {
-      return { machine: await fetchOne(language), language };
+      const machine = await fetchOne(language);
+      if (machine !== null && machine !== void 0) return { machine, language };
     } catch (error) {
       if (!isMachineNotFound(error)) throw error;
     }
@@ -14376,6 +14377,7 @@ function blankRow() {
     productId: null,
     name: "",
     netPrice: 0,
+    grossPrice: 0,
     quantity: 1,
     minQuantity: 1,
     matches: [],
@@ -14406,6 +14408,7 @@ function QuickOrderInner(props) {
   const graphqlClient = props.graphqlClient;
   const displayPrice = (n) => props.formatPrice ? props.formatPrice(n) : formatPrice(n, { symbol: currency, locale: localeForLanguage(props.language) });
   const L = (key, fallback) => getLabel(labels, key, fallback);
+  const rowPrice = (r) => props.includeTax ? r.netPrice : r.grossPrice;
   const { submitting, searchProducts, submit } = useQuickOrder({
     graphqlClient,
     user,
@@ -14432,7 +14435,7 @@ function QuickOrderInner(props) {
   }, []);
   const onCodeInput = useCallback(
     (key, value) => {
-      patchRow(key, { code: value, productId: null, name: "", netPrice: 0, searched: false });
+      patchRow(key, { code: value, productId: null, name: "", netPrice: 0, grossPrice: 0, searched: false });
       setNotice(null);
       const timers = searchTimers.current;
       if (timers[key]) clearTimeout(timers[key]);
@@ -14453,7 +14456,7 @@ function QuickOrderInner(props) {
       const dup = rows.some((r) => r.key !== key && r.productId && r.code === match.sku);
       if (dup) {
         setNotice(L("alreadyInList", "Product is already in the list"));
-        patchRow(key, { code: "", matches: [], productId: null, name: "", netPrice: 0, searched: false });
+        patchRow(key, { code: "", matches: [], productId: null, name: "", netPrice: 0, grossPrice: 0, searched: false });
         return;
       }
       patchRow(key, {
@@ -14462,6 +14465,7 @@ function QuickOrderInner(props) {
         clusterId: match.clusterId,
         name: match.name,
         netPrice: match.netPrice,
+        grossPrice: match.grossPrice,
         quantity: match.minQuantity,
         minQuantity: match.minQuantity,
         matches: [],
@@ -14523,6 +14527,7 @@ function QuickOrderInner(props) {
             clusterId: exact.clusterId,
             name: exact.name,
             netPrice: exact.netPrice,
+            grossPrice: exact.grossPrice,
             quantity: Math.max(exact.minQuantity, line.quantity),
             minQuantity: exact.minQuantity
           });
@@ -14592,7 +14597,7 @@ function QuickOrderInner(props) {
       /* @__PURE__ */ jsxs("div", { className: "hidden md:grid grid-cols-12 gap-2 px-2 pb-2 text-xs font-medium text-muted-foreground border-b border-border", children: [
         /* @__PURE__ */ jsx("div", { className: "col-span-3", children: L("colCode", "Article no. / SKU") }),
         /* @__PURE__ */ jsx("div", { className: "col-span-3", children: L("colName", "Product name") }),
-        /* @__PURE__ */ jsx("div", { className: "col-span-2", children: L("colPrice", "excl. VAT") }),
+        /* @__PURE__ */ jsx("div", { className: "col-span-2", children: props.includeTax ? L("colPriceInclVat", "incl. VAT") : L("colPrice", "excl. VAT") }),
         /* @__PURE__ */ jsx("div", { className: "col-span-1", children: L("colQuantity", "Qty") }),
         /* @__PURE__ */ jsx("div", { className: "col-span-2 text-right", children: L("colTotal", "Total") }),
         /* @__PURE__ */ jsx("div", { className: "col-span-1" })
@@ -14645,7 +14650,7 @@ function QuickOrderInner(props) {
           "input",
           {
             type: "text",
-            value: r.productId ? displayPrice(r.netPrice) : "",
+            value: r.productId ? displayPrice(rowPrice(r)) : "",
             disabled: true,
             className: "w-full rounded border border-input bg-muted/40 px-2 py-1.5 text-sm text-muted-foreground"
           }
@@ -14665,7 +14670,7 @@ function QuickOrderInner(props) {
             className: "w-full rounded border border-input bg-background px-2 py-1.5 text-sm focus:outline-none focus:ring-2 focus:ring-ring disabled:bg-muted/40"
           }
         ) }),
-        /* @__PURE__ */ jsx("div", { className: "col-span-9 md:col-span-2 text-right text-sm text-foreground whitespace-nowrap", children: r.productId ? displayPrice(r.netPrice * r.quantity) : "" }),
+        /* @__PURE__ */ jsx("div", { className: "col-span-9 md:col-span-2 text-right text-sm text-foreground whitespace-nowrap", children: r.productId ? displayPrice(rowPrice(r) * r.quantity) : "" }),
         /* @__PURE__ */ jsx("div", { className: "col-span-3 md:col-span-1 flex justify-end", children: /* @__PURE__ */ jsx(
           "button",
           {
@@ -17705,8 +17710,8 @@ function PurchaseAuthorizationRequests(rawProps) {
                 /* @__PURE__ */ jsx("thead", { className: "bg-muted/50 border-b border-border", children: /* @__PURE__ */ jsxs("tr", { children: [
                   /* @__PURE__ */ jsx("th", { className: "text-left px-3 py-2 font-medium text-muted-foreground", children: getLabel(props.labels, "itemProduct", "Product") }),
                   /* @__PURE__ */ jsx("th", { className: "text-right px-3 py-2 font-medium text-muted-foreground", children: getLabel(props.labels, "itemQty", "Qty") }),
-                  /* @__PURE__ */ jsx("th", { className: "text-right px-3 py-2 font-medium text-muted-foreground", children: getLabel(props.labels, "itemUnitPrice", "Unit price") }),
-                  /* @__PURE__ */ jsx("th", { className: "text-right px-3 py-2 font-medium text-muted-foreground", children: getLabel(props.labels, "itemTotal", "Total") })
+                  /* @__PURE__ */ jsx("th", { className: "text-right px-3 py-2 font-medium text-muted-foreground", children: getLabel(props.labels, "itemUnitPrice", "Unit price excl. VAT") }),
+                  /* @__PURE__ */ jsx("th", { className: "text-right px-3 py-2 font-medium text-muted-foreground", children: getLabel(props.labels, "itemTotal", "Total excl. VAT") })
                 ] }) }),
                 /* @__PURE__ */ jsx("tbody", { className: "divide-y divide-border", children: getModalItems().map((item, idx) => /* @__PURE__ */ jsxs("tr", { children: [
                   /* @__PURE__ */ jsx("td", { className: "px-3 py-2", children: getProductName5(item) }),
@@ -17714,7 +17719,7 @@ function PurchaseAuthorizationRequests(rawProps) {
                   /* @__PURE__ */ jsx("td", { className: "px-3 py-2 text-right", children: formatPrice17(
                     (item.quantity ?? 0) > 0 ? (item.totalSum ?? 0) / (item.quantity ?? 1) : 0
                   ) }),
-                  /* @__PURE__ */ jsx("td", { className: "px-3 py-2 text-right font-medium", children: formatPrice17(item.totalSumNet ?? 0) })
+                  /* @__PURE__ */ jsx("td", { className: "px-3 py-2 text-right font-medium", children: formatPrice17(item.totalSum ?? 0) })
                 ] }, idx)) })
               ] }) })
             ] }),