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

fakeRenameFileOrFolder fixes

Browse Source
This commit is contained in:
Čarodej
2022-03-17 16:52:58 +01:00
parent 0c334f5daf
commit fea2d839e7
4 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App/Console/Commands/GenerateDemoSubscriptionContentCommand.php
+4 -4
View File
@@ -96,7 +96,7 @@ class GenerateDemoSubscriptionContentCommand extends Command
$subscription->usages()->create([
'metered_feature_id' => $bandwidthFeature->id,
'quantity' => random_int(111, 999),
'quantity' => random_int(111, 999) / 1000,
'created_at' => now()->subDays($item),
]);
@@ -109,7 +109,7 @@ class GenerateDemoSubscriptionContentCommand extends Command
$subscription->usages()->create([
'metered_feature_id' => $storageFeature->id,
'quantity' => random_int(1111, 3999),
'quantity' => random_int(1111, 3999) / 1000,
'created_at' => now()->subDays($item),
]);
}
@@ -193,8 +193,8 @@ class GenerateDemoSubscriptionContentCommand extends Command
],
])->each(
function ($transaction) use ($user, $plan) {
$bandwidthUsage = random_int(1000, 12000);
$storageUsage = random_int(300, 4900);
$bandwidthUsage = random_int(1000, 12000) / 1000;
$storageUsage = random_int(300, 4900) / 1000;
$memberUsage = random_int(3, 20);
$user->transactions()->create([
src/App/Users/Actions/FormatUsageEstimatesAction.php
+3 -9
View File
@@ -12,22 +12,16 @@ class FormatUsageEstimatesAction
->mapWithKeys(function ($estimate) use ($currency) {
// Format usage
$usage = match ($estimate['feature']) {
'bandwidth', 'storage' => Metric::megabytes($estimate['usage'])->format(),
'bandwidth', 'storage' => Metric::megabytes($estimate['usage'] * 1000)->format(),
'flatFee' => intval($estimate['usage']) . ' ' . __('Pcs.'),
'member' => intval($estimate['usage']) . ' ' . __('Mem.'),
};
// Normalize units
$amount = match ($estimate['feature']) {
'bandwidth', 'storage' => $estimate['amount'] / 1000,
'flatFee', 'member' => $estimate['amount'],
};
return [
$estimate['feature'] => [
'feature' => $estimate['feature'],
'amount' => $amount,
'cost' => format_currency($amount, $currency),
'amount' => $estimate['amount'],
'cost' => format_currency($estimate['amount'], $currency),
'usage' => $usage,
],
];
src/Support/Scheduler/Actions/ReportUsageAction.php
+3 -3
View File
@@ -38,8 +38,8 @@ class ReportUsageAction
->where('user_id', $subscription->user->id)
->sum('filesize');
// We count storage size in GB, e.g. 0.15 is 150mb
$amount = $filesize / 1000000;
// We count storage size in GB, e.g. 0.150 is 150mb
$amount = $filesize / 1_000_000_000;
// Record storage capacity usage
$subscription->recordUsage('storage', $amount);
@@ -54,7 +54,7 @@ class ReportUsageAction
->whereDate('created_at', today()->subDay())
->first();
$amount = (($record->download ?? 0) + ($record->upload ?? 0)) / 1000000;
$amount = (($record->download ?? 0) + ($record->upload ?? 0)) / 1_000_000_000;
// Record storage capacity usage
$subscription->recordUsage('bandwidth', $amount);