thm-p3-configurator 0.0.174 → 0.0.176

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

@@ -103,7 +103,8 @@ const QuestionsForm = _ref => {
     onPrev = () => {},
     onSubmit = () => {},
     isFilter = false,
-    initialLicensePlate = null
+    initialLicensePlate = null,
+    initialModel = null
   } = _ref;
   const [filterAnswers, setFilterAnswers] = (0, _react.useState)({
     executionAnswer1: '',
@@ -145,7 +146,7 @@ const QuestionsForm = _ref => {
     if (hasMultipleExecutionQuestions && (!executionAnswer1 || !executionAnswer2)) {
       return {
         licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
-        model,
+        model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
         formula,
         discountCode,
         durationAnswer: durationAnswer
@@ -155,7 +156,7 @@ const QuestionsForm = _ref => {
     // Otherwise include all available answers
     return {
       licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
-      model,
+      model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
       formula,
       discountCode,
       executionAnswer1,
@@ -220,7 +221,7 @@ const QuestionsForm = _ref => {
   const shouldPrefetchProducts = !hasMultipleExecutionQuestions || executionAnswer1 && executionAnswer2;
   (0, _queries.useProductsQuery)(shouldPrefetchProducts ? {
     licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
-    model,
+    model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
     executionAnswer1,
     executionAnswer2,
     durationAnswer,
@@ -229,7 +230,7 @@ const QuestionsForm = _ref => {
     priceCalculationDate
   } : {
     licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
-    model,
+    model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
     formula,
     discountCode,
     priceCalculationDate
@@ -286,12 +287,19 @@ const QuestionsForm = _ref => {
           type: _OrderSessionContext.orderSessionActions.CLEAR_ANSWERS
         });
         if (isFilter) {
-          onSubmit({
-            type: 'licensePlate',
-            value: {
-              licensePlate: initialLicensePlate
-            }
-          });
+          if (!initialModel) {
+            onSubmit({
+              type: 'licensePlate',
+              value: {
+                licensePlate: initialLicensePlate
+              }
+            });
+          } else {
+            onSubmit({
+              type: 'model',
+              value: initialModel
+            });
+          }
           return;
         } else {
           if (questionsError) {
@@ -423,7 +431,7 @@ const QuestionsForm = _ref => {
       if (isFilter && hasMultipleExecutionQuestions && (!filterAnswers.executionAnswer1 || !filterAnswers.executionAnswer2)) {
         return;
       }
-      onSubmit(isFilter ? {
+      onSubmit(isFilter ? !initialModel ? {
         type: 'licensePlate',
         value: {
           licensePlate: initialLicensePlate,
@@ -431,6 +439,12 @@ const QuestionsForm = _ref => {
           executionAnswer2: filterAnswers.executionAnswer2,
           durationAnswer: filterAnswers.durationAnswer
         }
+      } : {
+        type: 'model',
+        value: initialModel,
+        executionAnswer1: filterAnswers.executionAnswer1,
+        executionAnswer2: filterAnswers.executionAnswer2,
+        durationAnswer: filterAnswers.durationAnswer
       } : {
         executionAnswer1,
         executionAnswer2,

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

@@ -105,10 +105,20 @@ function InternalLicenseplateModal(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_FormSteps.default, {
     count: 2,
     defaultActive: activeStep
-  }))), activeModalType === 1 && /*#__PURE__*/_react.default.createElement(_ManualSelectionForm.default, {
+  }))), activeModalType === 1 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, activeStep === 0 && /*#__PURE__*/_react.default.createElement(_ManualSelectionForm.default, {
     filterModalChange: handleModalTypeChange,
     handleSelectedFilterChange: handleSelectedFilterChange,
-    onSubmit: onSubmit,
+    onSubmit: handleNext,
     isFilter: true
-  })));
+  }), activeStep === 1 && /*#__PURE__*/_react.default.createElement(_QuestionsForm.default, {
+    isFilter: true,
+    initialModel: currentLicenseplate === null || currentLicenseplate === void 0 ? void 0 : currentLicenseplate.value,
+    onPrev: handlePrev,
+    onSubmit: onSubmit
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _helpers__.withStyle)('align-items-center justify-content-center text-center mt-2')
+  }, /*#__PURE__*/_react.default.createElement(_FormSteps.default, {
+    count: 2,
+    defaultActive: activeStep
+  })))));
 }

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

@@ -1044,9 +1044,6 @@ const initializeOrderSession = function initializeOrderSession() {
   // Check if we're on a single-order page by examining window.location
   const storageKey = isPrivateSingleOrder ? _constants__.PRIVATE_SINGLE_ORDER_SESSION_KEY : _constants__.ORDER_SESSION_KEY;
   const cachedSession = (0, _helpers__.parseJson)(window.sessionStorage.getItem(storageKey));
-  console.log('is single order page', isPrivateSingleOrder);
-  console.log('cachedSession', cachedSession);
-  console.log('storageKey', storageKey);
   if (!cachedSession) {
     return INITIAL_ORDER_SESSION_STATE;
   }

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

@@ -227,6 +227,30 @@ const InternalSingleOrderPage = () => {
           model: filter.value
         }
       });
+      if (filter.executionAnswer1) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_EXECUTION1_ANSWER,
+          payload: {
+            answer: filter.executionAnswer1
+          }
+        });
+      }
+      if (filter.executionAnswer2) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_EXECUTION2_ANSWER,
+          payload: {
+            answer: filter.executionAnswer2
+          }
+        });
+      }
+      if (filter.durationAnswer) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_DURATION_ANSWER,
+          payload: {
+            answer: filter.durationAnswer
+          }
+        });
+      }
     }
     if (filter.type === 'licensePlate') {
       var _filter$value$executi, _filter$value$executi2, _filter$value$duratio;

package/package.json

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