v1.7 beta.7

app/Http/Resources/PlanResource.php

@@ -17,7 +17,7 @@ class PlanResource extends JsonResource
     public function toArray($request)
     {
         // Get subscribers
-        $subscriber_count = Subscription::where('stripe_plan', $this['plan']['id'])->get();
+        $subscriber_count = Subscription::where('stripe_plan', $this['plan']['id'])->where('stripe_status', 'active')->get();
 
         return [
             'data' => [

resources/js/components/FilesView/DesktopToolbar.vue

@@ -38,8 +38,7 @@
                     />
                 </div>
 
-                <div class="toolbar-button-wrapper"
+                <div class="toolbar-button-wrapper" v-if="$checkPermission(['master', 'editor'])">
-                     v-if="$checkPermission(['master', 'editor'])">
                     <ToolbarButton
                             source="move"
                             :class="{'is-inactive': canMoveInView}"
@@ -111,10 +110,15 @@
             ]),
             hasCapacity() {
 
-                if (! this.$store.getters.config.storageLimit) {
+                // Check if set storage limitation
+                if (! this.$store.getters.config.storageLimit)
                     return true
-                }
 
+                // Check if is loaded user
+                if (! this.$store.getters.user )
+                    return true
+
+                // Check if user has storage
                 return this.$store.getters.user.relationships.storage.data.attributes.used <= 100
             },
             directoryName() {

resources/js/components/Index/IndexPageFooter.vue

@@ -5,11 +5,11 @@
             <b v-if="! config.app_logo_horizontal" class="logo-text">{{ config.app_name }}</b>
         </router-link>
         <ul class="navigation-links">
-            <li>
+<!--            <li>
                 <a href="/#pricing">
                     {{ $t('page_index.menu.pricing') }}
                 </a>
-            </li>
+            </li>-->
             <li>
                 <router-link :to="{name: 'ContactUs'}">
                     {{ $t('page_index.menu.contact_us') }}

resources/js/components/Others/CookieDisclaimer.vue

@@ -47,7 +47,7 @@
         @include widget-card;
         position: fixed;
         bottom: 0;
-        left: 35px;
+        left: 115px;
         max-width: 225px;
         z-index: 3;
         border-bottom-left-radius: 0;

resources/js/components/Others/ListInfoItem.vue

@@ -21,10 +21,6 @@
         display: block;
         padding-bottom: 20px;
 
-        &:first-child {
-            padding-bottom: 0;
-        }
-
         .action-button {
             cursor: pointer;
 

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

@@ -1,5 +1,5 @@
 <template>
-    <PageTab class="form-fixed-width">
+    <PageTab v-if="user" class="form-fixed-width">
         <PageTabGroup>
             <FormLabel>{{ $t('user_box_delete.title') }}</FormLabel>
             <InfoBox>
@@ -123,14 +123,4 @@
     .block-form {
         max-width: 100%;
     }
-
-
-    @media only screen and (max-width: 960px) {
-
-    }
-
-    @media (prefers-color-scheme: dark) {
-
-    }
-
 </style>

resources/views/index.blade.php

@@ -56,7 +56,7 @@
 
             legal: {!! isset($legal) ? $legal : 'undefined' !!},
 
-            installation: '{{ $installation }}',
+            installation: '{{ $installation ?? '' }}',
             latest_upgrade: '{{ isset($settings->latest_upgrade) && $settings->latest_upgrade ? $settings->latest_upgrade : null }}',
         }
     </script>