Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/ssh-key-while-launching

src/_components/modals/LaunchBubbleSettingsModal.vue

@@ -522,9 +522,10 @@ export default {
         this.accountPlan.timezone !== '' &&
         this.accountPlan.plan !== '' &&
         this.accountPlan.footprint !== '' &&
-        ((this.accountPlan.paymentMethodObject.paymentMethodType != null &&
-          this.accountPlan.paymentMethodObject.paymentInfo != null) ||
-          this.accountPlan.paymentMethodObject.uuid != null)
+        (this.configs.paymentsEnabled === false ||
+          ((this.accountPlan.paymentMethodObject.paymentMethodType != null &&
+            this.accountPlan.paymentMethodObject.paymentInfo != null) ||
+            this.accountPlan.paymentMethodObject.uuid != null))
       );
     },
 
@@ -686,7 +687,11 @@ export default {
       this.errors.clear();
       this.$validator.validate().then((valid) => {
         if (valid) {
-          if (this.paymentInfo || this.accountPlan.paymentMethodObject.uuid) {
+          if (
+            this.configs.paymentsEnabled === false ||
+            this.paymentInfo ||
+            this.accountPlan.paymentMethodObject.uuid
+          ) {
             const cloudRegion = this.findRegion(this.cloudRegionUuid);
             if (cloudRegion === null) {
               this.errors.add({