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

- Zero capacity storage

Browse Source 
- Set 0 storage capacity after creating order
This commit is contained in:
Peter Papp
2021-03-24 08:35:43 +01:00
parent 480f518ebc
commit 1ffa569ea3
5 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Oasis/AdminController.php
+13 -9
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use App\Models\User;
use App\Models\UserSettings;
use App\Notifications\Oasis\PaymentRequiredNotification;
use App\Services\Oasis\CzechRegisterSearchService;
use App\Services\StripeService;
@@ -52,19 +53,22 @@ class AdminController extends Controller
'password' => Hash::make(Str::random()),
]);
UserSettings::unguard();
// Store user settings
$newbie
->settings()
->create([
'ico' => $request->ico,
'name' => $request->name,
'address' => $request->address,
'state' => $request->state,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'phone_number' => $request->phone_number,
'timezone' => '1.0',
'storage_capacity' => 0,
'ico' => $request->ico,
'name' => $request->name,
'address' => $request->address,
'state' => $request->state,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'phone_number' => $request->phone_number,
'timezone' => '1.0',
]);
// Store subscription request
app/Http/helpers.php
+7 -1
View File
@@ -400,7 +400,11 @@ function get_storage_fill_percentage($used, $capacity)
$total = intval(Metric::gigabytes($capacity)->numberOfBytes());
// Count progress
$progress = ($used * 100) / $total;
if ($total == 0) {
$progress = 100;
} else {
$progress = ($used * 100) / $total;
}
// Return in 2 decimal
return number_format((float)$progress, 2, '.', '');
@@ -409,6 +413,8 @@ function get_storage_fill_percentage($used, $capacity)
/**
* Get user capacity fill by percentage
*
* @param $id
* @param null $additionals
* @return string
*/
function user_storage_percentage($id, $additionals = null)
resources/js/Oasis/Admin/Users.vue
+8 -2
View File
@@ -49,14 +49,20 @@
</span>
</td>
<td>
<span class="cell-item">
<span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
{{ row.data.attributes.storage.used_formatted }}
</span>
<span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
-
</span>
</td>
<td v-if="config.storageLimit">
<span class="cell-item">
<span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
{{ row.data.attributes.storage.capacity_formatted }}
</span>
<span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
-
</span>
</td>
<td>
<span class="cell-item">
resources/js/views/Admin/Users.vue
+8 -2
View File
@@ -44,14 +44,20 @@
</span>
</td>
<td>
<span class="cell-item">
<span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
{{ row.data.attributes.storage.used_formatted }}
</span>
<span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
-
</span>
</td>
<td v-if="config.storageLimit">
<span class="cell-item">
<span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
{{ row.data.attributes.storage.capacity_formatted }}
</span>
<span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
-
</span>
</td>
<td>
<span class="cell-item">
tests/Feature/Oasis/OasisAdminTest.php
+1
View File
@@ -99,6 +99,7 @@ class OasisAdminTest extends TestCase
$this->assertDatabaseHas('user_settings', [
'ico' => '08995281',
'payment_activation' => 0,
'storage_capacity' => 0,
]);
$newbie = User::whereEmail('john@doe.com')