fakeRenameFileOrFolder fixes

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

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([

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,
],
];