- cancel/resume subscription fix

- upload into root folder fix
- custom color theme part 3

resources/js/views/Admin/Users/User.vue

@@ -69,7 +69,7 @@
                         </div>
                     </router-link>
 
-                    <router-link replace :to="{name: 'UserDelete'}" v-if="user.data.relationships.settings.data.attributes.name !== admin.name"
+                    <router-link replace :to="{name: 'UserDelete'}" v-if="admin && user.data.relationships.settings.data.attributes.name !== admin.data.relationships.settings.data.attributes.name"
                                  class="menu-list-item link border-bottom-theme">
                         <div class="icon text-theme">
                             <trash2-icon size="17"></trash2-icon>
@@ -120,7 +120,7 @@
         computed: {
             ...mapGetters(['config']),
             admin() {
-                return this.$store.getters.user ? this.$store.getters.user.data.attributes : undefined
+                return this.$store.getters.user ? this.$store.getters.user : undefined
             },
         },
         data() {

resources/js/views/Admin/Users/UserTabs/UserDetail.vue

@@ -16,7 +16,7 @@
                     <label>{{ $t('admin_page_user.select_role') }}:</label>
                     <div class="single-line-form">
                         <SelectInput v-model="userRole" :options="roles"
-                                     :placeholder="$t('admin_page_user.select_role')" :isError="errors[0]"/>
+                                     :placeholder="$t('admin_page_user.select_role')" :isError="errors[0]" />
                         <ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit"
                                     button-style="theme" class="submit-button">
                             {{ $t('admin_page_user.save_role') }}
@@ -199,8 +199,6 @@
                         // Reset errors
                         this.$refs.changeRole.reset()
 
-                        this.isSendingRequest = false
-
                         this.$emit('reload-user')
 
                         events.$emit('toaster', {
@@ -209,16 +207,16 @@
                         })
                     })
                     .catch(() => {
-
-                        this.isSendingRequest = false
-
                         events.$emit('alert:open', {
                             title: this.$t('popup_error.title'),
                             message: this.$t('popup_error.message'),
                         })
                     })
+                    .finally(() => {
+                        this.isSendingRequest = false
+                    })
             }
-        }
+        },
     }
 </script>