mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-12 21:34:25 +00:00
household address: remove address selection
This commit is contained in:
parent
76d945f2a7
commit
6a42edd460
@ -1,10 +1,4 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class='household-address__select'>
|
|
||||||
<h2>{{ $t('select_a_existing_address') }}</h2>
|
|
||||||
<select-household-address
|
|
||||||
v-bind:address="address">
|
|
||||||
</select-household-address>
|
|
||||||
</div>
|
|
||||||
<div class='household-address__create'>
|
<div class='household-address__create'>
|
||||||
<h2>{{ $t('create_a_new_address') }}</h2>
|
<h2>{{ $t('create_a_new_address') }}</h2>
|
||||||
<add-address
|
<add-address
|
||||||
@ -18,14 +12,6 @@
|
|||||||
{{ newAddress.postcode.name }}
|
{{ newAddress.postcode.name }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
|
||||||
<div v-if="address.selected.address">
|
|
||||||
{{ address.selected.address.text }}
|
|
||||||
</div>
|
|
||||||
<div v-if="address.selected.address.postcode">
|
|
||||||
{{ address.selected.address.postcode.name }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<button class="sc-button bt-create centered mt-4" @click="addToHousehold">
|
<button class="sc-button bt-create centered mt-4" @click="addToHousehold">
|
||||||
@ -37,26 +23,16 @@
|
|||||||
<script>
|
<script>
|
||||||
|
|
||||||
import AddAddress from 'ChillMainAssets/vuejs/_components/AddAddress.vue';
|
import AddAddress from 'ChillMainAssets/vuejs/_components/AddAddress.vue';
|
||||||
import SelectHouseholdAddress from './components/SelectHouseholdAddress.vue';
|
|
||||||
import { fetchAddresses } from 'ChillMainAssets/vuejs/_api/AddAddress.js';
|
import { fetchAddresses } from 'ChillMainAssets/vuejs/_api/AddAddress.js';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'App',
|
name: 'App',
|
||||||
components: {
|
components: {
|
||||||
AddAddress,
|
AddAddress,
|
||||||
SelectHouseholdAddress
|
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
householdId: window.householdId,
|
householdId: window.householdId,
|
||||||
address: {
|
|
||||||
loaded: {
|
|
||||||
addresses: [],
|
|
||||||
},
|
|
||||||
selected: {
|
|
||||||
address : {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -65,16 +41,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getAddresses() {
|
|
||||||
console.log('getAddresses'); //TODO should do suggestion here
|
|
||||||
fetchAddresses().then(addresses => new Promise((resolve, reject) => {
|
|
||||||
this.address.loaded.addresses = addresses.results;
|
|
||||||
resolve();
|
|
||||||
}))
|
|
||||||
.catch((error) => {
|
|
||||||
this.errorMsg.push(error.message);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
addNewAddress({ address, modal }) {
|
addNewAddress({ address, modal }) {
|
||||||
console.log('@@@ CLICK button addNewAdress', address);
|
console.log('@@@ CLICK button addNewAdress', address);
|
||||||
|
|
||||||
@ -96,23 +62,19 @@ export default {
|
|||||||
createdAddress = Object.assign(createdAddress, {'point': address.selected.address.point.coordinates});
|
createdAddress = Object.assign(createdAddress, {'point': address.selected.address.point.coordinates});
|
||||||
}
|
}
|
||||||
|
|
||||||
this.address.selected.address = {}; //unset the selected address, if any
|
|
||||||
this.$store.dispatch('addAddress', createdAddress);
|
this.$store.dispatch('addAddress', createdAddress);
|
||||||
|
|
||||||
modal.showModal = false;
|
modal.showModal = false;
|
||||||
},
|
},
|
||||||
addToHousehold() {
|
addToHousehold() {
|
||||||
const householdId = this.householdId;
|
const householdId = this.householdId;
|
||||||
const addressId = this.address.selected.address.address_id === undefined ? this.$store.state.newAddress.address_id : this.address.selected.address.address_id
|
const addressId = this.$store.state.newAddress.address_id;
|
||||||
console.log(householdId);
|
console.log(householdId);
|
||||||
console.log(addressId);
|
console.log(addressId);
|
||||||
|
|
||||||
this.$store.dispatch('addAddressToHousehold', {householdId, addressId});
|
this.$store.dispatch('addAddressToHousehold', {householdId, addressId});
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
mounted() {
|
|
||||||
this.getAddresses();
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>{{ block('title') }}</h1>
|
<h1>{{ block('title') }}</h1>
|
||||||
|
|
||||||
<p>Household with id {{ household.id }}</p>
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div id="household-address"></div>
|
<div id="household-address"></div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user