project-booster-vue 9.62.4 → 9.63.1

package/package.json

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

package/src/components/appointment/PbAppointmentForm.vue

@@ -39,19 +39,18 @@ 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 = '';
-      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}`;
-      }
+
+      url = `${baseUrl}/leroy-merlin-${sessions.storeId}`;
+      url += `?calendar_id=${calendarId}`;
+      url += `&vevent[str5]=${currentAppointmentQualification.inhabitantProjectId}`;
 
       if (currentUser) {
         url += `&fiche[email]=${currentUser.email}`;

package/src/components/projects/project-hub/PbProjectHub.vue

@@ -1052,6 +1052,8 @@ export default defineComponent({
         KITCHEN_REMOTE: 'à distance',
         BATHROOM_REMOTE: 'à distance',
         BATHROOM_IN_STORE: 'en magasin',
+        BATHROOM_AT_HOME: 'à domicile',
+        BATHROOM_FURNITURES_AND_SHOWER: 'à distance',
       })[this.appointment.appointmentType];
       return `${prefix} le ${appointmenDateLabel} ${appointmentTypeLabel}`;
     },

package/src/components/projects/projects-list/PbProjectHub.vue

@@ -1052,6 +1052,8 @@ export default defineComponent({
         KITCHEN_REMOTE: 'à distance',
         BATHROOM_REMOTE: 'à distance',
         BATHROOM_IN_STORE: 'en magasin',
+        BATHROOM_AT_HOME: 'à domicile',
+        BATHROOM_FURNITURES_AND_SHOWER: 'à distance',
       })[this.appointment.appointmentType];
       return `${prefix} le ${appointmenDateLabel} ${appointmentTypeLabel}`;
     },

package/src/services/api/appointmentQualificationsApi.ts

@@ -86,10 +86,26 @@ 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,6 +4,7 @@ import {
   declarationsWithAppointment,
   declarationsWithoutAppointment,
   linkInhabitantProjectToAppointmentQualification,
+  getCalendarIdFromApi,
 } from '../../services/api/appointmentQualificationsApi';
 import { sendAppointmentQualificationEvent, sendAppointmentQualificationAnswers } from '../../services/api/eventsApi';
 import { ActionContext } from 'vuex';
@@ -20,6 +21,7 @@ export interface AppointmentQualificationState {
   currentAppointmentQualification: any;
   sessions: any;
   isQualificationAborted: boolean;
+  calendarId: string;
 }
 
 type AppointmentQualificationContext = ActionContext<AppointmentQualificationState, State>;
@@ -38,6 +40,7 @@ export default {
     currentAppointmentQualification: {},
     sessions: {},
     isQualificationAborted: false,
+    calendarId: '',
   },
 
   getters: {
@@ -65,6 +68,9 @@ export default {
     isQualificationAborted(state: AppointmentQualificationState) {
       return state.isQualificationAborted;
     },
+    getCalendarId(state: AppointmentQualificationState) {
+      return state.calendarId;
+    },
   },
 
   mutations: {
@@ -92,6 +98,9 @@ export default {
     setIsQualificationAborted(state: AppointmentQualificationState, isQualificationAborted: boolean) {
       state.isQualificationAborted = isQualificationAborted;
     },
+    setCalendarId(state: AppointmentQualificationState, calendarId: string) {
+      state.calendarId = calendarId;
+    },
   },
 
   actions: {
@@ -215,5 +224,14 @@ 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) {}
+    },
   },
 };