WIP MMCM

src/stores/mmcm.js

@@ -72,9 +72,9 @@ const timestampConverter = (digit13) => digit13 / 1000
 export const useMMCMStore = defineStore('counter', {
     state: () => ({
         idSession: '',
-        street: '',
-        zipCode: '',
-        city: '',
+        street: null,
+        zipCode: null,
+        city: null,
         productList: [],
         withPrescription: null,
         idProduct: null,
@@ -82,7 +82,7 @@ export const useMMCMStore = defineStore('counter', {
         dateCollect: null
     }),
     getters: {
-        fullAddress: (state) => state.street + ' ' + state.zipCode + ' ' + state.city,
+        fullAddress: (state) => (state.street !== null) ? state.street + ' ' + state.zipCode + ' ' + state.city : null,
         deliveryMethod: (state) => state.productList.filter(p => p.id === state.idProduct)[0].name,
         deliveryMethodCode: (state) => state.productList.filter(p => p.id === state.idProduct)[0].ref,
         dateDeliveryString: (state) => new Date(state.dateDelivery).toLocaleDateString("fr-FR"),

src/views/address-check.vue

@@ -43,7 +43,7 @@ export default {
     const store = useMMCMStore()
     const noOfferFound = ref(false)
 
-    const query = ref(import.meta.env.DEV ? "9 Impasse des Peupliers 13008 Marseill" : '')
+    const query = ref(store.fullAddress !== null ? store.fullAddress : import.meta.env.DEV ? "9 Impasse des Peupliers 13008 Marseill" : '')
 
     return {
       query,
@@ -61,6 +61,11 @@ export default {
   },
   methods: {
     updateSearchResult: async function () {
+
+      this.store.setStreet(null)
+      this.store.setZipCode(null)
+      this.store.setCity(null)
+
       this.isSearching = true
       this.noOfferFound = false
       this.searchResults = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.query)

src/views/delivery-option-summary.vue

@@ -15,24 +15,24 @@
   </button>
   </div>
   <div class="text-start">
-    <div class="mb-4"><i class="fa-solid fa-location-dot fa-fw text-primary  me-2"></i><strong>Adresse de livraison
+    <div class="mb-4"><i class="fa-solid fa-location-dot fa-fw text-primary me-2"></i><strong>Adresse de livraison
       : </strong>{{ store.fullAddress }}
     </div>
 
     <div class="mb-4"><i class="fa-solid fa-truck fa-fw text-primary me-2"></i><strong>Mode de livraison
       : </strong>{{ store.deliveryMethod }}
     </div>
-    <div class="mb-4"><i class="fa-solid fa-file-medical fa-fw text-primary  me-2"></i><strong>Collecte de l'ordonnnace
+    <div class="mb-4"><i class="fa-solid fa-file-medical fa-fw text-primary me-2"></i><strong>Collecte de l'ordonnance
       : </strong>
       <span v-if="store.withPrescription">Oui</span>
       <span v-else>Non</span>
     </div>
     <div class="mb-4" v-if="store.withPrescription">
-      <i class="fa-solid fa-calendar-days fa-fw text-primary  me-2"></i><strong>Date de collecte
-      de l'ordonnnce
+      <i class="fa-solid fa-calendar-days fa-fw text-primary me-2"></i><strong>Date de collecte
+      de l'ordonnance
       : </strong>{{ (store.dateCollect) ? store.dateCollectString : store.dateDeliveryString }}
     </div>
-    <div class="mb-4"><i class="fa-solid fa-calendar-days fa-fw text-primary  me-2"></i><strong>Date de livraison des
+    <div class="mb-4"><i class="fa-solid fa-calendar-days fa-fw text-primary me-2"></i><strong>Date de livraison des
       medicaments : </strong>{{ store.dateDeliveryString }}
     </div>
 
@@ -76,7 +76,7 @@ export default {
       }
 
       if (import.meta.env.DEV) {
-        urlApi += '&ID_SESSION=wUyQ6Pea';
+        urlApi += '&ID_SESSION=rRN4VnKI';
         console.log(urlApi)
       }
 

src/views/final-step.vue

@@ -20,8 +20,11 @@ export default {
   name: "final-step",
   methods: {
     exitVueApp(url) {
-      const domain = 'para-php7-dev'
-      window.location = 'https://' + domain + '.parapharmacie-et-medicament.com' + url + '?ids=' + this.store.idSession
+
+      if (import.meta.env.DEV) {
+        url = 'https://para-php7-devparapharmacie-et-medicament.com' + url
+      }
+      window.location = url + '?ids=' + this.store.idSession
     }
   }
 }