Commit graph

78 commits

Author SHA1 Message Date
IceToast 330ea45c5b fix: 🐛 Try catch for possible non available settings 2024-04-12 21:01:00 +02:00
IceToast e8a6adb4e6 fix: 🚚 Typo cancelled -> canceled 2023-06-08 16:10:42 +02:00
Dennis fec6c198d2
Merge branch 'development' into development 2023-05-16 22:05:34 +02:00
1day2die 680ffefb1e fix server upgrade while installation 2023-05-16 22:03:52 +02:00
1day2die 2b0321733e fix server upgrade 2023-05-16 21:38:09 +02:00
1day2die 2c9b933c6d fix server upgrade 2023-05-16 21:36:59 +02:00
IceToast b1aaaeb329 fix: 🐛 add missing cancel functionality 2023-05-08 11:39:21 +02:00
IceToast ad5ff40761 fix: 🐛 Old settings relict 2023-05-08 11:26:47 +02:00
IceToast 5b95dd4d13 Merge branch 'billing_system' into feature/billing_cycles
# Conflicts:
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	app/Models/User.php
#	lang/cs.json
#	lang/en.json
#	themes/default/views/admin/products/create.blade.php
#	themes/default/views/admin/products/edit.blade.php
#	themes/default/views/admin/settings/tabs/system.blade.php
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
#	themes/default/views/servers/settings.blade.php
2023-05-08 11:03:10 +02:00
1day2die 8279f07156 new Permission "admin.servers.bypass_creation_enabled" 2023-05-07 19:49:05 +02:00
1day2die eb3afbfaab full user permissions 2023-05-03 09:53:41 +02:00
ok236449 821d85e395 fix server deletion upon changing product 2023-04-12 20:51:08 +02:00
Ferks-FK fc49c6490f More Variables.. 2023-02-24 14:02:28 +01:00
Ferks-FK 9cd25034fc Another ton of modifications 2023-02-24 14:02:28 +01:00
Ferks-FK cfd370eb6d Too many changes to mention. 2023-02-24 14:02:28 +01:00
Ferks-FK 1d2548a174 Update all imports 2023-02-24 14:02:28 +01:00
IceToast 255671e20d
fix: 🐛 Merge issues 2023-02-06 14:45:44 +01:00
IceToast 94cbea528c
Fixed Upgrade/Downgrade Credit withdrawal 2023-02-06 14:35:35 +01:00
IceToast cf62cdef1f
fix: 🐛 See last commit 2023-02-06 14:30:14 +01:00
IceToast 35734579ae
fix: 🐛 Server creation fail when server.price = user.credits 2023-02-06 14:29:55 +01:00
IceToast 87ec49008d
fix: 🚑️ Fixed credits check at server creation & formatted prices nicely 2023-02-06 14:29:55 +01:00
IceToast 9ad2954f0e
fix: 📝 Undo Naming 2023-02-06 14:20:33 +01:00
IceToast 7fa9bf2062
feat: Added Server Cancelation route method and charging 2023-02-06 14:20:32 +01:00
IceToast da0dd37559
feat: Added last_billed to server model & always charge first & fixed Charge Server command 2023-02-06 14:17:43 +01:00
IceToast bd11bd2657
Revert "Merge branch 'v0.10' into development"
This reverts commit e6a545309f, reversing
changes made to 036fe6f47f.
2023-02-01 21:03:20 +01:00
IceToast 5fd58514b5 Merge branch addons/billing_period into V0.10 2023-01-21 15:13:48 +01:00
1day2die a088b81366 remove unused imports 2023-01-16 18:53:09 +01:00
Shift 70208d2157
Apply Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-12 coding style as a base with some minor additions.

You may customize the code style applied by configuring [Pint](https://laravel.com/docs/pint), [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer), or [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) for your project root.

For more information on customizing the code style applied by Shift, [watch this short video](https://laravelshift.com/videos/shift-code-style).
2023-01-05 17:01:42 +00:00
Ferks-FK 8a2d7b67f1 Add a warning of blocked server creation for adm's 2022-11-04 19:15:48 +00:00
Ferks-FK 98045d8896 General fixes 2022-11-04 17:15:16 +00:00
Ferks-FK 566383ccd5 Initial commits to the new options 2022-11-03 22:15:06 +00:00
Dennis 1c389c85c0
Merge pull request #574 from ok236449/development-2
Resource checks on server creation and upgrade
2022-08-24 20:11:32 +02:00
ok236449 df0d37bb81 Check for resources when upgrading server 2022-08-24 17:52:51 +02:00
ok236449 c26a47a982 Delete server on 404 instead of giving 500 2022-08-20 18:49:33 +02:00
ok236449 16067c6cc8 sync renamed servers on Pterodactyl 2022-08-19 21:50:04 +02:00
1day2die 07a2ebfccc min required credits per product when upgrading 2022-08-17 19:31:14 +02:00
IceToast ff5ad1e2bd feat: Added validation on enable upgrade system & disabled upgrade route if not enabled 2022-08-16 22:33:59 +02:00
IceToast 5bf5abfda7 feat: Added Enable Upgrade setting 2022-08-16 22:25:35 +02:00
SahrulGnwn 3f47fa5e9f Fix Bypass node limit when upgrade 2022-08-15 20:36:14 +07:00
Dennis be932acb78
Merge branch 'development' into development 2022-08-13 23:24:09 +02:00
1day2die 1ca4cea5a4 globally limit post requests 2022-08-13 22:29:57 +02:00
1day2die 66e81ebfcf Fix User-> Server edit bug 2022-08-13 22:21:55 +02:00
SahrulGnwn a9f7de3f45 Update ServerController.php 2022-08-12 20:55:22 +07:00
SahrulGnwn 7bb3caa494 Fix checking free resource node 2022-08-11 21:55:24 +07:00
SahrulGnwn 69d9fe5fb0 Restart After Upgrade 2022-08-11 20:50:33 +07:00
Dennis 1f9301ef0e
Merge pull request #520 from ControlPanel-gg/dev---upgradesystem
Dev   upgradesystem
2022-08-11 12:07:56 +02:00
SahrulGnwn 7ad56dad8d Fix Delete 2022-08-11 16:59:04 +07:00
Dennis c32d6f5e2e
Check for Node allocations 2022-08-11 08:10:24 +02:00
IceToast e9348eca52 fix: 🐛 Check if product supports the exact egg as server installed on 2022-08-03 16:43:41 +02:00
SahrulGnwn 6b5986881d Upgrade / Downgrade 2022-08-03 19:34:00 +07:00