@@ -139,7 +139,6 @@ export default { | |||||
this.sshPublicKey = ''; | this.sshPublicKey = ''; | ||||
this.minExpiration = new Date().toISOString(); | this.minExpiration = new Date().toISOString(); | ||||
this.expiration = null; | this.expiration = null; | ||||
this.timezone = this.detectedTimezone.timeZoneId; | |||||
this.submitted = false; | this.submitted = false; | ||||
}, | }, | ||||
hide() { | hide() { | ||||
@@ -138,7 +138,7 @@ | |||||
v-validate="'required'" | v-validate="'required'" | ||||
:placeholder="messages.field_label_network_domain" | :placeholder="messages.field_label_network_domain" | ||||
:options="domains" | :options="domains" | ||||
:reduce="d => d.name" | |||||
:reduce="(d) => d.name" | |||||
v-model="accountPlan.domain" | v-model="accountPlan.domain" | ||||
label="name" | label="name" | ||||
> | > | ||||
@@ -774,6 +774,7 @@ export default { | |||||
plans(p) { | plans(p) { | ||||
if (p) { | if (p) { | ||||
console.log('plans', JSON.stringify(this.user)); | |||||
if (this.user && this.user.preferredPlan) { | if (this.user && this.user.preferredPlan) { | ||||
const plans = this.planObjects; | const plans = this.planObjects; | ||||
if (plans) { | if (plans) { | ||||
@@ -190,7 +190,7 @@ export default { | |||||
payMethods.length > 0 | payMethods.length > 0 | ||||
) { | ) { | ||||
this.hasPaymentMethod = true; | this.hasPaymentMethod = true; | ||||
this.navigateToDashboard(); | |||||
this.initDefaults(); | |||||
} else { | } else { | ||||
this.navigateToPaymentPage(); | this.navigateToPaymentPage(); | ||||
} | } | ||||
@@ -334,6 +334,8 @@ export default { | |||||
this.checkSession({ | this.checkSession({ | ||||
messages: this.messages, | messages: this.messages, | ||||
errors: this.errors, | errors: this.errors, | ||||
}).then(() => { | |||||
this.$router.push('/'); | |||||
}); | }); | ||||
}); | }); | ||||
} | } | ||||
@@ -47,7 +47,7 @@ const actions = { | |||||
}, | }, | ||||
checkSession({ commit }, { messages, errors }) { | checkSession({ commit }, { messages, errors }) { | ||||
commit('checkSessionRequest'); | commit('checkSessionRequest'); | ||||
userService.getMe(messages, errors).then( | |||||
return userService.getMe(messages, errors).then( | |||||
(user) => commit('checkSessionSuccess', user), | (user) => commit('checkSessionSuccess', user), | ||||
(error) => { | (error) => { | ||||
commit('checkSessionFailure', error); | commit('checkSessionFailure', error); | ||||