nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue when you create plan with 0 team members amount

Browse Source
This commit is contained in:
Čarodej
2022-05-10 10:48:05 +02:00
parent 6472997cc1
commit 8c75166980
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.testing
View File

@@ -1,6 +1,6 @@
APP_NAME=Laravel APP_NAME=Laravel
APP_ENV=local APP_ENV=local
APP_KEY=base64:yZKAPw49CfEkTqkD1YU25gy+RJOnns8EJ/1CaiPbDps= APP_KEY=base64:XoZtpZo5SxV0uA1bMODxy2wfzZe2A4SMoxEnvj67Yz8=
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://localhost APP_URL=http://localhost
APP_DEMO=false APP_DEMO=false

1
changelog.md
View File

@@ -6,6 +6,7 @@
- Fixed issue when upload doesn't start after you drag the file into empty view - Fixed issue when upload doesn't start after you drag the file into empty view
- Fixed issue when homepage flash to sign in screen after the homepage was disabled in admin panel - Fixed issue when homepage flash to sign in screen after the homepage was disabled in admin panel
- Fixed trash navigator issue - Fixed trash navigator issue
- Fixed issue when you create plan with 0 team members amount
## Version 2.1.2 ## Version 2.1.2
#### Release date: 8. May 2022 #### Release date: 8. May 2022

8
public/mix-manifest.json
View File

@@ -28,8 +28,8 @@
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=40e9f287b5258a40", "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=40e9f287b5258a40",
"/chunks/user.js": "/chunks/user.js?id=cf9a2a0d8c1fa1d9", "/chunks/user.js": "/chunks/user.js?id=cf9a2a0d8c1fa1d9",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=ff6c1fc63a372d96", "/chunks/user-detail.js": "/chunks/user-detail.js?id=ff6c1fc63a372d96",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=4f76194837113969", "/chunks/user-storage.js": "/chunks/user-storage.js?id=0e26321285c15e1a",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=797d77ff2b1c08cc", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=189de61fad1cd281",
"/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea", "/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5", "/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5",
"/chunks/plan.js": "/chunks/plan.js?id=3e7b0b34c2247e6c", "/chunks/plan.js": "/chunks/plan.js?id=3e7b0b34c2247e6c",
@@ -61,8 +61,8 @@
"/chunks/settings.js": "/chunks/settings.js?id=52f3d6db0f91fc89", "/chunks/settings.js": "/chunks/settings.js?id=52f3d6db0f91fc89",
"/chunks/profile.js": "/chunks/profile.js?id=3e24bb5e1f52d4bb", "/chunks/profile.js": "/chunks/profile.js?id=3e24bb5e1f52d4bb",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4", "/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=ecfee7f7e98204f8",
"/chunks/billing.js": "/chunks/billing.js?id=115c25478cee576d", "/chunks/billing.js": "/chunks/billing.js?id=a21fc7e052c60acd",
"/chunks/platform.js": "/chunks/platform.js?id=a32da2ed3fa8918a", "/chunks/platform.js": "/chunks/platform.js?id=a32da2ed3fa8918a",
"/chunks/files.js": "/chunks/files.js?id=5f29f35c280e680b", "/chunks/files.js": "/chunks/files.js?id=5f29f35c280e680b",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=6f43aea38e0927bc", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=6f43aea38e0927bc",

2
resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
View File

@@ -63,7 +63,7 @@ export default {
limitations.push({ limitations.push({
message: payload.message[key], message: payload.message[key],
isVisibleBar: item.total !== -1, isVisibleBar: item.total !== -1 && item.total !== 0,
distribution: [ distribution: [
{ {
progress: item.percentage, progress: item.percentage,

2
resources/js/components/UI/ProgressChart/ProgressLine.vue
View File

@@ -9,8 +9,6 @@
}" }"
class="chart-wrapper" class="chart-wrapper"
> >
<!--<DotLabel class="label" :class="{'offset-top': chart.progress < 5}" :color="chart.color" :title="chart.value" />-->
<!--Only singe line--> <!--Only singe line-->
<span <span
v-if="data.length === 1" v-if="data.length === 1"

7
src/App/Users/Models/UserLimitation.php
View File

@@ -94,10 +94,15 @@ class UserLimitation extends Model
$totalUsedEmails = $memberEmails->merge($InvitationEmails) $totalUsedEmails = $memberEmails->merge($InvitationEmails)
->unique(); ->unique();
// Get usage in percent
$percentage = (int) $this->max_team_members === 0
? 100
: ($totalUsedEmails->count() / $this->max_team_members) * 100;
return [ return [
'use' => $totalUsedEmails->count(), 'use' => $totalUsedEmails->count(),
'total' => (int) $this->max_team_members, 'total' => (int) $this->max_team_members,
'percentage' => ($totalUsedEmails->count() / $this->max_team_members) * 100, 'percentage' => $percentage,
'meta' => [ 'meta' => [
'allowed_emails' => $totalUsedEmails, 'allowed_emails' => $totalUsedEmails,
], ],