From e934f93f336f399034101f33434f82271cc3cacd Mon Sep 17 00:00:00 2001 From: Jonathan Chevalier Date: Mon, 17 Oct 2022 17:45:39 +0200 Subject: [PATCH] WIP MMCM --- src/stores/mmcm.js | 26 +++++++++++++++++++++++++- src/views/address-check.vue | 2 +- src/views/delivery-option-step-2.vue | 1 + src/views/delivery-option-step-3.vue | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/stores/mmcm.js b/src/stores/mmcm.js index 983549d..ef0f6c2 100644 --- a/src/stores/mmcm.js +++ b/src/stores/mmcm.js @@ -1,5 +1,6 @@ import {defineStore} from 'pinia' -import {add, format} from "date-fns"; +import {add, format, formatDistance} from "date-fns"; +import {fr} from 'date-fns/locale'; const today = new Date(); @@ -86,6 +87,29 @@ export const useMMCMStore = defineStore('counter', { minDateForCollect: (state) => (state.productList.filter(p => p.id === state.idProduct)[0].ref === 'MMCM_EXPRESS') ? date.collectExpress : date.collectFacteur, needPrescriptionDateCollect: (state) => !!(state.productList.filter(p => p.id === state.idProduct)[0].ref === 'MMCM_FACTEUR' && state.withPrescription), dateDeliveryTimestampInSecond: (state) => timestampConverter(state.dateDelivery), + msgDelivery : (state) => { + + //console.log(formatDistance(date.deliveryExpress, today)) + + let arr = [] + + if(date.deliveryExpress === today){ + arr.push('Dès aujourd\'hui en moins de 2h') + } + else{ + arr.push('A partir de ' + format(date.deliveryExpress, 'EEEE', {locale : fr}) +' en moins de 2h') + } + + const useFacteurDate = (state.withPrescription) ? date.deliveryFacteur : date.collectFacteur; + + if(useFacteurDate === tomorrow){ + arr.push('A partir de demain entre 9h et 17h') + } + else{ + arr.push('A partir de ' + format(useFacteurDate, 'EEEE', {locale : fr}) + ' entre 9h et 17h') + } + return arr + } }, actions: { diff --git a/src/views/address-check.vue b/src/views/address-check.vue index 40c975b..0a584ff 100644 --- a/src/views/address-check.vue +++ b/src/views/address-check.vue @@ -50,7 +50,7 @@ export default { name: "address-check", data() { return { - query: "", + query: "9 Impasse des Peupliers 13008 Marseill", searchResults: [], isSearching: false, isChecking: false, diff --git a/src/views/delivery-option-step-2.vue b/src/views/delivery-option-step-2.vue index c4338c7..3dc3d17 100644 --- a/src/views/delivery-option-step-2.vue +++ b/src/views/delivery-option-step-2.vue @@ -5,6 +5,7 @@
{{ product.name }}
+
{{store.msgDelivery[i]}}
diff --git a/src/views/delivery-option-step-3.vue b/src/views/delivery-option-step-3.vue index a1d45b2..ed81b69 100644 --- a/src/views/delivery-option-step-3.vue +++ b/src/views/delivery-option-step-3.vue @@ -52,7 +52,7 @@ export default { title: 'Date de livraison des médicaments :', vModel: dateDelivery, error: false, - minDate: store.minDateForDelivery, + minDate: (store.needPrescriptionDateCollect) ? store.minDateForDelivery : store.minDateForCollect, }))