diff --git a/src/stores/mmcm.js b/src/stores/mmcm.js index 42d951c..728b956 100644 --- a/src/stores/mmcm.js +++ b/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"), diff --git a/src/views/address-check.vue b/src/views/address-check.vue index bae1c61..ba5a576 100644 --- a/src/views/address-check.vue +++ b/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) diff --git a/src/views/delivery-option-summary.vue b/src/views/delivery-option-summary.vue index f091f77..42aeebb 100644 --- a/src/views/delivery-option-summary.vue +++ b/src/views/delivery-option-summary.vue @@ -15,24 +15,24 @@