thm-p3-configurator 0.0.354 → 0.0.355

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

@@ -345,12 +345,14 @@ const InternalBranchSelectorModal = () => {
     isLoadingBranchTypes
   } = (0, _queries.useBranchTypes)();
   const [_selectedBranchId, _setSelectedBranchId] = (0, _react.useState)();
+  const [isDismissed, setIsDismissed] = (0, _react.useState)(false);
   const authSession = (0, _AuthSessionContext.useAuthSession)();
   const isSingleOrderPage = (0, _useIsSingleOrder.default)();
   const formula = (0, _FormulaContext.useFormula)();
   const isTMGOrganization = (0, _useIsTmg.useIsTmg)();
   (0, _react.useEffect)(() => {
     _setSelectedBranchId(undefined);
+    setIsDismissed(false);
   }, [isSingleOrderPage]);
   const isLocation = _react.default.useMemo(() => {
     var _authSession$branch2;
@@ -431,8 +433,8 @@ const InternalBranchSelectorModal = () => {
       }
     });
   };
-  const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage;
-  const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization;
+  const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage && !isDismissed;
+  const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization && !isDismissed;
 
   // Show loading state only when we actually need to show the modal
   const shouldShowModal = shouldShowModalForSingleOrder || shouldShowModalForOtherPages;
@@ -460,7 +462,8 @@ const InternalBranchSelectorModal = () => {
     hasSecondaryButton: false,
     isPrimaryButtonDisabled: !_selectedBranchId,
     primaryButtonText: 'Ga door',
-    onPrimaryButtonClicked: handlePrimaryButtonClicked
+    onPrimaryButtonClicked: handlePrimaryButtonClicked,
+    onClose: () => setIsDismissed(true)
   }, isSingleOrderPage ? /*#__PURE__*/_react.default.createElement(SingleOrderModalContent, {
     setSelectedBranchId: _setSelectedBranchId,
     isLocation: isLocation,

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

@@ -156,10 +156,12 @@ const InternalSingleOrderPage = () => {
     anderAfleveradres,
     afhalenInWinkel
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
-  let formula = (0, _FormulaContext.useFormula)();
+  const sessionFormula = (0, _FormulaContext.useFormula)();
+  let formula = sessionFormula;
   if (singleOrderFormulaCode) {
     formula = singleOrderFormulaCode;
   }
+  const singleOrderCreationFormula = sessionFormula === _constants__.CONFIGURATOR_FORMULAS.TMG ? _constants__.CONFIGURATOR_FORMULAS.TMG : formula === _constants__.CONFIGURATOR_FORMULAS.THM ? _constants__.CONFIGURATOR_FORMULAS.TM : formula;
   const themeClass = (0, _helpers__.getConfiguratorThemeClassByFormula)(formula);
   const wrapperClass = "thm-configurator-wrapper thm-configurator-wrapper--offset ".concat(themeClass);
   const {
@@ -364,7 +366,7 @@ const InternalSingleOrderPage = () => {
         var _response$data2;
         // Regular flow for offline orders
         const preferredDateTime = appointment !== null && appointment !== void 0 && appointment.date && appointment !== null && appointment !== void 0 && appointment.time ? (0, _helpers__.parseDateAndTimeToTimestamp)(appointment === null || appointment === void 0 ? void 0 : appointment.date, appointment === null || appointment === void 0 ? void 0 : appointment.time) : null;
-        const response = await createSingleOrder(_objectSpread(_objectSpread({
+        const response = await createSingleOrder({
           licensePlate: filters.licensePlate,
           model: filters.model,
           cart: singleOrderCart,
@@ -372,12 +374,8 @@ const InternalSingleOrderPage = () => {
           customer: _objectSpread(_objectSpread({}, customer), {}, {
             anderAfleveradres,
             afhalenInWinkel
-          })
-        }, formula === _constants__.CONFIGURATOR_FORMULAS.THM ? {
-          formula: _constants__.CONFIGURATOR_FORMULAS.TM
-        } : {
-          formula
-        }), {}, {
+          }),
+          formula: singleOrderCreationFormula,
           branchId: selectedBranch,
           channel,
           preferredDateTime,
@@ -387,7 +385,7 @@ const InternalSingleOrderPage = () => {
           zakelijkContactTelefoonnummer: vehiclePayload.ownershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk ? (customer === null || customer === void 0 ? void 0 : customer.zakelijkContactTelefoonnummer) || undefined : undefined,
           zakeiljkContactFactuuradres: vehiclePayload.ownershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk ? (customer === null || customer === void 0 ? void 0 : customer.zakeiljkContactFactuuradres) || undefined : undefined,
           zakelijkContactEMailadres: vehiclePayload.ownershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk ? (customer === null || customer === void 0 ? void 0 : customer.zakelijkContactEMailadres) || undefined : undefined
-        }));
+        });
         if (response !== null && response !== void 0 && (_response$data2 = response.data) !== null && _response$data2 !== void 0 && (_response$data2 = _response$data2.data) !== null && _response$data2 !== void 0 && _response$data2.entityId) {
           setCreatedEntityId(response.data.data.entityId);
         }

package/package.json

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