Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-01 14:36:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'address_refactoring' into add-location-period

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-08-13 16:13:09 +02:00
commit ea691d9b32
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
View File

@ -475,7 +475,7 @@ export default {
// TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
this.flag.loading = true; this.flag.loading = true;
if ('newPostcode' in payload.newAddress) { if ('newPostcode' in payload.newAddress) {
let postcodeBody = payload.newAddress.newPostcode; let postcodeBody = payload.newAddress.newPostcode;
postcodeBody = Object.assign(postcodeBody, {'origin': 3}); postcodeBody = Object.assign(postcodeBody, {'origin': 3});
@ -570,9 +570,7 @@ export default {
case 'household': case 'household':
postAddressToHousehold(payload.entityId, payload.addressId) postAddressToHousehold(payload.entityId, payload.addressId)
.then(household => new Promise((resolve, reject) => { .then(household => new Promise((resolve, reject) => {
console.log('postAddressToHousehold', household);
console.log('commit addAddressToHousehold', household);
this.flag.loading = false; this.flag.loading = false;
this.flag.success = true; this.flag.success = true;
window.location.assign(payload.backUrl); window.location.assign(payload.backUrl);
@ -587,9 +585,7 @@ export default {
case 'person': case 'person':
postAddressToPerson(payload.entityId, payload.addressId) postAddressToPerson(payload.entityId, payload.addressId)
.then(person => new Promise((resolve, reject) => { .then(person => new Promise((resolve, reject) => {
console.log('postAddressToPerson', person);
console.log('commit addAddressToPerson !!!', person);
this.flag.loading = false; this.flag.loading = false;
this.flag.success = true; this.flag.success = true;
window.location.assign(payload.backUrl); window.location.assign(payload.backUrl);
@ -604,7 +600,8 @@ export default {
default: default:
this.errorMsg.push('That entity is not managed by address !'); this.errorMsg.push('That entity is not managed by address !');
} }
} else { // address is already linked, just finish ! } else {
// address is already linked, just finish !
window.location.assign(payload.backUrl); window.location.assign(payload.backUrl);
} }
}, },