thm-p3-configurator 0.0.123 → 0.0.124

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

@@ -124,7 +124,6 @@ function _toPrimitive(t, r) {
   return ("string" === r ? String : Number)(t);
 }
 const ProductCartTable = () => {
-  var _marketCorrection$con, _marketCorrection$con2;
   const formula = (0, _FormulaContext.useFormula)();
   const [isToggled, setIsToggled] = (0, _react.useState)(false);
   const [{
@@ -334,14 +333,14 @@ const ProductCartTable = () => {
       text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat),
       className: 'cart__table-price text-end'
     }] : [{}, {}, {
-      text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.montagePricePlusMarketCorrectionInclVat),
+      text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.montagePriceInclVat),
       className: 'cart__table-price text-end'
     }])]
   }), isToggled && marketCorrection && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
     productTitle: 'Marktcorrectie',
     productImage: _montagePlaceholder.default,
     extraCells: [{}, {}, {}, ...(isToggled ? [{
-      text: (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) > 0 ? "".concat((0, _helpers__.formatPrice)(((_marketCorrection$con = marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.consumerTotal) !== null && _marketCorrection$con !== void 0 ? _marketCorrection$con : 0) / 1.21 - marketCorrection.locationTotal), " (").concat(Math.round((((_marketCorrection$con2 = marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.consumerTotal) !== null && _marketCorrection$con2 !== void 0 ? _marketCorrection$con2 : 0) / 1.21 - marketCorrection.locationTotal) / marketCorrection.locationTotal * 10000) / 100, "%)") : 'N.v.t.',
+      text: (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) > 0 ? "".concat((0, _helpers__.formatPrice)(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal), " (").concat(Math.round(((marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.consumerTotal) - (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal)) / (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) * 100 * 100) / 100, "%)") : 'N.v.t.',
       className: 'cart__table-price text-end'
     }, {
       text: (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) > 0 ? (0, _helpers__.formatPrice)(marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) : 'N.v.t.',
@@ -376,7 +375,7 @@ const ProductCartTable = () => {
       text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.subtotalMontageExclVat),
       className: 'fw-bold text-end pb-2'
     }] : [{
-      text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.subtotalMontageInclVat),
+      text: (0, _helpers__.formatPrice)((totals === null || totals === void 0 ? void 0 : totals.subtotalMontageInclVat) - (totals === null || totals === void 0 ? void 0 : totals.totalMarketCorrectionInclVat)),
       className: 'fw-bold text-end pb-2'
     }])]
   })), accessoireProducts.length > 0 && /*#__PURE__*/_react.default.createElement(_ProductTableSection.default, {

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

@@ -571,6 +571,20 @@ const InternalAppointmentForm = _ref => {
     isRequired: true,
     label: "Telefoonnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['phoneNumber']
+  }), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    placeholder: "",
+    initialValue: customer.city,
+    name: "city",
+    onChange: value => dispatch({
+      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
+      payload: {
+        city: value
+      }
+    }),
+    key: "city",
+    isRequired: true,
+    label: "Stad:",
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['city']
   }), /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
     options: countryOptions,
     name: "country",
@@ -771,6 +785,27 @@ const InternalAppointmentForm = _ref => {
     isRequired: true,
     label: "Stad:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['city']
+  }), /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
+    options: countryOptions,
+    name: "country",
+    label: "Land:",
+    isRequired: false,
+    isLoading: isLoadingCountries,
+    noOptionsMessage: "Geen landen beschikbaar",
+    placeholder: "Selecteer een land",
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['countryId'],
+    initialValue: initialCountry,
+    onChange: _ref6 => {
+      let {
+        value
+      } = _ref6;
+      return dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
+        payload: {
+          countryId: value
+        }
+      });
+    }
   })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     initialValue: customer.phoneNumber,
@@ -781,7 +816,6 @@ const InternalAppointmentForm = _ref => {
         phoneNumber: value
       }
     }),
-    key: "phoneNumber",
     isRequired: true,
     label: "Telefoonnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['phoneNumber']
@@ -865,18 +899,17 @@ const InternalAppointmentForm = _ref => {
     placeholder: "Selecteer een land",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['countryId'],
     initialValue: initialCountry,
-    onChange: _ref6 => {
+    onChange: _ref7 => {
       let {
         value
-      } = _ref6;
+      } = _ref7;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
         payload: {
           countryId: value
         }
       });
-    },
-    key: "country"
+    }
   })))))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mb-4')
   }, /*#__PURE__*/_react.default.createElement(_CardWide.default, null, /*#__PURE__*/_react.default.createElement("div", {

package/package.json

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