Merge branch 'master' into feat/swagger

src/_components/layout/Footer.vue

@@ -18,17 +18,19 @@
       </a>
     </div>
     <div class="links">
-      <a
-        class="text-white link"
-        v-for="item in footerLinks"
-        :key="item"
-        :href="messages[`link_${item}`]"
-        :target="
-          messages[`link_${item}`].startsWith('http') ? '_blank' : '_self'
-        "
-      >
-        {{ messages[`title_${item}`] }}
-      </a>
+      <div class="link" v-for="item in footerLinks" :key="item">
+        <a
+          class="text-white"
+          v-if="messages[`link_${item}`].startsWith('http')"
+          :href="messages[`link_${item}`]"
+          target="_blank"
+        >
+          {{ messages[`title_${item}`] }}
+        </a>
+        <router-link v-else :to="messages[`link_${item}`]" class="text-white">
+          {{ messages[`title_${item}`] }}
+        </router-link>
+      </div>
     </div>
   </footer>
 </template>

src/_pages/main/account/MyAccount.vue

@@ -72,7 +72,8 @@ export default {
       if (this.messages) {
         const account_actions = this.configs.bubbleNode === true ? 'manage_account_node_actions' : 'manage_account_sage_actions';
         if (this.messages[account_actions]) {
-          const actions = this.messages[account_actions].split(',');
+          const vue = this;
+          const actions = this.messages[account_actions].split(',').filter(a => vue.configs.paymentsEnabled || (a !== 'billing' && a !== 'payment'));
           if (this.currentUser.admin && this.currentUser.firstAdmin) {
             const delete_index = actions.indexOf('delete');
             if (delete_index !== -1) actions.splice(delete_index, 1);

src/_pages/main/account/Support.vue

@@ -1,9 +1,9 @@
 <!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
 <template>
   <div>
-    <h1 class="title text-center white-text">{{ messages.title_support }}</h1>
+    <h1 class="title text-center">{{ messages.title_support }}</h1>
     <hr />
-    <h5 class="text-center white-text">
+    <h5 class="text-center">
       {{ messages.support_preamble }}
     </h5>
     <hr />

src/_store/system.module.js

@@ -210,11 +210,8 @@ const actions = {
           (error) => commit('checkForUpgradeFailure', error)
         );
     } else {
-      console.log(
-        'checkForUpgrade: already checked (' +
-          state.upgradeCheck +
-          '), not checking again'
-      );
+      commit('checkForUpgradeFailure', null)
+      console.log('checkForUpgrade: already checked (' + state.upgradeCheck + '), not checking again');
     }
   },
   upgrade({ commit }) {
@@ -535,6 +532,7 @@ const mutations = {
   },
   checkForUpgradeFailure(state, error) {
     state.error = error;
+    state.upgradeCheck = null;
   },
 
   upgradeRequest(state) {},