Browse Source

fix: payment issue during registration

pull/72/head
Tyler Chen 4 years ago
parent
commit
3908468cfb
5 changed files with 6 additions and 4 deletions
  1. +0
    -1
      src/_components/modals/AddSshKey.vue
  2. +2
    -1
      src/_components/modals/LaunchBubbleSettingsModal.vue
  3. +1
    -1
      src/_pages/Layout.vue
  4. +2
    -0
      src/_pages/auth/Payment.vue
  5. +1
    -1
      src/_store/account.module.js

+ 0
- 1
src/_components/modals/AddSshKey.vue View File

@@ -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() {


+ 2
- 1
src/_components/modals/LaunchBubbleSettingsModal.vue View File

@@ -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) {


+ 1
- 1
src/_pages/Layout.vue View File

@@ -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();
} }


+ 2
- 0
src/_pages/auth/Payment.vue View File

@@ -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('/');
}); });
}); });
} }


+ 1
- 1
src/_store/account.module.js View File

@@ -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);


Loading…
Cancel
Save