thm-p3-configurator 0.0.281 → 0.0.282

package/dist/src/shared/__api__/mutations.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useUpdatePrivateQuotationByIdMutation = exports.useUpdatePrivateAppointmentRequestByIdMutation = exports.useUpdatePrivateAppointmentByIdMutation = exports.useCreateSingleOrderMutation = exports.useCreateShopifyOrderMutation = exports.useCreateQuotationMutation = exports.useCreatePrivateQuotationMutation = exports.useCreatePrivateAppointmentRequestMutation = exports.useCreatePrivateAppointmentMutation = exports.useCreateAppointmentRequestMutation = void 0;
 require("core-js/modules/es.promise.js");
 var _reactQuery = require("react-query");
+var _montageRate = require("../__helpers__/montageRate");
 var _authenticatedProxyApi = require("./authenticatedProxyApi");
 var _publicProxyApi = require("./publicProxyApi");
 const _excluded = ["linkToExistingCustomerId"],
@@ -230,6 +231,7 @@ const useCreatePrivateQuotationMutation = () => {
         linkToExistingCustomerId
       } = _ref6,
       restCustomer = _objectWithoutProperties(_ref6, _excluded);
+    const apiMontageRate = (0, _montageRate.toApiMontageRate)(montageRate);
     const createQuotation = () => _authenticatedProxyApi.authenticatedProxyApi.postQuotation({
       isExitIntent,
       model,
@@ -244,7 +246,7 @@ const useCreatePrivateQuotationMutation = () => {
       selectBoardComputerUpdate,
       customer: restCustomer,
       branchId,
-      montageRate
+      montageRate: apiMontageRate
     });
     if (linkToExistingCustomerId) {
       return _authenticatedProxyApi.authenticatedProxyApi.postQuotation({
@@ -261,7 +263,7 @@ const useCreatePrivateQuotationMutation = () => {
         selectBoardComputerUpdate,
         customer: restCustomer,
         branchId,
-        montageRate
+        montageRate: apiMontageRate
       }).then(async res => {
         var _res$data;
         const entityId = (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.data) === null || _res$data === void 0 ? void 0 : _res$data.entityId;
@@ -319,6 +321,7 @@ const useCreatePrivateAppointmentMutation = () => {
         linkToExistingCustomerId
       } = _ref8,
       restCustomer = _objectWithoutProperties(_ref8, _excluded2);
+    const apiMontageRate = (0, _montageRate.toApiMontageRate)(montageRate);
     const response = await _authenticatedProxyApi.authenticatedProxyApi.postAppointment({
       appointment,
       model,
@@ -335,7 +338,7 @@ const useCreatePrivateAppointmentMutation = () => {
       branchId,
       customerAgreed,
       invoicePaymentByLeaseCompany,
-      montageRate
+      montageRate: apiMontageRate
     });
     const entityId = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.data) === null || _response$data === void 0 ? void 0 : _response$data.entityId;
     if (linkToExistingCustomerId && entityId) {
@@ -388,6 +391,7 @@ const useCreatePrivateAppointmentRequestMutation = () => {
         linkToExistingCustomerId
       } = _ref10,
       restCustomer = _objectWithoutProperties(_ref10, _excluded3);
+    const apiMontageRate = (0, _montageRate.toApiMontageRate)(montageRate);
     const response = await _authenticatedProxyApi.authenticatedProxyApi.postAppointmentRequest({
       appointment,
       model,
@@ -403,7 +407,7 @@ const useCreatePrivateAppointmentRequestMutation = () => {
       customer: restCustomer,
       branchId,
       customerAgreed,
-      montageRate
+      montageRate: apiMontageRate
     });
     const entityId = (_response$data2 = response.data) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.entityId;
     if (linkToExistingCustomerId && entityId) {
@@ -448,7 +452,8 @@ const useUpdatePrivateAppointmentRequestByIdMutation = id => {
       formula,
       discount,
       priceCalculationDate,
-      customerAgreed
+      customerAgreed,
+      montageRate
     } = _ref11;
     const _ref12 = customer || {},
       {
@@ -463,6 +468,7 @@ const useUpdatePrivateAppointmentRequestByIdMutation = id => {
         }
       });
     }
+    const apiMontageRate = (0, _montageRate.toApiMontageRate)(montageRate);
     return _authenticatedProxyApi.authenticatedProxyApi.putAppointmentRequestById({
       id,
       payload: {
@@ -480,7 +486,8 @@ const useUpdatePrivateAppointmentRequestByIdMutation = id => {
         customer: restCustomer,
         branchId,
         priceCalculationDate,
-        customerAgreed
+        customerAgreed,
+        montageRate: apiMontageRate
       }
     });
   });
@@ -513,7 +520,8 @@ const useUpdatePrivateQuotationByIdMutation = id => {
       branchId,
       formula,
       discount,
-      priceCalculationDate
+      priceCalculationDate,
+      montageRate
     } = _ref13;
     const _ref14 = customer || {},
       {
@@ -528,6 +536,7 @@ const useUpdatePrivateQuotationByIdMutation = id => {
         }
       });
     }
+    const apiMontageRate = (0, _montageRate.toApiMontageRate)(montageRate);
     return _authenticatedProxyApi.authenticatedProxyApi.putQuotationById({
       id,
       payload: {
@@ -542,7 +551,8 @@ const useUpdatePrivateQuotationByIdMutation = id => {
         selectBoardComputerUpdate,
         customer: restCustomer,
         branchId,
-        priceCalculationDate
+        priceCalculationDate,
+        montageRate: apiMontageRate
       }
     });
   });
@@ -578,7 +588,8 @@ const useUpdatePrivateAppointmentByIdMutation = id => {
       formula,
       discount,
       priceCalculationDate,
-      customerAgreed
+      customerAgreed,
+      montageRate
     } = _ref15;
     const _ref16 = customer || {},
       {
@@ -593,6 +604,7 @@ const useUpdatePrivateAppointmentByIdMutation = id => {
         }
       });
     }
+    const apiMontageRate = (0, _montageRate.toApiMontageRate)(montageRate);
     return _authenticatedProxyApi.authenticatedProxyApi.putAppointmentById({
       id,
       payload: {
@@ -610,7 +622,8 @@ const useUpdatePrivateAppointmentByIdMutation = id => {
         customer: restCustomer,
         branchId,
         priceCalculationDate,
-        customerAgreed
+        customerAgreed,
+        montageRate: apiMontageRate
       }
     });
   });

package/dist/src/shared/__containers__/ProductCartSide.js

@@ -42,6 +42,7 @@ var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _image = require("../__helpers__/image");
+var _montageRate = require("../__helpers__/montageRate");
 var _product = require("../__helpers__/product");
 var _useIsTowmotive = require("../__hooks__/useIsTowmotive");
 function _interopRequireDefault(e) {
@@ -126,7 +127,7 @@ const ProductCartSide = () => {
     branchId: isToggled ? selectedBranch : undefined,
     discountAmount,
     discountPercentage,
-    montageRate: montageRate !== null && montageRate !== void 0 ? montageRate : undefined
+    montageRate: (0, _montageRate.toApiMontageRate)(montageRate)
   });
   const marketCorrection = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === 'MC');
   let mainProducts = [];

package/dist/src/shared/__containers__/ProductsCartOverview.js

@@ -61,6 +61,7 @@ var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _cartTable2 = require("../__helpers__/cartTable");
 var _image = require("../__helpers__/image");
+var _montageRate = require("../__helpers__/montageRate");
 var _product = require("../__helpers__/product");
 var _useIsTmg = require("../__hooks__/useIsTmg");
 var _useIsTowmotive = require("../__hooks__/useIsTowmotive");
@@ -276,7 +277,7 @@ const ProductCartTable = () => {
     discountAmount,
     discountPercentage,
     formula,
-    montageRate: montageRate !== null && montageRate !== undefined ? montageRate / 100 : undefined
+    montageRate: (0, _montageRate.toApiMontageRate)(montageRate)
   });
   const montageHours = Number(totals === null || totals === void 0 ? void 0 : totals.montageTime) || 0;
   const montageTotalExcl = Number((totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat) || 0);
@@ -297,14 +298,13 @@ const ProductCartTable = () => {
   }, [cart, consumerDiscounts, dispatch, isToggled]);
   (0, _react.useEffect)(() => {
     const rateFromApi = totals === null || totals === void 0 ? void 0 : totals.montageRate;
-    if (rateFromApi === undefined || rateFromApi === null) return;
-    const numericRate = Number(rateFromApi);
-    if (Number.isNaN(numericRate)) return;
+    const uiRate = (0, _montageRate.toUiMontageRate)(rateFromApi);
+    if (uiRate === null) return;
     if (montageRate === null || montageRate === undefined) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MONTAGE_RATE,
         payload: {
-          montageRate: numericRate * 100
+          montageRate: uiRate
         }
       });
     }

package/dist/src/shared/__containers__/internal/InternalAppointmentForm.js

@@ -1,10 +1,8 @@
 "use strict";
 
 require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.number.parse-float.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.string.trim.js");
@@ -22,10 +20,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.number.parse-float.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.string.trim.js");
@@ -401,7 +397,6 @@ const InternalAppointmentForm = _ref => {
           isTmg: isTmg
         }
       });
-      const parsedMontageRate = montageRate === null || montageRate === undefined ? undefined : Number.parseFloat(montageRate.toString().replace(',', '.'));
       const payload = (0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({
         vehicle,
         customer: (0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, customer), {}, {
@@ -456,9 +451,9 @@ const InternalAppointmentForm = _ref => {
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage,
           consumerDiscounts
-        })
+        }),
+        montageRate: montageRate !== null && montageRate !== void 0 ? montageRate : undefined
       }));
-      payload.montageRate = Number.isNaN(parsedMontageRate) ? undefined : parsedMontageRate;
       await onSubmit(payload);
     } catch (ex) {
       console.error("handleSubmit(): ".concat(ex));

package/dist/src/shared/__containers__/internal/InternalQuotationForm.js

@@ -1,9 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.number.parse-float.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -18,10 +16,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("core-js/modules/es.number.parse-float.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -348,7 +344,6 @@ const InternalQuotationForm = _ref => {
           isTmg
         }
       });
-      const parsedMontageRate = montageRate === null || montageRate === undefined ? undefined : Number.parseFloat(montageRate.toString().replace(',', '.'));
       const payload = (0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({
         vehicle,
         customer: (0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, customer), {}, {
@@ -397,9 +392,9 @@ const InternalQuotationForm = _ref => {
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage,
           consumerDiscounts
-        })
+        }),
+        montageRate: montageRate !== null && montageRate !== void 0 ? montageRate : undefined
       }));
-      payload.montageRate = Number.isNaN(parsedMontageRate) ? undefined : parsedMontageRate;
       await onSubmit(payload);
     } catch (ex) {
       console.error("handleSubmit(): ".concat(ex));

package/dist/src/shared/__helpers__/dossier.js

@@ -25,6 +25,7 @@ require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _constants__ = require("../__constants__");
+var _montageRate = require("./montageRate");
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -119,6 +120,7 @@ const parseDossierToOrderSession = exports.parseDossierToOrderSession = function
     },
     discountPercentage: dossier === null || dossier === void 0 ? void 0 : dossier.kortingspercentage,
     discountAmount: (dossier === null || dossier === void 0 ? void 0 : dossier.kortingsbedragInclBtw) || null,
+    montageRate: (0, _montageRate.toUiMontageRate)((dossier === null || dossier === void 0 ? void 0 : dossier.montageRate) || (dossier === null || dossier === void 0 ? void 0 : dossier.montageTarief)),
     appointment: {
       date: dossier !== null && dossier !== void 0 && dossier.geplandeTijd ? new Date().setTime(dossier === null || dossier === void 0 ? void 0 : dossier.geplandeTijd) : dossier !== null && dossier !== void 0 && dossier.voorkeurstijd ? new Date().setTime(dossier === null || dossier === void 0 ? void 0 : dossier.voorkeurstijd) : null,
       time: dossier !== null && dossier !== void 0 && dossier.geplandeTijd ? new Date().setTime(dossier === null || dossier === void 0 ? void 0 : dossier.geplandeTijd) : dossier !== null && dossier !== void 0 && dossier.voorkeurstijd ? new Date().setTime(dossier === null || dossier === void 0 ? void 0 : dossier.voorkeurstijd) : null,

package/dist/src/shared/__helpers__/montageRate.js

@@ -0,0 +1,71 @@
+"use strict";
+
+require("core-js/modules/es.number.parse-float.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.replace.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toUiMontageRate = exports.toApiMontageRate = void 0;
+require("core-js/modules/es.number.parse-float.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.replace.js");
+/**
+ * @description Conversion helpers for montageRate unit normalization
+ * - UI / OrderSession: percent (e.g. 85 means 85%)
+ * - Backend + pricing API: fraction (e.g. 0.85)
+ */
+
+/**
+ * Converts UI percent value to API fraction
+ * @param {number | string | null | undefined} uiPercent - The montage rate in percent (UI format)
+ * @returns {number | undefined} The montage rate as fraction (API format), or undefined if nullish/invalid
+ */
+const toApiMontageRate = uiPercent => {
+  if (uiPercent === null || uiPercent === undefined) {
+    return undefined;
+  }
+
+  // Handle string input (e.g., "85" or "85,5")
+  const sanitized = typeof uiPercent === 'string' ? uiPercent.toString().replace(/[^0-9.,-]/g, '').replace(',', '.') : uiPercent.toString().replace(',', '.');
+
+  // Allow empty string or "0." / "0," while typing
+  if (sanitized === '' || sanitized === '0.' || sanitized === '0,') {
+    return undefined;
+  }
+  const parsed = Number.parseFloat(sanitized);
+  if (parsed === null || Number.isNaN(parsed)) {
+    return undefined;
+  }
+
+  // Clamp to >= 0 and convert percent to fraction
+  const clamped = Math.max(0, parsed);
+  return clamped / 100;
+};
+
+/**
+ * Converts API value to UI percent (with backward compatibility heuristic)
+ * @param {number | string | null | undefined} apiValue - The montage rate from API
+ * @returns {number | null} The montage rate in percent (UI format), or null if nullish/invalid
+ */
+exports.toApiMontageRate = toApiMontageRate;
+const toUiMontageRate = apiValue => {
+  if (apiValue === null || apiValue === undefined) {
+    return null;
+  }
+  const numericValue = Number(apiValue);
+  if (Number.isNaN(numericValue)) {
+    return null;
+  }
+
+  // Lenient heuristic for backward compatibility:
+  // - If value <= 3, assume it's a fraction and convert to percent
+  // - Otherwise, assume it's already in percent format
+  if (numericValue <= 3) {
+    return numericValue * 100;
+  }
+  return numericValue;
+};
+exports.toUiMontageRate = toUiMontageRate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.281",
+  "version": "0.0.282",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",