diff --git a/src/account/NewNetworkPage.vue b/src/account/NewNetworkPage.vue index 80fe07e..c90d87b 100644 --- a/src/account/NewNetworkPage.vue +++ b/src/account/NewNetworkPage.vue @@ -2,38 +2,88 @@

{{messages.form_label_title_new_network}}

+
+
+ + +
+
{{ errors.first('name') }}
+
-
+
+ {{messages.field_label_network_domain}}: + {{defaults.domain}} + {{messages.message_auto_detecting}} + +
+ + +
{{ errors.first('locale') }}
+
-
+
+ {{messages.field_label_locale}}: + {{messages['locale_'+defaults.locale]}} + {{messages.message_auto_detecting}} + +
+ + +
{{ errors.first('timezone') }}
+
-
+
+ {{messages.field_label_timezone}}: + {{tzDescription(defaults.timezone)}} + {{messages.message_auto_detecting}} + +
+ + +
{{ errors.first('plan') }}
-
- {{messages['plan_description_'+network.plan]}} -
+
-
+
+ {{messages.field_label_plan}}: + {{messages['plan_name_'+defaults.plan]}} + {{messages.message_auto_detecting}} + +
+
+ {{messages['plan_description_'+network.plan]}} +
+ + +
{{ errors.first('footprint') }}
-
- {{messages['footprint_description_'+network.footprint]}} -
+ +
+
+ {{messages.field_label_footprint}}: + {{messages['footprint_name_'+defaults.footprint]}} + {{messages.message_auto_detecting}} +
+
+ {{messages['footprint_description_'+network.footprint]}} +
+
{{ errors.first('paymentMethod') }}
@@ -83,6 +133,20 @@ paymentInfo: null } }, + customize: { + domain: false, + locale: false, + timezone: false, + plan: false, + footprint: false + }, + defaults: { + domain: '', + locale: '', + timezone: '', + plan: 'bubble', + footprint: 'Worldwide' + }, user: currentUser(), submitted: false, status: '' @@ -103,7 +167,7 @@ for (let i=0; i { @@ -175,16 +242,19 @@ domains (doms) { if (doms && doms[0]) { if (this.network.domain == null || this.network.domain === '') this.network.domain = doms[0].name; + if (this.defaults.domain == null || this.defaults.domain === '') this.defaults.domain = doms[0].name; } }, detectedTimezone (tz) { if (tz && tz.timeZoneId) { if (this.network.timezone == null || this.network.timezone === '') this.network.timezone = tz.timeZoneId; + if (this.defaults.timezone == null || this.defaults.timezone === '') this.defaults.timezone = tz.timeZoneId; } }, detectedLocale (loc) { if (loc) { if (this.network.locale == null || this.network.locale === '') this.network.locale = loc; + if (this.defaults.locale == null || this.defaults.locale === '') this.defaults.locale = loc; } } }, diff --git a/src/account/payment/StripePayment.vue b/src/account/payment/StripePayment.vue index 86cc90c..8ee8d2b 100644 --- a/src/account/payment/StripePayment.vue +++ b/src/account/payment/StripePayment.vue @@ -7,7 +7,7 @@