-
- {{ address.text }}
-
-
- {{ address.postcode.name }}
-
-
- {{ address.country.name.fr }}
-
+
+
+
+
+ Loading...
+
+
+
+
+ {{ address.text }}
+
+
+ {{ address.postcode.code }} {{ address.postcode.name }}
+
+
+ {{ address.country.name.fr }}
+
+
@@ -48,17 +56,60 @@
{{ $t('distribution') }}: {{ address.distribution }}
+
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
new file mode 100644
index 000000000..e61daf738
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -0,0 +1,42 @@
+const addressMessages = {
+ fr: {
+ add_an_address_title: 'Créer une adresse',
+ edit_an_address_title: 'Modifier une adresse',
+ create_a_new_address: 'Créer une nouvelle adresse',
+ edit_address: 'Modifier l\'adresse',
+ select_an_address_title: 'Sélectionner une adresse',
+ fill_an_address: 'Compléter l\'adresse',
+ select_country: 'Choisir le pays',
+ country: 'Pays',
+ select_city: 'Choisir une localité',
+ city: 'Localité',
+ other_city: 'Autre localité',
+ select_address: 'Choisir une adresse',
+ address: 'Adresse',
+ other_address: 'Autre adresse',
+ create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
+ isNoAddress: 'Pas d\'adresse complète',
+ street: 'Nom de rue',
+ streetNumber: 'Numéro',
+ floor: 'Étage',
+ corridor: 'Couloir',
+ steps: 'Escalier',
+ flat: 'Appartement',
+ buildingName: 'Nom du bâtiment',
+ extra: 'Complément d\'adresse',
+ distribution: 'Service particulier de distribution',
+ create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
+ postalCode_name: 'Nom',
+ postalCode_code: 'Code postal',
+ date: 'Date de la nouvelle adresse',
+ add_an_address_to_person: 'Ajouter l\'adresse à la personne',
+ validFrom: 'Date de la nouvelle adresse',
+ back_to_the_list: 'Retour à la liste',
+ person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
+ loading: 'chargement en cours...'
+ }
+};
+
+export {
+ addressMessages
+};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 27676369e..c96c35a6c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -1,14 +1,13 @@
import { createApp } from 'vue'
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { addressMessages } from './js/i18n'
import { store } from './store'
-
import App from './App.vue';
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { addressMessages } from './i18n'
const i18n = _createI18n(addressMessages);
const app = createApp({
- template: `
`,
+ template: `
`,
})
.use(store)
.use(i18n)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
deleted file mode 100644
index f8a7ea4d2..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const addressMessages = {
- fr: {
- add_an_address_title: 'Créer une adresse',
- edit_an_address_title: 'Modifier une adresse',
- create_a_new_address: 'Créer une nouvelle adresse',
- edit_address: 'Modifier l\'adresse',
- select_an_address_title: 'Sélectionner une adresse',
- fill_an_address: 'Compléter l\'adresse',
- select_country: 'Choisir le pays',
- country: 'Pays',
- select_city: 'Choisir une localité',
- city: 'Localité',
- other_city: 'Autre localité',
- select_address: 'Choisir une adresse',
- address: 'Adresse',
- other_address: 'Autre adresse',
- create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
- isNoAddress: 'Pas d\'adresse complète',
- street: 'Nom de rue',
- streetNumber: 'Numéro',
- floor: 'Étage',
- corridor: 'Couloir',
- steps: 'Escalier',
- flat: 'Appartement',
- buildingName: 'Nom du bâtiment',
- extra: 'Complément d\'adresse',
- distribution: 'Service particulier de distribution',
- create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
- postalCode_name: 'Nom',
- postalCode_code: 'Code postal',
- date: 'Date de la nouvelle adresse',
- add_an_address_to_person: 'Ajouter l\'adresse à la personne',
- validFrom: 'Date de la nouvelle adresse',
- back_to_the_list: 'Retour à la liste',
- person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
- loading: 'chargement en cours...'
- }
-};
-
-export {
- addressMessages
-};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js
new file mode 100644
index 000000000..392d033f5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js
@@ -0,0 +1,14 @@
+import 'es6-promise/auto';
+import { createStore } from 'vuex';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+const store = createStore({
+ strict: debug,
+ state: {},
+ getters: {},
+ mutations: {},
+ actions: {},
+});
+
+export { store };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
deleted file mode 100644
index 967675c8f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import 'es6-promise/auto';
-import { createStore } from 'vuex';
-
-import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../api'
-
-const debug = process.env.NODE_ENV !== 'production';
-
-const store = createStore({
- strict: debug,
- state: {
- address: {},
- editAddress: {}, //TODO or should be address?
- person: {},
- errorMsg: [],
- loading: false,
- success: false
- },
- getters: {
- },
- mutations: {
- catchError(state, error) {
- state.errorMsg.push(error);
- },
- addAddress(state, address) {
- console.log('@M addAddress address', address);
- state.address = address;
- },
- updateAddress(state, address) {
- console.log('@M updateAddress address', address);
- state.address = address;
- },
- addAddressToPerson(state, person) {
- console.log('@M addAddressToPerson person', person);
- state.person = person;
- },
- addDateToAddress(state, validFrom) {
- console.log('@M addDateToAddress address.validFrom', validFrom);
- state.validFrom = validFrom;
- },
- getEditAddress(state, address) {
- console.log('@M getEditAddress address', address);
- state.editAddress = address;
- },
- setLoading(state, b) {
- state.loading = b;
- },
- setSuccess(state, b) {
- state.success = b;
- }
- },
- actions: {
- addAddress({ commit }, payload) {
- console.log('@A addAddress payload', payload);
- commit('setLoading', true);
- if('newPostalCode' in payload){
- let postalCodeBody = payload.newPostalCode;
- postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
- postPostalCode(postalCodeBody)
- .then(postalCode => {
- let body = payload;
- body.postcode = {'id': postalCode.id},
- postAddress(body)
- .then(address => new Promise((resolve, reject) => {
- commit('addAddress', address);
- resolve();
- commit('setLoading', false);
- }))
- .catch((error) => {
- commit('catchError', error);
- commit('setLoading', false);
- });
- })
-
- } else {
- postAddress(payload)
- .then(address => new Promise((resolve, reject) => {
- commit('addAddress', address);
- resolve();
- commit('setLoading', false);
- }))
- .catch((error) => {
- commit('catchError', error);
- commit('setLoading', false);
- });
- }
- },
- addDateToAddressAndAddressToPerson({ commit }, payload) {
- console.log('@A addDateToAddressAndAddressToPerson payload', payload);
- commit('setLoading', true);
- patchAddress(payload.addressId, payload.body)
- .then(address => new Promise((resolve, reject) => {
- commit('addDateToAddress', address.validFrom);
- resolve();
- }).then(
- postAddressToPerson(payload.personId, payload.addressId)
- .then(person => new Promise((resolve, reject) => {
- commit('addAddressToPerson', person);
- commit('setLoading', false);
- commit('setSuccess', true);
- window.location.assign(payload.backUrl);
- resolve();
- }))
- .catch((error) => {
- commit('catchError', error);
- commit('setLoading', false);
- })
- ))
- .catch((error) => {
- commit('catchError', error);
- commit('setLoading', false);
- });
- },
- updateAddress({ commit }, payload) {
- console.log('@A updateAddress payload', payload);
-
- if('newPostalCode' in payload.newAddress){ // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
- let postalCodeBody = payload.newAddress.newPostalCode;
- postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
- postPostalCode(postalCodeBody)
- .then(postalCode => {
- let body = payload.newAddress;
- body.postcode = {'id': postalCode.id },
- patchAddress(payload.addressId, body)
- .then(address => new Promise((resolve, reject) => {
- commit('updateAddress', address);
- resolve();
- }))
- .catch((error) => {
- commit('catchError', error);
- });
- })
-
- } else {
- patchAddress(payload.addressId, payload.newAddress)
- .then(address => new Promise((resolve, reject) => {
- commit('updateAddress', address);
- resolve();
- }))
- .catch((error) => {
- commit('catchError', error);
- });
- }
- },
- getEditAddress({ commit }, payload) {
- console.log('@A getEditAddress payload', payload);
-
- getAddress(payload).then(address => new Promise((resolve, reject) => {
- commit('getEditAddress', address);
- resolve();
- }))
- .catch((error) => {
- commit('catchError', error);
- });
- },
- }
-});
-
-export { store };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 44d444247..b806c4b3e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -24,16 +24,16 @@