project-booster-vue 9.63.1 → 9.63.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.63.1",
+  "version": "9.63.3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/appointment/PbAppointmentForm.vue

@@ -39,18 +39,19 @@ export default defineComponent({
 
     const appointmentFormUrl = computed(() => {
       const sessions = store.getters['appointmentQualification/getSessions'];
-      store.dispatch('appointmentQualification/getDynamicCalendarId');
       const currentAppointmentQualification =
         store.getters['appointmentQualification/getCurrentAppointmentQualification'];
       const currentUser = store.getters['inhabitants/getCurrentInhabitant'];
       const baseUrl = store.getters['appointmentQualification/getClicRDVBaseUrl'];
-      const calendarId = store.getters['appointmentQualification/getCalendarId'];
 
       let url = '';
-
-      url = `${baseUrl}/leroy-merlin-${sessions.storeId}`;
-      url += `?calendar_id=${calendarId}`;
-      url += `&vevent[str5]=${currentAppointmentQualification.inhabitantProjectId}`;
+      if (props.payload?.viewModel?.calendarUrlPath) {
+        url = `${baseUrl}/${props.payload.viewModel.calendarUrlPath}?`;
+      } else {
+        url = `${baseUrl}/leroy-merlin-${sessions.storeId}`;
+        url += `?calendar_id=${sessions.calendarId}`;
+        url += `&vevent[str5]=${currentAppointmentQualification.inhabitantProjectId}`;
+      }
 
       if (currentUser) {
         url += `&fiche[email]=${currentUser.email}`;

package/src/components/scenario/scenarii/appointment-qualification-bathroom.json

@@ -317,7 +317,7 @@
     },
     "payload": {
       "viewModel": {
-        "label": "Quel type de baignoir voulez-vous installer ?",
+        "label": "Quel type de baignoire voulez-vous installer ?",
         "answersComponent": "MPbCard",
         "progressBar": true,
         "forceOneCardPerLineOnMobile": true,
@@ -777,7 +777,7 @@
                 {
                   "conditions": ["true"],
                   "nextStep": {
-                    "code": "LMFR_BATHROOM_SHARE_PLAN"
+                    "code": "LMFR_QUESTION_PLAN_INFO"
                   }
                 }
               ]
@@ -839,8 +839,8 @@
       }
     }
   },
-  "LMFR_BATHROOM_ADD_SIMULATION": {
-    "code": "LMFR_BATHROOM_ADD_SIMULATION",
+  "LMFR_QUESTION_SCENARIO_ADD_SIMULATION": {
+    "code": "LMFR_QUESTION_SCENARIO_ADD_SIMULATION",
     "type": "STEP",
     "component": "MPbConfigurationsImport",
     "slots": {
@@ -859,7 +859,7 @@
         "redirectLink": {
           "label": "Je préfère télécharger un plan",
           "nextStep": {
-            "code": "LMFR_BATHROOM_DOWNLOAD_PLAN"
+            "code": "LMFR_QUESTION_ADD_PLAN"
           }
         },
         "notificationPayload": {
@@ -881,7 +881,7 @@
         {
           "label": "Suivant",
           "nextStep": {
-            "code": "LMFR_BATHROOM_DOWNLOAD"
+            "code": "LMFR_QUESTION_ADD_PICTURE"
           }
         }
       ],
@@ -909,8 +909,8 @@
       }
     }
   },
-  "LMFR_BATHROOM_SHARE_PLAN": {
-    "code": "LMFR_BATHROOM_SHARE_PLAN",
+  "LMFR_QUESTION_PLAN_INFO": {
+    "code": "LMFR_QUESTION_PLAN_INFO",
     "type": "STEP",
     "component": "MPbQuestion",
     "slots": {
@@ -946,7 +946,7 @@
         "LATER": {
           "code": "LATER",
           "viewModel": {
-            "title": "Je transmet mon plan au plus tard 48h avant le rendez-vous"
+            "title": "Je transmets mon plan au plus tard 48h avant le rendez-vous"
           },
           "meta": {
             "ranking": 2
@@ -966,28 +966,28 @@
     "nextStep": {
       "conditionals": [
         {
-          "conditions": ["isAnswerContaining('LMFR_BATHROOM_SHARE_PLAN', 'DOWNLOAD_PLAN')"],
+          "conditions": ["isAnswerContaining('LMFR_QUESTION_PLAN_INFO', 'DOWNLOAD_PLAN')"],
           "nextStep": {
-            "code": "LMFR_BATHROOM_DOWNLOAD_PLAN"
+            "code": "LMFR_QUESTION_ADD_PLAN"
           }
         },
         {
-          "conditions": ["isAnswerContaining('LMFR_BATHROOM_SHARE_PLAN', 'LATER')"],
+          "conditions": ["isAnswerContaining('LMFR_QUESTION_PLAN_INFO', 'LATER')"],
           "nextStep": {
-            "code": "LMFR_BATHROOM_DOWNLOAD_PLAN_LATER"
+            "code": "LMFR_QUESTION_ADD_PLAN_LATER"
           }
         },
         {
-          "conditions": ["isAnswerContaining('LMFR_BATHROOM_SHARE_PLAN', 'IMPORT_SIMULATION')"],
+          "conditions": ["isAnswerContaining('LMFR_QUESTION_PLAN_INFO', 'IMPORT_SIMULATION')"],
           "nextStep": {
-            "code": "LMFR_BATHROOM_ADD_SIMULATION"
+            "code": "LMFR_QUESTION_SCENARIO_ADD_SIMULATION"
           }
         }
       ]
     }
   },
-  "LMFR_BATHROOM_DOWNLOAD_PLAN_LATER": {
-    "code": "LMFR_BATHROOM_DOWNLOAD_PLAN_LATER",
+  "LMFR_QUESTION_ADD_PLAN_LATER": {
+    "code": "LMFR_QUESTION_ADD_PLAN_LATER",
     "type": "STEP",
     "component": "MPbAlert",
     "slots": {
@@ -1051,17 +1051,17 @@
         {
           "label": "Etape suivante",
           "nextStep": {
-            "code": "LMFR_BATHROOM_DOWNLOAD"
+            "code": "LMFR_QUESTION_ADD_PICTURE"
           }
         }
       ]
     },
     "nextStep": {
-      "code": "LMFR_BATHROOM_DOWNLOAD"
+      "code": "LMFR_QUESTION_ADD_PICTURE"
     }
   },
-  "LMFR_BATHROOM_DOWNLOAD": {
-    "code": "LMFR_BATHROOM_DOWNLOAD",
+  "LMFR_QUESTION_ADD_PICTURE": {
+    "code": "LMFR_QUESTION_ADD_PICTURE",
     "type": "STEP",
     "slots": {
       "beforeContent": {
@@ -1155,8 +1155,8 @@
       }
     }
   },
-  "LMFR_BATHROOM_DOWNLOAD_PLAN": {
-    "code": "LMFR_BATHROOM_DOWNLOAD_PLAN",
+  "LMFR_QUESTION_ADD_PLAN": {
+    "code": "LMFR_QUESTION_ADD_PLAN",
     "type": "STEP",
     "component": "MPbUploadDocument",
     "slots": {
@@ -1178,7 +1178,7 @@
         "redirectLink": {
           "label": "Je préfère utiliser un plan 3D réalisé sur mon espace client.",
           "nextStep": {
-            "code": "LMFR_BATHROOM_ADD_SIMULATION"
+            "code": "LMFR_QUESTION_SCENARIO_ADD_SIMULATION"
           }
         },
         "showMore": {
@@ -1217,7 +1217,7 @@
         {
           "label": "Suivant",
           "nextStep": {
-            "code": "LMFR_BATHROOM_DOWNLOAD"
+            "code": "LMFR_QUESTION_ADD_PICTURE"
           }
         }
       ],

package/src/services/api/appointmentQualificationsApi.ts

@@ -86,26 +86,10 @@ const linkInhabitantProjectToAppointmentQualification = async (data: any, inhabi
   );
 };
 
-const getCalendarIdFromApi = async (storeId: string, appointmentType: string) => {
-  const response = await clientApi.get(
-    `/appointment-qualifications/contextualize?storeId=${storeId}&appointmentType=${appointmentType}?`,
-    {
-      headers: { 'Content-Type': 'application/json' },
-    },
-  );
-
-  return JSON.parse(
-    JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${escape($1)}"`;
-    }),
-  );
-};
-
 export {
   linkInhabitantProjectToAppointmentQualification,
   declarationsWithAppointment,
   saveAnswersByAppointmentQualificationId,
   getAppointmentQualification,
   declarationsWithoutAppointment,
-  getCalendarIdFromApi,
 };

package/src/stores/modules/appointmentQualificationStore.ts

@@ -4,7 +4,6 @@ import {
   declarationsWithAppointment,
   declarationsWithoutAppointment,
   linkInhabitantProjectToAppointmentQualification,
-  getCalendarIdFromApi,
 } from '../../services/api/appointmentQualificationsApi';
 import { sendAppointmentQualificationEvent, sendAppointmentQualificationAnswers } from '../../services/api/eventsApi';
 import { ActionContext } from 'vuex';
@@ -21,7 +20,6 @@ export interface AppointmentQualificationState {
   currentAppointmentQualification: any;
   sessions: any;
   isQualificationAborted: boolean;
-  calendarId: string;
 }
 
 type AppointmentQualificationContext = ActionContext<AppointmentQualificationState, State>;
@@ -40,7 +38,6 @@ export default {
     currentAppointmentQualification: {},
     sessions: {},
     isQualificationAborted: false,
-    calendarId: '',
   },
 
   getters: {
@@ -68,9 +65,6 @@ export default {
     isQualificationAborted(state: AppointmentQualificationState) {
       return state.isQualificationAborted;
     },
-    getCalendarId(state: AppointmentQualificationState) {
-      return state.calendarId;
-    },
   },
 
   mutations: {
@@ -98,9 +92,6 @@ export default {
     setIsQualificationAborted(state: AppointmentQualificationState, isQualificationAborted: boolean) {
       state.isQualificationAborted = isQualificationAborted;
     },
-    setCalendarId(state: AppointmentQualificationState, calendarId: string) {
-      state.calendarId = calendarId;
-    },
   },
 
   actions: {
@@ -224,14 +215,5 @@ export default {
         commit('setCurrentAppointmentQualification', null);
       }
     },
-    async getDynamicCalendarId({ commit, state }: AppointmentQualificationContext) {
-      try {
-        const type = state.sessions.appointmentQualificationFormStructure['__START__']?.meta?.webAnalytics.scenario;
-        const result = await getCalendarIdFromApi(state.sessions.storeId, type);
-        if (result) {
-          commit('setCalendarId', result.id);
-        }
-      } catch (e) {}
-    },
   },
 };