From 29e052c9f3b18aeb02c19a74738c9cd4293b8491 Mon Sep 17 00:00:00 2001
From: Jonathan Chevalier <jonathan.chevalier@live.com>
Date: Fri, 21 Oct 2022 15:28:24 +0200
Subject: [PATCH] WIP MMCM

---
 src/stores/mmcm.js                    |  1 +
 src/views/address-check.vue           |  1 +
 src/views/delivery-option-summary.vue | 13 +++++--------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/stores/mmcm.js b/src/stores/mmcm.js
index 4bda83e..685f161 100644
--- a/src/stores/mmcm.js
+++ b/src/stores/mmcm.js
@@ -84,6 +84,7 @@ export const useMMCMStore = defineStore('counter', {
     getters: {
         fullAddress: (state) => state.street + ' ' + state.zipCode + ' ' + state.city,
         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"),
         dateCollectString: (state) => new Date(state.dateCollect).toLocaleDateString("fr-FR"),
         minDateForDelivery: (state) => (state.productList.filter(p => p.id === state.idProduct)[0].ref === 'MMCM_EXPRESS') ? date.deliveryExpress : date.deliveryFacteur,
diff --git a/src/views/address-check.vue b/src/views/address-check.vue
index 0a584ff..8e8f978 100644
--- a/src/views/address-check.vue
+++ b/src/views/address-check.vue
@@ -50,6 +50,7 @@ export default {
   name: "address-check",
   data() {
     return {
+      //query: "",
       query: "9 Impasse des Peupliers 13008 Marseill",
       searchResults: [],
       isSearching: false,
diff --git a/src/views/delivery-option-summary.vue b/src/views/delivery-option-summary.vue
index afd728b..a4be7b0 100644
--- a/src/views/delivery-option-summary.vue
+++ b/src/views/delivery-option-summary.vue
@@ -7,8 +7,8 @@
       <span v-if="store.withPrescription">Oui</span>
       <span v-else>Non</span>
     </div>
-    <div class="mb-2" v-if="store.withPrescription && store.deliveryMethod === 'MMCM_FACTEUR'"><strong>Date de collect
-      de l'orodnnance
+    <div class="mb-2" v-if="store.withPrescription && store.dateDelivery !== store.dateCollect"><strong>Date de collecte
+      de l'ordonnnce
       : </strong>{{ store.dateCollectString }}
     </div>
     <div class="mb-2"><strong>Date de livraison des medicaments : </strong>{{ store.dateDeliveryString }}</div>
@@ -49,17 +49,14 @@ export default {
           + '&city=' + this.store.city
       ;
 
+
       if (this.store.withPrescription) {
-        if (this.store.deliveryMethod === 'MMCM_FACTEUR') {
-          urlApi += '&date_collect=' + this.store.dateCollectTimestampInSecond
-        } else {
-          urlApi += '&date_collect=' + this.store.dateDeliveryTimestampInSecond
-        }
+        urlApi += '&date_collect=' + ((this.store.dateCollect !== null) ? this.store.dateCollectTimestampInSecond : this.store.dateDeliveryTimestampInSecond)
       }
 
       if (import.meta.env.DEV) {
+        urlApi += '&ID_SESSION=ch6LyRNw';
         console.log(urlApi)
-        urlApi += '&ID_SESSION=0w1YDpPz';
       }
 
       const result = await fetch(urlApi).then(rep => rep.json())