v1.7 beta.8

resources/js/views/Upgrade/UpgradeBilling.vue

@@ -305,9 +305,6 @@
                 // Update user data
                 this.$store.dispatch('getAppData')
 
-                // End loading
-                this.isSubmitted = false
-
                 // Show toaster
                 events.$emit('toaster', {
                     type: 'success',
@@ -319,13 +316,16 @@
             },
             errorOrder(error) {
 
-                if (error.response.status = 402) {
+                // Redirect user to confirmation payment page
+                if (error.response.status === 402) {
+                    window.location.href = error.response.data.message;
+                }
+
+                // Show user error message
+                if (error.response.status === 400) {
                     this.isError = true
                     this.errorMessage = error.response.data.message
                 }
-
-                // End loading
-                this.isSubmitted = false
             },
             async submitOrder() {
 
@@ -375,6 +375,9 @@
                             })
                             .then(() => this.successOrder())
                             .catch((error) => this.errorOrder(error))
+                            .finally(() => {
+                                this.isSubmitted = false
+                            })
                     }
                 }
 
@@ -391,6 +394,9 @@
                         })
                         .then(() => this.successOrder())
                         .catch((error) => this.errorOrder(error))
+                        .finally(() => {
+                            this.isSubmitted = false
+                        })
                 }
             },
         },

resources/js/views/Upgrade/UpgradePlan.vue

@@ -2,14 +2,16 @@
     <div id="single-page">
         <div id="page-content" class="large-width center-page" v-show="! isLoading">
             <MobileHeader :title="$router.currentRoute.meta.title"/>
-
             <div class="content-page">
+
+                <!--Page Title-->
                 <div class="plan-title">
                     <cloud-icon size="42" class="title-icon"></cloud-icon>
                     <h1>{{ $t('page_pricing_tables.title') }}</h1>
                     <h2>{{ $t('page_pricing_tables.description') }}</h2>
                 </div>
 
+                <!--Pricing Tables-->
                 <PlanPricingTables @load="onLoadPricingTables" @selected-plan="onSelectTable"/>
             </div>
         </div>
@@ -55,6 +57,10 @@
             StripeElementsScript.setAttribute('src', 'https://js.stripe.com/v3/')
             document.head.appendChild(StripeElementsScript)
         },
+        mounted() {
+            // Reload user data
+            this.$store.dispatch('getAppData')
+        }
     }
 </script>