From cb7e2ad92155088121eb8c63cb5bd5ad91225eaf Mon Sep 17 00:00:00 2001 From: GotPPay Date: Tue, 15 May 2018 17:01:41 +0200 Subject: [PATCH] set default pickup address to members home address --- .../steppers/components/VerticalNonLinear.js | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js index 2dc542b..bebc136 100644 --- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js +++ b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js @@ -33,6 +33,8 @@ import Instance from '../../../../../../../components/Connection'; import Checkbox from 'material-ui/Checkbox'; import Popover from 'material-ui/Popover'; +const ADDRESS_TYPE_HOME = "home"; + let DateTimeFormat; @@ -469,6 +471,16 @@ class VerticalNonLinear extends React.Component { if (user.useruuid !== loggedUser.useruuid) { Instance.getRawConn().get(`/v1/nemt/users/member/${user.useruuid}`) .then(function (res) { + let userHomeAddress = null; + res.data.addresses.forEach(address => { + if (address.address_type === ADDRESS_TYPE_HOME) { + userHomeAddress = address; + } + }); + if (userHomeAddress != null) { + userHomeAddress.name = "Home"; + state.handlePickupChanged(userHomeAddress, state); + } state.setState(Object.assign(state.state, { user: res.data, showUserSelection: true, userSelectionText: `${res.data.member} - ${res.data.name}` })); }) .catch(err => { @@ -894,7 +906,17 @@ class VerticalNonLinear extends React.Component { if (this.state.showUserSelection && this.state.users.length > 0) { const handleAutocomplete = (u) => { - state.setState(Object.assign(state.state, { user: u, userSelectionText: u.userdata })); + let userHomeAddress = null; + u.addresses.forEach(address => { + if (address.address_type === ADDRESS_TYPE_HOME) { + userHomeAddress = address; + } + }); + if (userHomeAddress != null) { + userHomeAddress.name = "Home"; + state.handlePickupChanged(userHomeAddress,state); + } + state.setState(Object.assign(state.state, { user: u, userSelectionText: u.userdata })); } const datasourceConfig = { text: 'userdata', value: 'useruuid' } userSelection = (