project-booster-vue 9.42.4 → 9.42.6

package/package.json

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

package/src/components/products/PbProducts.vue

@@ -111,7 +111,7 @@ export default defineComponent({
   created() {
     this.$store.dispatch('products/loadProduct', {
       payload: this.payload.viewModel.defaultProduct,
-      sessions: this.metadata.storeId || '',
+      storeId: this.metadata.storeId || '',
     });
   },
   methods: {

package/src/components/restitution/PbRestitutionList.vue

@@ -50,13 +50,7 @@
           :label="button.label"
           @click="callAction(button.action)"
           :theme="button.bordered ? 'bordered' : 'solid'"
-          v-if="!button.conditions"
-        />
-        <m-button
-          :label="button.label"
-          @click="callAction(button.action)"
-          :theme="button.bordered ? 'bordered' : 'solid'"
-          v-if="checkConditional(button.conditions) && button.conditions"
+          v-if="areConditionsValid(button.conditions)"
         />
       </div>
       <div class="pb-restitution-list__footer__save">
@@ -145,7 +139,7 @@ import MLink from '../mozaic/link/MLink.vue';
 import PbProjectItemSave from '../projects/project-item-save/PbProjectItemSave.vue';
 import MNotification from '../mozaic/notifications/MNotification.vue';
 import { NotificationOptions } from '@/types/pb/Notification';
-import { RestitutionPayload, RestitutionPayloadAction } from '@/types/pb/Restitution';
+import { RestitutionPayload, RestitutionPayloadAction, RestitutionPayloadCallToAction } from '@/types/pb/Restitution';
 import { ScenarioStepAnswer } from '@/types/pb/Scenario';
 import PbRestitutionListBlock from './PbRestitutionListBlock.vue';
 import { Project } from '../../types/pb/Project';
@@ -169,6 +163,7 @@ export default defineComponent({
       dialogContent: null,
       showSaveProjectItem: false,
       notifications: [] as NotificationOptions[],
+      displayedCta: [] as RestitutionPayloadCallToAction[],
     };
   },
   // eslint-disable-next-line vue/order-in-components
@@ -220,22 +215,10 @@ export default defineComponent({
   },
   created() {
     if (this.payload?.callToActions) {
-      if (this.payload?.callToActions) {
-        const saveAction = Object.values(this.payload.callToActions).find((cta) => {
-          return (
-            areConditionsValid(cta.conditions!, this.answers, this.runtimeOptions) &&
-            cta.action?.type === 'MODAL' &&
-            cta.action?.component === 'PbProjectItemSave'
-          );
-        });
-        this.showSaveProjectItem = this.showSaveEstimate;
-      }
+      this.showSaveProjectItem = this.showSaveEstimate;
     }
   },
   methods: {
-    checkConditional(cta: any) {
-      return areConditionsValid(cta, this.answers, this.runtimeOptions);
-    },
     handleShowDialog(content: any) {
       this.dialogContent = content;
       this.showDialog = !this.showDialog;
@@ -264,30 +247,38 @@ export default defineComponent({
     handleDialogClose() {
       this.showSaveProjectItem = false;
     },
-    callAction(action: RestitutionPayloadAction) {
+    callAction(action: any) {
       if (action.type === 'MODAL') {
         if (action.component === 'PbProjectItemSave') {
           if (this.runtimeOptions.isLoggedIn === true) {
             this.showSaveProjectItem = true;
           }
 
+          this.$store.dispatch('sendEventToBus', {
+            code: 'RESTITUTION-ACTION-CLICKED',
+            payload: {
+              context: {
+                answers: this.answers,
+                call: action,
+              },
+            },
+          });
+
           this.$emit('click-save-item', {
             answers: [],
             action: action,
           });
-        } else if (action.withoutModal) {
-          this.$emit('click-save-item', {
+        } else {
+          this.$emit('step-completed', {
             answers: [],
-            action: action,
+            nextStep: action,
           });
         }
-      } else {
-        this.$emit('step-completed', {
-          answers: [],
-          nextStep: action,
-        });
       }
     },
+    areConditionsValid(conditions: string[]) {
+      return areConditionsValid(conditions, this.answers, this.runtimeOptions);
+    },
   },
 });
 </script>

package/src/components/scenario/PbScenario.vue

@@ -286,7 +286,10 @@ export default defineComponent({
         } else {
           emitEventToPipeline('STEP-STARTED', step);
         }
-        if (state.value.currentStep.component === 'PbRestitution' && !props.runtimeOptions.projectMode) {
+        if (
+          ['PbRestitution', 'PbRestitutionList'].includes(state.value.currentStep.component || '') &&
+          !props.runtimeOptions.projectMode
+        ) {
           emitEventToPipeline('RESTITUTION-LANDED', state.value.answers);
         }
       }

package/src/stores/modules/productsStore.ts

@@ -1,6 +1,7 @@
 import { ActionContext } from 'vuex';
 import { State } from '@/stores/state';
 import { getProductById } from '../../services/api/productApi';
+import { ProductPayload } from '@/types/pb/Product';
 
 export interface ProductState {
   // eslint-disable-next-line @typescript-eslint/ban-types
@@ -36,12 +37,21 @@ export default {
     updateRefProduct({ commit }: ProductContext, { ref }: { ref: string }) {
       commit('setRefProduct', ref);
     },
-    async loadProduct({ commit, state }: ProductContext, { payload, storeId }: { payload: object; storeId: string }) {
+    async loadProduct(
+      { commit, state }: ProductContext,
+      { payload, storeId }: { payload: ProductPayload; storeId: string },
+    ) {
       if (state.refProduct) {
         const product = await getProductById(state.refProduct, storeId);
 
         if (product) {
-          commit('setCurrentProduct', { ...payload, ...product });
+          const formattedProduct = {
+            code: product.code || null,
+            photo: product.photo || payload.photo,
+            designation: product.designation || payload.designation,
+            price: product.price || null,
+          };
+          commit('setCurrentProduct', formattedProduct);
         } else {
           commit('setCurrentProduct', payload);
         }

package/src/types/pb/Product.ts

@@ -0,0 +1,15 @@
+export interface ProductPayload {
+  code?: string;
+  photo?: string;
+  designation?: string;
+  price?: ProductPricePayload;
+}
+
+export interface ProductPricePayload {
+  currency?: string;
+  discount?: string;
+  initialUnitAmount?: number;
+  initialUnitAmountNoTax?: number;
+  unitAmount?: number;
+  unitAmountNoTax?: number;
+}

package/src/types/pb/Restitution.ts

@@ -52,7 +52,6 @@ export interface RestitutionPayloadPriceBar {
 export interface RestitutionPayloadAction {
   type: string;
   code: string;
-  withoutModal?: any;
   component?: string;
   payload?: {
     link: string;