From bb0f6cb030e2abb743462aebb1ff0ee0203e89ca Mon Sep 17 00:00:00 2001 From: Jonathan Chevalier Date: Thu, 24 Nov 2022 18:11:47 +0100 Subject: [PATCH] WIP MMCM --- src/stores/mmcm.js | 5 +++++ src/views/delivery-option-step-3.vue | 21 ++++++++++++++++++++- src/views/delivery-option-summary.vue | 4 ++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/stores/mmcm.js b/src/stores/mmcm.js index 763e1bc..746a8ec 100644 --- a/src/stores/mmcm.js +++ b/src/stores/mmcm.js @@ -82,6 +82,7 @@ export const useMMCMStore = defineStore('counter', { dateCollect: null, methodDelivery: 'Main propre', methodCollect: 'Main propre', + timeSlot : '09h30-11h00', }), getters: { fullAddress: (state) => (state.street !== null) ? state.street + ' ' + state.zipCode + ' ' + state.city : null, @@ -89,6 +90,7 @@ export const useMMCMStore = defineStore('counter', { 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"), + displayTimeSlot: (state) => (state.productList.filter(p => p.id === state.idProduct)[0].ref === 'MMCM_EXPRESS') ? 'entre ' +state.timeSlot : 'entre 09h00-17h00', minDateForDelivery: (state) => (state.productList.filter(p => p.id === state.idProduct)[0].ref === 'MMCM_EXPRESS') ? date.deliveryExpress : date.deliveryFacteur, 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), @@ -152,6 +154,9 @@ export const useMMCMStore = defineStore('counter', { }, setIdProduct(id) { this.idProduct = id + }, + setTimeSlot(timeSlot) { + this.timeSlot = timeSlot } }, }) diff --git a/src/views/delivery-option-step-3.vue b/src/views/delivery-option-step-3.vue index 7a0bb2f..e095dca 100644 --- a/src/views/delivery-option-step-3.vue +++ b/src/views/delivery-option-step-3.vue @@ -31,7 +31,23 @@ + + + +
+
Créneau horaire :
+ +
+ + +
+ + +
+
@@ -60,7 +76,7 @@ export default { setup() { const store = useMMCMStore() - const {dateDelivery, dateCollect, methodDelivery, methodCollect} = storeToRefs(store) + const {dateDelivery, dateCollect, methodDelivery, methodCollect, timeSlot} = storeToRefs(store) let pickerList = [] if (store.needPrescriptionDateCollect) { @@ -85,8 +101,11 @@ export default { minDate: (store.needPrescriptionDateCollect) ? store.minDateForDelivery : store.minDateForCollect, })) + const timeSlotList = ['09h30-11h00', '11h00-12h30', ' 15h30-17h00', '17h00-18h30'] return { + timeSlotList, + timeSlot, dateDelivery, dateCollect, fr, diff --git a/src/views/delivery-option-summary.vue b/src/views/delivery-option-summary.vue index 11748cc..ec18b5f 100644 --- a/src/views/delivery-option-summary.vue +++ b/src/views/delivery-option-summary.vue @@ -30,10 +30,10 @@
Date de collecte de l'ordonnance - : {{ (store.dateCollect) ? store.dateCollectString : store.dateDeliveryString }} + : {{ (store.dateCollect) ? store.dateCollectString : store.dateDeliveryString }} {{store.displayTimeSlot}}
Date de livraison des - medicaments : {{ store.dateDeliveryString }} + medicaments : {{ store.dateDeliveryString }} {{store.displayTimeSlot}}