thm-p3-configurator 0.0.69 → 0.0.71

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

@@ -1,11 +1,9 @@
 "use strict";
 
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.orderApi = void 0;
-require("core-js/modules/es.promise.js");
 var _axios = _interopRequireDefault(require("axios"));
 var _index = require("../__constants__/index.js");
 var _LocalStorageWorker = require("../__services__/LocalStorageWorker.js");
@@ -31,25 +29,9 @@ orderClient.interceptors.request.use(config => {
   config.headers.Authorization = "Bearer ".concat(authSession === null || authSession === void 0 ? void 0 : authSession.accessToken);
   return config;
 });
-
-// Add response interceptor to handle 4xx errors
-orderClient.interceptors.response.use(response => response, error => {
-  if (error.response && error.response.status >= 400 && error.response.status < 500) {
-    console.error('API Error:', {
-      status: error.response.status,
-      statusText: error.response.statusText,
-      data: error.response.data,
-      url: error.config.url
-    });
-  }
-  return Promise.reject(error);
-});
 const orderApi = exports.orderApi = {
-  getOrder: orderParameters => {
-    console.log(orderParameters);
-    return orderClient("api".concat(APP_CONFIG.internal ? '' : '/public', "/order?").concat(orderParameters) // Remove the `/public` param if the configurator is internal,
-    );
-  },
+  getOrder: orderParameters => orderClient("api".concat(APP_CONFIG.internal ? '' : '/public', "/order?").concat(orderParameters) // Remove the `/public` param if the configurator is internal,
+  ),
   getArticlePrices: partsQueryString => orderClient("api".concat(APP_CONFIG.internal ? '' : '/public', "/prices?").concat(partsQueryString)),
   getArticles: filters => orderClient("api/public/articles?".concat(filters)),
   getBrands: () => orderClient('api/public/makes'),

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

@@ -297,9 +297,13 @@ const useSingleOrderArticles = exports.useSingleOrderArticles = function useSing
  */
 const useSingleOrderCart = () => {
   const [{
-    singleOrderCart
+    singleOrderCart,
+    singleOrderFormulaCode
   }] = (0, _OrderSessionContext.useOrderSession)();
-  const formula = (0, _FormulaContext.useFormula)();
+  let formula = (0, _FormulaContext.useFormula)();
+  if (singleOrderFormulaCode) {
+    formula = singleOrderFormulaCode;
+  }
   let cartOrderQuery = new URLSearchParams((0, _helpers__.removeNullishProps)({
     formula,
     isSingle: true,

package/dist/src/shared/__components__/LocationsSelector/index.js

@@ -11,11 +11,13 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _reactGoogleMaps = require("@vis.gl/react-google-maps");
 var _react = _interopRequireWildcard(require("react"));
 var _queries = require("../../__api__/queries");
+var _constants__ = require("../../__constants__");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
 var _useBreakpoint = _interopRequireDefault(require("../../__hooks__/useBreakpoint"));
 var _useUserLocation = _interopRequireDefault(require("../../__hooks__/useUserLocation"));
+var _LocalStorageWorker = require("../../__services__/LocalStorageWorker");
 var _LocationAutoComplete = _interopRequireDefault(require("./LocationAutoComplete"));
 var _LocationClusteredMap = _interopRequireDefault(require("./LocationClusteredMap"));
 var _LocationList = _interopRequireDefault(require("./LocationList"));
@@ -66,19 +68,36 @@ const LocationsSelector = /*#__PURE__*/_react.default.memo(() => {
   const [{
     franchiseName
   }] = (0, _OrderSessionContext.useOrderSession)();
+  const authSession = _LocalStorageWorker.lsw.getJson(_constants__.AUTH_SESSION_KEY);
   const {
-    branches: locations
-  } = (0, _queries.useBranchesQuery)({
-    offset: 0,
-    limit: 400,
-    formula,
-    franchiseName
-  });
+    branchTypes
+  } = (0, _queries.useBranchTypes)();
+  const isTMGOrganization = _react.default.useMemo(() => {
+    var _branchTypes$byId$aut, _authSession$branch;
+    return (branchTypes === null || branchTypes === void 0 || (_branchTypes$byId$aut = branchTypes.byId[authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 || (_authSession$branch = _authSession$branch.organisatietype) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch[0]]) === null || _branchTypes$byId$aut === void 0 ? void 0 : _branchTypes$byId$aut.title) === _constants__.TMG_ORGANIZATION_TYPE;
+  }, [branchTypes, authSession]);
+  let locations;
+  if (isTMGOrganization) {
+    const {
+      branches
+    } = (0, _queries.useBranchesQuery)({
+      offset: 0,
+      limit: 400,
+      formula,
+      franchiseName
+    });
+    locations = (branches === null || branches === void 0 ? void 0 : branches.results) || [];
+  } else {
+    const {
+      myBranches
+    } = (0, _queries.useMyBranches)(formula);
+    locations = myBranches || [];
+  }
   const {
     byId,
     allIds
   } = (0, _react.useMemo)(() => (0, _helpers__.normalizeArray)({
-    array: (locations === null || locations === void 0 ? void 0 : locations.results) || [],
+    array: locations || [],
     key: 'entityId'
   }), [locations]);
   (0, _react.useEffect)(() => {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VEHICLE_OWNERSHIP_TYPE = exports.USER_GEOLOCATION_KEY = exports.TMG_ORGANIZATION_TYPE = exports.StockStatus = exports.PRODUCT_CATEGORIES = exports.PRIVATE_SINGLE_ORDER_SESSION_KEY = exports.ORDER_SESSION_KEY = exports.NAVIGATION_STEPS_INTERNAL = exports.NAVIGATION_STEPS_EXTERNAL = exports.NAVIGATION_BUTTONS = exports.MOUSE_EXIT_INTENT_THROTTLE = exports.MOUSE_EXIT_INTENT_OFFSET = exports.LOCATION_TYPE = exports.LOCALE = exports.FORM_ERROR_MESSAGES = exports.DOSSIER_TYPES = exports.DISCOUNT_TYPES = exports.DEFAULT_MAP_LONGITUDE = exports.DEFAULT_MAP_LATITUDE = exports.DEFAULT_ARTICLE_BRAND = exports.CONFIGURATOR_FORMULAS = exports.BOARD_COMPUTER_DISABLED_KEY = exports.AUTH_SESSION_KEY = exports.ARTICLES_SYSTEM_FIELDS = exports.API_ERROR_CODES = exports.ANWB_DISCOUNT_CODE = exports.ALL_EXPERIMENTS = exports.ACTIVE_VARIANTS = void 0;
+exports.VEHICLE_OWNERSHIP_TYPE = exports.USER_GEOLOCATION_KEY = exports.TMG_ORGANIZATION_TYPE = exports.StockStatus = exports.PRODUCT_CATEGORIES = exports.PRIVATE_SINGLE_ORDER_SESSION_KEY = exports.ORDER_SESSION_KEY = exports.NAVIGATION_STEPS_INTERNAL = exports.NAVIGATION_STEPS_EXTERNAL = exports.NAVIGATION_BUTTONS = exports.MOUSE_EXIT_INTENT_THROTTLE = exports.MOUSE_EXIT_INTENT_OFFSET = exports.LOCATION_TYPE = exports.LOCATION_CHANGE_BUTTON_LABEL = exports.LOCALE = exports.FORM_ERROR_MESSAGES = exports.DOSSIER_TYPES = exports.DISCOUNT_TYPES = exports.DEFAULT_MAP_LONGITUDE = exports.DEFAULT_MAP_LATITUDE = exports.DEFAULT_ARTICLE_BRAND = exports.CONFIGURATOR_FORMULAS = exports.BOARD_COMPUTER_DISABLED_KEY = exports.AUTH_SESSION_KEY = exports.ARTICLES_SYSTEM_FIELDS = exports.API_ERROR_CODES = exports.ANWB_DISCOUNT_CODE = exports.ALL_EXPERIMENTS = exports.ACTIVE_VARIANTS = void 0;
 const DOSSIER_TYPES = exports.DOSSIER_TYPES = {
   Quotation: 'quotation',
   AppointmentRequest: 'appointment-request',
@@ -90,6 +90,11 @@ const NAVIGATION_BUTTONS = exports.NAVIGATION_BUTTONS = {
     label: 'Maak een afspraak',
     type: 'next',
     shouldShowForDossierTypes: [DOSSIER_TYPES.AppointmentRequest, DOSSIER_TYPES.PlannedAppointment]
+  }, {
+    to: '/configurator/montagelocatie',
+    label: 'Wijzig de locatie',
+    type: 'next',
+    shouldShowForDossierTypes: [DOSSIER_TYPES.Quotation]
   }],
   '/configurator/montagelocatie': [{
     to: '/configurator/overzicht',
@@ -98,7 +103,13 @@ const NAVIGATION_BUTTONS = exports.NAVIGATION_BUTTONS = {
   }, {
     to: '/configurator/gegevens',
     label: 'Maak een afspraak',
-    type: 'next'
+    type: 'next',
+    shouldShowForDossierTypes: [DOSSIER_TYPES.AppointmentRequest, DOSSIER_TYPES.PlannedAppointment]
+  }, {
+    to: '/configurator/offerte',
+    label: 'Mail mij de offerte',
+    type: 'next',
+    shouldShowForDossierTypes: [DOSSIER_TYPES.Quotation]
   }]
 };
 const DEFAULT_MAP_LATITUDE = exports.DEFAULT_MAP_LATITUDE = 52.090736;
@@ -130,6 +141,7 @@ const CONFIGURATOR_FORMULAS = exports.CONFIGURATOR_FORMULAS = {
   THC: 'THC',
   TMG: 'TMG'
 };
+const LOCATION_CHANGE_BUTTON_LABEL = exports.LOCATION_CHANGE_BUTTON_LABEL = 'Wijzig de locatie';
 const TMG_ORGANIZATION_TYPE = exports.TMG_ORGANIZATION_TYPE = 'TowMotive Group';
 const LOCATION_TYPE = exports.LOCATION_TYPE = 'Vestiging';
 const ANWB_DISCOUNT_CODE = exports.ANWB_DISCOUNT_CODE = 'ANWBTHC25';

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

@@ -94,7 +94,8 @@ const BottomNavigationBar = () => {
     selectedCableset,
     selectedCombiset,
     selectedBranch,
-    existingDossierType
+    existingDossierType,
+    allowLocationChange
   }] = (0, _OrderSessionContext.useOrderSession)();
   if (!(buttons !== null && buttons !== void 0 && buttons.length)) {
     return null;
@@ -119,6 +120,12 @@ const BottomNavigationBar = () => {
     if (existingDossierType && shouldShowForDossierTypes.length && !shouldShowForDossierTypes.includes(existingDossierType)) {
       return null;
     }
+    if (label === _constants__.LOCATION_CHANGE_BUTTON_LABEL && to === '/configurator/montagelocatie' && allowLocationChange === false) {
+      return null;
+    }
+    if (to === '/configurator/montagelocatie' && existingDossierType && !allowLocationChange) {
+      to = '/configurator/gegevens';
+    }
     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"))

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

@@ -62,7 +62,7 @@ const VehicleData = _ref => {
     isDefaultExpanded: true,
     body: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ' ', /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _helpers__.withStyle)('col-auto col-md-12 text-center')
-    }, /*#__PURE__*/_react.default.createElement("img", {
+    }, !isFilter && /*#__PURE__*/_react.default.createElement("img", {
       className: (0, _helpers__.withStyle)('vehicle-data__image img-fluid rounded-1 mx-0 mb-1'),
       src: (0, _image.getImageFromHyper)({
         imageId: vehicleLogo

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

@@ -164,6 +164,7 @@ const InternalAppointmentForm = _ref => {
     chassisNumber,
     channel,
     durationAnswer,
+    allowLocationChange,
     selectedBoardComputer,
     selectedCableset,
     selectedCombiset,
@@ -256,7 +257,7 @@ const InternalAppointmentForm = _ref => {
       });
       await onSubmit((0, _helpers__.removeNullishProps)({
         vehicle,
-        customer: _objectSpread(_objectSpread({}, customer), {}, {
+        customer: (0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, customer), {}, {
           firstName: (_customer$firstName = customer === null || customer === void 0 ? void 0 : customer.firstName) !== null && _customer$firstName !== void 0 ? _customer$firstName : undefined,
           lastName: (_customer$lastName = customer === null || customer === void 0 ? void 0 : customer.lastName) !== null && _customer$lastName !== void 0 ? _customer$lastName : undefined,
           phoneNumber: (_customer$phoneNumber = customer === null || customer === void 0 ? void 0 : customer.phoneNumber) !== null && _customer$phoneNumber !== void 0 ? _customer$phoneNumber : undefined,
@@ -269,7 +270,7 @@ const InternalAppointmentForm = _ref => {
           zipCode: (_customer$zipCode = customer === null || customer === void 0 ? void 0 : customer.zipCode) !== null && _customer$zipCode !== void 0 ? _customer$zipCode : undefined,
           companyName: (_customer$companyName = customer === null || customer === void 0 ? void 0 : customer.companyName) !== null && _customer$companyName !== void 0 ? _customer$companyName : undefined,
           invoiceEmail: (_customer$invoiceEmai = customer === null || customer === void 0 ? void 0 : customer.invoiceEmail) !== null && _customer$invoiceEmai !== void 0 ? _customer$invoiceEmai : undefined
-        }),
+        })),
         customerAgreed,
         appointment,
         channel,
@@ -690,7 +691,7 @@ const InternalAppointmentForm = _ref => {
     className: (0, _helpers__.withStyle)('d-flex align-items-center justify-content-end mt-4')
   }, /*#__PURE__*/_react.default.createElement(_NavigationButton.default, {
     variant: "link",
-    to: '/configurator/montagelocatie',
+    to: allowLocationChange ? '/configurator/montagelocatie' : '/configurator/overzicht',
     label: 'Vorige',
     state: {
       prevPathName: history.location.pathname

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

@@ -68,9 +68,6 @@ const NormalPageModalContent = _ref => {
   const [_selectedBranchId, _setSelectedBranchId] = (0, _react.useState)();
   const [_branches, _setBranches] = (0, _react.useState)([]);
   const formula = (0, _FormulaContext.useFormula)();
-  const {
-    branchTypes
-  } = (0, _queries.useBranchTypes)();
   const {
     myBranches,
     isLoadingMyBranches

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

@@ -112,6 +112,7 @@ const INITIAL_ORDER_SESSION_STATE = {
   executionAnswer1: null,
   executionAnswer2: null,
   priceCalculationDate: new Date().getTime(),
+  allowLocationChange: false,
   durationOptions: [],
   execution1Options: [],
   execution2Options: [],

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

@@ -67,7 +67,7 @@ function _toPrimitive(t, r) {
  * @description Covnerts an existing hyper dossier object into a local order session
  */
 const parseDossierToOrderSession = exports.parseDossierToOrderSession = function parseDossierToOrderSession() {
-  var _dossier$kanaal, _dossier$kanaalPartne, _dossier$kanaalHoofka, _dossier$vestiging, _dossier$typeEigendom, _Date, _dossier$klant, _dossier$klant2, _dossier$klant3, _dossier$klant4, _dossier$klant5, _dossier$klant$postal, _dossier$klant6, _dossier$klant$city, _dossier$klant7, _dossier$klant$street, _dossier$klant8, _dossier$klant$huisnu, _dossier$klant9;
+  var _dossier$kanaal, _dossier$kanaalPartne, _dossier$kanaalHoofka, _dossier$statusDossie, _dossier$statusDossie2, _dossier$vestiging, _dossier$typeEigendom, _Date, _dossier$klant, _dossier$klant2, _dossier$klant3, _dossier$klant4, _dossier$klant5, _dossier$klant$postal, _dossier$klant6, _dossier$klant$city, _dossier$klant7, _dossier$klant$street, _dossier$klant8, _dossier$klant$huisnu, _dossier$klant9;
   let dossier = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
     licensePlate: dossier === null || dossier === void 0 ? void 0 : dossier.kenteken,
@@ -92,6 +92,7 @@ const parseDossierToOrderSession = exports.parseDossierToOrderSession = function
     selectedDiscountedProducts: [],
     // TODO
     selectedBoardComputer: null,
+    allowLocationChange: (_dossier$statusDossie = dossier === null || dossier === void 0 || (_dossier$statusDossie2 = dossier.statusDossier) === null || _dossier$statusDossie2 === void 0 ? void 0 : _dossier$statusDossie2.vestigingWijzigenToegestaan) !== null && _dossier$statusDossie !== void 0 ? _dossier$statusDossie : false,
     // Static:
     franchiseName: null,
     buildYear: null,

package/dist/src/shared/__pages__/internal/InternalLocationsPage.js

@@ -3,17 +3,18 @@
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouter = require("react-router");
 var _queries = require("../../__api__/queries");
 var _Header = _interopRequireDefault(require("../../__components__/Header"));
 var _LocationsSelector = _interopRequireDefault(require("../../__components__/LocationsSelector"));
 var _NavigationSteps = _interopRequireDefault(require("../../__components__/NavigationSteps"));
+var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _constants__ = require("../../__constants__");
 var _BottomNavigationBar = _interopRequireDefault(require("../../__containers__/BottomNavigationBar"));
 var _internal = require("../../__containers__/internal");
@@ -60,6 +61,10 @@ const InternalLocationsPage = _ref => {
   const history = (0, _reactRouter.useHistory)();
   const formula = (0, _FormulaContext.useFormula)();
   const authSession = _LocalStorageWorker.lsw.getJson(_constants__.AUTH_SESSION_KEY);
+  const [{
+    allowLocationChange,
+    existingDossierId
+  }] = (0, _OrderSessionContext.useOrderSession)();
   (0, _react.useEffect)(() => {
     var _branchTypes$byId$aut, _authSession$branch, _location$state;
     const branchType = branchTypes === null || branchTypes === void 0 || (_branchTypes$byId$aut = branchTypes.byId[authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 || (_authSession$branch = _authSession$branch.organisatietype) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch[0]]) === null || _branchTypes$byId$aut === void 0 ? void 0 : _branchTypes$byId$aut.title;
@@ -69,6 +74,10 @@ const InternalLocationsPage = _ref => {
       return;
     }
 
+    // if we are editing an existing dossier and allowLocationChange is truethy, allowthe user to edit the location
+    if (allowLocationChange && existingDossierId) {
+      return;
+    }
     // Step 2: skip this page if the branch type is not TowMotive Group
     // If the previous page is appointment page ("gegevens") -> go back to overview ("overzicht")
     // Otherwise: proceed to the appointment page ("gegevens")

package/package.json

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