thm-p3-configurator 0.0.76 → 0.0.77

package/dist/src/shared/__components__/ProductCard/ProductCardSpecifications.js

@@ -17,13 +17,14 @@ function _interopRequireDefault(e) {
 }
 const ProductCardSpecifications = _ref => {
   let {
-    specifications = []
+    specifications = [],
+    className = ''
   } = _ref;
   if (!specifications.length) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement("ul", {
-    className: (0, _helpers__.withStyle)('col-12 col-md-6 list-unstyled product-critera__text mt-2 mb-2')
+    className: (0, _helpers__.withStyle)("col-12 col-md-6 list-unstyled product-critera__text mt-2 mb-2 ".concat(className))
   }, specifications.map(_ref2 => {
     let {
       key,

package/dist/src/shared/__components__/ProductCard/ProductCardUsps.js

@@ -39,13 +39,14 @@ const ProductCardUspExclude = _ref3 => {
 };
 const ProductCardUSPS = _ref4 => {
   let {
-    usps = []
+    usps = [],
+    className = ''
   } = _ref4;
   if (!usps.length) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement("ul", {
-    className: (0, _helpers__.withStyle)('list-check mt-2 col-12 col-md-6')
+    className: (0, _helpers__.withStyle)("list-check mt-2 col-12 col-md-6 ".concat(className))
   }, usps.map((usp, key) => {
     const {
       type,

package/dist/src/shared/__components__/SingleOrderProductCard.js

@@ -3,6 +3,7 @@
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.weak-map.js");
@@ -13,12 +14,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _react = _interopRequireWildcard(require("react"));
+var _queries = require("../__api__/queries");
 var _NumericInput = _interopRequireDefault(require("../__components__/Form/NumericInput"));
 var _helpers__ = require("../__helpers__");
 var _OutlinedButton = _interopRequireDefault(require("./Buttons/OutlinedButton"));
 var _PrimaryButton = _interopRequireDefault(require("./Buttons/PrimaryButton"));
+var _ProductCardSpecifications = _interopRequireDefault(require("./ProductCard/ProductCardSpecifications"));
+var _ProductCardUsps = _interopRequireDefault(require("./ProductCard/ProductCardUsps"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -77,11 +82,17 @@ const ProductSpecifications = _ref3 => {
   } = _ref3;
   return specifications && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('card-text mb-3')
-  }, /*#__PURE__*/_react.default.createElement("strong", null, "Specificaties: "), /*#__PURE__*/_react.default.createElement("br", null), (specifications !== null && specifications !== void 0 ? specifications : 'Niet beschikbaar').split('\n').map((line, index) => /*#__PURE__*/_react.default.createElement(_react.Fragment, {
-    key: index
-  }, line, /*#__PURE__*/_react.default.createElement("br", null))));
+  }, /*#__PURE__*/_react.default.createElement("strong", null, "Specificaties: "), /*#__PURE__*/_react.default.createElement("br", null), specifications.map((_ref4, index) => {
+    let {
+      key,
+      value
+    } = _ref4;
+    return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
+      key: index
+    }, key, ": ", value, /*#__PURE__*/_react.default.createElement("br", null));
+  }));
 };
-const ProductActions = _ref4 => {
+const ProductActions = _ref5 => {
   let {
     isOutOfStock,
     stock,
@@ -90,7 +101,7 @@ const ProductActions = _ref4 => {
     handleQuantityChange,
     handleSelected,
     removeFromCart
-  } = _ref4;
+  } = _ref5;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('d-flex justify-content-end')
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -116,16 +127,14 @@ const ProductActions = _ref4 => {
     label: "Verwijder"
   }))));
 };
-const ProductCategories = _ref5 => {
+const ProductCategories = _ref6 => {
   let {
     productType = null,
     productGroup = null,
     productSubgroup = null,
     articleNumber = null
-  } = _ref5;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('mb-3')
-  }, articleNumber && /*#__PURE__*/_react.default.createElement("p", {
+  } = _ref6;
+  return /*#__PURE__*/_react.default.createElement("div", null, articleNumber && /*#__PURE__*/_react.default.createElement("p", {
     className: (0, _helpers__.withStyle)('fst-italic mb-0')
   }, /*#__PURE__*/_react.default.createElement("strong", null, "Artikelnummer:"), " ", articleNumber), productType && /*#__PURE__*/_react.default.createElement("p", {
     className: (0, _helpers__.withStyle)('fst-italic mb-0')
@@ -135,7 +144,7 @@ const ProductCategories = _ref5 => {
     className: (0, _helpers__.withStyle)('fst-italic mb-0')
   }, /*#__PURE__*/_react.default.createElement("strong", null, "Subgroep:"), " ", productSubgroup));
 };
-const SingleOrderProductCard = _ref6 => {
+const SingleOrderProductCard = _ref7 => {
   let {
     productId,
     isSelected,
@@ -147,14 +156,33 @@ const SingleOrderProductCard = _ref6 => {
     productGroup,
     productSubgroup,
     articleNumber,
+    productUsps,
     productTitle,
-    productDescription,
     productPrice,
     productSpecifications,
     quantity = 0,
     handleQuantityChange,
-    removeFromCart
-  } = _ref6;
+    removeFromCart,
+    isModelArticle = false
+  } = _ref7;
+  const {
+    productFieldLabels
+  } = (0, _queries.useProductFieldLabels)();
+  const filteredProductSpecifications = productSpecifications.filter(_ref8 => {
+    let {
+      key
+    } = _ref8;
+    return productFieldLabels === null || productFieldLabels === void 0 ? void 0 : productFieldLabels[key];
+  }).map(_ref9 => {
+    let {
+      key,
+      value
+    } = _ref9;
+    return {
+      key: productFieldLabels[key],
+      value
+    };
+  });
   return /*#__PURE__*/_react.default.createElement("div", {
     key: productId + "-".concat(Date.now()),
     className: (0, _helpers__.withStyle)("card card__horizontal card__link ".concat(isSelected ? 'active' : '', " container-fluid p-0 my-3"))
@@ -175,11 +203,15 @@ const SingleOrderProductCard = _ref6 => {
     productGroup: productGroup,
     productSubgroup: productSubgroup,
     articleNumber: articleNumber
-  }), /*#__PURE__*/_react.default.createElement(ProductDescription, {
-    description: productDescription
-  }), /*#__PURE__*/_react.default.createElement(ProductSpecifications, {
-    specifications: productSpecifications
-  })), /*#__PURE__*/_react.default.createElement(ProductActions, {
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _helpers__.withStyle)(isModelArticle ? 'd-flex justify-content-between' : '')
+  }, (productUsps === null || productUsps === void 0 ? void 0 : productUsps.length) > 0 && /*#__PURE__*/_react.default.createElement(_ProductCardUsps.default, {
+    usps: productUsps,
+    className: isModelArticle ? 'mr-2' : 'w-100'
+  }), (filteredProductSpecifications === null || filteredProductSpecifications === void 0 ? void 0 : filteredProductSpecifications.length) > 0 && /*#__PURE__*/_react.default.createElement(_ProductCardSpecifications.default, {
+    specifications: filteredProductSpecifications,
+    className: isModelArticle ? '' : 'w-100'
+  }))), /*#__PURE__*/_react.default.createElement(ProductActions, {
     isOutOfStock: isOutOfStock,
     stock: stock,
     quantity: quantity,

package/dist/src/shared/__constants__/index.js

@@ -84,12 +84,14 @@ const NAVIGATION_BUTTONS = exports.NAVIGATION_BUTTONS = {
     to: '/configurator/offerte',
     label: 'Mail mij de offerte',
     type: 'prev',
-    shouldShowForDossierTypes: [DOSSIER_TYPES.Quotation]
+    shouldShowForDossierTypes: [DOSSIER_TYPES.Quotation],
+    setType: DOSSIER_TYPES.Quotation
   }, {
     to: '/configurator/montagelocatie',
     label: 'Maak een afspraak',
     type: 'next',
-    shouldShowForDossierTypes: [DOSSIER_TYPES.AppointmentRequest, DOSSIER_TYPES.PlannedAppointment]
+    shouldShowForDossierTypes: [DOSSIER_TYPES.AppointmentRequest, DOSSIER_TYPES.PlannedAppointment],
+    setType: DOSSIER_TYPES.PlannedAppointment
   }, {
     to: '/configurator/montagelocatie',
     label: 'Wijzig de locatie',

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

@@ -86,17 +86,25 @@ const ButtonByType = _ref => {
   }
 };
 const BottomNavigationBar = () => {
-  var _history$location;
+  var _history$location, _history$location2;
   const history = (0, _reactRouterDom.useHistory)();
   const buttons = _constants__.NAVIGATION_BUTTONS === null || _constants__.NAVIGATION_BUTTONS === void 0 ? void 0 : _constants__.NAVIGATION_BUTTONS[history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.pathname];
-  const [{
+  let [{
     selectedTowbar,
     selectedCableset,
     selectedCombiset,
     selectedBranch,
     existingDossierType,
-    allowLocationChange
-  }] = (0, _OrderSessionContext.useOrderSession)();
+    existingDossierId,
+    allowLocationChange,
+    currentDossierType
+  }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  if (!existingDossierType && (history === null || history === void 0 || (_history$location2 = history.location) === null || _history$location2 === void 0 ? void 0 : _history$location2.pathname) == '/configurator/overzicht') {
+    dispatch({
+      type: _OrderSessionContext.orderSessionActions.RESET_CURRENT_DOSSIER_TYPE
+    });
+    currentDossierType = null;
+  }
   if (!(buttons !== null && buttons !== void 0 && buttons.length)) {
     return null;
   }
@@ -109,17 +117,21 @@ const BottomNavigationBar = () => {
   }, APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mt-2 mb-1')
   }, /*#__PURE__*/_react.default.createElement(_InternalPriceCalculationSelector.default, null)), buttons.map(_ref2 => {
-    var _history$location2;
+    var _history$location3;
     let {
       to,
       label,
       type,
-      shouldShowForDossierTypes = []
+      shouldShowForDossierTypes = [],
+      setType
     } = _ref2;
     // Note: restrict buttons depending on the existing dossier type (if we're editing a dossier)
     if (existingDossierType && shouldShowForDossierTypes.length && !shouldShowForDossierTypes.includes(existingDossierType)) {
       return null;
     }
+    if (currentDossierType && !existingDossierType && shouldShowForDossierTypes.length && !shouldShowForDossierTypes.includes(currentDossierType)) {
+      return null;
+    }
     if (label === _constants__.LOCATION_CHANGE_BUTTON_LABEL && to === '/configurator/montagelocatie' && allowLocationChange === false) {
       return null;
     }
@@ -129,15 +141,30 @@ const BottomNavigationBar = () => {
     return /*#__PURE__*/_react.default.createElement("div", {
       key: 'link-' + label,
       className: (0, _helpers__.withStyle)("col-12 col-sm-auto d-flex order-2 order-sm-0 justify-content-".concat(buttons.length > 1 ? 'center' : 'end', " mt-1"))
-    }, /*#__PURE__*/_react.default.createElement(ButtonByType, {
+    }, /*#__PURE__*/_react.default.createElement(ButtonByType, _extends({}, setType && {
+      onClick: () => {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_CURRENT_DOSSIER_TYPE,
+          payload: {
+            currentDossierType: setType
+          }
+        });
+        console.log({
+          type: _OrderSessionContext.orderSessionActions.SET_CURRENT_DOSSIER_TYPE,
+          payload: {
+            currentDossierType: setType
+          }
+        });
+      }
+    }, {
       type: type,
       to: to,
       label: label,
       state: {
         prevPathName: history.location.pathname
       },
-      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location2 = history.location) === null || _history$location2 === void 0 ? void 0 : _history$location2.pathname) === '/configurator/montagelocatie' && !selectedBranch
-    }));
+      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location3 = history.location) === null || _history$location3 === void 0 ? void 0 : _history$location3.pathname) === '/configurator/montagelocatie' && !selectedBranch
+    })));
   })))));
 };
 var _default = exports.default = BottomNavigationBar;

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

@@ -26,10 +26,11 @@ var _DangerAlert = _interopRequireDefault(require("../../__components__/DangerAl
 var _EmptyState = _interopRequireDefault(require("../../__components__/EmptyState"));
 var _Pagination = _interopRequireDefault(require("../../__components__/Pagination"));
 var _SingleOrderProductCard = _interopRequireDefault(require("../../__components__/SingleOrderProductCard"));
+var _constants__ = require("../../__constants__");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
-var _constants__ = require("../../__constants__");
+var _product = require("../../__helpers__/product");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -127,6 +128,7 @@ const InternalSingleOrderProductOverview = _ref => {
     var _cart$find$quantity, _cart$find, _article$locationPric, _article$locationPric2, _article$locationPric3, _article$consumerPric;
     return /*#__PURE__*/_react.default.createElement(_SingleOrderProductCard.default, {
       key: article.articleNumber,
+      isModelArticle: Boolean(model || licensePlate),
       removeFromCart: () => _removeFromCart(article.articleNumber),
       productId: article.articleNumber,
       quantity: (_cart$find$quantity = (_cart$find = cart.find(product => product.articleNumber === article.articleNumber)) === null || _cart$find === void 0 ? void 0 : _cart$find.quantity) !== null && _cart$find$quantity !== void 0 ? _cart$find$quantity : 0,
@@ -134,11 +136,21 @@ const InternalSingleOrderProductOverview = _ref => {
       stock: (_article$locationPric = article === null || article === void 0 || (_article$locationPric2 = article.locationPrices) === null || _article$locationPric2 === void 0 || (_article$locationPric2 = _article$locationPric2.stock) === null || _article$locationPric2 === void 0 ? void 0 : _article$locationPric2.quantity) !== null && _article$locationPric !== void 0 ? _article$locationPric : 0,
       isOutOfStock: (article === null || article === void 0 || (_article$locationPric3 = article.locationPrices) === null || _article$locationPric3 === void 0 || (_article$locationPric3 = _article$locationPric3.stock) === null || _article$locationPric3 === void 0 ? void 0 : _article$locationPric3.status) == _constants__.StockStatus.OutOfStock,
       handleSelected: () => handleQuantityChange(article.articleNumber, 1),
+      productUsps: [{
+        type: 'excl',
+        text: article === null || article === void 0 ? void 0 : article.excl
+      }, {
+        type: 'incl',
+        text: article === null || article === void 0 ? void 0 : article.incl
+      }, {
+        type: 'remark',
+        text: article === null || article === void 0 ? void 0 : article.remark
+      }],
       articleNumber: article.articleNumber,
       handleQuantityChange: handleQuantityChange,
-      productSpecifications: article === null || article === void 0 ? void 0 : article.specifications,
       productDescription: article === null || article === void 0 ? void 0 : article.description,
       productImage: article.image,
+      productSpecifications: (0, _product.extractProductSpecsArray)(article),
       productTitle: article.name,
       productPrice: Number(article === null || article === void 0 || (_article$consumerPric = article.consumerPrices) === null || _article$consumerPric === void 0 ? void 0 : _article$consumerPric.priceInclVat).toFixed(2),
       productType: article === null || article === void 0 ? void 0 : article.type,

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

@@ -102,6 +102,7 @@ OrderSessionContext.displayName = 'OrderSessionContext';
 const INITIAL_ORDER_SESSION_STATE = {
   isTouched: false,
   existingDossierId: null,
+  currentDossierType: null,
   existingDossierType: null,
   licensePlate: null,
   buildYear: null,
@@ -174,6 +175,8 @@ const orderSessionActions = exports.orderSessionActions = {
   SET_DURATION_OPTIONS: 'SET_DURATION_OPTIONS',
   SET_EXECUTION1_OPTIONS: 'SET_EXECUTION1_OPTIONS',
   SET_EXECUTION2_OPTIONS: 'SET_EXECUTION2_OPTIONS',
+  SET_CURRENT_DOSSIER_TYPE: 'SET_CURRENT_DOSSIER_TYPE',
+  RESET_CURRENT_DOSSIER_TYPE: 'RESET_CURRENT_DOSSIER_TYPE',
   CLEAR_ANSWERS: 'CLEAR_ANSWERS',
   SET_SELECTED_TOWBAR: 'SET_SELECTED_TOWBAR',
   SET_SELECTED_CABLESET: 'SET_SELECTED_CABLESET',
@@ -335,6 +338,15 @@ const orderSessionReducer = (state, action) => {
           model: null
         });
       }
+    case orderSessionActions.SET_CURRENT_DOSSIER_TYPE:
+      {
+        const {
+          currentDossierType
+        } = action.payload;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          currentDossierType
+        });
+      }
     case orderSessionActions.SET_LICENSE_PLATE:
       {
         const {

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

@@ -38,8 +38,8 @@ var _authenticatedProxyApi = require("../__api__/authenticatedProxyApi");
 var _orderApi = require("../__api__/orderApi");
 var _index = require("./index");
 var _logoPrimary = _interopRequireDefault(require("../../../public/assets/images/logo-primary.png"));
-var _image = require("../__helpers__/image");
 var _index2 = require("../__constants__/index");
+var _image = require("../__helpers__/image");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -217,8 +217,7 @@ const enrichArticlesWithBrandsAndPrices = async (articles, branchId, formula) =>
 exports.enrichArticlesWithBrandsAndPrices = enrichArticlesWithBrandsAndPrices;
 const formatModelArticle = article => {
   var _ref3, _article$name, _ref4, _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe, _article$type, _article$group, _article$subgroup;
-  console.log('article', article);
-  return {
+  return _objectSpread(_objectSpread({}, article), {}, {
     name: (_ref3 = (_article$name = article.name) !== null && _article$name !== void 0 ? _article$name : article === null || article === void 0 ? void 0 : article.title) !== null && _ref3 !== void 0 ? _ref3 : null,
     description: (_ref4 = (_article$description$ = article === null || article === void 0 || (_article$description = article.description) === null || _article$description === void 0 || (_article$description = _article$description.ops) === null || _article$description === void 0 || (_article$description = _article$description[0]) === null || _article$description === void 0 ? void 0 : _article$description.insert) !== null && _article$description$ !== void 0 ? _article$description$ : article === null || article === void 0 ? void 0 : article.remark) !== null && _ref4 !== void 0 ? _ref4 : null,
     subTitle: (_article$boldDescript = article === null || article === void 0 || (_article$boldDescript2 = article.boldDescription) === null || _article$boldDescript2 === void 0 || (_article$boldDescript2 = _article$boldDescript2.ops) === null || _article$boldDescript2 === void 0 || (_article$boldDescript2 = _article$boldDescript2[0]) === null || _article$boldDescript2 === void 0 ? void 0 : _article$boldDescript2.insert) !== null && _article$boldDescript !== void 0 ? _article$boldDescript : null,
@@ -230,7 +229,7 @@ const formatModelArticle = article => {
     type: article === null || article === void 0 || (_article$type = article.type) === null || _article$type === void 0 ? void 0 : _article$type.title,
     group: article === null || article === void 0 || (_article$group = article.group) === null || _article$group === void 0 ? void 0 : _article$group.title,
     subgroup: article === null || article === void 0 || (_article$subgroup = article.subgroup) === null || _article$subgroup === void 0 ? void 0 : _article$subgroup.title
-  };
+  });
 };
 const formatGenericArticle = article => {
   var _article$images3, _article$images4, _article$articleNumbe2, _article$type2, _article$group2, _article$subgroup2;
@@ -242,7 +241,7 @@ const formatGenericArticle = article => {
     let [label, value] = _ref6;
     return "".concat(label, ": ").concat(value);
   }).join(' \n ');
-  return {
+  return _objectSpread(_objectSpread({}, article), {}, {
     name: article.name,
     description: null,
     subTitle: null,
@@ -254,5 +253,5 @@ const formatGenericArticle = article => {
     type: article === null || article === void 0 || (_article$type2 = article.type) === null || _article$type2 === void 0 ? void 0 : _article$type2.title,
     group: article === null || article === void 0 || (_article$group2 = article.group) === null || _article$group2 === void 0 ? void 0 : _article$group2.title,
     subgroup: article === null || article === void 0 || (_article$subgroup2 = article.subgroup) === null || _article$subgroup2 === void 0 ? void 0 : _article$subgroup2.title
-  };
+  });
 };

package/package.json

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