Merge branch 'hotfix/V8-6406-page-school--comparatif--remettr'

.gitlab-ci.yml

@@ -8,7 +8,7 @@ cache:
 
 before_script:
   - corepack enable
-  - yarn set version berry
+  - yarn set version berry@4.3.1
   - yarn install --network-timeout 10000
   - HOST=ci yarn prepare
 

components/Common/CookiesConsent.vue

@@ -210,9 +210,9 @@
 <script setup lang="ts">
 import { onMounted, type Ref, ref } from 'vue'
 import { useCookies } from 'vue3-cookies'
+import { useDisplay } from 'vuetify'
 import { COOKIE_CONSENT_CHOICE } from '~/types/enum/enums'
 import type { CookiesPreferences } from '~/types/interface'
-import {useDisplay} from "vuetify";
 
 const layoutStore = useLayoutStore()
 const { mdAndDown } = useDisplay()
@@ -458,7 +458,6 @@ onMounted(() => {
   border-radius: 15px;
   padding: 20px;
 
-
   @media (max-width: 600px) {
     max-height: 650px;
     overflow-y: scroll;

components/Common/Table/Comparatif.vue

@@ -8,6 +8,7 @@
 
             <th>
               <p class="standard">Standard</p>
+              <p v-if="showFrom" class="from">À partir de</p>
               <p class="price">
                 {{ standardPrice }} <span class="ttc">ttc</span>
               </p>
@@ -16,6 +17,7 @@
 
             <th class="premium-column">
               <p class="standard">Premium</p>
+              <p v-if="showFrom" class="from">À partir de</p>
               <p class="price">
                 {{ premiumPrice }} <span class="ttc">ttc</span>
               </p>
@@ -204,6 +206,11 @@ const props = defineProps({
     type: Array as PropType<Array<ComparisonItem>>,
     required: true,
   },
+  showFrom: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
 })
 
 const height = computed(() => 150 + props.items.length * 48)
@@ -294,6 +301,7 @@ td:first-child {
   margin-bottom: 1rem;
 }
 
+.from,
 .ttc {
   font-weight: 300;
   font-size: 12px;

components/Logiciels/School/Comparatif.vue

@@ -12,6 +12,7 @@
           standard-price="34,90€"
           premium-price="49€"
           :items="comparisonItems"
+          :show-from="true"
         />
 
         <div class="asterisk">

package.json

@@ -81,5 +81,5 @@
     "sass-loader": "^14.1.0",
     "typescript": "^5.3.3"
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.3.1"
 }