thm-p3-configurator 0.0.236 → 0.0.238

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

@@ -155,11 +155,12 @@ const ProductCartSide = () => {
         marginPercentage: 0
       };
     }
+    const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
 
     // Get prices directly from product objects and calculate excl VAT for location
-    const purchasePrice = cartItem !== null && cartItem !== void 0 && cartItem.locationTotal ? cartItem.locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+    const purchasePrice = hasLocationTotal ? cartItem.locationTotal : 0;
     const salesPrice = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
-    const margin = salesPrice - purchasePrice;
+    const margin = hasLocationTotal ? salesPrice - purchasePrice : 0;
     const marginPercentage = purchasePrice ? margin / purchasePrice * 100 : 0;
     return {
       purchasePrice,

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

@@ -3,7 +3,6 @@
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.parse-float.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.weak-map.js");
@@ -23,7 +22,6 @@ exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.parse-float.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -187,6 +185,12 @@ const ProductCartTable = () => {
   // Subtotal calculation variables
   let mainProductsSubtotal = 0;
   let accessoireProductsSubtotal = 0;
+  const calculatePurchaseSubtotal = products => {
+    return products.reduce((total, product) => {
+      var _product$priceInfo;
+      return total + Number((product === null || product === void 0 || (_product$priceInfo = product.priceInfo) === null || _product$priceInfo === void 0 ? void 0 : _product$priceInfo.purchasePrice) || 0);
+    }, 0);
+  };
 
   /**
    * Calculate item prices from a cart item
@@ -233,11 +237,12 @@ const ProductCartTable = () => {
     let purchasePrice = 0;
     let salesPrice = 0;
     const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
+    const locationTotal = hasLocationTotal ? Number(cartItem.locationTotal) : 0;
 
     // Get prices directly from product objects
     if (APP_CONFIG.internal) {
-      purchasePrice = cartItem !== null && cartItem !== void 0 && cartItem.locationTotal ? cartItem.locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
-      salesPrice = isToggled ? (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) / 1.21 : cartItem !== null && cartItem !== void 0 && cartItem.locationTotal ? cartItem.locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+      purchasePrice = locationTotal;
+      salesPrice = isToggled ? (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) / 1.21 : hasLocationTotal ? locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
     } else {
       purchasePrice = (product === null || product === void 0 ? void 0 : product.price) || 0;
       salesPrice = (product === null || product === void 0 ? void 0 : product.price) || 0;
@@ -281,14 +286,14 @@ const ProductCartTable = () => {
     });
 
     // Calculate subtotals based on locationTotal (purchasePrice)
-    mainProductsSubtotal = mainProducts.reduce((total, product) => {
-      return total + parseFloat(product.priceInfo.purchasePrice);
-    }, 0);
-    accessoireProductsSubtotal = accessoireProducts.reduce((total, product) => {
-      return total + parseFloat(product.priceInfo.purchasePrice);
-    }, 0);
+    mainProductsSubtotal = calculatePurchaseSubtotal(mainProducts);
+    accessoireProductsSubtotal = calculatePurchaseSubtotal(accessoireProducts);
+  }
+  const shouldIncludeMarketCorrection = isToggled && (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal);
+  if (shouldIncludeMarketCorrection) {
+    const marketCorrectionPrice = Number(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) || 0;
+    mainProductsSubtotal += marketCorrectionPrice;
   }
-  mainProductsSubtotal = mainProductsSubtotal + (marketCorrection !== null && marketCorrection !== void 0 && marketCorrection.locationTotal ? parseFloat(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) : 0);
   if (isLoadingProducts) {
     return /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null);
   }

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

@@ -182,6 +182,7 @@ const InternalAppointmentForm = _ref => {
     customerAgreed,
     customer,
     licensePlate,
+    licensePlateBrandModel,
     model,
     vehicle,
     chassisNumber,
@@ -1596,7 +1597,7 @@ const InternalAppointmentForm = _ref => {
     },
     label: "Goedkeuringsnummer onbekend",
     isDisabled: !!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber)
-  })), !licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })), !licensePlate && !licensePlateBrandModel && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "licensePlate",
     placeholder: "",
     value: _licensePlate,
@@ -1606,6 +1607,16 @@ const InternalAppointmentForm = _ref => {
     form: "quotation",
     label: "Kenteken:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
+  }), (licensePlate || licensePlateBrandModel) && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    key: "licensePlateReadOnly",
+    placeholder: "",
+    value: licensePlate || licensePlateBrandModel || '',
+    name: "licensePlateReadOnly",
+    onChange: () => {},
+    isRequired: false,
+    form: "quotation",
+    label: "Kenteken:",
+    isDisabled: true
   }), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "chassisNumber",
     placeholder: "",

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

@@ -55,7 +55,7 @@ const InternalDiscountCodeSelector = () => {
     }
   };
   if (isLoadingDiscounts || !Array.isArray(discounts)) return null;
-  const selectedDiscountCode = discounts.find(discount => (discount === null || discount === void 0 ? void 0 : discount.code.toLowerCase()) === discountCode.toLowerCase());
+  const selectedDiscountCode = discounts.find(discount => (discount === null || discount === void 0 ? void 0 : discount.code.toLowerCase()) === (discountCode === null || discountCode === void 0 ? void 0 : discountCode.toLowerCase()));
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('mb-2')
   }, /*#__PURE__*/_react.default.createElement(_CardWide.default, {

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

@@ -162,6 +162,7 @@ const InternalQuotationForm = _ref => {
     vehicle,
     customer,
     licensePlate,
+    licensePlateBrandModel,
     model,
     chassisNumber,
     executionAnswer1,
@@ -930,7 +931,7 @@ const InternalQuotationForm = _ref => {
     },
     label: "Goedkeuringsnummer onbekend",
     isDisabled: !!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber)
-  })), !licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })), !licensePlate && !licensePlateBrandModel && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     value: _licensePlate,
     name: "licensePlate",
@@ -939,6 +940,16 @@ const InternalQuotationForm = _ref => {
     form: "quotation",
     label: "Kenteken:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
+  }), (licensePlate || licensePlateBrandModel) && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    key: "licensePlateReadOnly",
+    placeholder: "",
+    value: licensePlate || licensePlateBrandModel || '',
+    name: "licensePlateReadOnly",
+    onChange: () => {},
+    isRequired: false,
+    form: "quotation",
+    label: "Kenteken:",
+    isDisabled: true
   }), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     value: vehicle === null || vehicle === void 0 ? void 0 : vehicle.chassisNumber,

package/dist/src/shared/__context__/OrderSessionContext.js

@@ -105,6 +105,7 @@ const INITIAL_ORDER_SESSION_STATE = {
   currentDossierType: null,
   existingDossierType: null,
   licensePlate: null,
+  licensePlateBrandModel: null,
   buildYear: null,
   model: null,
   brand: null,

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

@@ -77,6 +77,7 @@ const parseDossierToOrderSession = exports.parseDossierToOrderSession = function
   return {
     canAlterQuantity: (dossier === null || dossier === void 0 || (_dossier$statusBeoord = dossier.statusBeoordeling) === null || _dossier$statusBeoord === void 0 ? void 0 : _dossier$statusBeoord.title) === _constants__.STATUS_ASSESSMENT.Open,
     licensePlate: dossier === null || dossier === void 0 ? void 0 : dossier.kenteken,
+    licensePlateBrandModel: dossier === null || dossier === void 0 ? void 0 : dossier.kentekenMerkmodel,
     model: dossier !== null && dossier !== void 0 && dossier.kenteken ? null : dossier === null || dossier === void 0 ? void 0 : dossier.model,
     // Note: only fill in when license plate is empty
     channel: {

package/package.json

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