project-booster-vue 9.62.3 → 9.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.62.3",
+  "version": "9.63.0",
   "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/rework/alert/MPbAlert.vue

@@ -48,7 +48,7 @@
       </div>
     </div>
 
-    <m-modal :modalTitle="titleModal" :open="showModal" @update:open="showModal = false" class="m-pb-alert__dialog">
+    <m-modal :modalTitle="titleModal" :open="showModal" @update:open="handleCloseModal" class="m-pb-alert__dialog">
       <template #default>
         <div class="m-pb-alert__dialog__iframe">
           <iframe
@@ -63,7 +63,7 @@
         </div>
       </template>
       <template #footer>
-        <m-button label="Fermer" @click.prevent="showModal = false" />
+        <m-button label="Fermer" @click.prevent="handleCloseModal" />
       </template>
     </m-modal>
   </div>
@@ -92,9 +92,14 @@ const props = defineProps({
   },
 });
 
+const handleCloseModal = () => {
+  showModal.value = false;
+  srcModal.value = '';
+};
+
 const handleShowModal = (option: any) => {
   if (option.viewModel.button.dialog) {
-    showModal.value = !showModal.value;
+    showModal.value = true;
     titleModal.value = option.viewModel.title;
     srcModal.value = option.viewModel.button.dialog.src;
   } else if (option.viewModel.button.href) {

package/src/components/rework/exit-options/MPbExitOptions.vue

@@ -85,7 +85,6 @@ import { ScenarioStepAnswer } from '@/types/pb/Scenario';
 
 const emit = defineEmits(['go-back', 'step-completed']);
 const message = ref('');
-const currentIndex = ref(0);
 
 const props = defineProps({
   /**
@@ -119,18 +118,12 @@ const props = defineProps({
  */
 const callAction = (action: PayloadAction) => {
   if (action.code != '__BACK__') {
-    let answers: any = [];
-
-    if (message.value.length > 10) {
-      answers = [
+    emit('step-completed', {
+      answers: [
         {
           message,
         },
-      ];
-    }
-
-    emit('step-completed', {
-      answers,
+      ],
       nextStep: action,
     });
   } else {

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

@@ -111,6 +111,7 @@
                 },
                 {
                   "conditions": [
+                    "isAnswerContaining('LMFR_QUESTION_WORKS', 'REPLACE_BATHTUB_TO_SHOWER')",
                     "isAnswerContaining('LMFR_QUESTION_WORKS', 'REPLACE_BATHTUB_TO_SHOWER') && isAnswerContaining('LMFR_QUESTION_WORKS', 'FURNITURES')",
                     "isAnswerContaining('LMFR_QUESTION_WORKS', 'REPLACE_BATHTUB_TO_SHOWER') && isAnswerContaining('LMFR_QUESTION_WORKS', 'WC')",
                     "isAnswerContaining('LMFR_QUESTION_WORKS', 'REPLACE_BATHTUB_TO_SHOWER') && isAnswerContaining('LMFR_QUESTION_WORKS', 'COVERING_WALL')",

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) {}
+    },
   },
 };